From 310e25e2faafca6230225c737ca91fa2886d6ccb Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Tue, 30 Jan 2024 13:16:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=20=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/heli/classes/ClassesForm.vue    | 25 ++++++-------------
 .../src/views/heli/hlvuestyle/userSelect.vue  |  2 +-
 .../views/heli/warehouse/WarehouseForm.vue    |  2 +-
 3 files changed, 9 insertions(+), 20 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 4d77957e..44a72814 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,23 +34,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="负责人" prop="leaderUserId">
-        <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>
+          <UserSelect v-model="formData.leaderUserId" :leaderUserId="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" />
@@ -79,7 +63,7 @@ import * as UserApi from "@/api/system/user";
 import * as WorkshopApi from "@/api/heli/workshop";
 import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 import {getWorkshopPage} from "@/api/heli/workshop";
-
+import UserSelect from '../hlvuestyle/userSelect.vue'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 
@@ -219,4 +203,9 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+
+const handleSelectedUser = (newValue: any) => {
+  // console.log('接收对应的数据:', newValue)
+  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 60dd4e43..1d79a384 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,7 +2,7 @@
   <!-- 负责人选择 -->
   <el-select
     v-model="valueName"
-    placeholder="请输入负责人"
+    placeholder="请选择相关人员"
     :remote-method="remoteMethod"
     remote-show-suffix
     remote
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 9da63fc1..24bf711c 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
@@ -166,6 +166,6 @@ const resetForm = () => {
 
 const handleSelectedUser = (newValue: any) => {
   // console.log('接收对应的数据:', newValue)
-  formData.value.leaderUserId = newValue.id
+  formData.value.contact = newValue.id
 }
 </script>