From c519e9875f78658e06b31d38493767cf3362124e Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 10 Apr 2024 17:05:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7/?=
 =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?----=E6=9C=89=E6=95=88=E6=9C=9F=E9=80=9A=E8=BF=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=AF=B7=E6=B1=82=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 21 +++++++------------
 .../supplierdeliverRequestMain.data.ts        |  6 +++---
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 4154c55ff..4b63f0065 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -196,14 +196,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       ItembasicApi.getItembasicPage({
         code:itemCodes.join(',')
       }).then((res)=>{
-        console.log('有效期',res)
-        tableData.value.forEach((item,index)=>{
-          tableData.value[index]['expireTime'] = index==0?1:2
+        res.list.forEach((item,index)=>{
+          const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+          findItem['expireTime'] = findItem['expireTime']
         })
-        // res.list.forEach((item,index)=>{
-          // const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
-          // findItem['expireTime'] = findItem['expireTime']
-        // })
       })
     } else {
       const setV = {}
@@ -259,14 +255,11 @@ const getSearchTableData = async (number,formField,searchField)=>{
   ItembasicApi.getItembasicPage({
     code:itemCodes.join(',')
   }).then((res)=>{
-    console.log('有效期',res)
-    tableData.value.forEach((item,index)=>{
-      tableData.value[index]['expireTime'] = index==0?1:2
+    res.list.forEach((item,index)=>{
+      const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+      findItem['expireTime'] = findItem['expireTime']
+
     })
-    // res.list.forEach((item,index)=>{
-      // const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
-      // findItem['expireTime'] = findItem['expireTime']
-    // })
   })
 }
 // 查询页面返回——详情
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 13eccf5d8..efeeb61fd 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -649,7 +649,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '生产日期1',
+    label: '生产日期',
     field: 'produceDate',
     formatter: dateFormatter2,
     detail: {
@@ -715,7 +715,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     }
   },
   {
-    label: '过期日期3',
+    label: '过期日期',
     field: 'expireDate',
     formatter: dateFormatter2,
     detail: {
@@ -1084,7 +1084,7 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '生产日期2',
+    label: '生产日期',
     field: 'produceDate',
     formatter: dateFormatter2,
     detail: {