From 65129f3c1d9ca15fb2e575142415b6a9b744a9f5 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 20 十一月 2024 17:07:40 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
index 3dd92c3..88a49c7 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue
@@ -181,13 +181,15 @@
       <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
       <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
       <div class="row5">
-        <span>{{item.project}}</span>&nbsp;
-        <span>{{ item.building_number }}</span>
+        <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number }}</span>
         <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
       </div>
       <div class="row6">
         <span>{{item.glass_child}}</span>&nbsp;
         <span>{{item.processing_note}}</span>
+      </div>
+      <div class="row5">
+        <span>{{item.project}}</span>&nbsp;
       </div>
     </div>
   </div>
@@ -223,26 +225,26 @@
 }
 
 .row1 {
-  font-size: 8pt;
+  font-size: 6pt;
   font-weight: bold;
-  height: 20px;
+  height: 15px;
 }
 .row1 span {
-  font-size: 10pt;
+  font-size: 8pt;
   font-weight: bold;
 }
 .row2 span {
-  font-size: 12pt;
+  font-size: 10pt;
   font-weight: bold;
 }
 
 .row2 {
   font-size: 8pt;
   font-weight: bold;
-  height: 20px;
+  height: 15px;
 }
 span {
-  font-size: 10pt;
+  font-size: 8pt;
   font-weight: bold;
 }
 
@@ -255,15 +257,16 @@
 
 .row3 {
   margin-top: -5px;
-  height: 25px;
-  font-size: 17pt;
+  height: 15px;
+  font-size: 13pt;
   font-weight: bolder;
 }
 
 .row5 {
-  height: 20px;
+  margin-top: 5px;
+  height: 15px;
   font-weight: bold;
-  font-size: 8pt;
+  font-size: 6pt;
 }
 .row5 span {
   font-size: 12pt;
@@ -271,9 +274,9 @@
 }
 
 .row6 {
-  height: 20px;
+  height: 15px;
   font-weight: bold;
-  font-size: 8pt;
+  font-size: 4pt;
 }
 .row6 span {
   font-size: 12pt;

--
Gitblit v1.8.0