From 2c98be64470f8298d3083ce337b0ffb948bee5f7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:45:34 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 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 647da1f..8706999 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
@@ -163,12 +163,11 @@
 <!--     鍗婃垚鍝佹爣绛�-->
     <template v-for="(item,id) in labelList">
     <div v-if="type!=='3'" id="entirety" >
-      <div v-if="item.customer_name!==undefined" class="row1" >
+      <div  class="row1" >
 <!--閽㈠寲鐗堝浘搴忓彿锛岄挗鍖栫増鍥鹃噷鐨勯『搴�-->
 <!--        <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
-        <span style="font-size: 12px;">{{ item.customer_name }}</span>&nbsp;
-        <span v-if="company.showDeliveryCreator">{{ item.order_id }}</span>&nbsp;
-        <span v-if="!company.showDeliveryCreator">{{ item.process_id }}</span>&nbsp;
+        <span style="font-size: 12px;">{{ item.customer_name }}</span>
+
         <template v-if="company.showDeliveryCreator">
           <span v-if="item.process.includes('澶硅兌')||item.process.includes('澶瑰眰')">鑳剁墖</span>
           <span v-else-if="item.process.includes('涓┖')">涓┖</span>
@@ -180,7 +179,10 @@
 <!--        <div class="cell1" v-if="item.stock_id!=undefined">{{ item.stock_id+'/'+item.polys_id }}</div>-->
 
       </div>
-
+      <div v-if="item.customer_name!==undefined" class="row9">
+        <span v-if="company.showDeliveryCreator">{{ item.order_id }}</span>
+        <span v-if="!company.showDeliveryCreator">{{ item.process_id }}</span>
+      </div>
       <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
         <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
           ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
@@ -330,13 +332,20 @@
 
 .row3 {
   margin-top: -5px;
+  height: 18px;
+  font-size: 12pt;
+  font-weight: bolder;
+}
+
+.row9 {
+  margin-top: -15px;
   height: 25px;
   font-size: 15pt;
   font-weight: bolder;
 }
 
 .row5 {
-  height: 15px;
+  height: 10px;
   font-weight: bold;
   font-size: 6pt;
 }
@@ -351,7 +360,7 @@
   font-size: 4pt;
 }
 .row6 span {
-  font-size: 12pt;
+  font-size: 10pt;
   font-weight: bold;
 }
 .cell{

--
Gitblit v1.8.0