From c0185a3ce7b4e156567847c96b22f40e6b9b89ee Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Fri, 28 Mar 2025 10:03:04 +0800
Subject: [PATCH] =?UTF-8?q?YT-2288=E5=8F=97=E5=85=A5=E5=8F=B7=E4=BE=BF?=
 =?UTF-8?q?=E6=AC=A1=E6=97=B6=E9=97=B4=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=8F=97?=
 =?UTF-8?q?=E5=85=A5=E5=8F=B7=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierManage/modelDeliTime/index.vue    | 14 +++++++-----
 .../modelDeliTime/modelDeliTime.data.ts       | 22 +++++++++----------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue
index 25ac3a5db..a67edd609 100644
--- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue
@@ -148,8 +148,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
     }
     const setV = {}
     setV[formField] = val[0][searchField]
-    if (formField == 'modelShow') {
-      setV['modelShow'] = val.map(item=>item.model).join(',')
+    if (formField == 'model') {
+      setV['model'] = val.map(item=>item.model).join(',')
     }
 
     if (formField == 'supplierCode') {
@@ -182,7 +182,7 @@ const submitForm = async (formType, submitData) => {
   if (data.masterId) {
     data.id = data.masterId
   }
-  data.model =data.modelShow[0]
+  // data.model =data.modelShow[0]
   // data.model =data.modelShow.join(',')
   data.yearAndMonth =data.yearAndMonthShow.join(',')
   data.subList = tableData.value // 拼接子表数据参数
@@ -327,23 +327,25 @@ const openForm = async (type: string, row?: any) => {
         item.componentProps.isSearchList = false
         item.componentProps.disabled = true
       }
-      if (item.field == 'modelShow') {
+      if (item.field == 'model') {
         item.componentProps.disabled = true
+        item.componentProps.isSearchList = false
       }
       if (item.field == 'yearAndMonthShow') {
         item.componentProps.disabled = true
       }
     })
     row.yearAndMonthShow =row.yearAndMonth.split(',')
-    row.modelShow =row.model.split(',')
+    // row.modelShow =row.model.split(',')
   } else {
     ModelDeliTime.allSchemas.formSchema.forEach((item) => {
       if (item.field == 'supplierCode') {
         item.componentProps.isSearchList = true
         item.componentProps.disabled = false
       }
-       if (item.field == 'modelShow') {
+       if (item.field == 'model') {
         item.componentProps.disabled = false
+        item.componentProps.isSearchList = true
       }
       if (item.field == 'yearAndMonthShow') {
         item.componentProps.disabled = false
diff --git a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts
index 5a742fd1f..b796c0be4 100644
--- a/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts
@@ -106,11 +106,11 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
   // },
   {
     label: '受入号',
-    field: 'modelShow',
+    field: 'model',
     sort: 'custom',
     isSearch: true,
-    isTable: false,
-    isDetail: false,
+    isTable: true,
+    isDetail: true,
     // form: {
     //   component: 'Select',
     //   componentProps: {
@@ -156,14 +156,14 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '受入号',
-    field: 'model',
-    sort: 'custom',
-    isTable: true,
-    isDetail: true,
-    isForm: false,
-  },
+  // {
+  //   label: '受入号',
+  //   field: 'model',
+  //   sort: 'custom',
+  //   isTable: true,
+  //   isDetail: true,
+  //   isForm: false,
+  // },
   {
     label: '年月',
     field: 'yearAndMonthShow',