From 323d9cdb46f8e0bf1691af18c972277ecf34a86e Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 20 七月 2022 19:47:43 +0800
Subject: [PATCH] 1.修改打印bug

---
 src/views/scgl/sckbg.vue |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index 4ec892b..ce1b3ed 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -981,8 +981,10 @@
 
         if (obj.nextstepname === null || obj.nextstepcode === '') {
           this.dialogForm.nextstepname = obj.stepname
+          this.dialogForm.nextstepcode = obj.stepcode
         } else {
           this.dialogForm.nextstepname = obj.nextstepname
+          this.dialogForm.nextstepcode = obj.nextstepcode
         }
 
         this.dialogForm.startqtySum = obj.noreportqty
@@ -1044,8 +1046,10 @@
         this.dialogForm.stepcode = obj.stepcode
         if (obj.nextstepname === null || obj.nextstepcode === '') {
           this.dialogForm.nextstepname = obj.stepname
+          this.dialogForm.nextstepcode = obj.stepcode
         } else {
           this.dialogForm.nextstepname = obj.nextstepname
+          this.dialogForm.nextstepcode = obj.nextstepcode
         }
         this.dialogForm.noputqty = obj.noputqty
         this.dialogForm.stepseq = obj.seq
@@ -1336,13 +1340,14 @@
             partname: this.dialogForm.partname, // 浜у搧鍚嶇О
             next_stepname: this.dialogForm.nextstepname, // 涓嬮亾宸ュ簭
             qty: this.dialogForm.startqty, // 鏁伴噺
-            qrcode: this.form.orderstepqrcode// 浜岀淮鐮�
+            // qrcode: this.form.orderstepqrcode// 浜岀淮鐮�
+            qrcode: this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode // 浜岀淮鐮�
           }
         ]
       }
       const args = {
-        type: 'preview', // preview  print
-        showOptionDlg: true, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+        type: 'print', // preview  print
+        showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
         report: urlAddRandomNo('./static/grf/鎶ュ伐浜у嚭鏍囩.grf'),
         data: obj
       }
@@ -1359,13 +1364,14 @@
             partname: this.dialogForm.partname, // 浜у搧鍚嶇О
             next_stepname: this.dialogForm.nextstepname, // 涓嬮亾宸ュ簭
             qty: this.dialogForm.sqty, // 鏁伴噺
-            qrcode: this.WXform.orderstepqrcode// 浜岀淮鐮�
+            // qrcode: this.WXform.orderstepqrcode// 浜岀淮鐮�
+            qrcode: this.dialogForm.wo_code + ';' + this.dialogForm.nextstepcode// 浜岀淮鐮�
           }
         ]
       }
       const args = {
-        type: 'preview', // preview  print
-        showOptionDlg: true, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
+        type: 'print', // preview  print
+        showOptionDlg: false, // 濡傛灉涓嶆樉绀烘墦鍗板璇濇鑰岀洿鎺ユ墦鍗帮紝灏嗘琛屾敞閲婂幓鎺夊嵆鍙�
         report: urlAddRandomNo('./static/grf/澶栧崗鏀舵枡鏍囩.grf'),
         data: obj
       }

--
Gitblit v1.9.3