From fc930d55683fd40e915fef671c5847992cecfa51 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 17 Oct 2022 13:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=E6=A0=91=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/config/pages/roleManage/index.vue | 25 ++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/pages/config/pages/roleManage/index.vue b/src/pages/config/pages/roleManage/index.vue
index d26d3ab7a..f78e5e6d7 100644
--- a/src/pages/config/pages/roleManage/index.vue
+++ b/src/pages/config/pages/roleManage/index.vue
@@ -406,6 +406,7 @@ export default {
       type: '', // 新增/编辑状态
       addRoleTitle: '',
       SuperiorRoleData: {},
+      selectype:[],
       nodeList3: [],
       SuperiorRoleModel: false,
       addFormRules: {
@@ -440,7 +441,9 @@ export default {
       treeData4: [],
       defaultProps3: {
         children: 'children',
-        label: 'menuName'
+        label: function (a,b){
+          return a.label = a.name || a.menuName
+        }
       },
       nodeList2: [],
       btnLoading: false,
@@ -641,9 +644,11 @@ export default {
     async getTreeAsync(){
       let tsResource = await this.getTree3()
       let sarMenuStandard = await this.getTree4()
+      let zlStandard = await this.getTree5()
 
       let list1 = []
       let list2 = []
+      let list3 = []
       if(tsResource && tsResource.ok && tsResource.data){
         list1 = tsResource.data
       }
@@ -652,8 +657,12 @@ export default {
         list2 = sarMenuStandard.data
       }
 
-      if(list2.length > 0){
-        list1 = list1.concat(list2)
+      if(zlStandard && zlStandard.ok && zlStandard.data){
+        list3 = zlStandard.data
+      }
+
+      if(list2.length > 0 && list3.length > 0){
+        list1 = list1.concat(list2,list3)
       }
 
       if(list1.length > 0){
@@ -693,6 +702,16 @@ export default {
         })
       })
     },
+    getTree5(res,json) {
+      return new Promise((resolve, reject) => {
+        this.$http.get('fileMaterialCenter/zlTree/permissConfig', {}, {
+          _this: this
+        }, res => {
+          const history = res;
+          resolve(history)
+        })
+      })
+    },
     confirmDialogData() {
       this.btnLoading = true
       this.$http.postData('sarRole/role/resource', {