From 582accdc325e8b9bab4c79dd682dffe316fe25b7 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Wed, 31 Jul 2024 16:22:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8F=90=E8=B4=A7=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arteryDistrilbutionBillLadingList.js      | 12 ++++++
 .../arteryDistrilbutionBillLadingList.vue     | 37 ++++++++++++++++---
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/api/distribution/arteryDistrilbutionBillLadingList.js b/src/api/distribution/arteryDistrilbutionBillLadingList.js
index 5789c1fc..3bcb498b 100644
--- a/src/api/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/api/distribution/arteryDistrilbutionBillLadingList.js
@@ -177,6 +177,18 @@ export const postPageListExport = data => {
   });
 };
 
+/**
+ * 干线提货扫描明细导出
+ */
+export const postBillladingPackageDetailExport = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/billladingPackageDetailExport',
+    method: 'post',
+    data,
+    responseType: 'blob',
+  });
+};
+
 /**
  * 干线提货详情导出
  */
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index c2e845fd..2ceac17e 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -105,7 +105,12 @@
             >
               取消提货
             </el-button>
-            <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain>
+            <el-button
+              type="danger"
+              icon="el-icon-download"
+              @click="() => handleExportInfo('page')"
+              plain
+            >
               导出
             </el-button>
           </div>
@@ -271,8 +276,17 @@
         :before-close="beforeClose"
         append-to-body
       >
+        <el-button
+          type="danger"
+          icon="el-icon-download"
+          @click="() => handleExportInfo('detail')"
+          plain
+        >
+          导出
+        </el-button>
         <!-- 列表模块 -->
         <tablecmt
+          class="mt20"
           :columnList="columnDetailList"
           :tableData="detailsData"
           :loading="loadingObj.detailsLoding"
@@ -333,6 +347,7 @@ import {
   postFindWaybillBillladingList,
   postAddWaybillToBillladingId,
   postPageListExport,
+  postBillladingPackageDetailExport,
 } from '@/api/distribution/arteryDistrilbutionBillLadingList';
 // 引入表格配置文件
 import {
@@ -1006,21 +1021,31 @@ export default {
       this.form.num = this.form.maxNum;
     },
     /** 导出 */
-    async handleExportInfo() {
+    async handleExportInfo(type, row = {}) {
       try {
-        this.loadingObj.pageLoading = true;
+        type === 'detail'
+          ? (this.loadingObj.detailsLoding = true)
+          : (this.loadingObj.pageLoading = true);
 
-        const res = await postPageListExport(this.query);
+        const res =
+          type === 'detail'
+            ? await postBillladingPackageDetailExport(this.detailQuery)
+            : await postPageListExport(this.query);
 
         const { status, data } = res;
         if (status !== 200) return;
         console.log('data :>> ', data);
 
-        downloadXls(data, `干线提货数据-${dateNow()}.xlsx`);
+        const name =
+          type === 'detail' ? `${this.title}-${dateNow()}.xlsx` : `干线提货数据-${dateNow()}.xlsx`;
+
+        downloadXls(data, name);
       } catch (error) {
         console.log('error :>> ', error);
       } finally {
-        this.loadingObj.pageLoading = false;
+        type === 'detail'
+          ? (this.loadingObj.detailsLoding = false)
+          : (this.loadingObj.pageLoading = false);
       }
     },
   },