From 43fca2cb16964496caafdbc34e969d2a7cde7cc0 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期四, 30 三月 2023 15:32:56 +0800
Subject: [PATCH] 用户接口

---
 src/views/system/user/index.vue |  119 ++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 89 insertions(+), 30 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8bd5f91..3030f1b 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -2,13 +2,19 @@
     <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-icon>-->
-<!--                        <ele-Search />-->
-<!--                    </el-icon>-->
-<!--                    查询-->
-<!--                </el-button>-->
+                <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>
                         <ele-FolderAdd />
@@ -18,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>-->
-<!--                <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 +51,7 @@
             <br />
             <br />
         </el-card>
-        <userDialog ref="userRef" @getUserList="initUserTableData" />
+        <userDialog ref="userRef" @getUserList="initUserTableData"/>
     </div>
 </template>
 
@@ -71,7 +78,11 @@
     describe: string;
     createTime: string;
 }
-interface DepartmentDataRow {}
+interface idType{
+  id: number,
+  name: string
+}
+
 interface TableDataState {
     userTableData: {
         data: Array<TableDataRow>;
@@ -84,8 +95,10 @@
             pageSize: number;
         };
     };
-    departmentList: [];
+    idTypeList: Array<idType>
+    depList: [];
     roleList: [];
+    searchName:string
 }
 
 export default defineComponent({
@@ -105,8 +118,15 @@
                     pageSize: 10
                 }
             },
-            departmentList: [],
-            roleList: []
+            idTypeList:[
+              {
+                id: 1,
+                name: '身份证'
+              }
+            ],
+            depList: [],
+            roleList: [],
+            searchName: ''
         });
         // 初始化表格数据
         const initUserTableData = async () => {
@@ -122,6 +142,41 @@
             }
         };
 
+        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
+              });
+            }
+          }
+        }
+
+        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();
@@ -137,19 +192,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,
@@ -179,13 +235,16 @@
         onMounted(() => {
             initUserTableData();
             getRoleData();
+            getDepList()
         });
         return {
             userRef,
+            reset,
             onOpenUserDialog,
             onRowDel,
             onHandleSizeChange,
             initUserTableData,
+            searchByName,
             onHandleCurrentChange,
             ...toRefs(state)
         };

--
Gitblit v1.9.2