-修改仅特级动火和受限空间时的签字操作

master/src/main/java/com/ruoyi/project/invoice/controller/TApproveReserveInvoiceController.java

@@ -258,7 +258,7 @@ public class TApproveReserveInvoiceController extends BaseController {
         }
         List<TInvoiceWorkcontent> workcontents = invoiceWorkcontentMapper.selectTInvoiceWorkcontentBybookingticketId(Long.valueOf(invoice.getInvoiceId()));
         for (TInvoiceWorkcontent workcontent : workcontents) {
-            if (workcontent.getWorkType() == 1 || workcontent.getWorkType() == 2 || workcontent.getWorkType() == 3 || workcontent.getWorkType() == 15) {
+            if (workcontent.getWorkType() == 1 || workcontent.getWorkType() == 15) {
                 param.put("isspecial", "1");
                 break;
             } else {

ui/src/views/approve/approveDetail/invoice-detail.vue

@@ -202,7 +202,12 @@ export default {
     },
     // 字典翻译
     floorLocationFormat(row, column) {
-      return this.selectDictLabel(this.floorLocationOptions, row.floorLocation);
+      console.log(row.floorLocation)
+      let floor="";
+      row.floorLocation.split(",").forEach(item=>{
+        floor+= this.selectDictLabel(this.floorLocationOptions,item)+","
+      })
+      return floor.substring(0,floor.length-1);
     },
     // 字典翻译
     userMgFormat(row, column) {

ui/src/views/invoice/bookingworkticket/index.vue

@@ -614,7 +614,7 @@ export default {
               this.approveForm.isToday = 1;
         }
          //判断是否涉及 动火 和当日
-          if (row.workType===1||row.workType===2||row.workType===3||row.workType===15){
+          if (row.workType===1||row.workType===15){
             this.approveForm.isSpecial = 1
           }
         this.approveForm.userSupId=row.bookingworkticket.userMg;
@@ -927,8 +927,7 @@ export default {
                    this.approveForm.isToday = 0;
             }
             for(let i=0;i<this.ruleForm.length;i++){
-               if( this.ruleForm[i].workType===1||this.ruleForm[i].workType===2||
-               this.ruleForm[i].workType===3||this.ruleForm[i].workType===15){
+               if( this.ruleForm[i].workType===1||this.ruleForm[i].workType===15){
               this.approveForm.isSpecial = 1
                  break;
             }else{