From cbb23429b8beed72b58cbb57f9b3c56a0fb2b5d2 Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期五, 09 五月 2025 13:31:26 +0800 Subject: [PATCH] 修改 --- src/views/system/user/index.vue | 212 +++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 159 insertions(+), 53 deletions(-) diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index a892e9c..099239e 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -2,13 +2,21 @@ <div class="system-user-container"> <el-card shadow="hover"> <div class="system-user-search mb15"> - <el-input size="default" v-model.trim="userTableData.listQuery.searchParams.username" placeholder="请输入用户名" style="max-width: 180px"> </el-input> - <el-input size="default" v-model.trim="userTableData.listQuery.searchParams.realName" placeholder="请输入真实姓名" style="max-width: 180px; margin-left: 10px"> </el-input> - <el-button size="default" type="primary" class="ml10" @click="initUserTableData"> + <el-input size="default" v-model.trim="userTableData.listQuery.searchParams.realName" placeholder="真实姓名" style="max-width: 180px;margin-right: 10px"> </el-input> + <el-select v-model="userTableData.listQuery.searchParams.roleId" placeholder="角色类型" clearable class="w100" style="max-width: 180px" size="default"> + <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"> </el-option> + </el-select> + <el-button size="default" type="primary" class="ml10" @click="searchByName()"> <el-icon> <ele-Search /> </el-icon> 查询 + </el-button> + <el-button size="default" class="ml10" @click="reset()"> + <el-icon> + <RefreshLeft /> + </el-icon> + 重置 </el-button> <el-button size="default" type="success" class="ml10" @click="onOpenUserDialog('新增', '')"> <el-icon> @@ -19,24 +27,26 @@ </div> <el-table :data="userTableData.data" style="width: 100%"> <el-table-column type="index" label="序号" width="60" /> - <el-table-column prop="username" label="用户名" show-overflow-tooltip></el-table-column> - <el-table-column prop="realName" label="真实姓名" show-overflow-tooltip></el-table-column> - <el-table-column prop="sex" label="性别" show-overflow-tooltip></el-table-column> - <el-table-column prop="role.name" label="关联角色" show-overflow-tooltip></el-table-column> - <el-table-column prop="department.name" label="部门" show-overflow-tooltip></el-table-column> - <el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column> - <el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column> - <el-table-column prop="status" label="用户状态" show-overflow-tooltip> - <template #default="scope"> - <el-tag type="success" v-if="scope.row.status">启用</el-tag> - <el-tag type="info" v-else>禁用</el-tag> - </template> + <el-table-column prop="name" label="用户名"/> + <el-table-column prop="realName" label="真实姓名"/> + <el-table-column prop="phone" label="手机号"/> + <el-table-column prop="depName" label="部门"></el-table-column> + <el-table-column prop="roles" label="关联角色"> + <template #default="scope"> + <span>{{ scope.row.roles.map(obj => obj.roleName).join('、') }}</span> + </template> </el-table-column> - <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column> + <el-table-column prop="idType" label="证件类型"> + <template #default="scope"> + <span>{{idTypeList.find(item=>item.id == scope.row.idType)?.name}}</span> + </template> + </el-table-column> + <el-table-column prop="idSerial" label="证件号码"></el-table-column> <el-table-column label="操作" width="100"> <template #default="scope"> - <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenUserDialog('修改', scope.row)">修改</el-button> - <el-button style="color: red" :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button> + <el-button :disabled="scope.row.name === 'admin'" size="small" text type="primary" @click="onOpenUserDialog('修改', scope.row)">修改</el-button> + <el-button style="color: red" :disabled="scope.row.name === 'admin'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button> + <el-button v-if="scope.row.name !== 'admin'" style="color: red" :disabled="!isAdmin" size="small" text type="primary" @click="onResetPwd(scope.row)">重置密码</el-button> </template> </el-table-column> </el-table> @@ -45,7 +55,7 @@ <br /> <br /> </el-card> - <userDialog ref="userRef" @getUserList="initUserTableData" /> + <userDialog ref="userRef" @getUserList="initUserTableData"/> </div> </template> @@ -56,7 +66,10 @@ import { userApi } from '/@/api/systemManage/user'; import { departmentApi } from '/@/api/systemManage/department'; import { useRoleApi } from '/@/api/systemManage/role'; - +import {useUserInfo} from "/@/stores/userInfo"; +import {storeToRefs} from "pinia"; +const userInfo = useUserInfo(); +const { userInfos } = storeToRefs(userInfo); // 定义接口来定义对象的类型 interface TableDataRow { userName: string; @@ -72,23 +85,33 @@ describe: string; createTime: string; } -interface DepartmentDataRow {} +interface idType{ + id: number, + name: string +} + interface TableDataState { + isAdmin: boolean userTableData: { data: Array<TableDataRow>; total: number; loading: boolean; listQuery: { - searchParams: { - username: string | null; - realName: string | null; - }; pageIndex: number; pageSize: number; + searchParams:{ + roleId: number | null; + name: string + realName: string + userIndentityId: number | null; + } }; }; - departmentList: []; + idTypeList: Array<idType> + depList: []; roleList: []; + expList: []; + searchType: null | number } export default defineComponent({ @@ -97,26 +120,37 @@ setup() { const userRef = ref(); const state = reactive<TableDataState>({ + isAdmin: false, userTableData: { data: [], total: 0, loading: false, listQuery: { - searchParams: { - username: null, - realName: null - }, - pageIndex: 1, - pageSize: 10 + pageIndex: 1, + pageSize: 10, + searchParams:{ + roleId: null, + name: '', + realName: '', + userIndentityId: null + } } }, - departmentList: [], - roleList: [] + idTypeList:[ + { + id: 1, + name: '身份证' + } + ], + depList: [], + roleList: [], + expList: [], + searchType:null }); // 初始化表格数据 const initUserTableData = async () => { let res = await userApi().getUserList(state.userTableData.listQuery); - if (res.data.code === '200') { + if (res.data.code === 100) { state.userTableData.data = res.data.data; state.userTableData.total = res.data.total; } else { @@ -126,22 +160,76 @@ }); } }; + const initRoleTableData = async () => { + let res = await useRoleApi().getRoleList(); + if (res.data.code === 100) { + state.roleList = res.data.data; + } else { + ElMessage({ + type: 'warning', + message: res.data.msg + }); + } + }; - const getDepartmentData = async () => { - let res = await departmentApi().getDepartmentList(); - if (res.data.code === '200') { - state.departmentList = res.data.data; - } else { + const searchByName = ()=>{ + initUserTableData() + } + + const onResetPwd = (row: TableDataRow)=>{ + ElMessageBox.confirm(`此操作将重置:“${row.name}”的密码,是否继续?`, '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning' + }) + .then(async () => { + let res = await userApi().resetPwd({uid: row.id}); + if (res.data.code === 100) { ElMessage({ - type: 'warning', - message: res.data.msg + type: 'success', + duration: 2000, + message: '密码重置成功' }); - } + await initUserTableData(); + } else { + ElMessage({ + type: 'warning', + message: res.data.msg + }); + } + }) + .catch(() => {}); + } + + const reset = () =>{ + state.userTableData.listQuery = { + pageIndex: 1, + pageSize: 10, + searchParams:{ + roleId: null, + name: '', + realName: '', + userIndentityId: null + } + } + initUserTableData() + } + + const getDepList = async () => { + let res = await departmentApi().getDepartmentList() + if (res.data.code === 100) { + state.depList = res.data.data; + } else { + ElMessage({ + type: 'warning', + message: res.data.msg + }); + } }; const getRoleData = async () => { let res = await useRoleApi().getRoleList(); - if (res.data.code === '200') { + if (res.data.code === 100) { state.roleList = res.data.data; } else { ElMessage({ @@ -151,21 +239,33 @@ } }; + const getExpertsData = async () => { + let res = await useRoleApi().getExpList(); + if (res.data.code === 100) { + state.expList = res.data.data; + } else { + ElMessage({ + type: 'warning', + message: res.data.msg + }); + } + }; + // 打开新增修改用户弹窗 const onOpenUserDialog = (type: string, value: any) => { - userRef.value.openDialog(type, value, state.departmentList, state.roleList); + userRef.value.openDialog(type, value, state.depList, state.roleList, state.expList); }; // 删除用户 const onRowDel = (row: TableDataRow) => { - ElMessageBox.confirm(`此操作将永久删除账户名称:“${row.realName}”,是否继续?`, '提示', { + ElMessageBox.confirm(`此操作将永久删除账户名称:“${row.name}”,是否继续?`, '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }) .then(async () => { - let res = await userApi().deleteUser({ uid: row.uid }); - if (res.data.code === '200') { + let res = await userApi().deleteUser(row.id); + if (res.data.code === 100) { ElMessage({ type: 'success', duration: 2000, @@ -193,20 +293,26 @@ }; // 页面加载时 onMounted(() => { - let a = { name: 1, c: { name: 1 } }; - let b = Object.assign({}, a); - b.c.name = 2; - console.log(a.c.name); initUserTableData(); - getDepartmentData(); + initRoleTableData(); getRoleData(); + getExpertsData(); + getDepList() + if(userInfos.value.roles.find(i=>i.roleId == 6 || i.roleId == 7)){ + state.isAdmin = true + }else{ + state.isAdmin = false + } }); return { userRef, + onResetPwd, + reset, onOpenUserDialog, onRowDel, onHandleSizeChange, initUserTableData, + searchByName, onHandleCurrentChange, ...toRefs(state) }; -- Gitblit v1.9.2