From 99d0bb96043ba5d6db66bbfb00f67ca4e09f3ffb Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 07 三月 2025 09:08:33 +0800
Subject: [PATCH] 小片尺寸和成品尺寸不相同时，打印显示小片信息
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 22 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 a47b294..2ceed2b 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
@@ -155,48 +155,69 @@
<el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
<el-input v-if="!company.showDeliveryCreator" v-model="remarks" style="background-color: transparent;border: none;margin-top: -20px;width: 100px"/>
<div id="printFlowCard" >
- <div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >
-
+<!-- 鍗婃垚鍝佹爣绛�-->
+ <template v-for="(item,id) in labelList">
+ <div v-if="type!=='3'" id="entirety" >
<div class="row1" >
-
- <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>
+<!--閽㈠寲鐗堝浘搴忓彿锛岄挗鍖栫増鍥鹃噷鐨勯『搴�-->
+<!-- <div class="cell" v-if="item.heat_layout_id!==undefined">{{ item.heat_layout_id }}/{{ item.heat_layout_sort }}</div>-->
<span>{{ item.customer_name }}</span>
<span>{{ item.order_id }}</span>
<span v-if="item.process.includes('澶硅兌')||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!=undefined">{{ item.stock_id }}</div>
+<!--stock_id 鐗堝浘-->
+<!-- <div class="cell1" v-if="item.stock_id!=undefined">{{ item.stock_id+'/'+item.polys_id }}</div>-->
</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="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">
+ <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!==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!==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">
+ {{ item.stock_id }}/{{ item.polys_id }}
+ </span>
+ {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
+ </div>
<div class="row5">
<span>{{item.project}}</span>
- <span>{{item.building_number}}</span>
+ <span>{{item.building_number?item.building_number.replace(/\r|\n|\s/g,''):''}}</span>
<span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
</div>
<div class="row6">
<span>{{item.glass_child}}</span>
- <span v-if="company.showDeliveryCreator" >{{item.processing_note}}</span>
+ <span v-if="company.showDeliveryCreator" style="font-size: 10pt" >{{item.processing_note}}</span>
<span v-else style="font-size: 6pt">{{item.processing_note}}</span>
+
+ <br v-if="!company.showDeliveryCreator" />
+ <span v-if="!company.showDeliveryCreator" style="font-size: 6pt;margin-top: -10px">{{item.product_name}}</span>
</div>
</div>
+ <div class="element-to-break-after" v-if="(id+1)%44==0"></div>
+ </template>
-
+<!--鎴愬搧鍚嶇О-->
<template v-if="type==='3'" v-for="(item,id) in labelList">
<div v-if="type==='3'" id="entirety" v-for="n in item.quantity" >
<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 style="font-size: 8pt">{{ item.customer_name }}</span>
- <div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
+ <span style="font-size: 8pt">{{ item.customer_name }}</span>
</div>
<div class="row2" v-else>
@@ -205,8 +226,24 @@
<div class="row2" style="font-size: 8pt" >{{item.order_id}}
<span style="font-size: 8pt">{{ remarks }}</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="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;">
+ ({{ 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">
+ {{ 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;">
+ ({{ 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">
+ {{ item.stock_id }}/{{ item.polys_id }}
+ </span>
+ {{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}
+ </div>
<div class="row5">
<span style="white-space: pre-wrap;font-size: 8pt">{{ item.building_number?item.building_number.replace(/\r|\n|\s/g,''):'' }}</span>
@@ -216,6 +253,7 @@
<span style="font-size: 10pt">{{item.glass_child}}</span>
</div>
</div>
+ <div class="element-to-break-after" v-if="(id+1)%44==0"></div>
</template>
</div>
@@ -243,8 +281,8 @@
#entirety{
text-align: center;
width: 180px;
- height: 87px;
- margin-bottom: 10px;
+ height: 90px;
+ margin-bottom: 7px;
margin-right: 5px;
overflow: hidden;
white-space: nowrap;
@@ -253,7 +291,7 @@
.row1 {
font-size: 8pt;
font-weight: bold;
- height: 15px;
+ height: 20px;
}
.row1 span {
font-size: 10pt;
@@ -284,23 +322,22 @@
.row3 {
margin-top: -5px;
height: 25px;
- font-size: 17pt;
+ font-size: 15pt;
font-weight: bolder;
}
.row5 {
- margin-top: 5px;
height: 15px;
font-weight: bold;
font-size: 6pt;
}
.row5 span {
- font-size: 12pt;
+ font-size: 8pt;
font-weight: bold;
}
.row6 {
- height: 15px;
+ height: 25px;
font-weight: bold;
font-size: 4pt;
}
@@ -326,6 +363,10 @@
font-size: 6pt;
}
+.element-to-break-after {
+ page-break-after: always;
+}
+
--
Gitblit v1.8.0