From f1f40e9a28fafab5d884630b8900b11060ebe9fc Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期二, 31 十月 2023 08:53:35 +0800
Subject: [PATCH] 修改
---
src/views/system/user/index.vue | 152 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 121 insertions(+), 31 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b25d7a8..473f805 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,12 +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.roleId" placeholder="请输入用户名" style="max-width: 180px"> </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>
@@ -18,20 +27,21 @@
</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>-->
-<!-- <el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>-->
+ <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="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>
@@ -44,7 +54,7 @@
<br />
<br />
</el-card>
- <userDialog ref="userRef" @getUserList="initUserTableData" />
+ <userDialog ref="userRef" @getUserList="initUserTableData"/>
</div>
</template>
@@ -71,21 +81,32 @@
describe: string;
createTime: string;
}
-interface DepartmentDataRow {}
+interface idType{
+ id: number,
+ name: string
+}
+
interface TableDataState {
userTableData: {
data: Array<TableDataRow>;
total: number;
loading: boolean;
listQuery: {
- roleId: number | null;
- usePage: boolean;
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({
@@ -99,14 +120,26 @@
total: 0,
loading: false,
listQuery: {
- roleId: 1,
- usePage: false,
- 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 () => {
@@ -121,7 +154,47 @@
});
}
};
+ 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 searchByName = ()=>{
+ initUserTableData()
+ }
+
+ 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();
@@ -135,21 +208,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,
@@ -178,14 +263,19 @@
// 页面加载时
onMounted(() => {
initUserTableData();
+ initRoleTableData();
getRoleData();
+ getExpertsData();
+ getDepList()
});
return {
userRef,
+ reset,
onOpenUserDialog,
onRowDel,
onHandleSizeChange,
initUserTableData,
+ searchByName,
onHandleCurrentChange,
...toRefs(state)
};
--
Gitblit v1.9.2