|
|
|
|
@ -2,7 +2,7 @@
|
|
|
|
|
<!-- 负责人选择 -->
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="valueName"
|
|
|
|
|
placeholder="请输入负责人"
|
|
|
|
|
placeholder="请选择相关人员"
|
|
|
|
|
:remote-method="remoteMethod"
|
|
|
|
|
remote-show-suffix
|
|
|
|
|
remote
|
|
|
|
|
@ -11,6 +11,7 @@
|
|
|
|
|
filterable
|
|
|
|
|
:loading="userSelectLoading"
|
|
|
|
|
@change="onSelectChange"
|
|
|
|
|
@visible-change="onVisibleChange"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in userSelectList"
|
|
|
|
|
@ -25,13 +26,8 @@
|
|
|
|
|
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: {
|
|
|
|
|
modelValue: {
|
|
|
|
|
type: [Number, String],
|
|
|
|
|
required: true // 如果是必需的属性，可以设置为true
|
|
|
|
|
}
|
|
|
|
|
@ -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() // 存储选中的完整用户对象
|
|
|
|
|
@ -50,27 +47,30 @@ const emit = defineEmits(['update:newValue'])
|
|
|
|
|
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
|
|
|
|
|
const userSelectList = ref<UserApi.UserVO[]>([])
|
|
|
|
|
const userSelectLoading = ref(false)
|
|
|
|
|
const leaderUserId = toRefs(props).leaderUserId // 获取 props 中的 leaderUserId
|
|
|
|
|
const propsmodelValue = toRefs(props).modelValue // 获取 props 中的 modelValue
|
|
|
|
|
const initialValue: any = ref(null) // 存储初始选中的用户 ID
|
|
|
|
|
|
|
|
|
|
const gitlist = async () => {
|
|
|
|
|
const data = await UserApi.getUserPage(userParams)
|
|
|
|
|
userList.value = data.list
|
|
|
|
|
// 设置初始值
|
|
|
|
|
if (leaderUserId.value) {
|
|
|
|
|
valueName.value = leaderUserId.value
|
|
|
|
|
if (propsmodelValue.value) {
|
|
|
|
|
valueName.value = propsmodelValue.value
|
|
|
|
|
const initialUser = await UserApi.getUser(valueName.value)
|
|
|
|
|
|
|
|
|
|
// 查找初始用户是否已经在 userList 中
|
|
|
|
|
let foundInitialUserInList = false
|
|
|
|
|
for (const user of userList.value) {
|
|
|
|
|
if (user.id === initialUser.id) {
|
|
|
|
|
userSelectList.value = []
|
|
|
|
|
userList.value = []
|
|
|
|
|
foundInitialUserInList = true
|
|
|
|
|
break
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// 如果初始用户不在列表中，则将其添加到列表开头
|
|
|
|
|
if (!foundInitialUserInList && !userSelectList.value.length) {
|
|
|
|
|
userSelectList.value = []
|
|
|
|
|
userList.value = []
|
|
|
|
|
userList.value.unshift(initialUser)
|
|
|
|
|
}
|
|
|
|
|
@ -81,31 +81,11 @@ const gitlist = async () => {
|
|
|
|
|
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
|
|
|
|
|
userParams.userNickName = query
|
|
|
|
|
const data = await UserApi.getUserPage(userParams)
|
|
|
|
|
userSelectList.value = data.list
|
|
|
|
|
} else {
|
|
|
|
|
// 加载所有数据（无查询条件时的情况）
|
|
|
|
|
const data = await UserApi.getUserPage({ ...userParams, pageNo: 1 })
|
|
|
|
|
@ -127,6 +107,15 @@ onMounted(async () => {
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
const onVisibleChange = (isVisible: boolean) => {
|
|
|
|
|
if (!isVisible) {
|
|
|
|
|
// 下拉框关闭时，重置查询参数和下拉框列表
|
|
|
|
|
userParams.userNickName = undefined
|
|
|
|
|
userList.value = []
|
|
|
|
|
userSelectList.value = []
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const onSelectChange = (newValue: any) => {
|
|
|
|
|
valueNameObject.value = userList.value.find((user) => user.id === newValue) // 更新选中的完整用户对象
|
|
|
|
|
emit('update:newValue', valueNameObject.value)
|
|
|
|
|
|
