From 7e810cf016d1b637b693eeca4a4d8447083c68e2 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期四, 07 八月 2025 14:59:34 +0800
Subject: [PATCH] 修改
---
src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue b/src/views/build/conpanyFunctionConsult/staffManage/staffRegister/index.vue
index 0404d39..2dc2697 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"/>
@@ -70,6 +78,11 @@
<el-table-column label="联系方式" prop="phone" align="center"/>
<el-table-column label="专业" prop="post" align="center"/>
<el-table-column label="用户类型" prop="userTypeName" align="center"/>
+ <el-table-column label="角色" prop="userTypeName" align="center">
+ <template #default="scope">
+ {{ scope.row.roles?.map(i=>i.roleName).join('、') }}
+ </template>
+ </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
<template #default="scope">
<el-button link type="primary" @click="openDialog('view',scope.row)">查看</el-button>
@@ -99,6 +112,7 @@
import {delUser, getUser} from "@/api/onlineEducation/user";
import Cookies from "js-cookie";
import useUserStore from "@/store/modules/user";
+import {listRole} from "@/api/system/role";
const userStore = useUserStore()
const { proxy } = getCurrentInstance();
@@ -116,6 +130,7 @@
dataList: [],
isAdmin: false,
companyList: [],
+ roleList: [],
expertData: [],
userTypeList: [
{
@@ -165,6 +180,7 @@
data.queryParams.companyId = userStore.companyId
}
await getList()
+ await getRoleList()
})
onUnmounted(()=>{
@@ -178,7 +194,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)
}
})
@@ -190,6 +206,18 @@
await getAllList()
}
+const getRoleList = () => {
+ listRole(proxy.addDateRange({
+ pageNum: 1,
+ pageSize: 999,
+ roleName: undefined,
+ roleKey: undefined,
+ status: undefined
+ }, [])).then(response => {
+ data.roleList = response.data.list
+ });
+}
+
const getCompanyList = async ()=>{
const queryParams = {
pageNum: 1,
@@ -198,22 +226,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,11 +255,11 @@
}
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);
+ dialogRef.value.openDialog(type, value, data.queryParams.companyId,data.roleList);
}
/** 重置新增的表单以及其他数据 */
--
Gitblit v1.9.2