From 2712eb506f90020ca626034f884b1d80d53a7be9 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 14 Dec 2023 10:24:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A3=85=E8=BD=A6=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverylist/distributionDeliveryListedt.vue      | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index dc31ee12..81527d63 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -1498,6 +1498,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'loadingTime',
+          label: '装车时间',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'quantity',
           label: '包件数量',

From c907447e82f2df84a641cbd1592c32eafa7276bd Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Thu, 14 Dec 2023 16:02:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=98=E7=9B=98?=
 =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0=E9=AB=98=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicdata/warehouse/tray/basicdataTray.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/basicdata/warehouse/tray/basicdataTray.vue b/src/views/basicdata/warehouse/tray/basicdataTray.vue
index ec735ba8..0955b904 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTray.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTray.vue
@@ -359,6 +359,7 @@ export default {
           let pri_html = '';
           pri_html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
           // console.log(pri_html);
+          console.log(123123)
           that.w_print(pri_html);
         });
         // checkcode.push(item.orderPackageCode)
@@ -377,7 +378,7 @@ export default {
       // // 设置打印后自动关闭
       LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
       // // data就是一段html文本
-      LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
+      LODOP.ADD_PRINT_HTM('45', '0%', '100%', '100%', templateData);
       // LODOP.PREVIEW(); //预览(预览打印无脚标)
       LODOP.PRINT(); //直接打印
     },