LY 专项培养

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

@@ -239,6 +239,10 @@ public class TApproveDangerController extends BaseController
                     TApproveDanger approveDanger = tApproveDangerService.selectTApproveDangerById(Long.parseLong(h.getBusinessKey()));
                     devProcess.settApprove(approveDanger);
                     devProcess.setApNo(approveDanger.getApproveNo());
+                }else if(pi.getProcessDefinitionName().equals("专项培训计划审核")){
+                    TStApprove approve = tStApproveService.selectTStApproveById(Long.parseLong(pi.getBusinessKey()));
+                    devProcess.setApproveObject(approve);
+                    devProcess.setApNo(approve.getApNo());
                 }
                 devProcess.setBusinessKey(pi.getBusinessKey());
                 devProcess.setProcessCreateTime(pi.getStartTime());

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

@@ -44,6 +44,7 @@
     <process-img v-if="processImgVisible" ref="processImg" @refreshDataList="getList"></process-img>
     <add-or-update v-if="specDealVisible" ref="specDeal" @refreshDataList="getList"></add-or-update>
     <spec-modify v-if="specModifyDealVisible" ref="specModifyDeal" @refreshDataList="getList"></spec-modify>
+    <spec-training-plan v-if="specTrainingPlanVisible" ref="specTrainingPlan" @refreshDataList="getList"></spec-training-plan>
 
   </div>
 </template>
@@ -56,10 +57,11 @@
   import ProcessImg from '../processImg'
   import AddOrUpdate from '../approveDetail/spec-detail';
   import SpecModify from '../approveDetail/specModify-detail';
+  import SpecTrainingPlan from '../approveDetail/specTrainingPlan-detaill';
 
   export default {
     name: "Myapprove",
-    components: { Treeselect,ProcessImg,AddOrUpdate,SpecModify},
+    components: { Treeselect,ProcessImg,AddOrUpdate,SpecModify,SpecTrainingPlan},
     data() {
       return {
         // 遮罩层
@@ -67,6 +69,7 @@
         processImgVisible: false,
         specDealVisible: false,
         specModifyDealVisible: false,
+        specTrainingPlanVisible: false,
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -162,6 +165,12 @@
             console.log(row.taskName)
             this.$refs.specModifyDeal.init(row.approveSpecModify.id, row.taskId, row.processId,row.taskName)
           })
+        }else if (row.processName == "专项培训计划审核") {
+          this.specTrainingPlanVisible = true
+          this.$nextTick(() => {
+            console.log(row.taskName)
+            this.$refs.specTrainingPlan.init(row.approveObject.id, row.taskId, row.processId, row.taskName)
+          })
         }else {
           this.approveInfo = row;
           this.infoTaskName = row.taskName;