From ebeed11b5acab488847a92f938074da6dfe2507b Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 9 Oct 2021 17:23:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B->=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=BB=93=E6=9E=84=E9=80=89=E6=8B=A9=E6=A1=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/treeSelect/treeSelectNew.vue   |  2 +-
 .../pages/creatProcess/bzrk/step1.vue         | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/components/treeSelect/treeSelectNew.vue b/src/components/treeSelect/treeSelectNew.vue
index 9656955c2..8e8c3a0ea 100644
--- a/src/components/treeSelect/treeSelectNew.vue
+++ b/src/components/treeSelect/treeSelectNew.vue
@@ -264,7 +264,7 @@
                 this.$emit('popoverHide', this.checkedIds, this.checkedData,false);
             },
             cancelUserInfo () {
-                this.$emit('popoverHide', this.checkedIds, this.checkedData,false);
+                this.$emit('popoverHideCancel', this.checkedIds, this.checkedData,false);
             },
         },
         watch: {
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index c2548b25e..0e8e4fc56 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -549,7 +549,7 @@
                                             :url="url"
                                             :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.kccvppsbm" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', form.kccvppsbm)"></el-input>
@@ -565,7 +565,7 @@
                                             :url="url"
                                             :urlChild="urlChild"
                                             :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"
-                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"></tree-select-new>
+                                            :nodeKey="nodeKeyCode" @popoverHide="popoverHideCarVs"  @popoverHideCancel="popoverHideCarVsCancel"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
                                     <el-input v-model="form.dybxh" placeholder="选择模块结构单元变型号" @click.native="choiceZRR4('dybxh', '模块结构单元', form.dybxh)"></el-input>
@@ -581,7 +581,7 @@
                                             :show-checkBox="showCheckBox"
                                             :urlChild="urlChild"
                                             :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
+                                            :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item v-show="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
                                   <el-select :popper-append-to-body="false"  v-model="form.gkdw" placeholder="请选择归口管理部门">
@@ -2313,19 +2313,23 @@
                 this.modalShowFlag1 = false
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
-                    if(checkedData.length > 0){
+                if(checkedData && checkedData.length != 0) {
+                    if(checkedData.length > 0 && checkedData.length != 0){
                         this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
                         this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
                     }else {
                         this.form.cycvppsbm = checkedData.code
                         this.form.cycvppscn = checkedData.chineseName
                     }
+                    this.modalShowFlag2 = false
                 }
-                this.modalShowFlag2 = false
+                
+            },
+            popoverHideBusVsCancel(){
+              this.modalShowFlag2 = false
             },
             popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
+                if(checkedData && checkedData.length != 0) {
                     if(checkedData.length > 0){
                         this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
                         this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
@@ -2333,11 +2337,15 @@
                         this.form.kccvppsbm = checkedData.code
                         this.form.kccvppscn = checkedData.chineseName
                     }
+                    this.modalShowFlag3 = false
+
                 }
+            },
+            popoverHideCarVsCancel(){
                 this.modalShowFlag3 = false
             },
             popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-                if(checkedData) {
+                if(checkedData && checkedData.length != 0) {
                     if(checkedData.length > 0){
                         this.form.dybxh = checkedData.map(item => item.model).join(",")
                         this.form.dymc = checkedData.map(item => item.name).join(",")
@@ -2345,7 +2353,11 @@
                         this.form.dybxh = checkedData.model
                         this.form.dymc = checkedData.name
                     }
+                        this.modalShowFlag4 = false
                 }
+            
+            },
+               popoverHideModelCancel(){
                 this.modalShowFlag4 = false
             },
             closeDrawer() {