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

src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocation.vue

@@ -418,7 +418,7 @@ export default {
       // // 设置打印后自动关闭
       LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
       // // data就是一段html文本
-      LODOP.ADD_PRINT_HTM('40', '0%', '100%', '100%', templateData);
+      LODOP.ADD_PRINT_HTM('20', '0%', '100%', '100%', templateData);
       // LODOP.PREVIEW(); //预览(预览打印无脚标)
       LODOP.PRINT(); //直接打印
     },