From 0c0fa2483fd431104f6498e40fffd983d913dce2 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 25 Apr 2023 17:11:09 +0800
Subject: [PATCH] 修改
---
src/views/system/user/index.vue | 144 +++++++++++++++++++++++++++++++----------------
1 files changed, 94 insertions(+), 50 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a892e9c..fe0ea7e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,13 +2,18 @@
<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="searchName" placeholder="真实姓名" style="max-width: 180px"> </el-input>
+ <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,20 +24,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 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>
@@ -45,7 +51,7 @@
<br />
<br />
</el-card>
- <userDialog ref="userRef" @getUserList="initUserTableData" />
+ <userDialog ref="userRef" @getUserList="initUserTableData"/>
</div>
</template>
@@ -72,23 +78,30 @@
describe: string;
createTime: string;
}
-interface DepartmentDataRow {}
+interface idType{
+ id: number,
+ name: string
+}
+
interface TableDataState {
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
+ }
};
};
- departmentList: [];
+ idTypeList: Array<idType>
+ depList: [];
roleList: [];
+ searchName:string
}
export default defineComponent({
@@ -102,21 +115,29 @@
total: 0,
loading: false,
listQuery: {
- searchParams: {
- username: null,
- realName: null
- },
- pageIndex: 1,
- pageSize: 10
+ pageIndex: 1,
+ pageSize: 10,
+ searchParams:{
+ roleId: null,
+ name: '',
+ realName: ''
+ }
}
},
- departmentList: [],
- roleList: []
+ idTypeList:[
+ {
+ id: 1,
+ name: '身份证'
+ }
+ ],
+ depList: [],
+ roleList: [],
+ searchName: ''
});
// 初始化表格数据
const initUserTableData = async () => {
let res = await userApi().getUserList(state.userTableData.listQuery);
- if (res.data.code === '200') {
+ if (res.data.code === 200) {
state.userTableData.data = res.data.data;
state.userTableData.total = res.data.total;
} else {
@@ -127,21 +148,45 @@
}
};
- const getDepartmentData = async () => {
- let res = await departmentApi().getDepartmentList();
- if (res.data.code === '200') {
- state.departmentList = res.data.data;
+ const searchByName = async () =>{
+ if(state.searchName == ''){
+ ElMessage({
+ type: 'warning',
+ message: '请输入搜索内容'
+ });
+ }else{
+ let res = await userApi().getUserLByRealName(state.searchName);
+ if (res.data.code === 100) {
+ state.userTableData.data = res.data.data
} else {
- ElMessage({
- type: 'warning',
- message: res.data.msg
- });
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
}
+ }
+ }
+
+ const reset = () =>{
+ state.searchName = ''
+ 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({
@@ -153,19 +198,20 @@
// 打开新增修改用户弹窗
const onOpenUserDialog = (type: string, value: any) => {
- userRef.value.openDialog(type, value, state.departmentList, state.roleList);
+ console.log('打开',state.depList, state.roleList)
+ userRef.value.openDialog(type, value, state.depList, state.roleList);
};
// 删除用户
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 +239,18 @@
};
// 页面加载时
onMounted(() => {
- let a = { name: 1, c: { name: 1 } };
- let b = Object.assign({}, a);
- b.c.name = 2;
- console.log(a.c.name);
initUserTableData();
- getDepartmentData();
getRoleData();
+ getDepList()
});
return {
userRef,
+ reset,
onOpenUserDialog,
onRowDel,
onHandleSizeChange,
initUserTableData,
+ searchByName,
onHandleCurrentChange,
...toRefs(state)
};
--
Gitblit v1.9.2