jshERP-web/src/views/system/modules/UserModal.vue

@@ -53,7 +53,7 @@
               :dropdownStyle="{ maxHeight: '200px', overflow: 'auto' }"
               allow-clear
               :treeData="orgaTree"
-              v-decorator="['orgaId']"
+              v-decorator="['orgaId', validatorRules.orgaId]"
               placeholder="请选择机构"
             >
             </a-tree-select>
@@ -140,6 +140,14 @@ export default {
             },
           ],
         },
+        orgaId: {
+          rules: [
+            {
+              required: true,
+              message: '请选择机构!',
+            },
+          ],
+        },
       },
       model: {},
       labelCol: {

jshERP-web/src/views/task/HandledList.vue

@@ -21,6 +21,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-select v-model="queryParam.auditStatus" allowClear placeholder="请选择状态">
+                    <a-select-option :value="0" :key="0">审批中</a-select-option>
                     <a-select-option :value="1" :key="1">审批完成</a-select-option>
                     <a-select-option :value="2" :key="2">审批未通过</a-select-option>
                   </a-select>

jshERP-web/src/views/task/modules/FlowModal.vue

@@ -47,11 +47,11 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="24 / 2">
-              <a-form-model-item :label="`审核人${index+1}`" :labelCol="labelCol" :wrapperCol="wrapperCol" :prop="`auditNodes[${index}].auditor`" :rules="item.auditorType===1?{
-                required: true,
-                message: '请选择',
+              <a-form-model-item :label="`审核人${index+1}`" :labelCol="labelCol" :wrapperCol="wrapperCol" :prop="`auditNodes[${index}].auditor`" :rules="{
+                required: item.auditorType==1,
                 trigger: 'change',
-              }:{}">
+                validator: (rule, value, callback) => validatorAuditor(rule, value, callback, index)
+              }">
                 <a-select v-model="item.auditor" @change="changeAuditor($event,index)" allowClear placeholder="请选择" :disabled="item.auditorType!=1||isReadOnly" style="width: 100%;">
                   <a-select-option v-for="(item, index) in _userList" :disabled="item.disabled" :key="index" :value="item.id">
                     {{ item.userName }}
@@ -232,7 +232,6 @@ export default {
       })
     },
      changeAuditorType(v,index){
-      // this.$refs.form.clearValidate([`auditNodes[${index}].auditor`])
       this.model.auditNodes[index].auditor = undefined
       this.$forceUpdate()
       this.$nextTick(() => {
@@ -240,8 +239,10 @@ export default {
       })
     },
     changeAuditor(val,index){
-      this.$refs.form.clearValidate([`auditNodes[${index}].auditor`])
       this.$forceUpdate()
+      this.$nextTick(() => {
+        this.$refs.form.validate()
+      })
     },
     validatorAuditorType(rule, value, callback, index){
       if(index === 0){
@@ -258,6 +259,19 @@ export default {
         callback()
       }
     },
+    validatorAuditor(rule, value, callback, index){
+      const auditorType = this.model.auditNodes[index].auditorType
+      const auditor = this.model.auditNodes[index].auditor
+      if(auditorType==1){
+        if(auditor){
+          callback()
+        }else{
+          callback(new Error(`请选择审核人${index+1}`))
+        }
+      }else{
+        callback()
+      }
+    },
     handleOk() {
       const that = this
       // 触发表单验证

src/main/java/com/jsh/erp/controller/pda/PdaController.java

@@ -375,11 +375,11 @@ public class PdaController extends BaseController {
     @ApiOperation("设置复核任务状态")
     public AjaxResult setReviewStatus(@RequestBody PDADepotHeadDTO pdaDepotHeadDTO){
         Long userId = userService.getCurrentUser().getId();
-        DepotHead depotHead = depotHeadService.getDepotHead(pdaDepotHeadDTO.getId());
+        DepotHead depotHead = depotHeadService.getById(pdaDepotHeadDTO.getId());
         if (!depotHead.getStatus().equals("6")){
             return AjaxResult.error("该复核任务已被处理");
         }
-        if (depotHead.getCreator() == userId){
+        if (depotHead.getOperId().equals(userId)){
             return AjaxResult.error("提交人不能和复核人为同一账号");
         }
         boolean b = depotHeadService.setReviewStatus(pdaDepotHeadDTO);