Merge branch 'dev' into pre-production

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: [],

src/option/waybill/TemporaryStorageList.js

@@ -689,7 +689,7 @@ export const packageColumnList = [
   {
     prop: 'incomeCategory',
     label: '收入品类',
-    type: 6,
+    type: 13,
     values: '',
     width: '200',
     checkarr: [],

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));