From a686c7f0d69e111a4f2392bae599a414708040bf Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 13 Oct 2021 18:42:24 +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=E7=BC=96=E8=BE=91=20=E6=A0=91=E5=BD=A2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=20=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzrk/step4.vue         | 149 +++++++++++++-----
 .../domesticStandardsAndRegulations/index.vue |   5 +-
 .../foreignStandardsAndRegulations/index.vue  |  17 +-
 3 files changed, 123 insertions(+), 48 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index f655b1e19..bac4125da 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -137,7 +137,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-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                   <el-input
@@ -791,7 +791,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>
@@ -805,7 +805,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>
@@ -819,7 +819,7 @@
                           :url="url"
                           :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-if="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="请选择归口管理部门">
@@ -2056,52 +2056,117 @@ export default {
     },fileChange(fileList){
       console.log("fileList",fileList);
     },
-    popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData) {
-        if(checkedData.length > 0){
-          this.form.standSystem = checkedData.map(item => item.menuName).join(",")
-        }else {
-          this.form.standSystem = checkedData.menuName
-        }
+    // popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    //   if(checkedData) {
+    //     if(checkedData.length > 0){
+    //       this.form.standSystem = checkedData.map(item => item.menuName).join(",")
+    //     }else {
+    //       this.form.standSystem = checkedData.menuName
+    //     }
+    //   }
+    //   this.modalShowFlag1 = false
+    // },popoverHideCancel(){
+    //
+    // },
+    // popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    //   if(checkedData) {
+    //     if(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
+    // },
+    // popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    //   if(checkedData) {
+    //     if(checkedData.length > 0){
+    //       this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
+    //       this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
+    //     }else {
+    //       this.form.kccvppsbm = checkedData.code
+    //       this.form.kccvppscn = checkedData.chineseName
+    //     }
+    //   }
+    //   this.modalShowFlag3 = false
+    // },
+    // popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    //   if(checkedData) {
+    //     if(checkedData.length > 0){
+    //       this.form.dybxh = checkedData.map(item => item.model).join(",")
+    //       this.form.dymc = checkedData.map(item => item.name).join(",")
+    //     }else {
+    //       this.form.dybxh = checkedData.model
+    //       this.form.dymc = checkedData.name
+    //     }
+    //   }
+    //   this.modalShowFlag4 = false
+    // },
+
+  popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    if(checkedData) {
+      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
-    },
-    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData) {
-        if(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
-        }
+    }
+
+  },
+  popoverHideCancel(){
+    this.modalShowFlag1  = false
+  },
+  popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    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
-    },
-    popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData) {
-        if(checkedData.length > 0){
-          this.form.kccvppsbm = checkedData.map(item => item.code).join(",")
-          this.form.kccvppscn = checkedData.map(item => item.chineseName).join(",")
-        }else {
-          this.form.kccvppsbm = checkedData.code
-          this.form.kccvppscn = checkedData.chineseName
-        }
+    }
+
+  },
+  popoverHideBusVsCancel(){
+    this.modalShowFlag2 = false
+  },
+  popoverHideCarVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    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(",")
+      }else {
+        this.form.kccvppsbm = checkedData.code
+        this.form.kccvppscn = checkedData.chineseName
       }
       this.modalShowFlag3 = false
-    },
-    popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
-      if(checkedData) {
-        if(checkedData.length > 0){
-          this.form.dybxh = checkedData.map(item => item.model).join(",")
-          this.form.dymc = checkedData.map(item => item.name).join(",")
-        }else {
-          this.form.dybxh = checkedData.model
-          this.form.dymc = checkedData.name
-        }
+
+    }
+  },
+  popoverHideCarVsCancel(){
+    this.modalShowFlag3 = false
+  },
+  popoverHideModel (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    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(",")
+      }else {
+        this.form.dybxh = checkedData.model
+        this.form.dymc = checkedData.name
       }
       this.modalShowFlag4 = false
-    },
+    }
+
+  },
+  popoverHideModelCancel(){
+    this.modalShowFlag4 = false
+  },
     processTable () {
       this.$http.get('lawss/activiti/get_list_by_instance', {
         prcNum: this.$route.query.prcNum,
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 692c4f843..4445e07b3 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1072,7 +1072,7 @@
         width="500"
         :data="standSystemOptions"
         :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
-        :nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
+        :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
       <tree-select-new
         width="500"
         :lazy=true
@@ -2406,6 +2406,9 @@ export default {
       this.modalShowFlag1 = false
       this.$forceUpdate()
     },
+    popoverHideCancel(){
+      this.modalShowFlag1  = false
+    },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 0ed618eaf..ffce99992 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -882,7 +882,8 @@
                       class="add-form-item"
                     >
                       <template slot="label">关联模块--乘用车VPPS编码</template>
-                      <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
+                      <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码"
+                                @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
                     </el-form-item>
                   </template>
                   <template v-else-if="field.attrField === 'KCCVPPSBM'">
@@ -1422,7 +1423,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>
       <tree-select-new
         width="500"
         :lazy=true
@@ -1433,7 +1434,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>
       <tree-select-new
         width="500"
         :lazy=true
@@ -1444,7 +1445,7 @@
         :url="url"
         :urlChild="urlChild"
         :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
-        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel"></tree-select-new>
+        :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-new>
       <!-- 导入失败 -->
       <el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
         <p slot="title" style="color:#f60">
@@ -2220,7 +2221,6 @@ export default {
       this.urlChild = "sarModelTree/childByList"
     },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      debugger
       if (checkedData) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
@@ -2233,6 +2233,9 @@ export default {
       this.modalShowFlag2 = false
       this.$forceUpdate()
     },
+    popoverHideBusVsCancel(){
+      this.modalShowFlag2 = false
+    },
     popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData) {
         if (checkedData.length > 0) {
@@ -2245,6 +2248,8 @@ export default {
       }
       this.modalShowFlag3 = false
       this.$forceUpdate()
+    },popoverHideCarVsCancel(){
+      this.modalShowFlag3 = false
     },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
       if (checkedData) {
@@ -2258,6 +2263,8 @@ export default {
       }
       this.modalShowFlag4 = false
       this.$forceUpdate()
+    },popoverHideModelCancel(){
+      this.modalShowFlag4 = false
     },
     // 将文本状态的id与name对应
     setMap(data) {