From c5742b6e6eadda91a0cd99ebcc51d27d0f344c73 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期三, 06 八月 2025 17:04:08 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin

---
 src/views/Permission/RoleManage.vue |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/views/Permission/RoleManage.vue b/src/views/Permission/RoleManage.vue
index 4f57eb0..ba103bb 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,
     },
   },
 };
@@ -217,17 +218,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) {}
 }
 

--
Gitblit v1.9.1