From 606ff223566d7045fa98881ebcc0835dd1dc2607 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 22 Oct 2024 14:19:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BC=80=E5=8D=95?=
 =?UTF-8?q?=E5=93=81=E7=B1=BB=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/waybill/TemporaryStorageList.js | 2 +-
 src/views/waybill/WaybillOrderList.vue     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/option/waybill/TemporaryStorageList.js b/src/option/waybill/TemporaryStorageList.js
index 4544cbc1..91245456 100644
--- a/src/option/waybill/TemporaryStorageList.js
+++ b/src/option/waybill/TemporaryStorageList.js
@@ -689,7 +689,7 @@ export const packageColumnList = [
   {
     prop: 'incomeCategory',
     label: '收入品类',
-    type: 6,
+    type: 13,
     values: '',
     width: '200',
     checkarr: [],
diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue
index f6d2a6d8..48b971d3 100644
--- a/src/views/waybill/WaybillOrderList.vue
+++ b/src/views/waybill/WaybillOrderList.vue
@@ -658,10 +658,10 @@ const batchPrint = async () => {
 
         let template = value.templateHtml;
 
-        console.log('value.templateHtml :>> ', value.templateHtml);
+        // console.log('value.templateHtml :>> ', value.templateHtml);
 
-        template = template.replace('第n页', `第${i + 1}页`);
-        template = template.replace('共n页', `共${element.length}页`);
+        // template = template.replace('第n页', `第${i + 1}页`);
+        // template = template.replace('共n页', `共${element.length}页`);
         // template = template.replaceAll('0.00', ``);
 
         _html += JSON.parse(JSON.stringify(template));

From f8abc5e4a7e6649bff21aac769854374ee52fe84 Mon Sep 17 00:00:00 2001
From: qb <1191961160@qq.com>
Date: Tue, 22 Oct 2024 14:28:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Token=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/website.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/website.js b/src/config/website.js
index 8980301d..e57298d2 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -13,7 +13,7 @@ export default {
   captchaMode: false, // 是否开启验证码模式
   switchMode: false, // 是否开启部门切换模式
   lockPage: '/lock',
-  tokenTime: 3000,
+  tokenTime: 10800,
   tokenHeader: 'Blade-Auth',
   //http的status默认放行不才用统一处理的,
   statusWhiteList: [],