From af11cca0799c4fb1a487415bd56327ef46b700cb Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Fri, 19 Jan 2024 13:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=20=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=AF=B9=E5=BA=94=E7=9A=84=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=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    |  1 -
 .../src/views/heli/hlvuestyle/indexFrom.vue   |  7 ++++++-
 .../views/heli/hlvuestyle/supplierSelect.vue  | 21 ++++++++++++-------
 3 files changed, 19 insertions(+), 10 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 15ddd2ce..648e194f 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
@@ -44,7 +44,6 @@ onMounted(async () => {
   }
   try {
     const data = await CustomerApi.getCustomerPage(clientParams)
-    console.log(data.list)
     clientList.value = data.list
     // 设置初始值，如果需要的话
     remoteMethod('')
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 87281963..abbc0169 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
@@ -23,7 +23,7 @@
         <ClientSelect v-model="formData.clientId" @update:newValue="handleSelectedClient" />
       </el-form-item>
       <el-form-item label="供应商" prop="supplierId">
-        <SupplierSelect v-model="formData.supplierId" />
+        <SupplierSelect v-model="formData.supplierId"  @update:newValue="handleSelectedSupplier"  />
       </el-form-item>
       <el-form-item label="材质" prop="compositionId">
         <CompositionSelect v-model="formData.compositionId" />
@@ -166,4 +166,9 @@ const handleSelectedClient = (newValue: any) => {
   console.log('接收客户对应的数据:', newValue)
   formData.value.clientId = newValue.id
 }
+//接收供应商传递的数据
+const handleSelectedSupplier = (newValue: any) => {
+  console.log('接收客户对应的数据:', newValue)
+  formData.value.supplierId = newValue.id
+}
 </script>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/supplierSelect.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/supplierSelect.vue
index 0b660b10..f7101737 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/supplierSelect.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/supplierSelect.vue
@@ -12,7 +12,7 @@
     :loading="Loading"
     @change="onSelectChange"
   >
-    <el-option v-for="item in supplierSelectList" :key="item.id" :label="item.name" :value="item.id" />
+    <el-option v-for="item in supplierSelectList" :key="item.id" :label="item.code + ' ' + item.name" :value="item.id" />
   </el-select>
 </template>
 
@@ -21,6 +21,9 @@ import { ref, onMounted, toRefs } from 'vue'
 import * as SupplierApi from '@/api/heli/supplier'
 
 const valueName: any = ref() //选中的值
+const valueNameObject: any = ref() //选中的值
+const emit = defineEmits(['update:newValue'])
+
 const supplierList = ref<SupplierApi.SupplierVO[]>([]) // 用户列表
 const supplierSelectList = ref<SupplierApi.SupplierVO[]>([])
 const Loading = ref(false)
@@ -36,7 +39,6 @@ onMounted(async () => {
   }
   try {
     const data = await SupplierApi.getSupplierPage(queryParams)
-    console.log(data.list)
     supplierList.value = data.list
     // 设置初始值，如果需要的话
     remoteMethod('')
@@ -51,7 +53,11 @@ const remoteMethod = (query: any) => {
     setTimeout(() => {
       Loading.value = false
       supplierSelectList.value = supplierList.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,9 +65,8 @@ const remoteMethod = (query: any) => {
   }
 }
 
-// const onSelectChange = (newValue: number | null) => {
-//   // console.log(newValue)
-//   emit('update:valueName', newValue)
-//   valueName.value = newValue
-// }
+const onSelectChange = (newValue: any) => {
+  valueNameObject.value = supplierList.value.find(supplier => supplier.id === newValue); // 更新选中的完整用户对象
+  emit('update:newValue', valueNameObject.value)
+}
 </script>