From a8a5c0a31e8f9a0510c1a3d54aa2bb7833336bcd Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Fri, 21 Mar 2025 17:06:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A6=81=E6=AD=A2admin=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=8F=9C=E5=8D=95=E5=88=86=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3b431652..9de537b6 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -32,8 +32,10 @@ import { hasPermissions } from '@/plugins/auth-user';
 import { MENU_PATH_INLINE } from '@/constants/menu-constants';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import useI18n from '@/hooks/useI18n';
+import useUserStore from '@/store/modules/user';
 const { t } = useI18n();
 const { getDict } = useDictStore();
+const userStore = useUserStore();
 const router = useRouter();
 const route = useRoute();
 const routePath = route.path;
@@ -144,7 +146,7 @@ let tableColumns: ColumnsType = [
     title: t('views.system.role.createTime'),
     dataIndex: 'createTime',
     align: 'center',
-    width: 150,
+    width: 200,
     customRender(opt) {
       if (+opt.value <= 0) return '';
       return parseDateToStr(+opt.value);
@@ -366,7 +368,7 @@ function fnModalVisibleByEdit(roleId?: string | number) {
       menuTreeSelect().then(res => {
         modalState.confirmLoading = false;
         hide();
-        if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
+        if (res.code === RESULT_CODE_SUCCESS) {
           menuTree.checkedKeys = parseTreeKeys(res.data, 'id');
           menuTree.expandedKeys = parseTreeNodeKeys(res.data, 'id');
           menuTree.treeData = res.data;
@@ -940,7 +942,7 @@ onMounted(() => {
               v-if="
                 dict.sysNormalDisable.length > 0 &&
                 record.roleId !== '1' &&
-                record.roleKey !== 'admin' &&
+                !userStore.roles?.includes(record.roleKey) &&
                 hasPermissions(['system:role:edit'])
               "
               v-model:checked="record.status"
@@ -970,7 +972,10 @@ onMounted(() => {
                 </a-button>
               </a-tooltip>
               <a-tooltip
-                v-if="record.roleId !== '1' && record.roleKey !== 'admin'"
+                v-if="
+                  record.roleId !== '1' &&
+                  !userStore.roles?.includes(record.roleKey)
+                "
               >
                 <template #title>{{ t('common.editText') }}</template>
                 <a-button
@@ -982,7 +987,10 @@ onMounted(() => {
                 </a-button>
               </a-tooltip>
               <a-tooltip
-                v-if="record.roleId !== '1' && record.roleKey !== 'admin'"
+                v-if="
+                  record.roleId !== '1' &&
+                  !userStore.roles?.includes(record.roleKey)
+                "
               >
                 <template #title>{{ t('common.deleteText') }}</template>
                 <a-button