From d3babf69a4f418a56a95a07956fccc97625e19e8 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Wed, 31 Jan 2024 12:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E5=B7=A5=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/hlvuestyle/userSelect.vue   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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 ad546e9b..14bba2c2 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
@@ -2,6 +2,8 @@
   <!-- 负责人选择 -->
   <el-select
     v-model="propsmodelValue"
+    v-loading="loading"
+    element-loading-background="rgb(255, 255, 255)"
     placeholder="请选择相关人员"
     :remote-method="remoteMethod"
     remote-show-suffix
@@ -46,24 +48,22 @@ const valueNameObject: any = ref() // 存储选中的完整用户对象
 const emit = defineEmits(['update:newValue'])
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const userSelectList = ref<UserApi.UserVO[]>([])
+const loading = ref(true)
 const userSelectLoading = ref(false)
 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
+  userList.value = [...userList.value, ...data.list]
   // 设置初始值
   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
       }
@@ -74,8 +74,11 @@ const gitlist = async () => {
       userList.value = []
       userList.value.unshift(initialUser)
     }
+    // loading.value = false
   }
-  remoteMethod('')
+  userSelectList.value = userList.value
+  console.log(userList.value);
+  loading.value = false
 }
 
 const remoteMethod = async (query: any) => {
@@ -88,10 +91,7 @@ const remoteMethod = async (query: any) => {
       userList.value = data.list
       userSelectList.value = data.list
     } else {
-      // 加载所有数据（无查询条件时的情况）
-      const data = await UserApi.getUserPage({ ...userParams, pageNo: 1 })
-      userList.value = [...userList.value, ...data.list]
-      userSelectList.value = userList.value
+      gitlist()
     }
   } catch (error) {
     console.error(error)