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/PrintLabel.vue | 9 +++++----
1 files changed, 5 insertions(+), 4 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 0e37ea8..fda42f9 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
@@ -135,8 +135,9 @@
<span v-else></span>
</div>
- <div class="row3" v-if="item.other_columns==null||(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.project}}</span>
<span>{{ item.building_number }}</span>
@@ -199,7 +200,7 @@
.row3 {
margin-top: -5px;
height: 25px;
- font-size: 12pt;
+ font-size: 15pt;
font-weight: bolder;
}
@@ -219,7 +220,7 @@
@page {
size: auto; /* auto is the initial value */
- margin: 13mm 4mm 0mm 6mm /* this affects the margin in the printer settings */
+ margin: 13mm 4mm 0mm 4mm /* this affects the margin in the printer settings */
}
--
Gitblit v1.8.0