From ed2159b543e0dc80cde1aafeba7c3f4600a86057 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 19 Jan 2024 12:51:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=89=E4=B8=AD=20?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=AF=B9=E5=BA=94=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/heli/hlvuestyle/clientSelect.vue    | 20 +++++++++++++++++--
 .../src/views/heli/hlvuestyle/indexFrom.vue   |  8 +++++++-
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
index 8248a4a2..15ddd2ce 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/clientSelect.vue
@@ -12,7 +12,12 @@
     :loading="Loading"
     @change="onSelectChange"
   >
-    <el-option v-for="item in clientSelectList" :key="item.id" :label="item.name" :value="item.id" />
+    <el-option
+      v-for="item in clientSelectList"
+      :key="item.id"
+      :label="item.code + ' ' + item.name"
+      :value="item.id"
+    />
   </el-select>
 </template>
 
@@ -21,6 +26,9 @@ import { ref, onMounted, toRefs } from 'vue'
 import * as CustomerApi from '@/api/heli/customer'
 
 const valueName: any = ref() //选中的值
+const valueNameObject: any = ref() //选中的值
+const emit = defineEmits(['update:newValue'])
+
 const clientList = ref<CustomerApi.CustomerVO[]>([]) //列表
 const clientSelectList = ref<CustomerApi.CustomerVO[]>([])
 const Loading = ref(false)
@@ -51,7 +59,11 @@ const remoteMethod = (query: any) => {
     setTimeout(() => {
       Loading.value = false
       clientSelectList.value = clientList.value
-        .filter((item) => item.name.toLowerCase().includes(query.toLowerCase()))
+        .filter(
+          (item) =>
+            item.code.toLowerCase().includes(query.toLowerCase()) ||
+            item.name.toLowerCase().includes(query.toLowerCase())
+        )
         .slice(0, 10) //只显示前10个
     }, 200)
   } else {
@@ -59,4 +71,8 @@ const remoteMethod = (query: any) => {
   }
 }
 
+const onSelectChange = (newValue: any) => {
+  valueNameObject.value = clientList.value.find(client => client.id === newValue); // 更新选中的完整用户对象
+  emit('update:newValue', valueNameObject.value)
+}
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue
index b3b84da1..87281963 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue
@@ -20,7 +20,7 @@
         <UserSelect v-model="formData.leaderUserId" @update:newValue="handleSelectedUser" />
       </el-form-item>
       <el-form-item label="客户" prop="clientId">
-        <ClientSelect v-model="formData.clientId" />
+        <ClientSelect v-model="formData.clientId" @update:newValue="handleSelectedClient" />
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">
         <SupplierSelect v-model="formData.supplierId" />
@@ -160,4 +160,10 @@ const handleSelectedClasses = (newValue: any) => {
   console.log('接收班组对应的数据:', newValue)
   formData.value.classesId = newValue.id
 }
+
+//接收客户传递的数据
+const handleSelectedClient = (newValue: any) => {
+  console.log('接收客户对应的数据:', newValue)
+  formData.value.clientId = newValue.id
+}
 </script>