Explorar el Código

张丁 班长操作

zhangding hace 3 años
padre
commit
80eb23995a

+ 1 - 0
master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceBookingworkticketController.java

@@ -386,6 +386,7 @@ public class TInvoiceBookingworkticketController extends BaseController
     /**
      * 票号生成文件
      */
+    @PreAuthorize("@ss.hasPermi('invoice:bookingworkticket:edit')")
     @GetMapping(value = "/assion{id}")
     public AjaxResult assion(@PathVariable("id") Long id)
     {

+ 2 - 2
master/src/main/java/com/ruoyi/project/invoice/controller/TInvoiceWorkcontentController.java

@@ -61,7 +61,7 @@ public class TInvoiceWorkcontentController extends BaseController
     /**
      * 获取预约作业内容详细信息
      */
-    @PreAuthorize("@ss.hasPermi('invoice:workcontent:query')")
+    @PreAuthorize("@ss.hasPermi('invoice:bookingworkticket:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -92,7 +92,7 @@ public class TInvoiceWorkcontentController extends BaseController
     /**
      * 修改预约作业内容
      */
-    @PreAuthorize("@ss.hasPermi('invoice:workcontent:edit')")
+    @PreAuthorize("@ss.hasPermi('invoice:bookingworkticket:edit')")
     @Log(title = "预约作业内容", businessType = BusinessType.UPDATE)
     @PutMapping
 

+ 7 - 10
ui/src/views/invoice/bookingworkticket/index.vue

@@ -137,7 +137,7 @@
             type="text"
             icon="el-icon-s-promotion"
             @click="association(scope.row)"
-            v-hasPermi="['invoice:bookingworkticket:edit']"
+            v-hasPermi="['invoice:bookingworkticket:edit','invoice:bookingworkticket:query']"
           ></el-button>
            </template>
  </el-table-column>
@@ -394,7 +394,7 @@
     </div>
      <div slot="footer" class="dialog-footer">
               <el-button @click="guanlianVisible=false">取 消</el-button>
-    <el-button type="primary" @click="submitassociation">确 定</el-button>
+    <el-button type="primary"    v-hasPermi="['invoice:bookingworkticket:edit']" @click="submitassociation">确 定</el-button>
           </div>
 </el-dialog>
     <add-approve v-if="addAprroveVisible" ref="addApprove" @refreshDataList="getList"></add-approve>
@@ -754,8 +754,6 @@ export default {
         //得到用户名-承包商名称
        listBookingworkticket(this.queryParams).then(response => {
          this.bookingworkticketList=response.rows;
-     
-        
        this.total = response.total;
         this.loading = false;
       });
@@ -1032,15 +1030,14 @@ export default {
       putData.id=this.associationParams.id
       putData.reservationNumber=this.reservationNumber
        updateWorkcontent(putData).then(response => {
-              console.log(response.data)
-                 this.$set(this.tableData, index, row);
+          //    console.log(response.row)
+            
           });
            assion(this.associationParams.bookingticketId).then(response => {
-              console.log(response.data)
+            this.getList()
           });
-         this.msgSuccess("请求成功");
-        this.getList()
-       
+
+         this.msgSuccess("请求成功");       
       },
       /** 下载模板操作 */
       importTemplate() {