-修改申请时修改预约票区域选择-

-修改装置主管选择逻辑

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

@@ -8,13 +8,11 @@ import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.project.approve.damain.DevTask;
-import com.ruoyi.project.invoice.domain.TApproveReserveInvoice;
-import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticket;
-import com.ruoyi.project.invoice.domain.TInvoiceBookingworkticketVo;
-import com.ruoyi.project.invoice.domain.TInvoiceWorkcontent;
-import com.ruoyi.project.invoice.mapper.TInvoiceWorkcontentMapper;
+import com.ruoyi.project.invoice.domain.*;
 import com.ruoyi.project.invoice.service.ITApproveReserveInvoiceService;
 import com.ruoyi.project.invoice.service.ITInvoiceBookingworkticketService;
+import com.ruoyi.project.invoice.service.ITInvoiceDeviceService;
+import com.ruoyi.project.invoice.service.ITInvoiceWorkcontentService;
 import com.ruoyi.project.listener.invoiceApprove.*;
 import com.ruoyi.project.system.domain.SysUser;
 import com.ruoyi.project.system.service.ISysUserService;
@@ -43,6 +41,8 @@ public class TApproveReserveInvoiceController extends BaseController {
     private ITApproveReserveInvoiceService tApproveReserveInvoiceService;
     @Autowired
     private ITInvoiceBookingworkticketService workService;
+    @Autowired
+    private ITInvoiceDeviceService deviceService;
 
     @Autowired
     private TaskService taskService;
@@ -51,7 +51,7 @@ public class TApproveReserveInvoiceController extends BaseController {
     private RuntimeService runtimeService;
 
     @Autowired
-    private TInvoiceWorkcontentMapper invoiceWorkcontentMapper;
+    private ITInvoiceWorkcontentService invoiceWorkcontentMapper;
 
     @Autowired
     private ISysUserService iSysUserService;
@@ -130,40 +130,12 @@ public class TApproveReserveInvoiceController extends BaseController {
             applyUser = invoice.getCreaterCode().toString();
 //            invoice.setStatus(0L);
 //            workService.updateById(invoice);
-            switch (invoice.getWorkArea()) {
-                case "310裂解区":
-                case "700开关锅炉":
-                case "320裂解区":
-                case "250管廊-700":
-                    devSupId = "20253,20257";
-                    break;
-                case "330压缩区":
-                case "废水处理":
-                case "600废碱":
-                case "250管廊-600":
-                    devSupId = "20249,20317";
-                    break;
-                case "380分离区":
-                case "360分离区":
-                case "350分离区":
-                case "340分离区":
-                    devSupId = "20252";
-                    break;
-                case "400汽油加氢":
-                case "250管廊-400":
-                    devSupId = "20248";
-                    break;
-                case "500芳烃抽提":
-                case "250管廊-500":
-                    devSupId = "20244";
-                    break;
-                case "D301控制楼":
-                case " D201变电所":
-                case " 维修厂房":
-                case "危废车库":
-                    devSupId = "20332,20250,20276";
-//                    devSupId = "10081";
-                    break;
+            TInvoiceDevice device = new TInvoiceDevice();
+            device.setWorkArea(invoice.getWorkArea());
+            List<TInvoiceDevice> tInvoiceDevices = deviceService.selectTInvoiceDeviceList(device);
+            for (TInvoiceDevice tInvoiceDevice : tInvoiceDevices)   {
+                devSupId = tInvoiceDevice.getRegionalHead();
+                logger.info("========devSupId:" + devSupId);
             }
         }
         //开始工作流、监听

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

@@ -75,7 +75,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="作业区域" prop="workArea">
-              <el-select v-model="form.workArea" placeholder="请选择作业区域">
+              <el-select v-model="form.workArea" placeholder="请选择作业区域" :disabled="isDevSup">
                 <el-option
                   v-for="dict in workAreaOptions"
                   :key="dict.id"
@@ -237,6 +237,7 @@ import {getUserByUnit} from "@/api/invoice/unit";
 import {treeselect} from "@/api/system/dept";
 import {addBookingworkticket, getBookingworkticket, updateBookingworkticket} from "@/api/invoice/bookingworkticket";
 import Treeselect from "@riophae/vue-treeselect";
+import {selectDevice} from "@/api/invoice/device";
 
 export default {
   name: "invoice-detail",
@@ -472,9 +473,7 @@ export default {
       this.getDicts("booking_work_status").then(response => {
         this.statusOptions = response.data;
       });
-      this.getDicts("book_work_area").then(response => {
-        this.workAreaOptions = response.data;
-      });
+      this.getDeviceup();
       this.getDicts("book_unit_number").then(response => {
         this.unitNumberOptions = response.data;
       });
@@ -551,6 +550,25 @@ export default {
       this.reset();
     },
 
+    getDeviceup(){
+      const queryForm= {
+        pageNum: 1,
+        pageSize: 20,
+        devName: null,
+        workArea: null,
+        regionalHead: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null,
+        remarks: null
+      };
+      selectDevice(queryForm).then(response => {
+        this.workAreaOptions = response.data
+      });
+    },
+
     detailCancel() {
       this.open = false;
       this.detailReset();