From ed3ce5c8f6e1f7ac1aad3218ab5e518fc95cdb0f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 10 九月 2024 10:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 2f2eed2..628e4d1 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
@@ -132,12 +132,15 @@
     </div>-->
     <div id="entirety" v-for="(item,id) in labelList" >
         <div class="row1">
+
+          <div class="cell" v-if="item.heat_layout_id!=null">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
           <span>{{ item.customer_name }}</span>&nbsp;
           <span>{{ item.order_id }}</span>&nbsp;
           <span v-if="item.process.includes('澶硅兌')">鑳剁墖</span>
           <span v-else-if="item.process.includes('涓┖')">涓┖</span>
           <span v-else-if="item.process.includes('鐧惧彾')">鐧惧彾</span>
           <span v-else></span>
+
         </div>
 
         <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>
@@ -176,10 +179,12 @@
 
 #entirety{
   text-align: center;
-  width: 185px;
+  width: 180px;
   height: 87px;
   margin-bottom: 10px;
+  margin-right: 5px;
   overflow: hidden;
+  white-space: nowrap;
 }
 
 .row1 {
@@ -235,6 +240,12 @@
   font-size: 10pt;
   font-weight: bold;
 }
+.cell{
+  position: absolute;
+  font-weight: bold;
+  margin-left: 5px;
+  margin-top: 0px;
+}
 
 
 

--
Gitblit v1.8.0