From 76aa3db24e2257f401eef8bddd60271640eea5e4 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, 6 Apr 2022 16:49:58 +0800
Subject: [PATCH] =?UTF-8?q?52385=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E5=A1=AB=E4=B8=8D?=
 =?UTF-8?q?=E5=90=88=E8=A7=84=E9=A1=B9=EF=BC=8C=E4=B8=8D=E5=A1=AB=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4=EF=BC=8C=E7=9B=AE=E5=89=8D=E8=83=BD?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step4.vue         | 21 ++++++++++++++-----
 .../pages/creatProcess/xmpg/step3.vue         |  3 ++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 5c11c4174..8adb96b92 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -128,8 +128,8 @@
                   </el-radio-group>
                   <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
-                <el-form-item v-show="form.standInData=='1'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-                  <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                  <el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
                   <tree-select-new
                     :key="key"
                     :multiple=false
@@ -148,9 +148,9 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item label="归档位置" class="add-form-item form-item-disabled">
+                <el-form-item label="归档位置" prop="treeListName" class="add-form-item form-item-disabled">
                   <el-input
-                    style="display: none"
+                    v-show="false"
                     v-model="form.treeListId"
                   ></el-input>
                   <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
@@ -1662,6 +1662,12 @@ export default {
       replaceLoading: true,
       replacePage: 1,
       rules: {
+        standSystem: [
+          {required: true, message: '请选择标准体系', trigger: 'change'}
+        ],
+        treeListName: [
+          {required: true, message: '请选择归档位置', trigger: 'blur'}
+        ],
         standSort: [
           {required: true, message: '请选择标准类别', trigger: 'change'}
         ],
@@ -2501,6 +2507,9 @@ export default {
           this.form.treeListName = checkedData.menuName
           this.form.treeListId = checkedData.id
         }
+        this.$nextTick(_ => {
+          this.$refs.form.validateField('treeListName')
+        })
         this.modalShowTree = false
       }
 
@@ -2940,7 +2949,9 @@ export default {
     this.modelFunc()
   },
   watch: {
-
+    'form.treeListName'(val) {
+      console.log(this.form.treeListName)
+    },
     'form.country': {
       handler(val) {
         if (val !== '' && val !== null && typeof (val) !== 'undefined') {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index c18cabc9c..f0a787ece 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -860,8 +860,9 @@ export default {
           return
         }else{
           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 !== undefined) || (this.dataList[i].complianceReasons === "" && this.dataList[i].noCompliance === "" && this.dataList[i].countermeasures === "" && this.dataList[i].completionTime === undefined)) {
+            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)) {
               this.comFlag = 0;
+              return;
             } else {
               this.comFlag++;
             }