From 0b276f1bfced32300a73aebec97fb60aa28ed60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 8 Apr 2022 16:03:13 +0800
Subject: [PATCH] =?UTF-8?q?52503=20=20=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=E5=A1=AB=E5=86=99=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzpg/step5.vue         | 23 ++++++++++++-------
 .../pages/creatProcess/xmpg/step3.vue         |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index e784e848d..cb1835263 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -807,13 +807,22 @@ export default {
         this.isSubmit = false
       })
     },
-    handlePrice(){
-      for (let i = 0; i < this.dataList.length; i++) {
-        if (this.dataList[i].complianceReasons|| (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
-        }else {
-          this.comFlag ++
+    handlePrice() {
+      this.dataList.forEach(item =>{
+        if(item.complianceReasons){
+          this.comFlag = 0;
+          return
+        }else{
+          for (let i = 0; i < this.dataList.length; i++) {
+            if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
+              this.comFlag = 0;
+              return;
+            } else {
+              this.comFlag++;
+            }
+          }
         }
-      }
+      })
     },
     //提交事件
     handleSubmit() {
@@ -842,8 +851,6 @@ export default {
             this.listForm.dataList = this.dataList;
             const json = JSON.stringify(this.listForm);
             this.isSubmit = true
-            console.log('可以提交');
-            return
             this.$http.post("lawss/activiti/completeTask", {
               taskIds: this.taskIds,
               userId: this.userId,
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index f0a787ece..ef7a2600f 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -860,7 +860,7 @@ export default {
           return
         }else{
           for (let i = 0; i < this.dataList.length; i++) {
-            if (this.dataList[i].complianceReasons || this.dataList[i].remarks || (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
+            if (this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime !== undefined || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance && this.dataList[i].countermeasures && this.dataList[i].completionTime === undefined)) {
               this.comFlag = 0;
               return;
             } else {