From 5ce8895b3665706579a3c3ac3e805a308b4842a7 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Mon, 5 Aug 2024 10:48:36 +0800
Subject: [PATCH] roll label

---
 src/printFormat/roll_label.js       | 9 +++++----
 src/views/modules/label/roll.vue    | 2 +-
 src/views/modules/part/external.vue | 5 ++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js
index 5366f7d..3e24e86 100644
--- a/src/printFormat/roll_label.js
+++ b/src/printFormat/roll_label.js
@@ -14,9 +14,9 @@ export const print_roll_label = (printList,printerName)=>{
     LODOP.SET_PRINT_MODE('CUSTOM_TASK_NAME', '多条页')
     for (let i = 0; i < printList.length; i++) {
       let row = printList[i];
-      console.log(row)
       LODOP.NewPage();
-      LODOP.ADD_PRINT_IMAGE(2,-2,"20mm","20mm",`<img src="${row.qrCode}"/>`);
+      LODOP.SET_PRINT_PAGESIZE(0,450,250,"");
+      LODOP.ADD_PRINT_IMAGE(0,4,"18mm","18mm",`<img src="${row.qrCode}"/>`);
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
       LODOP.ADD_PRINT_IMAGE(4,100,62,12,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
@@ -31,7 +31,7 @@ export const print_roll_label = (printList,printerName)=>{
       LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(27,127,25,20,"UOM");
+      LODOP.ADD_PRINT_TEXT(27,122,25,20,"UOM");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -51,7 +51,7 @@ export const print_roll_label = (printList,printerName)=>{
       LODOP.SET_PRINT_STYLEA(0,"FontSize",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_TEXT(27,145,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",5);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
@@ -93,6 +93,7 @@ export const print_roll_label = (printList,printerName)=>{
         LODOP.SET_PRINT_STYLEA(0,"Bold",1);
       }
       LODOP.PRINT();
+      // LODOP.PRINT_DESIGN()
     }
   }
 
diff --git a/src/views/modules/label/roll.vue b/src/views/modules/label/roll.vue
index f54ac52..deb060b 100644
--- a/src/views/modules/label/roll.vue
+++ b/src/views/modules/label/roll.vue
@@ -389,8 +389,8 @@ export default {
               }
               print_roll_label(arr,printerNameList[j].defaultPrinterName)
             }
-            this.$message.success(data.msg)
           }
+          this.$message.success(data.msg)
         }else {
           this.$message.warning(data.msg)
         }
diff --git a/src/views/modules/part/external.vue b/src/views/modules/part/external.vue
index 478cb20..ba190f0 100644
--- a/src/views/modules/part/external.vue
+++ b/src/views/modules/part/external.vue
@@ -1030,6 +1030,9 @@ export default {
         this.$message.error(error)
       })
     },
+    changeQtyRollCarton(){
+      this.savePart.qtyPerRoll = this.savePart.qtyPerCarton;
+    }
   },
   computed:{
 
@@ -1165,7 +1168,7 @@ export default {
         </el-col>
         <el-col :span="7">
           <el-form-item :label="category.qtyPerRollPart" prop="qtyPerCarton" :show-message="false">
-            <el-input-number :step="0" :min="0" :controls="false" :disabled="category.editQtyPerCarton === 'N'" v-model="savePart.qtyPerCarton"></el-input-number>
+            <el-input-number :step="0" :min="0" :controls="false" @change="changeQtyRollCarton" :disabled="category.editQtyPerCarton === 'N'" v-model="savePart.qtyPerCarton"></el-input-number>
           </el-form-item>
         </el-col>
       </el-row>