From 2561e1ea94bc6c63b4d2ede5264240c06480f77c Mon Sep 17 00:00:00 2001
From: wangxianlei <542787045@qq.com>
Date: Thu, 5 Jun 2025 17:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8C=BA=E5=88=86=E5=8D=8F=E5=AE=9A=E5=93=81?=
 =?UTF-8?q?=E3=80=81=E8=87=AA=E5=88=B6=E3=80=81=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../supplierdeliverRequestMain/index.vue       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 7ebf60586..00580ceea 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -181,8 +181,8 @@
 <!--  <SearchTable width="905px" ref="searchTableRef" sureText="打印所选" @searchTableSuccess="searchTableSuccess1">-->
   <SearchTable width="905px" ref="searchTableRef" sureText="打印所选" @searchTableSuccess="handlePrintSelectExport">
     <template #actionsOther>
-      <el-button type="primary" @click="printAllClick">打印全部</el-button>
-<!--      <el-button type="primary" :loading="printAllLoading" @click="handlePrintAllExport">打印全部</el-button>-->
+<!--      <el-button type="primary" @click="printAllClick">打印全部</el-button>-->
+      <el-button type="primary" :loading="printAllLoading" @click="handlePrintAllExport">打印全部</el-button>
 
     </template> 
   </SearchTable>
@@ -1271,7 +1271,7 @@ const printAllClick = async () => {
 /** 导出明细按钮操作 */
 const printAllLoading = ref(false) // 导出的加载中
 
-const doHandlePrintAllExport = async (asnNumber) => {
+const doHandlePrintAllExport = async (asnNumber, lbType) => {
   try {
     // 发起导出导出明细
     printAllLoading.value = true
@@ -1279,6 +1279,7 @@ const doHandlePrintAllExport = async (asnNumber) => {
       pageNo: 1,
       relateNumber: asnNumber,
       pageSize: 99999999,
+      lbType
     }
     const excelTitle = ref(route.meta.title)
     const data = await PackageApi.jasperExportAll(params)
@@ -1302,12 +1303,16 @@ const handlePrintAllExport = async () => {
       if(res.xdpLabel){
         //协定品标签
         asnNumber = res.xdpLabel;
+        doHandlePrintAllExport(asnNumber, "xdp");
       }
       if (res.cgLabel) {
         //采购标签
         asnNumber = res.cgLabel;
+        doHandlePrintAllExport(asnNumber, "cg");
       }
-      doHandlePrintAllExport(asnNumber);
+      // 测试下载多个文件
+      // doHandlePrintAllExport(asnNumber, "xdp");
+      // doHandlePrintAllExport(asnNumber, "cg");
     }).catch(err => {
       message.error(t('ts.创建标签失败'))
     })
@@ -1361,13 +1366,14 @@ const handlePrintSelectExport = async (formField, searchField, val, formRef, typ
       if(res.xdpLabel){
         //协定品标签
         asnNumber = res.xdpLabel;
+        doHandlePrintAllExport(asnNumber, "xdp");
       }
       if (res.cgLabel) {
         //采购标签
         asnNumber = res.cgLabel;
+        doHandlePrintAllExport(asnNumber, "cg");
       }
-      debugger;
-      doHandlePrintAllExport(asnNumber);
+
     }).catch(err => {
       message.error(t('ts.创建标签失败'))
     })