From 982aa41cf33f3eb5ec6ed99534e692e583f413be Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 30 Jul 2024 18:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/arteryDistrilbutionBillLadingList.js | 11 +++++++++++
 src/views/waybill/orderPackageList.vue                |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/api/distribution/arteryDistrilbutionBillLadingList.js b/src/api/distribution/arteryDistrilbutionBillLadingList.js
index 13dc43dc..50d1656a 100644
--- a/src/api/distribution/arteryDistrilbutionBillLadingList.js
+++ b/src/api/distribution/arteryDistrilbutionBillLadingList.js
@@ -164,3 +164,14 @@ export const postFindBillladingLogList = data => {
     data,
   });
 };
+
+/**
+ * 干线提货列表导出
+ */
+export const postPageListExport = data => {
+  return request({
+    url: '/api/logpm-trunkline/billlading/pageListExport',
+    method: 'post',
+    data,
+  });
+};
diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index 170b7a6f..a9aa62b8 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -61,7 +61,7 @@
             <el-input v-model="query.serviceNumber" placeholder="请输入服务号" clearable></el-input>
           </el-form-item>
 
-          <el-form-item label="创建时间">
+          <el-form-item label="入库时间">
             <el-date-picker
               v-model="query.incomingTimeArr"
               type="datetimerange"
@@ -519,6 +519,13 @@ const onLoad = async (params = {}) => {
     details.page.total = data.total;
 
     handleTranslationDataSeclect(details.packageListData, details.packageListColumnList);
+
+    for (let i = 0; i < details.packageListData.length; i++) {
+      const value = details.packageListData[i];
+
+      !value.trunklineLoadingTime && (value.trunklineLoadingTime = value.deliveryLoadingTime);
+      !value.trunklineSignTime && (value.trunklineSignTime = value.deliverySignTime);
+    }
   } catch (error) {
     console.log('error :>> ', error);
   } finally {