From a1faccc5e1e7a155ede10bb59b8b9db45fbceb2e Mon Sep 17 00:00:00 2001
From: David Wei <>
Date: Fri, 25 Aug 2023 15:31:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?remove=20=E5=88=A0=E9=99=A4=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E9=83=A8=E9=97=A8id=E7=AD=9B=E9=80=89=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E7=8B=AC=E7=AB=8B=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=BA=94=E8=AF=A5?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E6=89=80=E6=9C=89=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dept/types.ts    |  4 +--
 src/api/system/user/index.ts    | 14 +---------
 src/views/system/dept/index.vue | 49 +++++++++++++++++++++------------
 3 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/src/api/system/dept/types.ts b/src/api/system/dept/types.ts
index 867dbded..48496313 100644
--- a/src/api/system/dept/types.ts
+++ b/src/api/system/dept/types.ts
@@ -17,7 +17,7 @@ export interface DeptVO extends BaseEntity {
   deptId: number | string;
   deptName: string;
   orderNum: number;
-  leader: string;
+  leaderId: string;
   phone: string;
   email: string;
   status: string;
@@ -36,7 +36,7 @@ export interface DeptForm {
   deptId?: number | string;
   deptName?: string;
   orderNum?: number;
-  leader?: string;
+  leaderId?: string;
   phone?: string;
   email?: string;
   status?: string;
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index cb448f51..4ebd47fd 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -175,17 +175,6 @@ export const updateAuthRole = (data: { userId: string; roleIds: string }) => {
   });
 };
 
-/**
- * 查询当前部门的所有用户信息
- * @param deptId
- */
-export const listUserByDeptId = (deptId: string | number): AxiosPromise<UserVO[]> => {
-  return request({
-    url: '/system/user/list/dept/' + deptId,
-    method: 'get'
-  });
-};
-
 /**
  * 查询部门下拉树结构
  */
@@ -210,6 +199,5 @@ export default {
   uploadAvatar,
   getAuthRole,
   updateAuthRole,
-  deptTreeSelect,
-  listUserByDeptId
+  deptTreeSelect
 };
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index ab7ecbba..6c9cefda 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -96,9 +96,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="负责人" prop="leader">
-              <el-select v-model="form.leader" placeholder="请选择负责人">
-                <el-option v-for="item in deptUserList" :key="item.userId" :label="item.userName" :value="item.userId" />
+            <el-form-item label="负责人" prop="leaderId">
+              <el-select
+                v-model="form.leaderId"
+                filterable
+                remote
+                placeholder="请选择负责人"
+                :remote-method="getAllUser"
+                :loading="userLoading"
+              >
+                <el-option
+                  v-for="item in userList"
+                  :key="item.userId"
+                  :label="item.userName + '(' + item.nickName +')'"
+                  :value="item.userId"
+                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -135,14 +147,13 @@
 <script setup name="Dept" lang="ts">
 import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/system/dept"
 import { DeptForm, DeptQuery, DeptVO } from "@/api/system/dept/types";
-import {UserVO} from "@/api/system/user/types";
-import {listUserByDeptId} from "@/api/system/user";
+import {UserQuery, UserVO} from "@/api/system/user/types";
+import {listUser} from "@/api/system/user";
 
 interface DeptOptionsType {
   deptId: number | string;
   deptName: string;
   children: DeptOptionsType[];
-
 }
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -150,10 +161,11 @@ const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"))
 
 const deptList = ref<DeptVO[]>([])
 const loading = ref(true)
+const userLoading = ref(true)
 const showSearch = ref(true)
 const deptOptions = ref<DeptOptionsType[]>([])
 const isExpandAll = ref(true)
-const deptUserList = ref<UserVO[]>([]);
+const userList = ref<UserVO[]>([]);
 
 const dialog = reactive<DialogOption>({
   visible: false,
@@ -169,7 +181,7 @@ const initFormData: DeptForm = {
   parentId: undefined,
   deptName: undefined,
   orderNum: 0,
-  leader: undefined,
+  leaderId: undefined,
   phone: undefined,
   email: undefined,
   status: "0"
@@ -203,13 +215,16 @@ const getList = async () => {
   }
   loading.value = false
 }
-
-/** 查询当前部门的所有用户 */
-async function getDeptAllUser(deptId: any) {
-  if (deptId !== null && deptId !== "" && deptId !== undefined) {
-    const res = await listUserByDeptId(deptId);
-    deptUserList.value = res.data;
-  }
+/** 查询当前部门可选的所有用户 */
+const getAllUser = async (query?: string) => {
+  userLoading.value = true;
+  const res = await listUser({
+    userName: query,
+    pageNum: 1,
+    pageSize: 50
+  });
+  userList.value = res.rows;
+  userLoading.value = false
 }
 
 /** 取消按钮 */
@@ -264,8 +279,8 @@ const handleAdd = async (row?: DeptVO) => {
 /** 修改按钮操作 */
 const handleUpdate = async (row: DeptVO) => {
   reset();
-  //查询当前部门所有用户
-  getDeptAllUser(row.deptId);
+  // 查询当前部门可选所有用户
+  await getAllUser();
   const res = await getDept(row.deptId);
   form.value = res.data
   const response = await listDeptExcludeChild(row.deptId);
-- 
Gitee


From 15964a68d1f7f9ffd3670a2d6214fa802b09b7f5 Mon Sep 17 00:00:00 2001
From: David Wei <>
Date: Fri, 25 Aug 2023 16:15:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E9=9D=9E=E5=BF=85=E5=A1=AB=E7=9A=84?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=B4=9F=E8=B4=A3=E4=BA=BA=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=9C=80=E8=A6=81=E8=83=BD=E7=BD=AE=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 6c9cefda..264a55e0 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -99,11 +99,13 @@
             <el-form-item label="负责人" prop="leaderId">
               <el-select
                 v-model="form.leaderId"
+                clearable
                 filterable
                 remote
                 placeholder="请选择负责人"
                 :remote-method="getAllUser"
                 :loading="userLoading"
+                style="width: 100%;"
               >
                 <el-option
                   v-for="item in userList"
-- 
Gitee