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

src/utils/print.js

@@ -3,12 +3,12 @@ import hwyPrintNew from '@/utils/print/index';
 
 /** 处理标签打印 */
 const handleTitlePrint = (LODOP, templateData)=>{
-  LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
-  LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+  LODOP.PRINT_INITA("");
+  // LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
   LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出，且英文单词拆开
   // LODOP.SET_PRINT_STYLE('FontColor', '#000000');
   // // 设置打印整宽且不变形
-  LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
+  LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '60%');
   // // 设置打印后自动关闭
   LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
     // // data就是一段html文本
@@ -55,7 +55,8 @@ const print = (nodeList, type = 'deliveryPrint') => {
     if (type === 'titlePrint') handleTitlePrint(LODOP, templateData)
     else handleDeliveryPrint(LODOP, templateData)
     // LODOP.NewPage()
-    LODOP.PRINT(); //直接打印
+    // LODOP.PRINT(); //直接打印
+    LODOP.PRINT_DESIGN();
   });
   // LODOP.PREVIEW(); //预览(预览打印无脚标)
 };
@@ -74,24 +75,6 @@ const newPrint = nodeName => {
 };
 
 
-const hwyPrint2 = nodeList => {
-  // 直接调用时使用默认节点列表
-  if (!nodeList) nodeList = document.querySelectorAll('.el-dialog__body>div>div>div');
-
-  // 初始化打印实例
-  let LODOP = getLodop();
-
-  // 当列表内没有元素时, 退出函数
-  if (nodeList.length === 0) return;
-
-  // 循环列表内元素并打印
-  nodeList.forEach(orderNode => {
 
-    // LODOP.NewPage()100
-    LODOP.PRINT(); //直接打印
-    // LODOP.PRINT_DESIGN();
-  });
-  // LODOP.PREVIEW(); //预览(预览打印无脚标)
-};
 
 export default print;