From e4222e7b038cc56621cd3fb1754beb478216b03f Mon Sep 17 00:00:00 2001
From: lai <10633968+laiyujun1@user.noreply.gitee.com>
Date: Fri, 20 Dec 2024 17:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue |  4 ++--
 src/views/system/user/index.vue | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c955a316..442b8761 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -968,7 +968,7 @@ onMounted(() => {
                   <template #icon><ProfileOutlined /></template>
                 </a-button>
               </a-tooltip>
-              <a-tooltip v-if="record.roleId !== '1'">
+              <a-tooltip v-if="record.roleId !== '1' && record.roleKey !== 'tenant'">
                 <template #title>{{ t('common.editText') }}</template>
                 <a-button
                   type="link"
@@ -978,7 +978,7 @@ onMounted(() => {
                   <template #icon><FormOutlined /></template>
                 </a-button>
               </a-tooltip>
-              <a-tooltip v-if="record.roleId !== '1'">
+              <a-tooltip v-if="record.roleId !== '1' && record.roleKey !== 'tenant'">
                 <template #title>{{ t('common.deleteText') }}</template>
                 <a-button
                   type="link"
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b12c3f63..1d5506d8 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -814,11 +814,21 @@ function fnGetDeptTree() {
 
 function handleChange(value: any, options: any) {
   modalState.from.roleIds = [value];
+  console.log(modalState.from.roleIds, options.roleKey);
+
   modalState.showTenant = options.roleKey === 'tenant';
   // 获取租户树结构数据
   if (modalState.showTenant) fnGetDeptTree();
 }
 
+function handleDel(value: any, options: any) {
+  console.log(modalState.from.roleIds, options.roleKey);
+  modalState.showTenant = options.roleKey !== 'tenant';
+  // 获取租户树结构数据
+  if (modalState.showTenant) fnGetDeptTree();
+}
+
+
 onMounted(() => {
   // 初始字典数据
   Promise.allSettled([
@@ -1496,6 +1506,7 @@ onMounted(() => {
             :field-names="{ label: 'roleName', value: 'roleId' }"
             :placeholder="t('common.selectPlease')"
             @select="handleChange"
+            @deselect="handleDel"
           >
           </a-select>
         </a-form-item>