From e6bf567a863fb8a6bc7b776ac938825111c9ab52 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期一, 14 十月 2024 08:54:07 +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 |   56 +++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 35 insertions(+), 21 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 48bceb2..3dd92c3 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
@@ -28,6 +28,8 @@
 projectNo.value = route.query.projectNo
 type.value = route.query.type
 
+
+
 onMounted(() => {
   if(projectNo.value!=null){
     request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
@@ -155,30 +157,38 @@
       </div>
     </div>-->
     <div id="entirety" v-for="(item,id) in labelList" >
-        <div class="row1">
+      <div class="row1" v-if="item.heat_layout_id!=null">
 
-          <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 class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
+        <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 class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
 
-        </div>
+      </div>
+      <div class="row2" v-else>
+        <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>
-        <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 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="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 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>
   </div>
 
@@ -218,6 +228,10 @@
   height: 20px;
 }
 .row1 span {
+  font-size: 10pt;
+  font-weight: bold;
+}
+.row2 span {
   font-size: 12pt;
   font-weight: bold;
 }

--
Gitblit v1.8.0