From 1052dd9a5a36d531f1ea89a04ad2d7a1047ae4d7 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期三, 22 二月 2023 13:36:19 +0800
Subject: [PATCH] 修改

---
 src/views/system/user/index.vue |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a892e9c..06e520f 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,8 +2,17 @@
     <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-cascader
+                    v-model="userTableData.listQuery.searchParams.depId"
+                    :props="props"
+                    :options="departmentList"
+                    :show-all-levels="false"
+                    placeholder="请选择部门"
+                    clearable
+                    size="default"
+                ></el-cascader>
+                <el-input size="default" v-model.trim="userTableData.listQuery.searchParams.username" placeholder="请输入用户名" style="max-width: 180px;margin-left: 10px;margin-right: 10px"> </el-input>
+                <el-input size="default" v-model.trim="userTableData.listQuery.searchParams.realName" placeholder="请输入真实姓名" style="max-width: 180px"> </el-input>
                 <el-button size="default" type="primary" class="ml10" @click="initUserTableData">
                     <el-icon>
                         <ele-Search />
@@ -21,9 +30,14 @@
                 <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="gender" label="性别" show-overflow-tooltip>
+                  <template #default="scope">
+                    <el-tag type="success" v-if="scope.row.gender == 1">男</el-tag>
+                    <el-tag type="success" v-else-if="scope.row.gender == 0">女</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="role.roleName" label="关联角色" show-overflow-tooltip></el-table-column>
+                <el-table-column prop="department.depName" 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>
@@ -80,6 +94,7 @@
         loading: boolean;
         listQuery: {
             searchParams: {
+                depId: string | null;
                 username: string | null;
                 realName: string | null;
             };
@@ -89,6 +104,7 @@
     };
     departmentList: [];
     roleList: [];
+    props:{}
 }
 
 export default defineComponent({
@@ -103,6 +119,7 @@
                 loading: false,
                 listQuery: {
                     searchParams: {
+                        depId: null,
                         username: null,
                         realName: null
                     },
@@ -111,7 +128,13 @@
                 }
             },
             departmentList: [],
-            roleList: []
+            roleList: [],
+            props: {
+              label: 'depName',
+              value: 'depId',
+              checkStrictly: true,
+              emitPath: false
+            }
         });
         // 初始化表格数据
         const initUserTableData = async () => {

--
Gitblit v1.9.2