From 6c05b85e17b70dbc806636d9df5408b1ab441931 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Sat, 14 Sep 2024 19:17:24 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=9C=AA=E5=86=BB=E7=BB=93=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E7=82=B9=E5=87=BB=E8=A7=A3=E5=86=BB=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/zh-CN.ts            |  1 +
 src/views/system/user/index.vue | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 49c3e196f..b7920e2d5 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -54,6 +54,7 @@ export default {
     createTime: '创建时间',
     updateTime: '更新时间',
     unLockSuccess: '解冻成功',
+    unLockFail: '账号未冻结',
     copy: '复制',
     copySuccess: '复制成功',
     copyError: '复制失败',
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4232e1c36..d2d28220c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -81,7 +81,7 @@
                            v-hasPermi="['system:permission:assign-user-role']">
                   <Icon icon="ep:circle-check" />分配角色
                 </el-button>
-                <el-button type="primary" link @click="handleFree(scope.row.id)" v-hasPermi="['system:user:update-password']"  v-if="useUserStore().userSelfInfo.userType=='MASTER'">
+                <el-button type="primary" link @click="handleFree(scope.row)" v-hasPermi="['system:user:update-password']"  v-if="useUserStore().userSelfInfo.userType=='MASTER'">
                   <Icon icon="ep:edit" />解冻
                 </el-button>
                 <el-button type="danger" link @click="handleDelete(scope.row.id)" v-hasPermi="['system:user:delete']">
@@ -240,7 +240,7 @@ const handleCommand = (command: string, row: UserApi.UserVO) => {
       handleRole(row)
       break
     case 'handleFree':
-      handleFree(row.id)
+      handleFree(row)
       break
     default:
       break
@@ -260,13 +260,18 @@ const handleDelete = async (id: number) => {
   } catch { }
 }
 /** 解冻按钮操作 */
-const handleFree = async (id: number) => {
+const handleFree = async (row: any) => {
   try {
+    debugger
     // 发起删除
-    await UserApi.unLockUser(id)
-    message.success(t('common.unLockSuccess'))
-    // 刷新列表
-    await getList()
+    if(row.frozenStatus=="是"){
+      await UserApi.unLockUser(row.id)
+      message.success(t('common.unLockSuccess'))
+      // 刷新列表
+      await getList()
+    }else{
+      message.error(t('common.unLockFail'))
+    }
   } catch { }
 }
 /** 重置密码 */