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']">
分配角色
-
+
解冻
@@ -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 { }
}
/** 重置密码 */