From bab91173f021109fe933d49bf79e861f8d78b0b9 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期三, 08 三月 2023 16:09:30 +0800
Subject: [PATCH] 1.流转标签新增60*40尺寸

---
 src/views/scgl/sckbg.vue |   56 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index f9738fd..fe03e19 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -996,58 +996,62 @@
       @close="dialogVisible2Close"
     >
       <!-- 瑕佹墦鍗扮殑鍖哄煙 -->
-      <div id="printMe2" style="padding: 30px;">
+      <div id="printMe2"  >
         <div
-          style="display: flex;width: 280px;height: 150px;border: 1px solid #000;text-align: center;font-size: 10px;"
+          style="display: flex;width: 220px;height: 130px;border: 1px solid #000;text-align: center;font-size: 12px"
         >
 
-          <div style="width: 90px;display: flex;flex-direction: column;border-right: 1px solid #000">
+          <div style="width: 70px;display: flex;flex-direction: column;border-right: 1px solid #000">
             <div
-              style="display: flex;height: 90px;border-bottom:1px solid #000;
+              style="display: flex;height: 60%;border-bottom:1px solid #000;
               justify-content: center;align-items: center;position: relative"
             >
-              <div id="qrCode2" ref="qrCodeDiv2" style="overflow-y: hidden;height:60px;position: absolute;left: 14px;" />
+              <div
+                id="qrCode2"
+                ref="qrCodeDiv2"
+                style="overflow-y: hidden;height:71%;position: absolute;left: 7px;"
+              />
             </div>
             <div
-              style="display: flex;height: 30px;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
+              style="display: flex;height:  20%;justify-content: flex-start;border-bottom:1px solid #000;align-items: center"
             >
-              <div style="margin-left: 5px;width: 28px">鏁伴噺:</div>
-              {{ qrForm.startqty }}
+              <div style="margin-left: 3px; ">鏁伴噺:{{ qrForm.startqty }}</div>
             </div>
-            <div style="display: flex;height: 30px;justify-content: flex-start;align-items: center">
-              <div style="margin-left: 5px;width: 42px">澶勭悊浜�:</div>
-              {{ qrForm.operator }}
+            <div style="display: flex;height:  20%;justify-content: flex-start;align-items: center;">
+              <div style="margin-left: 3px; ">鎿嶄綔:{{ qrForm.operator }}</div>
+
             </div>
           </div>
 
-          <div style="width:190px;display: flex;flex-direction: column">
+          <div style="width:150px;display: flex;flex-direction: column">
             <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.wo_code }}</div>
+              <div style="margin-left: 3px;">缂栧彿:{{ qrForm.wo_code }}</div>
+
             </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.partcode }}</div>
+              <div style="margin-left: 3px;">浜у搧缂栫爜:{{ qrForm.partcode }}</div>
+
             </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.partname }}</div>
+              <div style="margin-left: 3px;">浜у搧鍚嶇О:{{ qrForm.partname }}</div>
+
             </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 style="margin-left: 3px;">涓嬮亾宸ュ簭:{{ 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 style=" margin-left: 3px;">鏃堕棿: {{ qrForm.operatorTime }}</div>
+              <!--                <div>{{ qrForm.operatorTime?qrForm.operatorTime.substring(5):'' }}</div>-->
+              <!--                <div>{{ qrForm.operatorTime }}</div>-->
             </div>
 
           </div>
@@ -1802,7 +1806,7 @@
         this.dialogForm.startqty = obj.noreportqty
 
         this.dialogForm.nextstepname = obj.nextstepname
-        this.dialogForm.nextstepcode = obj.nextstepcode
+        this.dialogForm.nextstepcode =obj.nextstepcode ? obj.nextstepcode : obj.stepcode
 
         this.dialogForm.startqtySum = obj.noreportqty
       })
@@ -1863,7 +1867,7 @@
         this.dialogForm.stepcode = obj.stepcode
 
         this.dialogForm.nextstepname = obj.nextstepname
-        this.dialogForm.nextstepcode = obj.nextstepcode
+        this.dialogForm.nextstepcode = obj.nextstepcode ? obj.nextstepcode : obj.stepcode
 
         this.dialogForm.noputqty = obj.noputqty
         this.dialogForm.stepseq = obj.seq
@@ -2273,9 +2277,9 @@
       new QRCode(this.$refs.qrCodeDiv2, {
         text: text,
         // width: 50,
-        width: 60,
+        width: 55,
         // height: 50,
-        height: 60,
+        height: 55,
         colorDark: '#000', // 浜岀淮鐮侀鑹�
         colorLight: '#ffffff', // 浜岀淮鐮佽儗鏅壊
         correctLevel: QRCode.CorrectLevel.L// 瀹归敊鐜囷紝L/M/H

--
Gitblit v1.9.3