From dd2bdb18a8394d2f2a13534a98bcadb8020e3668 Mon Sep 17 00:00:00 2001 From: 祖安之光 <11848914+light-of-zuan@user.noreply.gitee.com> Date: 星期三, 23 七月 2025 16:09:33 +0800 Subject: [PATCH] 修改新增 --- src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue index 0404d39..35b800c 100644 --- a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue +++ b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue @@ -62,7 +62,15 @@ <!-- 表格数据 --> <el-table v-loading="loading" :data="dataList" :border="true"> <el-table-column label="序号" type="index" align="center" width="80" /> - <el-table-column label="姓名" prop="username" align="center" /> + <el-table-column label="用户名" prop="username" align="center"/> + <el-table-column label="姓名" prop="name" align="center"/> + <el-table-column label="年龄" prop="age" align="center"/> + <el-table-column label="职称" prop="positional" align="center"/> + <el-table-column label="人员类别" prop="personType" align="center"> + <template #default="scope"> + {{ scope.row.personType == 1?'技术':scope.row.personType == 2?'管理':'行政' }} + </template> + </el-table-column> <el-table-column label="身份证号" prop="idCard" align="center" /> <el-table-column label="入职时间" prop="entryTime" align="center"/> <el-table-column label="部门" prop="deptName" align="center"/> @@ -178,7 +186,7 @@ data.dataList = res.data.list.map(item => { return { ...item, - userTypeName: item.userType === 0 ? '管理员' : item.userType === 1 ? '企业级' : item.userType === 2 ? '部门级' : item.userType === 3 ? '车间级' :'其他', + userTypeName: item.userType === 0 ? '系统管理员' : (item.userType === 1 || item.userType === 2 || item.userType === 3) ? '企业用户': item.userType === 6 ? '企业管理员':'其他', entryTime: item.entryTime?.substring(0, 10) } }) @@ -198,22 +206,26 @@ const res = await getCompany(queryParams) if (res.code == 200) { data.companyList = res.data.list?res.data.list:[] - data.queryParams.companyId = data.companyList[0].id + // data.queryParams.companyId = data.companyList[0].id } else { ElMessage.warning(res.message) } } const getAllList = async () => { - let params = data.queryParams - params.pageSize = 999 - const res = await getUser(params) + const res = await getUser({ + pageNum: 1, + pageSize: 999, + username: '', + userType: null, + companyId: null + }) if(res.code == 200){ - data.expertData = res.data.list.map((item,index) => { + data.expertData = res.data.list?.map((item,index) => { return { ...item, index: index + 1, - userTypeName: item.userType === 0 ? '管理员' : item.userType === 1 ? '企业级' : item.userType === 2 ? '部门级' : item.userType === 3 ? '车间级' :'其他', + userTypeName: item.userType === 0 ? '系统管理员' : (item.userType === 1 || item.userType === 2 || item.userType === 3) ? '企业用户': item.userType === 6 ? '企业管理员':'其他', entryTime: item.entryTime?.substring(0, 10) } }) @@ -223,8 +235,8 @@ } const openDialog = (type, value) => { - if(userInfo.value.userType === 3){ - ElMessage.warning('车间级用户不能新增') + if(userInfo.value.userType !== 0 && userInfo.value.userType !== 6){ + ElMessage.warning('非管理员身份不可操作') return; } dialogRef.value.openDialog(type, value, data.queryParams.companyId); -- Gitblit v1.9.2