职工搜索功能优化 以及 全局是否字典调节

mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts

@@ -4,6 +4,7 @@ export interface UserVO {
   id: number
   username: string
   nickname: string
+  userNickName:string
   deptId: number
   postIds: string[]
   email: string

mes-ui/mes-ui-admin-vue3/src/styles/cus.scss

@@ -244,8 +244,14 @@
   background-color: transparent;
   border: none;
 }
-.sizestylenone{
+.sizestylenone {
   background-color: transparent;
   border: none;
   color: var(--el-table-text-color);
-}
+}
+
+.fou {
+  background-color: #f7fbfd;
+  border: 1px solid #d4d6e3;
+  color: #77838C;
+}

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue

@@ -11,6 +11,7 @@
     filterable
     :loading="userSelectLoading"
     @change="onSelectChange"
+     @visible-change="onVisibleChange"
   >
     <el-option
       v-for="item in userSelectList"
@@ -25,11 +26,6 @@
 import { ref, onMounted, toRefs, computed } from 'vue'
 import * as UserApi from '@/api/system/user'
 
-interface UserVO {
-  id: number
-  username: string
-  nickname: string
-}
 const props = defineProps({
   leaderUserId: {
     type: [Number, String],
@@ -41,7 +37,8 @@ const userParams = {
   pageSize: 10,
   status: undefined, // 根据实际情况调整参数
   username: undefined,
-  nickname: undefined
+  nickname: undefined,
+  userNickName: undefined
 }
 const valueName: any = ref() //选中的值
 const valueNameObject: any = ref() // 存储选中的完整用户对象
@@ -81,32 +78,12 @@ const gitlist = async () => {
 const remoteMethod = async (query: any) => {
   userSelectLoading.value = true
   userSelectList.value = []
-
   try {
     if (query) {
-      // 根据 username 查询
+      userParams.userNickName = query
-      userParams.username = query
+      const data = await UserApi.getUserPage(userParams)
-      const dataByUsername = await UserApi.getUserPage(userParams)
+      userSelectList.value = data.list
-
+    }else {
-      // 将根据 username 查询的结果添加到临时列表（用于去重）
-      let tempUserList = [...dataByUsername.list]
-
-      // 根据 nickname 查询（假设 nickname 查询返回的数据与 username 不重复）
-      userParams.username = undefined
-      userParams.nickname = query
-      const dataByNickname = await UserApi.getUserPage(userParams)
-
-      // 将根据 nickname 查询的结果合并至临时列表，并去重
-      tempUserList = [
-        ...tempUserList,
-        ...dataByNickname.list.filter(
-          (item) => !tempUserList.some((selectItem) => selectItem.id === item.id)
-        )
-      ]
-
-      // 设置最终的用户选择列表为去重后的结果
-      userSelectList.value = tempUserList
-    } else {
       // 加载所有数据（无查询条件时的情况）
       const data = await UserApi.getUserPage({ ...userParams, pageNo: 1 })
       userList.value = [...userList.value, ...data.list]
@@ -127,6 +104,14 @@ onMounted(async () => {
   }
 })
 
+const onVisibleChange = (isVisible: boolean) => {
+  if (!isVisible) {
+    // 下拉框关闭时，重置查询参数和下拉框列表
+    userParams.userNickName = undefined;
+    userSelectList.value = [];
+  }
+}
+
 const onSelectChange = (newValue: any) => {
   valueNameObject.value = userList.value.find((user) => user.id === newValue) // 更新选中的完整用户对象
   emit('update:newValue', valueNameObject.value)