bulusiLuo 2 yıl önce
ebeveyn
işleme
e4e1bc571b

+ 9 - 7
src/views/mbsys/collaborative/announcement/noticeExamine/index.vue

@@ -611,13 +611,15 @@ export default {
       if (data.hasOwnProperty("configId")) {
         params = Object.assign(params, { configId: data.configId }); //流程配置ID
       }
-      if (
-        state == 1 &&
-        data.headleState == 1 &&
-        (nextStep.deptStaff == "" || nextStep.deptStaff == null)
-      ) {
-        this.$message.warning("提交请选择下一步审核人");
-        return null;
+      if(data.curProcessStep !==3){
+        if (
+          state == 1 &&
+          data.headleState == 1 &&
+          (nextStep.deptStaff == "" || nextStep.deptStaff == null)
+        ) {
+          this.$message.warning("提交请选择下一步审核人");
+          return null;
+        }
       }
       Object.assign(params, { nextStep: nextStep });
       const json = JSON.stringify(params);

+ 9 - 7
src/views/mbsys/collaborative/collectDocument/collectDocExamine/index.vue

@@ -606,13 +606,15 @@ export default {
       if (data.hasOwnProperty("configId")) {
         params = Object.assign(params, { configId: data.configId }); //流程配置ID
       }
-      if (
-        state == 1 &&
-        data.headleState == 1 &&
-        (nextStep.deptStaff == "" || nextStep.deptStaff == null)
-      ) {
-        this.$message.warning("提交请选择下一步审核人");
-        return null;
+      if(data.curProcessStep !==5){
+        if (
+          state == 1 &&
+          data.headleState == 1 &&
+          (nextStep.deptStaff == "" || nextStep.deptStaff == null)
+        ) {
+          this.$message.warning("提交请选择下一步审核人");
+          return null;
+        }
       }
       Object.assign(params, { nextStep: nextStep });
       const json = JSON.stringify(params);

+ 0 - 8
src/views/mbsys/collaborative/meetingmanage/meetingapproval/index.vue

@@ -600,14 +600,6 @@ export default {
       if (data.hasOwnProperty("configId")) {
         params = Object.assign(params, { configId: data.configId }); //流程配置ID
       }
-      if (
-        state == 1 &&
-        data.headleState == 1 &&
-        (nextStep.deptStaff == "" || nextStep.deptStaff == null)
-      ) {
-        this.$message.warning("提交请选择下一步审核人");
-        return null;
-      }
       Object.assign(params, { nextStep: nextStep });
       const json = JSON.stringify(params);
       // 将 json 字符串转化为 Blob 对象

+ 0 - 8
src/views/mbsys/collaborative/sendDocument/sendDocExamine/index.vue

@@ -606,14 +606,6 @@ export default {
       if (data.hasOwnProperty("configId")) {
         params = Object.assign(params, { configId: data.configId }); //流程配置ID
       }
-      if (
-        state == 1 &&
-        data.headleState == 1 &&
-        (nextStep.deptStaff == "" || nextStep.deptStaff == null)
-      ) {
-        this.$message.warning("提交请选择下一步审核人");
-        return null;
-      }
       Object.assign(params, { nextStep: nextStep });
       const json = JSON.stringify(params);
       // 将 json 字符串转化为 Blob 对象

+ 1 - 8
src/views/mbsys/collaborative/vehiclemanage/vehicleapproval/index.vue

@@ -579,6 +579,7 @@ export default {
      * 不是第一步审核的才用改映射方法
      */
     examineFormParamMapping(data, state) {
+      console.log("data", data);
       let params = {
         handleResults: 0, //处理结果0:不处理;1:同意;2:不同意
         operateState: 0, //表单类型:0、其它; 1、采购入库(关联采购工单);2、余料退库(关联出库工单);3、工程出库(关联工程工单);4其它出库;5、维修出库(关联维修工单)
@@ -610,14 +611,6 @@ export default {
       if (data.hasOwnProperty("configId")) {
         params = Object.assign(params, { configId: data.configId }); //流程配置ID
       }
-      if (
-        state == 1 &&
-        data.headleState == 1 &&
-        (nextStep.deptStaff == "" || nextStep.deptStaff == null)
-      ) {
-        this.$message.warning("提交请选择下一步审核人");
-        return null;
-      }
       Object.assign(params, { nextStep: nextStep });
       const json = JSON.stringify(params);
       // 将 json 字符串转化为 Blob 对象