From 3e5f9e6b8a5cdbf32f5a632d2f2327d8c7150dbf Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 30 Jul 2024 10:16:06 +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

---
 src/views/waybill/orderPackageList.vue        | 17 +++++++++--------
 src/views/waybill/orderPackageListDetails.vue | 13 +++++++++----
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/views/waybill/orderPackageList.vue b/src/views/waybill/orderPackageList.vue
index 3cd8e021..170b7a6f 100644
--- a/src/views/waybill/orderPackageList.vue
+++ b/src/views/waybill/orderPackageList.vue
@@ -63,14 +63,15 @@
 
           <el-form-item label="创建时间">
             <el-date-picker
-              v-model="query.createTimeArr"
-              type="daterange"
+              v-model="query.incomingTimeArr"
+              type="datetimerange"
               unlink-panels
               range-separator="至"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
-              value-format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)]"
               clearable
             />
           </el-form-item>
@@ -503,14 +504,14 @@ const onLoad = async (params = {}) => {
 
     // 创建时间
     if (
-      getObjType(details.query.createTimeArr) === 'array' &&
-      details.query.createTimeArr.length > 0
+      getObjType(details.query.incomingTimeArr) === 'array' &&
+      details.query.incomingTimeArr.length > 0
     ) {
-      submitData.createTimeStartStr = details.query.createTimeArr[0];
-      submitData.createTimeEndStr = details.query.createTimeArr[1];
+      submitData.incomingTimeStartStr = details.query.incomingTimeArr[0];
+      submitData.incomingTimeEndStr = details.query.incomingTimeArr[1];
     }
 
-    delete submitData.createTimeArr;
+    delete submitData.incomingTimeArr;
     const res = await postFindOrderDetails(submitData);
     const { code, data } = res.data;
     if (code !== 200) return;
diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue
index 70a747e4..8d90006e 100644
--- a/src/views/waybill/orderPackageListDetails.vue
+++ b/src/views/waybill/orderPackageListDetails.vue
@@ -861,11 +861,16 @@ const handleBatchBarcode = async () => {
 
     const res = await getShowAdvancePackgeCode(qr);
 
-    if (res.data.code !== 200) return;
-    details.popUpShow.QRCodeVisible = true;
-    console.log(res.data);
     details.html = '';
-    details.html = getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+    const { code, data } = res.data;
+    if (code !== 200 || !data || getObjType(data.moldList) !== 'array') return;
+    if (data.moldList.length === 0) return;
+
+    for (const iterator of data.moldList) {
+      details.html += iterator;
+    }
+
+    details.popUpShow.QRCodeVisible = true;
   } catch (error) {
     console.log('error :>> ', error);
   } finally {