From b22a0ebac9564db70ee3186735ef952f6d93206b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Wed, 5 Jun 2024 19:28:04 +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

---
 .../wms/productreceiptRequestMain/index.ts    |  6 +++
 .../productreceiptRequestMain/index.vue       | 30 ++++++------
 .../productreceiptRequestMain.data.ts         | 46 +++++++++++++++++--
 3 files changed, 65 insertions(+), 17 deletions(-)

diff --git a/src/api/wms/productreceiptRequestMain/index.ts b/src/api/wms/productreceiptRequestMain/index.ts
index 0d337b177..d809c5efa 100644
--- a/src/api/wms/productreceiptRequestMain/index.ts
+++ b/src/api/wms/productreceiptRequestMain/index.ts
@@ -137,4 +137,10 @@ export const agree = (id) => {
 // 处理
 export const handle = (id) => {
   return request.put({ url: '/wms/productreceipt-request-main/handle?id=' + id })
+}
+
+
+// 创建标签
+export const productCreateLabel = async (data: ProductreceiptRequestMainVO) => {
+  return await request.post({ url: `/wms/productreceipt-request-main/productCreateLabel`, data })
 }
\ No newline at end of file
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
index c7fc1330c..20c11885a 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue
@@ -124,7 +124,7 @@
   <ImportForm ref="importFormRef" url="/wms/productreceipt-request-main/import" :importTemplateData="importTemplateData" 
   @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'predict'"/>
   <!-- 标签打印 -->
-  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
 </template>
 
 <script setup lang="ts">
@@ -200,6 +200,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()
@@ -614,18 +617,17 @@ 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
@@ -717,7 +719,7 @@ const labelPrint = async (row) => {
 }
 
 // 批量打印--预生产收货
-const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
   // let rows:any = []
   // val.forEach(item=>{
diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
index a17068459..d4d491158 100644
--- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
+++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts
@@ -1781,10 +1781,51 @@ 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
+        }]
     },
   },
   {
@@ -1806,7 +1847,6 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '包装规格2',
     field: 'secondPackUnit',
-    isTable: true,
     sort: 'custom',
     table: {
       width: 150,