From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue | 113 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 79 insertions(+), 34 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 9206d1c..263e1a4 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
@@ -28,6 +28,8 @@
projectNo.value = route.query.projectNo
type.value = route.query.type
+
+
onMounted(() => {
if(projectNo.value!=null){
request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
@@ -136,26 +138,51 @@
<template>
<el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
<div id="printFlowCard" >
-<!-- <div id="entirety" v-for="(items,id) in produceList" >
- <div v-for="(item,index) in items.data" :key="index">
- <div class="row1">{{ item.customer_name }}</div>
- <div class="row2">
- <span>{{ item.order_id }}</span>
- <span>{{ item.type_name }}</span>
- </div>
- <div class="row3">{{item.child_width}}*{{item.child_height}}={{item.quantity}}</div>
- <div class="row5">
- <span>{{item.project}}</span>
- <span>{{ item.remarks }}</span>
- </div>
- <div class="row6">
- <span>{{item.glass_child}}</span>
- <span>{{item.processing_note}}</span>
- </div>
+ <div v-if="type!=='3'" id="entirety" v-for="(item,id) in labelList" >
+
+ <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>{{ item.customer_name }}</span>
+ <span>{{ item.order_id }}</span>
+ <span v-if="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!=null">{{ item.stock_id }}</div>
+
</div>
- </div>-->
- <div id="entirety" v-for="(item,id) in labelList" >
- <div class="row1">
+ <div class="row2" v-else>
+ <span>{{ item.customer_name }}</span>
+ <span>{{ item.order_id }}</span>
+ <span v-if="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>
+
+ <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="row5">
+ <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number }}</span>
+ <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
+ </div>
+ <div class="row6">
+ <span>{{item.glass_child}}</span>
+ <span>{{item.processing_note}}</span>
+ </div>
+ <div class="row5">
+ <span>{{item.project}}</span>
+ </div>
+ </div>
+
+
+
+
+ <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>{{ item.customer_name }}</span>
@@ -167,19 +194,31 @@
<div class="cell1" v-if="item.stock_id!=null">{{ item.stock_id }}</div>
</div>
+ <div class="row2" v-else>
+ <span>{{ item.customer_name }}</span>
+ <span>{{ item.order_id }}</span>
+ <span v-if="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>
<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="row5">
- <span>{{item.project}}</span>
- <span>{{ item.building_number }}</span>
+ <span style="white-space: pre-wrap;font-size: 6pt">{{ item.building_number }}</span>
<span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
</div>
<div class="row6">
<span>{{item.glass_child}}</span>
<span>{{item.processing_note}}</span>
</div>
- </div>
+ <div class="row5">
+ <span>{{item.project}}</span>
+ </div>
+ </div>
+ </template>
+
</div>
</template>
@@ -213,11 +252,15 @@
}
.row1 {
- font-size: 8pt;
+ font-size: 6pt;
font-weight: bold;
- height: 20px;
+ height: 15px;
}
.row1 span {
+ font-size: 8pt;
+ font-weight: bold;
+}
+.row2 span {
font-size: 10pt;
font-weight: bold;
}
@@ -225,10 +268,10 @@
.row2 {
font-size: 8pt;
font-weight: bold;
- height: 20px;
+ height: 15px;
}
span {
- font-size: 10pt;
+ font-size: 8pt;
font-weight: bold;
}
@@ -241,28 +284,29 @@
.row3 {
margin-top: -5px;
- height: 25px;
- font-size: 15pt;
+ height: 15px;
+ font-size: 13pt;
font-weight: bolder;
}
.row5 {
- height: 20px;
+ margin-top: 5px;
+ height: 15px;
font-weight: bold;
- font-size: 8pt;
+ font-size: 6pt;
}
.row5 span {
- font-size: 10pt;
+ font-size: 12pt;
font-weight: bold;
}
.row6 {
- height: 20px;
+ height: 15px;
font-weight: bold;
- font-size: 8pt;
+ font-size: 4pt;
}
.row6 span {
- font-size: 10pt;
+ font-size: 12pt;
font-weight: bold;
}
.cell{
@@ -270,6 +314,7 @@
font-weight: bold;
margin-left: 5px;
margin-top: 0px;
+ font-size: 8pt;
}
.cell1{
--
Gitblit v1.8.0