From 8be895639f0250ced67a4437e7ebf6854d054749 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 24 八月 2022 17:36:20 +0800
Subject: [PATCH] 1.修改小标签打印

---
 src/views/scgl/sckbg.vue |   82 +++++++++++++++++++++++-----------------
 1 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index a58b000..c12ae07 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -835,7 +835,7 @@
       </span>
     </el-dialog>
 
-    <!--鎵撳嵃棰勮椤甸潰-->
+    <!--鎵撳嵃棰勮椤甸潰  灏忔爣绛�-->
     <el-dialog
       title="棰勮"
       :visible.sync="dialogVisible2"
@@ -847,52 +847,60 @@
       <!-- 瑕佹墦鍗扮殑鍖哄煙 -->
       <div id="printMe2" style="padding: 30px;">
         <div
-          style="display: flex;width: 300px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
+          style="display: flex;width: 280px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
         >
-          <div style="width: 80px;display: flex;flex-direction: column;border-right: 1px solid #000">
+
+          <div style="width: 90px;display: flex;flex-direction: column;border-right: 1px solid #000">
             <div
-              style="display: flex;height: 120px;border-bottom:1px solid #000;justify-content: center;align-items: center "
+              style="display: flex;height: 90px;border-bottom:1px solid #000;
+              justify-content: center;align-items: center;position: relative"
             >
-              <div id="qrCode2" ref="qrCodeDiv2" />
+              <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+            </div>
+            <div style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center">
+              <div style="margin-left: 5px;width: 28px">鏁伴噺:</div>
+              {{ qrForm.startqty }}
             </div>
             <div style="display: flex;height: 30px;justify-content: flex-start;align-items: center">
-              <div style="margin-left: 5px;width: 30px">鏁伴噺:</div>
-              10000
-              <!--              {{ qrForm.startqty }}-->
+              <div style="margin-left: 5px;width: 42px">澶勭悊浜�:</div>
+              {{ qrForm.operator }}
             </div>
           </div>
 
-          <div style="width:220px;display: flex;flex-direction: column">
+          <div style="width:190px;display: flex;flex-direction: column">
             <div
-              style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
+              style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center;text-align: left"
             >
               <div style="width: 60px;margin-left: 5px;">宸ュ崟缂栧彿:</div>
               <div>{{ qrForm.wo_code }}</div>
             </div>
             <div
-              style="display: flex;height: 25%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
+              style="display: flex;height: 20%;border-bottom:1px solid #000;justify-content: flex-start;align-items: center ;text-align: left"
             >
               <div style="width: 60px;margin-left: 5px;">浜у搧缂栫爜:</div>
               <div>{{ qrForm.partcode }}</div>
             </div>
             <div
-              style="display: flex;height: 25%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+              style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
             >
               <div style="width:60px;margin-left: 5px;">浜у搧鍚嶇О:</div>
               <div>{{ qrForm.partname }}</div>
             </div>
-            <div style="display: flex;height: 25%;justify-content: flex-start;align-items: center;text-align: left">
-              <div style="width: 60px;margin-left: 5px;">涓嬮亾宸ュ簭:</div>
+            <div
+              style="display: flex;height: 20%;border-bottom:1px solid #000 ;justify-content: flex-start;align-items: center;text-align: left"
+            >
+              <div style="width:60px;margin-left: 5px;">涓嬮亾宸ュ簭:</div>
               <div>{{ qrForm.nextstepname }}</div>
             </div>
+            <div style="display: flex;height: 20%;justify-content: flex-start;align-items: center;text-align: left">
+              <div style="width: 60px;margin-left: 5px;">澶勭悊鏃堕棿:</div>
+              <div>{{ qrForm.operatorTime }}</div>
+            </div>
 
-            <!--            {{ qrForm.operator }}-->
-            <!--            {{ qrForm.operatorTime }}-->
           </div>
 
         </div>
       </div>
-
       <span slot="footer" class="dialog-footer">
         <div class="footerButton">
           <el-button @click="dialogVisible2 = false">鍙� 娑�</el-button>
@@ -1872,8 +1880,10 @@
     bindQRCode(text) {
       new QRCode(this.$refs.qrCodeDiv2, {
         text: text,
-        width: 50,
-        height: 50,
+        // width: 50,
+        width: 60,
+        // height: 50,
+        height: 60,
         colorDark: '#000', // 浜岀淮鐮侀鑹�
         colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
         correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H
@@ -1886,12 +1896,10 @@
       this.qrForm.partcode = this.dialogForm.partcode
       this.qrForm.partname = this.dialogForm.partname
       this.qrForm.nextstepname = this.dialogForm.nextstepname
-
+      this.qrForm.operator = getCookie('username')
+      this.qrForm.operatorTime = handleDatetime2(new Date())
       this.$nextTick(() => {
         this.bindQRCode(this.qrForm.qrvalue)
-        console.log(this.$refs.qrCodeDiv2, 123)
-        // console.log(this.$refs.qrCodeDiv2.querySelectorAll('#qrCode2>img'), 1)
-        // console.log(this.$refs.qrCodeDiv2.querySelectorAll('#qrCode2>canvas'), 2)
       })
     },
     WXprint2() {
@@ -1901,6 +1909,8 @@
       this.qrForm.partcode = this.dialogForm.partcode
       this.qrForm.partname = this.dialogForm.partname
       this.qrForm.nextstepname = this.dialogForm.nextstepname
+      this.qrForm.operator = getCookie('username')
+      this.qrForm.operatorTime = handleDatetime2(new Date())
       this.$nextTick(() => {
         this.bindQRCode(this.qrForm.qrvalue)
       })
@@ -1912,7 +1922,9 @@
       this.qrForm.partcode = ''
       this.qrForm.partname = ''
       this.qrForm.nextstepname = ''
-      this.$refs.qrCodeDiv2 = ''
+      this.qrForm.operator = ''
+      this.qrForm.operatorTime = ''
+      // this.$refs.qrCodeDiv2 = ''
     },
 
     // 鑾峰彇椤甸潰楂樺害
@@ -1943,18 +1955,18 @@
       // console.log(JSON.stringify(data), 1)
       // console.log(this.badDialogForm.operation, 1)
       // this.badPrintOperator =
-      this.badPrint(this.badOperationArr.find(item => item.usercode === this.badDialogForm.operation).username)
-      this.dialogVisible2 = true
+      // this.badPrint(this.badOperationArr.find(item => item.usercode === this.badDialogForm.operation).username)
+      // this.dialogVisible2 = true
 
-      // EditOrderNgStepSeave(data, this.badDialogForm.operation).then(res => {
-      //   if (res.code === '200' || res.code === '301') {
-      //     this.getBadList()
-      //     this.badDialogVisible = false
-      //     this.badPrint(this.badOperationArr.find(item => item.usercode === this.badDialogForm.operation).username)
-      //     this.dialogVisible2 = true
-      //     return this.$message.success('淇濆瓨鎴愬姛锛�')
-      //   }
-      // })
+      EditOrderNgStepSeave(data, this.badDialogForm.operation).then(res => {
+        if (res.code === '200' || res.code === '301') {
+          this.getBadList()
+          this.badDialogVisible = false
+          this.badPrint(this.badOperationArr.find(item => item.usercode === this.badDialogForm.operation).username)
+          this.dialogVisible2 = true
+          return this.$message.success('淇濆瓨鎴愬姛锛�')
+        }
+      })
     },
     badPrint(username) {
       this.qrForm.qrvalue = this.badDialogForm.wo_code + ';' + this.badDialogForm.nextstepcode

--
Gitblit v1.9.3