From 84410026d472189112f9a6516943c3e02a31c960 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 5 Jun 2024 19:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../index.vue                                 | 25 +++++-----
 .../productreceiptAssembleRequestMain.data.ts | 48 +++++++++++++++++--
 2 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index a908fc68c..19b7a87d4 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -201,6 +201,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       if (formField == 'secondPackUnit') {
         row['secondPackUnit'] = val[0]['packUnit']
         row['secondPackQty'] = val[0]['packQty']
+      }else if(formField == 'packUnit'){
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
       }else if (formField == 'itemCode') {
         row['uom'] = val[0]['uom']
         row['produceDate'] = dayjs().valueOf()
@@ -616,18 +619,16 @@ const searchFormClick = (searchData) => {
 // 创建标签
 const submitFormLabel = async (formType, data) => {
   try {
-    detatableData.tableList.forEach(async (item) => {
-      // 创建标签 要物料库区配置表中 入库包装规格
-      item.packUnit = null
-      item.inOfOut = 'in'
-      await PackageApi.createPackageLabel(item).then(res => {
-        isCreateLabel.value = true
-        message.success('创建标签成功')
-      }).catch(err => {
-        isCreateLabel.value = false
-        console.log(err)
-        message.error('创建标签失败')
-      })
+    console.log("aaaaa",data);
+    data.subList=detatableData.tableList
+    console.log("bbbbb",data);
+    await ProductreceiptRequestMainApi.productCreateLabel(data).then(res => {
+      isCreateLabel.value = true
+      message.success('创建标签成功')
+    }).catch(err => {
+      isCreateLabel.value = false
+      console.log(err)
+      message.error('创建标签失败')
     })
   } finally {
     formLabelRef.value.formLoading = false
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
index dc09b59e5..8aef36f4e 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts
@@ -1781,11 +1781,52 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'packUnit',
     sort: 'custom',
     table: {
-      width: 180
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
     },
     tableForm: {
-      disabled: true
-    },
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageByProductreceipt,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
   },
   {
     label: '包装数量1',
@@ -1806,7 +1847,6 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '包装规格2',
     field: 'secondPackUnit',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150,