Merge remote-tracking branch 'origin/master'

src/printFormat/alphaHardTagPrintFormat.js

@@ -15,7 +15,7 @@ const rightIndex = 'Y'
 
 let sizeTop = 190;
 
-export function printAlphaHardTagLabel (printList, icons, printerName, flag) {
+export function printAlphaHardTagLabel (printList, icons, printerName, flag,hz = 0) {
 
   const LODOP = getLodop()
   if (LODOP) {
@@ -38,13 +38,13 @@ export function printAlphaHardTagLabel (printList, icons, printerName, flag) {
           sizeTop = 0;
         }
         if (row.printLabelType === 0 || row.printLabelType === 1){
-          printCartonLabel(LODOP,row,icons) // 箱标签
+          printCartonLabel(LODOP,row,icons,hz) // 箱标签
         }
         if (row.printLabelType === 0 || row.printLabelType === 2){
-          printProductLabel(LODOP,row)
+          printProductLabel(LODOP,row,hz)
         }
       }else {
-        printCartonLabel(LODOP,row,icons) // 箱标签
+        printCartonLabel(LODOP,row,icons,hz) // 箱标签
       }
       LODOP.PRINT()
     }
@@ -53,10 +53,10 @@ export function printAlphaHardTagLabel (printList, icons, printerName, flag) {
   }
 }
 
-const printCartonLabel = (LODOP,row,icons) => {
+const printCartonLabel = (LODOP,row,icons,hz) => {
   //如果打印正常的标签
   LODOP.NewPageA()
-  LODOP.SET_PRINT_PAGESIZE(0, 1100, 512, '')
+  LODOP.SET_PRINT_PAGESIZE(hz, 1100, 512, '')
   LODOP.ADD_PRINT_IMAGE(-5, 20, '26mm', '26mm', row.qrCode)
   LODOP.SET_PRINT_STYLEA(0, 'Stretch', 1)
   LODOP.ADD_PRINT_IMAGE(4, 255, 90, 16, '<img src="data:image/png;base64,' + ckpLogo + '"/>')
@@ -157,12 +157,12 @@ const printCartonLabel = (LODOP,row,icons) => {
   }
 }
 
-const printProductLabel = (LODOP,row) =>{
+const printProductLabel = (LODOP,row,hz) =>{
   console.log(row.templateNo)
   // LODOP.NewPageA();
   LODOP.SET_SHOW_MODE("MESSAGE_GETING_URL", "");//该语句隐藏进度条或修改提示信息
   LODOP.SET_SHOW_MODE("MESSAGE_PARSING_URL", "");//该语句隐藏进度条或修改提示信息
-  LODOP.SET_PRINT_PAGESIZE(0,1100,1005,"");
+  LODOP.SET_PRINT_PAGESIZE(hz,1100,1005,"");
   eval(`${row.templateNo}(LODOP,row)`)
 }
 

src/printFormat/antenna.js

@@ -14,7 +14,7 @@ const printTop = 15
 const rightIndex = 'Y'
 
 let sizeTop = 190;
-export const printAntennaLabel = (printList, icons, printerName,flag) => {
+export const printAntennaLabel = (printList, icons, printerName,flag,hz = 0) => {
   const LODOP = getLodop()
   if (LODOP) {
     // LODOP.SET_LICENSES('', '13F0BF6589BB32F360918E33F9C10905', '', '')
@@ -36,13 +36,13 @@ export const printAntennaLabel = (printList, icons, printerName,flag) => {
           sizeTop = 0;
         }
         if (row.printLabelType === 0 || row.printLabelType === 1){
-          printLabel(LODOP,row,icons) // 箱标签
+          printLabel(LODOP,row,icons,hz) // 箱标签
         }
         if (row.printLabelType === 0 || row.printLabelType === 2){
-          printProductLabel(LODOP,row)
+          printProductLabel(LODOP,row,hz)
         }
       }else {
-        printLabel(LODOP,row,icons) // 箱标签
+        printLabel(LODOP,row,icons,hz) // 箱标签
       }
     }
     //LODOP.PREVIEW();
@@ -51,9 +51,9 @@ export const printAntennaLabel = (printList, icons, printerName,flag) => {
   }
 }
 
-const printLabel = (LODOP,row,icons)=>{
+const printLabel = (LODOP,row,icons,hz)=>{
   LODOP.NewPageA();
-  LODOP.SET_PRINT_PAGESIZE(0, 1100, 512, '')
+  LODOP.SET_PRINT_PAGESIZE(hz, 1100, 512, '')
   LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode);
   LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
   LODOP.ADD_PRINT_IMAGE(4,255,90,16, '<img src="data:image/png;base64,' + ckpLogo + '"/>')
@@ -132,12 +132,12 @@ const printLabel = (LODOP,row,icons)=>{
 }
 
 
-const printProductLabel = (LODOP,row) =>{
+const printProductLabel = (LODOP,row,hz) =>{
   console.log(row.templateNo)
   // LODOP.NewPageA();
   LODOP.SET_SHOW_MODE("MESSAGE_GETING_URL", "");//该语句隐藏进度条或修改提示信息
   LODOP.SET_SHOW_MODE("MESSAGE_PARSING_URL", "");//该语句隐藏进度条或修改提示信息
-  LODOP.SET_PRINT_PAGESIZE(0,1100,1005,"");
+  LODOP.SET_PRINT_PAGESIZE(hz,1100,1005,"");
   eval(`${row.templateNo}(LODOP,row)`)
 }
 

src/utils/LodopFuncs.js

@@ -59,7 +59,7 @@ function getLodop() {
 
       type: 'warning',
 
-      showCancelButton: true,
+      showCancelButton: false,
 
       message: 'You haven’t install the printing component, you can follow the steps in Manual to complete the installation, then close and reopen the window again, it should be fixed',