From b67081f905b7c3a34c4e4840cddf07a1441dbc01 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 5 Jun 2024 17:19:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueRequestMain/issueRequestMain.data.ts |  6 ++---
 .../supplierdeliverBasicForm.vue              | 22 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 38407d012..07a0de8ab 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -451,7 +451,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 200,
+      width: 230,
       fixed: 'right'
     },
   },
@@ -579,7 +579,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'packingNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
     sortSearchDefault:4,
@@ -846,7 +846,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemName',
     sort: 'custom',
     table: {
-      width: 150
+      width: 300
     },
     sortTableDefault:4,
     isTableForm: false,
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
index 258460f1f..0964a5025 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue
@@ -165,6 +165,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
     console.log("type:",type)
     console.log("formField:",formField)
     console.log(formField, searchField, val, formRef, type, row)
+    
     if (type == 'tableForm') {
       // 明细查询页赋值
       // row[formField] = val[0][searchField]
@@ -185,18 +186,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         newRow['poLine'] = item['poLine']
         newRow['orderQty'] = item['orderQty']
         newRow['uom'] = item['uom']
+        if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['poLine'] == item['poLine']&&item1['poNumber'] == item['poNumber'])) return
+
         itemCodes.push(item['itemCode'])
         tableData.value.push(newRow)
       })
-      //有效期
-      ItembasicApi.getItembasicPage({
-        code:itemCodes.join(',')
-      }).then((res)=>{
-        res.list.forEach((item,index)=>{
-          const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
-          findItem['expireTime'] = item['expireTime']
+      if(itemCodes.length>0){
+        //有效期
+        ItembasicApi.getItembasicPage({
+          code:itemCodes.join(',')
+        }).then((res)=>{
+          res.list.forEach((item,index)=>{
+            const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+            findItem['expireTime'] = item['expireTime']
+          })
         })
-      })
+      }
+      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]