From 4ea3fb422f1c1af628d948eb3908b6a61f71bbdf Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 18:05:17 +0800
Subject: [PATCH] fix: 修改

---
 src/views/Permission/RoleManage.vue |   58 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/views/Permission/RoleManage.vue b/src/views/Permission/RoleManage.vue
index 5143ab0..976860e 100644
--- a/src/views/Permission/RoleManage.vue
+++ b/src/views/Permission/RoleManage.vue
@@ -80,14 +80,15 @@
   // member: { emits: { onClick: (role) => openMemberDialog(role) } },
   disabledBtn: {
     emits: { onClick: (role) => roleEnableOrForbid(role) },
+    props: { type: 'danger' },
     extraProps: {
-      hide: (row) => row.isLocked,
+      hide: (row) => row.isDisabled,
     },
   },
   enableBtn: {
     emits: { onClick: (role) => roleEnableOrForbid(role) },
     extraProps: {
-      hide: (row) => !row.isLocked,
+      hide: (row) => !row.isDisabled,
     },
   },
 };
@@ -124,6 +125,7 @@
         },
         userType: extraParamState.userType,
         clientType: extraParamState.clientType,
+        keywords: extraParamState.queryCondition,
       };
       let res = await roleServices.getRoles(params, {
         showLoading: !state.loading,
@@ -159,7 +161,10 @@
         detail: detail,
       });
     } else {
-      handleAdd();
+      handleAdd({
+        userType: extraParamState.userType,
+        clientType: extraParamState.clientType,
+      });
     }
   } catch (error) {}
 }
@@ -217,17 +222,16 @@
 
 async function roleEnableOrForbid(row: API.GetRolesQueryResultItem) {
   try {
-    // await Message.tipMessage(`鏄惁${!row.isEnable ? '鍚敤' : '绂佺敤'}瑙掕壊`);
-    // let res = await userServices.roleEnableOrForbid({
-    //   id: row.id,
-    //   isEnable: !row.isEnable,
-    // });
-    // if (res) {
-    //   Message.successMessage('鎿嶄綔鎴愬姛');
-    //   getList(paginationState.pageIndex);
-    //   refetch({ type: 'inactive' });
-    //   return !!res;
-    // }
+    await Message.tipMessage(`鏄惁${row.isDisabled ? '鍚敤' : '绂佺敤'}瑙掕壊`);
+    let res = await roleServices.setRoleIsDisabled({
+      ids: [row.id],
+      isDisabled: !row.isDisabled,
+    });
+    if (res) {
+      Message.successMessage('鎿嶄綔鎴愬姛');
+      getList(paginationState.pageIndex);
+      return !!res;
+    }
   } catch (error) {}
 }
 
@@ -258,19 +262,19 @@
 
 async function handleAuthorize(selectedMenuIds: string[], resourceIds: string[]) {
   try {
-    // let params: API.SaveRoleCommand = {
-    //   ...authorizeForm.detail,
-    //   menuIds: selectedMenuIds,
-    //   resources: resourceIds.map((x) => ({
-    //     resourceId: x,
-    //     dataPower: EnumRoleWebApiDataPower.All,
-    //   })),
-    // };
-    // let res = await roleServices.saveRole(params);
-    // if (res) {
-    //   Message.successMessage('鎿嶄綔鎴愬姛');
-    //   getList(paginationState.pageIndex);
-    // }
+    let params: API.SaveRoleCommand = {
+      ...authorizeForm.detail,
+      menuIds: selectedMenuIds,
+      // resources: resourceIds.map((x) => ({
+      //   resourceId: x,
+      //   dataPower: EnumRoleWebApiDataPower.All,
+      // })),
+    };
+    let res = await roleServices.saveRole(params);
+    if (res) {
+      Message.successMessage('鎿嶄綔鎴愬姛');
+      getList(paginationState.pageIndex);
+    }
   } catch (error) {}
 }
 

--
Gitblit v1.9.1