From 85737408b73e37dc35481db09a43186c6d9dddeb Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 8 Oct 2024 15:12:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=89=98=E5=92=8C=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereceiptRequestMain/index.vue      |  2 +-
 .../purchasereceiptRequestMain.data.ts        | 80 ++++++++++++++++++-
 2 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
index caadd7bdd..7f2a3b7c7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue
@@ -218,7 +218,7 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
         row['packUnit'] = val[0]['packUnit']
         row['packQty'] = val[0]['packQty']
       }
-      if (formField == 'secondPackUnit') {
+      if (formField == 'secondPackUnit' || formField == 'secondPackQty') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
       }
diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
index 1c7bf9ea8..31f3f898c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts
@@ -2351,7 +2351,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     }
   },
   {
-    label: '包装数量',
+    label: '包装数量1',
     field: 'packQty',
     sort: 'custom',
     table: {
@@ -2409,7 +2409,7 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isForm: true
   },
   {
-    label: '包装规格',
+    label: '包装规格1',
     field: 'packUnit',
     dictClass: 'string',
     isTable: true,
@@ -2426,6 +2426,82 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSch
     isTableForm: true,
     isForm: true
   },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isTableRowValue: true, //查询当前searchTable表中行数据的值
+            isMainValue: false
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isTableRowValue: true, //查询当前searchTable表中行数据的值
+          isMainValue: false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
   {
     label: '供应商计量数量',
     field: 'supplierPackQty',