diff --git a/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts b/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts index c443a37f..92d42a27 100644 --- a/mes-ui/mes-ui-admin-vue3/src/api/system/user/index.ts +++ b/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 diff --git a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss b/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss index cefdfaf9..4d395d78 100644 --- a/mes-ui/mes-ui-admin-vue3/src/styles/cus.scss +++ b/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); -} \ No newline at end of file +} + +.fou { + background-color: #f7fbfd; + border: 1px solid #d4d6e3; + color: #77838C; +} diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue index 1d79a384..f6342d30 100644 --- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue +++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/userSelect.vue @@ -11,6 +11,7 @@ filterable :loading="userSelectLoading" @change="onSelectChange" + @visible-change="onVisibleChange" > { const remoteMethod = async (query: any) => { userSelectLoading.value = true userSelectList.value = [] - try { if (query) { - // 根据 username 查询 - userParams.username = query - const dataByUsername = await UserApi.getUserPage(userParams) - - // 将根据 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 { + userParams.userNickName = query + const data = await UserApi.getUserPage(userParams) + userSelectList.value = data.list + }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)