From e9e776e4ad2f191496defcca1a0250b2c49c9f4f Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 26 二月 2025 16:55:01 +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 | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 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 1541e73..eabdf49 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
@@ -122,7 +122,7 @@
"{display:none}@media print{" +
"@page {" +
" size: auto; " +
- " margin: 13mm 4mm 0mm 4mm; " +
+ " margin: 13mm 4mm 2mm 4mm; " +
" }body>:not(#" +
printId +
"){display:none !important}body>#" +
@@ -173,19 +173,19 @@
</div>
<div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
- <span v-if="item.heat_layout_id!==null && company.showDeliveryCreator" style="font-size: 7pt;">
+ <span v-if="item.heat_layout_id!==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!==null && !company.showDeliveryCreator" style="font-size: 7pt">
+ <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator" style="font-size: 7pt">
{{ item.stock_id }}/{{ item.polys_id }}
</span>
{{JSON.parse(item.other_columns).S02}}={{item.quantity}}
</div>
<div class="row3" v-else>
- <span v-if="item.heat_layout_id!==null && company.showDeliveryCreator" style="font-size: 7pt;">
+ <span v-if="item.heat_layout_id!==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!==null && !company.showDeliveryCreator" style="font-size: 7pt">
+ <span v-if="item.stock_id!==undefined && !company.showDeliveryCreator" style="font-size: 7pt">
{{ item.stock_id }}/{{ item.polys_id }}
</span>
{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
@@ -288,7 +288,7 @@
.row1 {
font-size: 8pt;
font-weight: bold;
- height: 15px;
+ height: 20px;
}
.row1 span {
font-size: 10pt;
@@ -318,13 +318,12 @@
.row3 {
margin-top: -5px;
- height: 20px;
+ height: 25px;
font-size: 15pt;
font-weight: bolder;
}
.row5 {
- margin-top: 5px;
height: 15px;
font-weight: bold;
font-size: 6pt;
@@ -335,7 +334,7 @@
}
.row6 {
- height: 15px;
+ height: 25px;
font-weight: bold;
font-size: 4pt;
}
--
Gitblit v1.8.0