SAI开项申请流程：执行人改为多人（+张力飞）

master/src/main/java/com/ruoyi/project/production/controller/TSaiApplyController.java

@@ -367,7 +367,7 @@ public class TSaiApplyController extends BaseController
         String comment = "";
         switch (condition) {
             case "0":
-                comment = "中止";
+                comment = "取消";
                 break;
             case "1":
                 comment = "通过";
@@ -381,7 +381,11 @@ public class TSaiApplyController extends BaseController
             case "评估":
                 if ("1".equals(condition)) {
                     form.setApplyStatus(2);
-                    param.put("executor", form.getExecutor());
+                    String executor = form.getExecutor();
+                    if (!"20276".equals(form.getExecutor())) {
+                        executor = form.getExecutor() + ",20276";
+                    }
+                    param.put("executor", executor);
                     nextHandler = form.getExecutor();
                     form.setHandler(form.getExecutor());
                 } else {

master/src/main/resources/processes/sai/saiApply.bpmn

@@ -3,7 +3,7 @@
   <process id="saiApplyProcess" name="SAI开项申请流程" isExecutable="true">
     <startEvent id="startevent" name="Start"></startEvent>
     <userTask id="assessTask" name="评估" activiti:assignee="#{assessor}"></userTask>
-    <userTask id="executeTask" name="执行" activiti:assignee="#{executor}"></userTask>
+    <userTask id="executeTask" name="执行" activiti:candidateUsers="#{executor}"></userTask>
     <userTask id="inspectTask" name="验收" activiti:candidateUsers="#{inspectors}"></userTask>
     <sequenceFlow id="flow5" name="通过" sourceRef="executeTask" targetRef="inspectTask">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
@@ -27,7 +27,7 @@
   <bpmndi:BPMNDiagram id="BPMNDiagram_saiApplyProcess">
     <bpmndi:BPMNPlane bpmnElement="saiApplyProcess" id="BPMNPlane_saiApplyProcess">
       <bpmndi:BPMNShape bpmnElement="startevent" id="BPMNShape_startevent">
-        <omgdc:Bounds height="35.0" width="35.0" x="60.0" y="112.0"></omgdc:Bounds>
+        <omgdc:Bounds height="35.0" width="35.0" x="70.0" y="112.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape bpmnElement="assessTask" id="BPMNShape_assessTask">
         <omgdc:Bounds height="55.0" width="105.0" x="154.0" y="102.0"></omgdc:Bounds>
@@ -52,7 +52,7 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
-        <omgdi:waypoint x="95.0" y="129.0"></omgdi:waypoint>
+        <omgdi:waypoint x="105.0" y="129.0"></omgdi:waypoint>
         <omgdi:waypoint x="154.0" y="129.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge bpmnElement="flow9" id="BPMNEdge_flow9">

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

@@ -104,9 +104,9 @@
             </el-table>
           </el-descriptions-item>
           <el-descriptions-item label="隐患" :span="3">
-            <el-radio v-model="unsafeChoice" label="1" style="margin-right: 10px;" :disabled="applyDisabled">不安全状态</el-radio>
+            <el-radio v-model="unsafeChoice" label="1" style="margin-right: 10px;" :disabled="applyDisabled" @change="handleUnsafeChoiceChange">不安全状态</el-radio>
             <el-form-item prop="unsafeStatus" style="display: inline-block;">
-              <el-select :disabled="applyDisabled" v-model="dataForm.unsafeStatus" placeholder="请选择不安全状态" style="margin-right: 20px;">
+              <el-select :disabled="applyDisabled" v-model="dataForm.unsafeStatus" placeholder="请选择不安全状态" style="margin-right: 20px;" clearable>
                 <el-option
                   v-for="dict in unsafeStatusOptions"
                   :key="dict.dictValue"
@@ -115,9 +115,9 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-radio v-model="unsafeChoice" label="2" style="margin-right: 10px;" :disabled="applyDisabled">不安全行为</el-radio>
+            <el-radio v-model="unsafeChoice" label="2" style="margin-right: 10px;" :disabled="applyDisabled" @change="handleUnsafeChoiceChange">不安全行为</el-radio>
             <el-form-item prop="unsafeAction" style="display: inline-block;">
-              <el-select :disabled="applyDisabled" v-model="dataForm.unsafeAction" placeholder="请选择不安全行为">
+              <el-select :disabled="applyDisabled" v-model="dataForm.unsafeAction" placeholder="请选择不安全行为" clearable>
                 <el-option
                   v-for="dict in unsafeActionOptions"
                   :key="dict.dictValue"
@@ -970,11 +970,11 @@ export default {
     /** 不安全行为/状态单选按钮值改变事件 */
     handleUnsafeChoiceChange() {
       if (this.unsafeChoice == '1') {
-        this.form.unsafeAction = null;
+        this.dataForm.unsafeAction = null;
         this.unsafeStatusDisabled = false;
         this.unsafeActionDisabled = true;
       } else if (this.unsafeChoice == '2') {
-        this.form.unsafeStatus = null;
+        this.dataForm.unsafeStatus = null;
         this.unsafeStatusDisabled = true;
         this.unsafeActionDisabled = false;
       }