From 50210fdd1494b1219e389cbb3f3f28ffcfad365f Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 16:13:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/classes/ClassesForm.vue    |  5 ++--
 .../src/views/heli/dept/DeptForm.vue          |  3 +--
 .../src/views/heli/hlvuestyle/userSelect.vue  |  1 +
 .../views/heli/warehouse/WarehouseForm.vue    |  5 ++--
 .../src/views/heli/workshop/WorkshopForm.vue  | 23 +++----------------
 5 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
index 44a72814..9c635923 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/classes/ClassesForm.vue
@@ -34,7 +34,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="负责人" prop="leaderUserId">
-          <UserSelect v-model="formData.leaderUserId" :leaderUserId="formData.leaderUserId" @update:newValue="handleSelectedUser" />
+          <UserSelect v-model="formData.leaderUserId"  @update:newValue="handleSelectedUser" />
       </el-form-item>
       <el-form-item label="班组描述" prop="description">
         <el-input type="textarea" v-model="formData.description" height="150px" show-word-limit maxlength="200" />
@@ -205,7 +205,6 @@ const resetForm = () => {
 }
 
 const handleSelectedUser = (newValue: any) => {
-  // console.log('接收对应的数据:', newValue)
-  formData.value.leaderUserId = newValue.id
+  formData.value.leaderUserId = newValue?.id
 }
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
index 2c161c5c..d88d33a1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/dept/DeptForm.vue
@@ -195,7 +195,6 @@ const resetForm = () => {
 // }
 
 const handleSelectedUser = (newValue: any) => {
-  console.log('接收对应的数据:', newValue)
-  formData.value.leaderUserId = newValue.id
+  formData.value.leaderUserId = newValue?.id
 }
 </script>
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 822195c3..ad546e9b 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
@@ -85,6 +85,7 @@ const remoteMethod = async (query: any) => {
     if (query) {
       userParams.userNickName = query
       const data = await UserApi.getUserPage(userParams)
+      userList.value = data.list
       userSelectList.value = data.list
     } else {
       // 加载所有数据（无查询条件时的情况）
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
index 24bf711c..2db9e8d1 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/warehouse/WarehouseForm.vue
@@ -16,7 +16,7 @@
       <el-form-item label="联系人" prop="contact">
         <UserSelect class="!w-500px"
           v-model="formData.contact"
-          :leaderUserId="formData.contact"
+          
           @update:newValue="handleSelectedUser"
         />
       </el-form-item>
@@ -165,7 +165,6 @@ const resetForm = () => {
 }
 
 const handleSelectedUser = (newValue: any) => {
-  // console.log('接收对应的数据:', newValue)
-  formData.value.contact = newValue.id
+  formData.value.contact = newValue?.id
 }
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
index d8527059..884bf47c 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/workshop/WorkshopForm.vue
@@ -27,26 +27,10 @@
       <el-form-item label="负责人" prop="leaderUserId">
          <UserSelect 
           v-model="formData.leaderUserId"
-          :leaderUserId="formData.leaderUserId"
+      
           @update:newValue="handleSelectedUser"
         />
-        <!-- <el-select v-model="formData.leaderUserId"
-                   placeholder="请输入负责人"
-                   :remote-method="remoteUserSearch"
-                   remote-show-suffix
-                   remote
-                   clearable
-                   reserve-keyword
-                   filterable
-                   :loading="userSelectLoading"
-        >
-          <el-option
-            v-for="item in userSelectList"
-            :key="item.id"
-            :label="item.username + ' ' + item.nickname"
-            :value="item.id"
-          />
-        </el-select> -->
+
       </el-form-item>
       <el-form-item label="描述信息" prop="description">
         <el-input type="textarea" v-model="formData.description" height="150px" show-word-limit maxlength="200"/>
@@ -186,7 +170,6 @@ const resetForm = () => {
 }
 
 const handleSelectedUser = (newValue: any) => {
-  // console.log('接收对应的数据:', newValue)
-  formData.value.leaderUserId = newValue.id
+  formData.value.leaderUserId = newValue?.id
 }
 </script>