From af38712779d2aba316cdc49d0fca128288b6d6a8 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Mon, 20 May 2024 09:05:03 +0800
Subject: [PATCH] =?UTF-8?q?24-05-16=20=E6=A0=87=E7=AD=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/print/print_package_label-NOOREVIEW.js | 2 +-
 src/views/modules/production/bagLabels.vue               | 4 +++-
 src/views/modules/production/scanForm.vue                | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/print/print_package_label-NOOREVIEW.js b/src/views/modules/print/print_package_label-NOOREVIEW.js
index 0b118ec..832ea74 100644
--- a/src/views/modules/print/print_package_label-NOOREVIEW.js
+++ b/src/views/modules/print/print_package_label-NOOREVIEW.js
@@ -13,7 +13,7 @@ export function printPackageLabelNoPreview(printList) {
       LODOP.NewPage();
       LODOP.SET_PRINT_PAGESIZE(0,1000,700,"");
       // LODOP.ADD_PRINT_BARCODE(133,286,130,88,"QRCode",printData.partSpec);
-      LODOP.ADD_PRINT_BARCODE(133,286,130,88,"QRCode",`${printData.site};${printData.partNo};${printData.unitQty};${printData.seqNo}` );
+      LODOP.ADD_PRINT_BARCODE(133,286,130,88,"QRCode",`${printData.site};${printData.partNo};${printData.unitQty};${printData.seqNo};${printData.printId}`);
       LODOP.ADD_PRINT_TEXT(93,18,123,25,"Product No:");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",12);
diff --git a/src/views/modules/production/bagLabels.vue b/src/views/modules/production/bagLabels.vue
index 3cb0d5e..553dd11 100644
--- a/src/views/modules/production/bagLabels.vue
+++ b/src/views/modules/production/bagLabels.vue
@@ -403,7 +403,9 @@ export default {
       </el-card>
     </div>
     <el-dialog title="提示" :visible.sync="flag" @open="()=>{
-      this.$refs.dialogInput.focus();
+      this.$nextTick(()=>{
+        this.$refs.dialogInput.focus();
+      })
     }" @close="()=>{
       this.number = 1
     }" width="15vw" top="30vh">
diff --git a/src/views/modules/production/scanForm.vue b/src/views/modules/production/scanForm.vue
index 831fe7d..fefbede 100644
--- a/src/views/modules/production/scanForm.vue
+++ b/src/views/modules/production/scanForm.vue
@@ -136,7 +136,7 @@ export default {
         return;
       }
       let arr = this.model.label.split(";");
-      if (arr.length < 4){
+      if (arr.length < 5){
         if (!arr[3]){
           this.$message.warning("标签jobNo为空")
           return;
@@ -179,6 +179,7 @@ export default {
         scanQty:arr[2],
         scanType:parseInt(arr[2]) !== this.partValue?'零散数量':'标准数量',
         seqNo:arr[3],
+        printId:arr[4]?arr[4]:'',
         createBy:this.$store.state.user.name,
         createData:dayjs().format("YYYY-MM-DD")
       }