From b481539c8cd70e95765c946fcc0b66615ac7c1c6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 28 三月 2025 15:43:54 +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 |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 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 2ae9c9d..24d4451 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
@@ -46,6 +46,7 @@
     request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
       if (res.code == 200) {
         labelList.value = deepClone(res.data.data)
+        console.log(res.data.data)
       } else {
         ElMessage.warning(res.msg)
         router.push("/login")
@@ -162,7 +163,7 @@
 <!--     鍗婃垚鍝佹爣绛�-->
     <template v-for="(item,id) in labelList">
     <div v-if="type!=='3'" id="entirety" >
-      <div class="row1" >
+      <div v-if="item.customer_name!==undefined" class="row1" >
 <!--閽㈠寲鐗堝浘搴忓彿锛岄挗鍖栫増鍥鹃噷鐨勯『搴�-->
 <!--        <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
         <span>{{ item.customer_name }}</span>&nbsp;
@@ -186,7 +187,7 @@
         {{JSON.parse(item.other_columns).S02}}={{item.quantity}}
       </div>
       <div class="row3" v-else>
-        <span v-if="item.heat_layout_id!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
+        <span v-if="item.heat_layout_sort!==undefined && company.showDeliveryCreator"  style="font-size: 7pt;">
           ({{ item.stock_id }}) {{ item.heat_layout_id }}/{{ item.heat_layout_sort }}
         </span>
         <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator"  style="font-size: 7pt">
@@ -194,12 +195,12 @@
         </span>
         {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
       </div>
-      <div class="row5">
+      <div v-if="item.customer_name!==undefined" class="row5">
         <span>{{item.project}}</span>&nbsp;
         <span>{{item.building_number?item.building_number.replace(/\r|\n|\s/g,''):''}}</span>&nbsp;
         <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>&nbsp;
       </div>
-      <div class="row6">
+      <div v-if="item.customer_name!==undefined" class="row6">
         <span>{{item.glass_child}}</span>&nbsp;
         <span v-if="company.showDeliveryCreator" style="font-size: 10pt" >{{item.processing_note}}</span>
         <span v-else style="font-size: 6pt">{{item.processing_note}}</span>
@@ -224,7 +225,7 @@
           <span style="font-size: 8pt">{{ item.customer_name }}</span>&nbsp;
 
         </div>
-        <div class="row2" v-else>
+        <div class="row1" v-else>
           <span style="font-size: 8pt">{{ item.customer_name }}</span>&nbsp;
         </div>
         <div class="row2" style="font-size: 8pt" >{{item.order_id}}

--
Gitblit v1.8.0