From 5112ffce14123f91e106597d91b52fdb09119da9 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 29 Aug 2024 13:12:14 +0800
Subject: [PATCH] 20240826

---
 src/printFormat/RF_RFID.js                 | 19 ++++++++++--
 src/printFormat/alphaHardTagPrintFormat.js | 14 ++++++---
 src/printFormat/antenna.js                 | 34 +++++++++++++++++-----
 src/printFormat/roll_label.js              | 30 +++++++++----------
 src/views/modules/label/roll.vue           |  1 +
 5 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/src/printFormat/RF_RFID.js b/src/printFormat/RF_RFID.js
index dbbe005..dc71861 100644
--- a/src/printFormat/RF_RFID.js
+++ b/src/printFormat/RF_RFID.js
@@ -28,18 +28,25 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => {
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       LODOP.ADD_PRINT_TEXT(20,126,40,20,"REF");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(42,126,40,20,"QTY");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(63,126,50,20,"DESC");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(18,175,200,20,row.ref);
       LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.ADD_PRINT_TEXT(40,175,93,20,row.qty);
+
+      LODOP.ADD_PRINT_TEXT(42,177,93,20,row.qty);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       LODOP.ADD_PRINT_TEXT(63,175,186,35,row.desc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",9);
 
       if (row.tradingMark && row.tradingMark === 'Y'){
         LODOP.ADD_PRINT_TEXT(63,350,50,35,'®');
@@ -48,25 +55,33 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => {
       }
       LODOP.ADD_PRINT_TEXT(42,274,40,20,"UoM");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(40,321,40,20,row.uom);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
       LODOP.ADD_PRINT_LINE(100,-2,99,406,0,1);
       LODOP.ADD_PRINT_LINE(146,-2,145,406,0,1);
 
       LODOP.ADD_PRINT_TEXT(105,25,151,20,"ROLL COUNT");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(105,202,100,20,row.rollCount);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
       LODOP.ADD_PRINT_TEXT(125,25,150,20,"MANUFACTURE DATE");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(125,202,100,20,row.date);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
       if(rightIndex === 'Y'){
         LODOP.ADD_PRINT_TEXT(152,255,180,20,row.freeInfo2);
         LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       }
       for(let i = 0; i < icons.length; i++){
         LODOP.ADD_PRINT_IMAGE(149,(printTop+i*40),37,31,`<img src="${icons[i].icon}" style="object-fit: contain"/>`);
diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js
index 891b176..e423fcc 100644
--- a/src/printFormat/alphaHardTagPrintFormat.js
+++ b/src/printFormat/alphaHardTagPrintFormat.js
@@ -28,7 +28,7 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
       LODOP.ADD_PRINT_IMAGE(4,275,96,15,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
-      LODOP.ADD_PRINT_TEXT(19,126,40,20,"REF");
+      LODOP.ADD_PRINT_TEXT(17,126,40,20,"REF");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(34,126,40,20,"QTY");
@@ -40,12 +40,16 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
       LODOP.ADD_PRINT_TEXT(15,175,200,20,row.ref);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
-      LODOP.ADD_PRINT_TEXT(32,175,93,20,row.qty);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+      LODOP.ADD_PRINT_TEXT(34,177,93,20,row.qty);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
       LODOP.ADD_PRINT_TEXT(50,175,186,35,row.desc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",9);
 
       if (row.tradingMark && row.tradingMark === 'Y'){
         LODOP.ADD_PRINT_TEXT(53,350,50,35,'®');
@@ -58,6 +62,8 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
       LODOP.ADD_PRINT_TEXT(32,321,40,20,row.uom);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
       LODOP.ADD_PRINT_LINE(86,-2,85,406,0,1);
       LODOP.ADD_PRINT_LINE(146,-2,145,406,0,1);
 
diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js
index 47cf165..1e92a7e 100644
--- a/src/printFormat/antenna.js
+++ b/src/printFormat/antenna.js
@@ -26,20 +26,28 @@ export const printAntennaLabel = (printList, icons, printerName) => {
       LODOP.ADD_PRINT_IMAGE(4, 275, 96, 14, '<img src="data:image/png;base64,' + ckpLogo + '"/>')
       LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2)
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
-      LODOP.ADD_PRINT_TEXT(20, 126, 40, 20, 'REF')
+      LODOP.ADD_PRINT_TEXT(17, 126, 40, 20, 'REF')
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(35, 126, 40, 20, 'QTY')
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(55, 126, 50, 20, 'DESC')
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(15, 175, 200, 20, row.ref)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
       LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
-      LODOP.ADD_PRINT_TEXT(32, 175, 93, 20, row.qty)
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
+      LODOP.ADD_PRINT_TEXT(35, 177, 93, 20, row.qty)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
       LODOP.ADD_PRINT_TEXT(55, 175, 186, 35, row.desc)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",9);
 
       if (row.tradingMark && row.tradingMark === 'Y'){
         LODOP.ADD_PRINT_TEXT(55,350,50,35,'®');
@@ -48,29 +56,39 @@ export const printAntennaLabel = (printList, icons, printerName) => {
       }
       LODOP.ADD_PRINT_TEXT(35, 274, 40, 20, 'UoM')
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
-      LODOP.ADD_PRINT_TEXT(32, 321, 40, 20, row.uom)
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      LODOP.ADD_PRINT_TEXT(33, 321, 40, 20, row.uom)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
       LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
+      LODOP.SET_PRINT_STYLEA(0,"Bold",1);
+
       LODOP.ADD_PRINT_LINE(92, -2, 91, 406, 0, 1)
       LODOP.ADD_PRINT_LINE(146, -2, 145, 406, 0, 1)
 
       LODOP.ADD_PRINT_TEXT(96, 25, 151, 20, 'PRODUCT REV.')
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.ADD_PRINT_TEXT(96, 177, 180, 20, row.productRev)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(128, 24, 150, 20, 'S/N')
+      LODOP.ADD_PRINT_TEXT(112, 24, 150, 20, 'S/N')
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
-      LODOP.ADD_PRINT_TEXT(128, 176, 180, 20, row.sn)
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      LODOP.ADD_PRINT_TEXT(112, 176, 180, 20, row.sn)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
 
-      LODOP.ADD_PRINT_TEXT(112, 25, 150, 20, 'MANUFACTURE DATE')
+      LODOP.ADD_PRINT_TEXT(128, 25, 150, 20, 'MANUFACTURE DATE')
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
-      LODOP.ADD_PRINT_TEXT(112, 177, 180, 20, row.date)
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      LODOP.ADD_PRINT_TEXT(128, 177, 180, 20, row.date)
       LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       if (rightIndex === 'Y') {
         LODOP.ADD_PRINT_TEXT(152, 255, 180, 20, row.freeInfo2)
         LODOP.SET_PRINT_STYLEA(0, 'FontName', 'Arial')
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       }
       for (let i = 0; i < icons.length; i++) {
         LODOP.ADD_PRINT_IMAGE(149, (printTop + i * 40), 37, 31, `<img src="${icons[i].icon}" style="object-fit: contain"/>`)
diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js
index afffbf1..2d6d96f 100644
--- a/src/printFormat/roll_label.js
+++ b/src/printFormat/roll_label.js
@@ -24,22 +24,22 @@ export const print_roll_label = (printList,printerName)=>{
 
       LODOP.ADD_PRINT_TEXT(15,73,25,20,"REF");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
       LODOP.ADD_PRINT_TEXT(27,73,25,20,"QTY");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
       LODOP.ADD_PRINT_TEXT(27,122,25,20,"UOM");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
       LODOP.ADD_PRINT_TEXT(38,73,30,20,"DESC");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
       LODOP.ADD_PRINT_TEXT(13,93,80,30,row.ref);
@@ -47,19 +47,19 @@ export const print_roll_label = (printList,printerName)=>{
       LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(25,93,35,20,row.qty);
+      LODOP.ADD_PRINT_TEXT(27,93,35,20,row.qty);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(25,140,35,20,row.uom);
+      LODOP.ADD_PRINT_TEXT(27,140,35,20,row.uom);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",8);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
       LODOP.ADD_PRINT_TEXT(38,96,80,35,row.desc);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
       if (row.rollLabelRequired === 'Y'){
@@ -69,18 +69,18 @@ export const print_roll_label = (printList,printerName)=>{
       }
       if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
         LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-        LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
         LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       }
 
       LODOP.ADD_PRINT_TEXT(63,73,29,15,"DATE");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
       LODOP.ADD_PRINT_TEXT(63,95,85,16,row.date);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-      LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+      LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
       if (row.rollLabelRequired === 'Y'){
@@ -90,11 +90,11 @@ export const print_roll_label = (printList,printerName)=>{
       }
       if (row.rollLabelRequired === 'Y' || row.serialNumberRequired === 'Y'){
         LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
-        LODOP.SET_PRINT_STYLEA(0,"FontSize",4);
+        LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
         LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       }
-      // LODOP.PRINT();
-      LODOP.PRINT_DESIGN()
+      LODOP.PRINT();
+      // LODOP.PRINT_DESIGN()
     }
   }
 
diff --git a/src/views/modules/label/roll.vue b/src/views/modules/label/roll.vue
index deb060b..8fe2925 100644
--- a/src/views/modules/label/roll.vue
+++ b/src/views/modules/label/roll.vue
@@ -390,6 +390,7 @@ export default {
               print_roll_label(arr,printerNameList[j].defaultPrinterName)
             }
           }
+          this.$refs.table.clearSelection()
           this.$message.success(data.msg)
         }else {
           this.$message.warning(data.msg)