From f5d96295ad9221c77de47ead48d6e863709eb817 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Fri, 14 Jun 2024 16:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=85=E8=A3=85=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRecordMain.data.ts         | 10 ++++++
 .../supplierdeliverRequestMain/index.vue      |  2 ++
 .../supplierdeliverRequestMain.data.ts        | 32 +++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
index d4b7f0c34..dc585dab9 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts
@@ -476,6 +476,16 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '包装名称',
+    field: 'packName',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '供应商计量数量',
     field: 'supplierQty',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 042076f95..6d4d63c3c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -338,10 +338,12 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row
       row[formField] = val[0][searchField]
       if (formField == 'packUnit') {
         row['packUnit'] = val[0]['packUnit']
+        row['packName'] = val[0]['packName']
         row['packQty'] = val[0]['packQty']
       }
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
+        row['secondPackName'] = val[0]['packName']
         row['secondPackQty'] = val[0]['packQty']
       }
     } 
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 10a3ee2af..5c0d9c0c2 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1527,6 +1527,22 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
         }]
     }
   },
+  {
+    label: '包装名称1',
+    field: 'packName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '物料数量1',
     field: 'packQty',
@@ -1596,6 +1612,22 @@ export const SupplierdeliverRequestDetailLabel = useCrudSchemas(reactive<CrudSch
         }]
     }
   },
+  {
+    label: '包装名称2',
+    field: 'secondPackName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '物料数量2',
     field: 'secondPackQty',