|
@ -81,7 +81,7 @@ |
|
|
v-hasPermi="['system:permission:assign-user-role']"> |
|
|
v-hasPermi="['system:permission:assign-user-role']"> |
|
|
<Icon icon="ep:circle-check" />分配角色 |
|
|
<Icon icon="ep:circle-check" />分配角色 |
|
|
</el-button> |
|
|
</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" />解冻 |
|
|
<Icon icon="ep:edit" />解冻 |
|
|
</el-button> |
|
|
</el-button> |
|
|
<el-button type="danger" link @click="handleDelete(scope.row.id)" v-hasPermi="['system:user:delete']"> |
|
|
<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) |
|
|
handleRole(row) |
|
|
break |
|
|
break |
|
|
case 'handleFree': |
|
|
case 'handleFree': |
|
|
handleFree(row.id) |
|
|
handleFree(row) |
|
|
break |
|
|
break |
|
|
default: |
|
|
default: |
|
|
break |
|
|
break |
|
@ -260,13 +260,18 @@ const handleDelete = async (id: number) => { |
|
|
} catch { } |
|
|
} catch { } |
|
|
} |
|
|
} |
|
|
/** 解冻按钮操作 */ |
|
|
/** 解冻按钮操作 */ |
|
|
const handleFree = async (id: number) => { |
|
|
const handleFree = async (row: any) => { |
|
|
try { |
|
|
try { |
|
|
|
|
|
debugger |
|
|
// 发起删除 |
|
|
// 发起删除 |
|
|
await UserApi.unLockUser(id) |
|
|
if(row.frozenStatus=="是"){ |
|
|
message.success(t('common.unLockSuccess')) |
|
|
await UserApi.unLockUser(row.id) |
|
|
// 刷新列表 |
|
|
message.success(t('common.unLockSuccess')) |
|
|
await getList() |
|
|
// 刷新列表 |
|
|
|
|
|
await getList() |
|
|
|
|
|
}else{ |
|
|
|
|
|
message.error(t('common.unLockFail')) |
|
|
|
|
|
} |
|
|
} catch { } |
|
|
} catch { } |
|
|
} |
|
|
} |
|
|
/** 重置密码 */ |
|
|
/** 重置密码 */ |
|
|