Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

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(); //直接打印
     },

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: '包件数量',