From 88aec8f6dddb71c64bbf37fb0a444197fbf12d69 Mon Sep 17 00:00:00 2001
From: dong <58670809@qq.com>
Date: Tue, 1 Nov 2022 10:55:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/userRulesManage/index.vue          | 14 ++++++++++++++
 src/views/userRulesManage/permissionList.vue | 14 ++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/src/views/userRulesManage/index.vue b/src/views/userRulesManage/index.vue
index 9b642cba2..8807105c9 100644
--- a/src/views/userRulesManage/index.vue
+++ b/src/views/userRulesManage/index.vue
@@ -81,6 +81,13 @@ export default {
                         columnValue: (row) => { return this.$convertField(row.subjectType, this.subTypeList, ['value', 'label']); },
                         tagType: (row) => { return ''; }
                     },
+                    {
+                        title: '功能',
+                        prop: 'systemAbilityList',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.getAbilityList(row.systemAbilityList); },
+                        tagType: (row) => { return ''; }
+                    },
                     {
                         title: this.$t('permission.isForever'),
                         width: '80',
@@ -157,6 +164,13 @@ export default {
         this.loadInitData();
     },
     methods: {
+        getAbilityList(list) {
+            const arr = [];
+            list && list.forEach(item => {
+                arr.push(item.abilityName);
+            });
+            return arr;
+        },
         loadInitData() {
             this.EffectiveTypeList.forEach(elem => {
                 this.queryForm.queryObject.status.config.data.push(elem);
diff --git a/src/views/userRulesManage/permissionList.vue b/src/views/userRulesManage/permissionList.vue
index 7d5978bd5..0a8ff5050 100644
--- a/src/views/userRulesManage/permissionList.vue
+++ b/src/views/userRulesManage/permissionList.vue
@@ -67,6 +67,13 @@ export default {
                         columnValue: (row) => { return this.$convertField(row.subjectType, this.subTypeList, ['value', 'label']); },
                         tagType: (row) => { return ''; }
                     },
+                    {
+                        title: '功能',
+                        prop: 'systemAbilityList',
+                        type: 'tagMore',
+                        columnValue: (row) => { return this.getAbilityList(row.systemAbilityList); },
+                        tagType: (row) => { return ''; }
+                    },
                     {
                         title: this.$t('permission.isForever'),
                         prop: 'forever',
@@ -136,6 +143,13 @@ export default {
         };
     },
     methods: {
+        getAbilityList(list) {
+            const arr = [];
+            list && list.forEach(item => {
+                arr.push(item.abilityName);
+            });
+            return arr;
+        },
         doShow(index, row) {
             if (!row.id) { return; }
             this.id = row.id;