From 0f380ec86e7bd36198059ff5fbc2a508f6a39183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E6=98=AD=E6=9C=9D?= <18394339404@163.com>
Date: Thu, 8 Aug 2024 15:37:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=94=80=E5=94=AEBD?=
 =?UTF-8?q?=E7=AD=89=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20&=20feat:=E6=96=B0=E5=A2=9E=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/select.js            |  5 ++++-
 src/views/acl/user/index.vue | 22 +++++++++++++---------
 vue.config.js                |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/api/select.js b/src/api/select.js
index 4a7ca1b..96583ab 100644
--- a/src/api/select.js
+++ b/src/api/select.js
@@ -3,7 +3,10 @@ import request from '@/utils/request'
 // 获取部门列表
 export const reqGetDepartments = () => request({ url: `/WRD-admin/sys/dept/list`, method: 'get' })
 
-// 获取部门列表
+// 获取所有部门
+export const reqGetAllDepartments = () => request({ url: `/WRD-admin/sys/dept/listAll`, method: 'get' })
+
+// 获取区域及城市
 export const reqGetRegionAndCity = () => request({ url: `/WRD-admin/sys/user/ReignAndCity`, method: 'get' })
 
 // 不带部门
diff --git a/src/views/acl/user/index.vue b/src/views/acl/user/index.vue
index a1900ce..48b9202 100644
--- a/src/views/acl/user/index.vue
+++ b/src/views/acl/user/index.vue
@@ -1,13 +1,10 @@
 <template>
   <div class="user-container">
     <el-form label-width="80px" :inline="true" class="button-headers">
-      <!-- <el-form-item>
-        <el-input v-model="model" placeholder="请输入GID"></el-input>
+      <el-form-item>
+        <el-input v-model="name" placeholder="请输入用户姓名" clearable />
       </el-form-item>
-      <el-button type="primary" icon="el-icon-search" @click="search"
-        >查询</el-button
-      >
-      <el-button type="default" @click="resetSearch">清空</el-button> -->
+      <el-button type="primary" icon="el-icon-search" @click="userSearch">查询</el-button>
       <el-button type="primary" @click="showAddUserDialog">添加用户</el-button>
       <el-button
         type="danger"
@@ -159,6 +156,7 @@ export default {
       loadingOfGetUserList: false,
       loadingOfSaveUserButton: false,
       dialogUserVisible: false,
+      name: '',
       user: {},
       page: 1,
       limit: 10,
@@ -209,15 +207,15 @@ export default {
   },
   methods: {
     async fetchDepartmentsList() {
-      const result = await this.$API.select.reqGetDepartments()
-      if (result.code == 0) {
+      const result = await this.$API.select.reqGetAllDepartments()
+      if (result.code === 0) {
         this.departmentList = result.data
       }
     },
     async fetchRolesList() {
       const resOfGetRolesList = await this.$API.role.reqGetRoleList()
 
-      if (resOfGetRolesList.code == 0) {
+      if (resOfGetRolesList.code === 0) {
         this.roles = resOfGetRolesList.data
       }
     },
@@ -230,6 +228,9 @@ export default {
         page: page,
         limit: limit
       }
+      if (this.name) {
+        queryInfo.name = this.name
+      }
       const resOfFetchUserList = await this.$API.user.reqGetUserList(queryInfo)
       if (resOfFetchUserList.code == 0) {
         this.total = resOfFetchUserList.data.total
@@ -355,6 +356,9 @@ export default {
       if (theRole) {
         return theRole.name
       }
+    },
+    userSearch() {
+      this.fetchUsersList()
     }
   }
 }
diff --git a/vue.config.js b/vue.config.js
index 4f19d21..34c7fb4 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -40,7 +40,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
         target: 'http://139.219.4.195:8003',
         // 测试地址
-        // target: 'http://192.168.1.161:8003',
+        // target: 'http://192.168.1.169:8003',
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }