From e9ef24c38f1c7ab08cd91004f8cad580b5ed5344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 1 Dec 2021 11:12:03 +0800
Subject: [PATCH] commit

---
 .../pages/creatProcess/xmpg/step3.vue         | 12 +++-
 .../pages/creatProcess/xmpg/step4.vue         | 59 ++++++++++++-------
 2 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 8b6ad145e..3288047f5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -592,6 +592,7 @@ export default {
             }
           });
         });
+        this.$refs.multipleTable.clearSelection();
       }
       this.modalshowflag = false;
     },
@@ -616,11 +617,16 @@ export default {
         if (this.selectList.length > 0) {
           this.lsType = type;
           this.nodeList = [];
-          if(row.implementerId){
-            this.nodeList = row.implementerId.split(",");
-          }
           this.modalshowflag = true;
           this.drawerTitle = "批量选择责任人";
+          this.selectList.forEach(item =>{
+           if(item.implementerId){
+             this.nodeList = item.implementerId.split(",");
+           }
+          })
+          // if(row.implementerId){
+          //   this.nodeList = row.implementerId.split(",");
+          // }
         } else {
           this.$message.warning("请选择要分发的数据");
         }
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index b90337067..877f1f555 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -233,6 +233,7 @@
                 <el-input
                    v-else
                    :disabled="acceptShow"
+                   @click.native="handlePrice(scope.row)"
                     v-model="dataList[scope.$index].complianceReasons"
                     placeholder="请输入合规原因"
                 >
@@ -260,6 +261,7 @@
                   <el-input
                       v-else
                       :disabled="acceptShow"
+                      @click.native="handlePrice(scope.row)"
                       v-model="dataList[scope.$index].noCompliance"
                       placeholder="请输入不合规项目"
                   >
@@ -281,6 +283,7 @@
                   </el-input>
                   <el-input
                       v-else
+                      @click.native="handlePrice(scope.row)"
                       :disabled="acceptShow"
                       v-model="dataList[scope.$index].countermeasures"
                       placeholder="请输入应对措施"
@@ -306,6 +309,7 @@
                       :disabled="acceptShow"
                       class="datePickLen"
                       clearable
+                      @click.native="handlePrice(scope.row)"
                       v-model="dataList[scope.$index].completionTime"
                       type="date"
                       placeholder="请选择日期">
@@ -542,6 +546,7 @@ export default {
     return {
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
+      comFlag: true,
       nodeList:[],
       drawerTitle:'',
       isTransfer: false,
@@ -720,6 +725,7 @@ export default {
      * @description: 动态表单读取
      */
     getFormFieldList(item) {
+      console.log(item);
       this.$nextTick(() => {
         this.listForm = JSON.parse(JSON.stringify(item));
         if (item.form === undefined) {
@@ -792,30 +798,41 @@ export default {
         this.isSubmit = false
       })
     },
+    handlePrice(row){
+      if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
+        this.comFlag = true
+      }else{
+        this.comFlag = false
+      }
+    },
     //提交事件
     handleSubmit() {
-      this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
-      this.listForm.commentText = this.commentText;
-      this.listForm.approvalOpinion = "";
-      this.listForm.signFlag = "";
-      this.listForm.dataList = this.dataList;
-      const json = JSON.stringify(this.listForm);
-      this.isSubmit = true;
-      this.$http.post("lawss/activiti/completeTask", {
-        taskIds: this.taskIds,
-        userId: this.userId,
-        json: json
-      }, {
-        _this: this
-      }, res => {
-        if (res.success) {
-          this.$message.success(res.message);
-          this.$router.push("/processCenter");
-        }
-        this.isSubmit = false;
-      }, e => {
+      if(!this.comFlag) {
+        this.$message.warning('请填写完整的不符合项信息')
+      }else{
+        this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
+        this.listForm.commentText = this.commentText;
+        this.listForm.approvalOpinion = "";
+        this.listForm.signFlag = "";
+        this.listForm.dataList = this.dataList;
+        const json = JSON.stringify(this.listForm);
+        this.isSubmit = true;
+        this.$http.post("lawss/activiti/completeTask", {
+          taskIds: this.taskIds,
+          userId: this.userId,
+          json: json
+        }, {
+          _this: this
+        }, res => {
+          if (res.success) {
+            this.$message.success(res.message);
+            this.$router.push("/processCenter");
+          }
+          this.isSubmit = false;
+        }, e => {
 
-      });
+        });
+      }
     },
     //标准表格选择框改变
     selectStandChange(data) {