Browse Source

1、用户管理限制只有MASTER类型用户可以显示解冻按钮

2、更换密码难度时下方给出密码规则描述
2、修改密码时旧密码校验失败文案修改
4、用户管理增加冻结状态显示
hella_online_20240919
bjang03 2 months ago
parent
commit
d1f3390dd1
  1. 18
      src/views/system/user/index.vue

18
src/views/system/user/index.vue

@ -58,7 +58,7 @@
<el-table-column label="用户昵称" align="center" prop="nickname" :show-overflow-tooltip="true" />
<el-table-column label="部门" align="center" key="deptName" prop="dept.name" :show-overflow-tooltip="true" />
<el-table-column label="手机号码" align="center" prop="mobile" width="120" />
<el-table-column label="冻结到期时间" align="center" prop="frozenEndTime" :formatter="dateFormatter" width="180" />
<el-table-column label="是否冻结" align="center" prop="frozenStatus" width="80" />
<el-table-column label="状态" align="center" key="status">
<template #default="scope">
<el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1"
@ -77,11 +77,11 @@
v-hasPermi="['system:user:update-password']">
<Icon icon="ep:key" />重置密码
</el-button>
<el-button type="primary" link @click="handleRole(scope.row)"
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="userStore.getUser.userType=='MASTER'">
<el-button type="primary" link @click="handleRole(scope.row)"
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'">
<Icon icon="ep:edit" />解冻
</el-button>
<el-button type="danger" link @click="handleDelete(scope.row.id)" v-hasPermi="['system:user:delete']">
@ -119,7 +119,6 @@ import UserAssignRoleForm from './UserAssignRoleForm.vue'
import DeptTree from './DeptTree.vue'
import { useUserStore } from '@/store/modules/user'
const userStore = useUserStore()
import { usePageLoading } from '@/hooks/web/usePageLoading'
const { loadStart, loadDone } = usePageLoading()
defineOptions({ name: 'SystemUser' })
@ -147,6 +146,11 @@ const getList = async () => {
loading.value = true
try {
const data = await UserApi.getUserPage(queryParams)
for(let i=0;i<data.list.length; i++){
if(data.list[i].frozenEndTime){
data.list[i].frozenStatus = "是"
}
}
list.value = data.list
total.value = data.total
} finally {

Loading…
Cancel
Save