设备变更

master/src/main/java/com/ruoyi/project/ehs/controller/TApproveDangerController.java

@@ -347,6 +347,11 @@ public class TApproveDangerController extends BaseController
                     logger.info("设备维修审批流程" +JSON.toJSONString(approve));
                     devTask.setApproveObj(approve);
                     devTask.setApNo(approve.getApNo());
+                }else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
+                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
+                    logger.info("设备变更申请" +JSON.toJSONString(approve));
+                    devTask.setApproveObj(approve);
+                    devTask.setApNo(approve.getApNo());
                 }
                 list.add(devTask);
             }
@@ -416,6 +421,12 @@ public class TApproveDangerController extends BaseController
                     devProcess.setApNo(approve.getApNo());
                     devProcess.setApName(user.getNickName());
                     devProcess.setApproveObject(approve);
+                }else if (pi.getProcessDefinitionName().equals("设备变更申请")) {
+                    TIntactApprove approve = tIntactApproveService.selectTIntactApproveById(Long.parseLong(pi.getBusinessKey()));
+                    SysUser user = sysUserService.selectUserById(approve.getUserId());
+                    devProcess.setApNo(approve.getApNo());
+                    devProcess.setApName(user.getNickName());
+                    devProcess.setApproveObject(approve);
                 }else {
                     TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(pi.getBusinessKey()));
                     SysUser user = sysUserService.selectUserById(approveDanger.getRecorderId());

ui/src/views/approve/taskdone/index.vue

@@ -55,6 +55,7 @@
     <spec-modify v-if="specModifyDealVisible" ref="specModifyDeal" @refreshDataList="getList"></spec-modify>
     <spec-training-plan v-if="specTrainingPlanVisible" ref="specTrainingPlan" @refreshDataList="getList"></spec-training-plan>
     <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance" @refreshDataList="getList"></spec-maintenance>
+    <intact-detail v-if="intactDetailVisible" ref="intactDetail" @refreshDataList="getList"></intact-detail>
   </div>
 </template>
 
@@ -69,10 +70,11 @@
   import SpecModify from '../approveDetail/specModify-detail';
   import SpecTrainingPlan from '../approveDetail/specTrainingPlan-detaill';
   import SpecMaintenance from "@/views/approve/approveDetail/specMaintenance-detail";
+  import IntactDetail from "@/views/approve/approveDetail/intact-detail";
   export default {
     name: "Taskdone",
     components: {
-      Treeselect, AddOrUpdate,ProcessImg,SpecModify,SpecTrainingPlan,SpecMaintenance
+      Treeselect, AddOrUpdate,ProcessImg,SpecModify,SpecTrainingPlan,SpecMaintenance,IntactDetail
     },
     data() {
       return {
@@ -83,6 +85,7 @@
         specModifyDealVisible: false,
         specTrainingPlanVisible: false,
         specMaintenanceVisible: false,
+        intactDetailVisible:false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -200,6 +203,12 @@
             console.log(row.taskName)
             this.$refs.specMaintenance.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
           })
+        }else if (row.processName == "设备变更申请") {
+          this.intactDetailVisible = true
+          this.$nextTick(() => {
+            console.log(row.taskName)
+            this.$refs.intactDetail.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+          })
         }else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;