From 7e51ce5fa3c38ec288713bca8a31f1faa834f995 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Fri, 11 Mar 2022 17:23:35 +0800
Subject: [PATCH] commit

---
 src/components/roleTree/index.vue             | 42 +++++++++++--------
 .../domesticStandardsAndRegulations/index.vue | 23 ++++++----
 2 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue
index 167290211..81ce91346 100644
--- a/src/components/roleTree/index.vue
+++ b/src/components/roleTree/index.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="roleTree">
         <el-drawer
-                :title="isTitle"
-                :visible.sync="isVisible2"
-                :wrapperClosable="false"
-                @close="handleTreeDrawerCancel"
-                size="460px">
+            :title="isTitle"
+            :visible.sync="visible"
+            :wrapperClosable="false"
+            @close="handleTreeDrawerCancel"
+            size="460px">
             <el-form
                     ref="attributeEO"
                     class="label-input-form"
@@ -22,7 +22,7 @@
             </el-form>
             <div class="divTree">
                 <el-tree
-                        v-if="open1 && isVisible2"
+                        v-if="open1 && isVisible"
                         node-key="id"
                         style="height: 100%; overflow: auto;"
                         class="filter-tree tree-line"
@@ -45,7 +45,7 @@
                   </span>
                 </el-tree>
                 <el-tree
-                        v-if="!open1 && isVisible2"
+                        v-if="!open1 && isVisible"
                         node-key="id"
                         style="height: 100%; overflow: auto;"
                         class="filter-tree tree-line"
@@ -124,10 +124,10 @@
         },
         data () {
             return {
+                visible: false,
                 nodeList2: [],
                 delList: [],
                 roleList: [],
-                isVisible2: false,
                 filterText: '',
                 defaultProps: {
                     children: 'children',
@@ -239,13 +239,14 @@
             },
             handleTreeDrawerCancel () {
                 this.filterText = ''
-                this.isVisible2 = false
                 this.open1 = true
+                this.visible = false
             },
             saveUserInfo () {
                 if (this.checkBox) {
-                    this.isVisible2 = false
                     this.$emit('checkedRole', this.roleList)
+                    this.nodeList2 = []
+                    this.$emit('update:isVisible', false)
                 } else {
                     if (this.nodeList2.length > 0 && this.nodeList2[0].length !== 0) {
                         let ids = ''
@@ -262,12 +263,14 @@
                         }, {
                             _this: this
                         }, res => {
-                            this.isVisible2 = false
                             this.$emit('checkedRole', res)
+                            this.nodeList2 = []
+                            this.$emit('update:isVisible', false)
                         })
                     } else {
-                        this.isVisible2 = false
                         this.$emit('checkedRole', this.roleList)
+                        this.nodeList2 = []
+                        this.$emit('update:isVisible', false)
                     }
                 }
                 this.open1 = true
@@ -316,13 +319,13 @@
         },
         watch: {
             isVisible (val) {
-                this.isVisible2 = val
-                this.nodeList2 = this.nodeList
+                this.visible = val
                 if (val) {
-                    if (this.nodeList2.length > 0 && this.nodeList2[0].length !== 0) {
+                    this.nodeList2 = this.nodeList
+                    if (this.nodeList2.length && this.nodeList2[0].length) {
                         let ids = ''
                         this.nodeList2.forEach(item => {
-                            if (ids.length > 0) {
+                            if (ids.length) {
                                 ids += ','
                                 ids += item
                             } else {
@@ -343,9 +346,12 @@
                     this.delList = []
                 }
             },
-            isVisible2 (val) {
+            visible(val) {
                 this.$emit('update:isVisible', val)
-            },
+                if (!val) {
+                    this.$emit('onCancel')
+                }
+            }
         },
         mounted () {
             this.getTree()
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 2aa61c629..4822b6315 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -2059,9 +2059,9 @@
     <Role-tree
       :is-title="drawerTitle"
       :is-visible.sync="modalShowRoleFlag"
-      @checkedRole="checkedRole2"
       :nodeList="nodeList2"
-    ></Role-tree>
+      @checkedRole="checkedRole2"
+    />
     <Role-tree
       is-title="选择人员信息"
       :is-visible.sync="modalshowflagRole"
@@ -4660,7 +4660,6 @@ export default {
           }
         }
         this.configStandList = res.data.list
-        console.log(this.configStandList);
         this.configTotal = res.data.count
         this.selectConfigStand = []
       }, e => {
@@ -5816,9 +5815,20 @@ export default {
         this.$set(this.textStatusMap, item.value, item.label)
       })
     },
-    choiceZRRS(type, title, id) {
-      this.nodeList = []
-      this.nodeList.push(id)
+    choiceZRRS(type, title, nameId) {
+      this.nodeList2 = []
+      if (nameId) {
+        let nameId1 = nameId.split(',')
+        let idList = []
+        nameId1.forEach(item => {
+          let a, b
+          a = item.substring(item.indexOf('(') +1)
+          b = a.substring(0, a.lastIndexOf(')'))
+          idList.push(b)
+        })
+        idList = idList.join(',')
+        this.nodeList2.push(idList)
+      }
       this.userType = type
       this.drawerTitle = title
       this.modalShowRoleFlag = true
@@ -5890,7 +5900,6 @@ export default {
       } else if (this.drawerTitle === '查询责任部门') {
         this.advanceSearchMapping['ZRBM'] = nameList
       }
-
     },
   },
   computed: {