wangggziwen hai 2 meses
pai
achega
1d53a419c9

+ 3 - 3
master/src/main/java/com/ruoyi/config/ActivitiConfig.java

@@ -153,9 +153,9 @@ public class ActivitiConfig {
 //        Resource spec13 = resourceLoader.getResource("classpath:/processes/apply/safetychange.bpmn"); //加载流程图资源文件
 //        deploymentBuilder13.enableDuplicateFiltering().addInputStream(spec13.getFilename(), spec13.getInputStream()).name("组织保护措施状态变更申请流程").deploy();//按流程id部署
 
-        DeploymentBuilder deploymentBuilder14 = repositoryService().createDeployment();
-        Resource spec14 = resourceLoader.getResource("classpath:/processes/sai/saiApply.bpmn"); //加载流程图资源文件
-        deploymentBuilder14.enableDuplicateFiltering().addInputStream(spec14.getFilename(), spec14.getInputStream()).name("SAI开项申请流程").deploy();//按流程id部署
+//        DeploymentBuilder deploymentBuilder14 = repositoryService().createDeployment();
+//        Resource spec14 = resourceLoader.getResource("classpath:/processes/sai/saiApply.bpmn"); //加载流程图资源文件
+//        deploymentBuilder14.enableDuplicateFiltering().addInputStream(spec14.getFilename(), spec14.getInputStream()).name("SAI开项申请流程").deploy();//按流程id部署
 
 //        DeploymentBuilder deploymentBuilder15 = repositoryService().createDeployment();
 //        Resource spec15 = resourceLoader.getResource("classpath:/processes/sems/semsWeekcheck.bpmn"); //加载流程图资源文件

+ 1 - 1
master/src/main/resources/processes/eoegsai/eoegSaiApply.bpmn

@@ -4,7 +4,7 @@
     <startEvent id="startevent" name="Start"></startEvent>
     <userTask id="assessTask" name="评估" activiti:candidateUsers="#{assessor}"></userTask>
     <userTask id="executeTask" name="执行" activiti:assignee="#{executor}"></userTask>
-    <userTask id="inspectTask" name="验收"></userTask>
+    <userTask id="inspectTask" name="验收" activiti:assignee="{inspectors}"></userTask>
     <sequenceFlow id="flow5" name="通过" sourceRef="executeTask" targetRef="inspectTask">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>

+ 1 - 1
ui/src/views/approve/approveDetail/eoeg-sai-apply-detail.vue

@@ -676,7 +676,7 @@ export default {
         this.dataForm.workArea = this.dataForm.workArea.toString();
         this.getFileList()
         // // 加载登记人列表
-        this.listStaffmgrByDeptAndTeam(null, null);
+        this.listStaffmgrByDeptAndTeam('38', null);
         this.handleUnsafeChoiceChange();
         if (this.dataForm.unsafeStatus != null && this.dataForm.unsafeStatus != "") {
           this.unsafeChoice = '1';