From 637b3e1bb419ab938f190e85ff44385241b169d1 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sat, 9 Oct 2021 17:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85->=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=A8=A1=E5=9D=97=20=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E5=90=8C=E4=B8=8A=E4=B8=80=E4=B8=AA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domesticStandardsAndRegulations/index.vue | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index d351f035e..5b1185a14 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1083,7 +1083,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
@@ -1094,7 +1094,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
@@ -1105,7 +1105,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">
@@ -2407,7 +2407,7 @@ export default {
       this.$forceUpdate()
     },
     popoverHideBusVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      if (checkedData) {
+      if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.CYCVPPSBM = checkedData.map(item => item.code).join(",")
           this.sarStandardsInfoEO.CYCVPPSCN = checkedData.map(item => item.chineseName).join(",")
@@ -2415,12 +2415,16 @@ export default {
           this.sarStandardsInfoEO.CYCVPPSBM = checkedData.code
           this.sarStandardsInfoEO.CYCVPPSCN = checkedData.chineseName
         }
+           this.modalShowFlag2 = false
       }
-      this.modalShowFlag2 = false
+   
       this.$forceUpdate()
     },
+        popoverHideBusVsCancel(){
+              this.modalShowFlag2 = false
+            },
     popoverHideCarVs(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      if (checkedData) {
+      if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.KCCVPPSBM = checkedData.map(item => item.code).join(",")
           this.sarStandardsInfoEO.KCCVPPSCN = checkedData.map(item => item.chineseName).join(",")
@@ -2428,12 +2432,16 @@ export default {
           this.sarStandardsInfoEO.KCCVPPSBM = checkedData.code
           this.sarStandardsInfoEO.KCCVPPSCN = checkedData.chineseName
         }
+        this.modalShowFlag3 = false
       }
-      this.modalShowFlag3 = false
+      
       this.$forceUpdate()
     },
+          popoverHideCarVsCancel(){
+              this.modalShowFlag3 = false
+            },
     popoverHideModel(checkedIds, checkedData, isShow, isLoadChild, topId) {
-      if (checkedData) {
+      if (checkedData  && checkedData.length != 0) {
         if (checkedData.length > 0) {
           this.sarStandardsInfoEO.DYBXH = checkedData.map(item => item.model).join(",")
           this.sarStandardsInfoEO.DYMC = checkedData.map(item => item.name).join(",")
@@ -2441,10 +2449,13 @@ export default {
           this.sarStandardsInfoEO.DYBXH = checkedData.model
           this.sarStandardsInfoEO.DYMC = checkedData.name
         }
+          this.modalShowFlag4 = false
       }
-      this.modalShowFlag4 = false
       this.$forceUpdate()
     },
+     popoverHideModelCancel(){
+              this.modalShowFlag4 = false
+            },
     busVsFunc() {
       this.$http.get('sarVppsTree/list', '', {
         _this: this