From f4e8f069d050293232cfe68ebd38b2b05c4ad4b4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 12 七月 2024 11:41:30 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
index 66e682a..eca1e59 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue
@@ -113,8 +113,9 @@
         <span>{{item.project}}</span>&nbsp;
         <span>{{ item.building_number }}</span>
       </div>
-      <div class="row3" v-if="JSON.parse(item.other_columns).S02==null">{{item.width}}*{{item.height}}={{item.quantity}}</div>
-      <div class="row3" v-else>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</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-if="item.bend_radius!=null">{{item.width}}*{{item.height}}=R/{{item.bend_radius}}</div>
+      <div class="row3" v-else>{{item.width}}*{{item.height}}={{item.quantity}}</div>
       <div class="row5">
         <span>{{item.glass_child}}</span>&nbsp;
         <span>{{item.processing_note}}</span>
@@ -177,7 +178,7 @@
   font-size: 12pt;
 }
 .row5 span {
-  font-size: 10pt;
+  font-size: 12pt;
 }
 
 .row6 {

--
Gitblit v1.8.0