From a105a3e6fc133cea11918e427b60bfb886b0d9ff Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Mon, 11 Oct 2021 11:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B->=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E4=BD=93=E7=B3=BB=E5=BC=B9=E5=87=BA=E6=A1=86->?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=20=E5=90=8C=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step1.vue         | 55 ++++++++++---------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index bfa71af94..175355b33 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -144,7 +144,7 @@
                                             width = "800"
                                             :data="standSystemOptions"
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-                                            :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+                                            :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
                                 </el-form-item>
                                 <el-form-item v-show="verifySarStandard && form.standInData === '1'"  label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
@@ -2213,6 +2213,7 @@
             },
             // 导入标准数据成功后执行
             importFileSuccess (response, file,fileList) {
+                console.log("helloFIleSuccess")
               // 上传成功后判断是否是两条数据是的话替换掉旧数据
               // if (fileList.length > 1) {
               //   this.fileList = fileList.splice(0, 1)
@@ -2222,48 +2223,48 @@
                     // this.fileList = []
                     if(this.fileType === 'fbgbjbd'){
                         this.FBGBJBDFileList=fileList;
-                        this.form.fbgbjbd = response.data.id;
-                        this.form.fbgbjbdName = response.data.name;
+                        this.form.fbgbjbd += response.data.id+',';
+                        this.form.fbgbjbdName += response.data.name+',';
                     }else if(this.fileType === 'xgd'){
                       this.xgdFileList=fileList;
-                      this.form.xgd = response.data.id;
-                        this.form.xgdName = response.data.name;
+                      this.form.xgd += response.data.id+',';
+                        this.form.xgdName += response.data.name+',';
                     }else if(this.fileType === 'bpg'){
                       this.bpgFileList=fileList;
-                        this.form.bpg = response.data.id;
-                        this.form.bpgName = response.data.name;
+                        this.form.bpg += response.data.id+',';
+                        this.form.bpgName += response.data.name+',';
                     }else if(this.fileType === 'ssg'){
                       this.ssgFileList=fileList;
-                        this.form.ssg = response.data.id;
-                        this.form.ssgName = response.data.name;
+                        this.form.ssg += response.data.id+',';
+                        this.form.ssgName += response.data.name+',';
                     }else if(this.fileType === 'zqyjg'){
                       this.zqyjgFileList=fileList;
-                        this.form.zqyjg = response.data.id;
-                        this.form.zqyjgName = response.data.name;
+                        this.form.zqyjg += response.data.id+',';
+                        this.form.zqyjgName += response.data.name+',';
                     }else if(this.fileType === 'jdwj'){
                       this.jdwjFileList=fileList;
-                        this.form.jdwj = response.data.id;
-                        this.form.jdwjName = response.data.name;
+                        this.form.jdwj += response.data.id+',';
+                        this.form.jdwjName += response.data.name+',';
                     }else if(this.fileType === 'kwj'){
                       this.kwjFileList=fileList;
-                        this.form.kwj = response.data.id;
-                        this.form.kwjName = response.data.name;
+                        this.form.kwj += response.data.id+',';
+                        this.form.kwjName += response.data.name+',';
                     }else if(this.fileType === 'xgd'){
                       this.xgdFileList=fileList;
-                        this.form.xgd = response.data.id;
-                        this.form.xgdName = response.data.name;
+                        this.form.xgd += response.data.id+',';
+                        this.form.xgdName += response.data.name+',';
                     }else if(this.fileType === 'glwj'){
                       this.qlwjFileList=fileList;
-                        this.form.glwj = response.data.id;
-                        this.form.glwjName = response.data.name;
+                        this.form.glwj += response.data.id+',';
+                        this.form.glwjName += response.data.name+',';
                     }else if(this.fileType === 'ca'){
                       this.caFileList=fileList;
-                        this.form.ca = response.data.id;
-                        this.form.caName = response.data.name;
+                        this.form.ca += response.data.id+',';
+                        this.form.caName += response.data.name+',';
                     }else if(this.fileType === 'zbjbd'){
                       this.zbjbdFileList=fileList;
-                        this.form.zbjbd = response.data.id;
-                        this.form.zbjbdName = response.data.name;
+                        this.form.zbjbd += response.data.id+',';
+                        this.form.zbjbdName += response.data.name+',';
                     }
                     this.$message({
                         showClose: true,
@@ -2304,13 +2305,17 @@
             },
             popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData) {
-                    if(checkedData.length > 0){
+                    if(checkedData.length > 0 && checkedData.length != 0){
                         this.form.standSystem = checkedData.map(item => item.menuName).join(",")
                     }else {
                         this.form.standSystem = checkedData.menuName
                     }
+                     this.modalShowFlag1 = false
                 }
-                this.modalShowFlag1 = false
+               
+            },
+            popoverHideCancel(){
+              this.modalShowFlag1  = false
             },
             popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
                 if(checkedData && checkedData.length != 0) {