From 81b7051a1305909703b308c05ee8c73ae22a9c16 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 9 Jul 2024 19:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue      | 35 +++++++++++++------
 .../supplierdeliverRequestMain/labelForm.vue  |  6 +++-
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 7fb1ded0f..0a3bff66d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -623,7 +623,25 @@ const buttonTableClick = async (val, row) => {
               masterId: row.masterId
             }
             genLabelId.value = row.masterId
-            await getDetailList()
+            // await getDetailList()
+            const params1 = {
+      masterId: row.masterId,
+      pageSize: '500',
+      pageNo: '1',
+      sort: '',
+      by: 'ASC'
+    }
+            await SupplierdeliverRequestDetailApi.getGenerateLabelList(params1).then((res) => {
+                detatableData1.value = res
+                detatableData1.value.forEach((item) => {
+                  console.log(item.boxPackaging)
+                  if (item.boxPackaging?.length > 0) {
+                    item.packUnitInitOptions = item.boxPackaging.map((cur) => {
+                      return { label: cur.packName, value: cur.packUnit }
+                    })
+                  }
+                })
+              })
             formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
           }
         })
@@ -980,15 +998,8 @@ const { getList: getDetailList } = detatableMethods
 // 生成标签按钮操作
 const submitFormLabel = async (data) => {
   try {
-    // console.log('formType==', formType)
-    // console.log('data==', data)
-    // data.subList = detatableData.tableList
-    // if (detatableData.tableList.find((item) => item.secondPackUnit == item.packUnit)) {
-    //   message.warning(t('ts.包装规格1和包装规格2不能相同'))
-    //   return
-    // }
     const data1 = {
-      subList: [...data]
+      subList: JSON.parse(JSON.stringify(data))
     }
     data1.subList.forEach((row) => {
       if (row.secondPackUnit && row.secondPackQty) {
@@ -1009,7 +1020,8 @@ const submitFormLabel = async (data) => {
         })
       }
     })
-    console.log('detatableData', detatableData)
+    
+    console.log(data1)
     await message.confirm(t('ts.是否为此数据生成标签？'))
     await SupplierdeliverRequestMainApi.genLabel(data1)
     isCreateLabel.value = true
@@ -1018,6 +1030,9 @@ const submitFormLabel = async (data) => {
   } finally {
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false
+    labelFormRef.value.formLoading = false
+    labelFormRef.value.dialogVisible = false
+
   }
 }
 const clearInput = async (field, row, index) => {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
index f3785c95b..ce6f5bb86 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue
@@ -6,7 +6,6 @@
       row-key="id"
       style="width: 1050px; max-height: 70vh; overflow-y: auto"
       v-if="tableData.length > 0 && dialogTableVisible == true"
-      @expand-change="expandChange"
     >
       <el-table-column type="expand" width="50">
         <template #default="scope">
@@ -170,12 +169,16 @@ const intData = () => {
       row.isTuo = 0 //有托
       // 数量%每箱数量  获取总共几箱
       row.allTuoQty = Math.ceil(parseFloat(row.qty) / parseFloat(row.packQty))
+      
     }
+    expandChange(row)
   })
+  console.log(tableData.value)
 }
 const expandChange = (row: any, expandedRows: any[]) => {
   // 判断托信息是否存在
   if (row.secondPackUnit && row.secondPackQty) {
+    console.log(222,row)
     // 数量除以托数量获取余数
     row.lastNumber = parseFloat(row.qty) % parseFloat(row.secondPackQty)
     // 托数量/箱数量  一托可以放几箱
@@ -194,6 +197,7 @@ const expandChange = (row: any, expandedRows: any[]) => {
         qtyOne: '',
        isTuo : 1 //有托
       }
+      console.log(222,row)
       // 如果有余数
       if (row.lastNumber) {
         // 最后一条信息直接展示余数的信息