From f7a2fcdda7f1120498c5c5f75c5a99955fc54b43 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 16 十二月 2025 16:54:09 +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/PrintCustomLabelSemi2.vue | 194 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 144 insertions(+), 50 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 1a38d5d..a6e3674 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
@@ -19,6 +19,8 @@
let dataList = ref([])
let list = ref([])
let lastList=ref([])
+let projectNo = ref([])
+let type = ref([])
let filterData = ref({})
@@ -27,36 +29,80 @@
})
+
const {currentRoute} = useRouter()
const route = currentRoute.value
-data.value.printList = JSON.parse(route.query.printList)
-const type = route.query.type
const faceOrientation = route.query.faceOrientation
const lableType = route.query.lableType
+const printType=route.query.printType
+projectNo.value = route.query.projectNo
+type.value = route.query.type
onMounted(() => {
- request.post(`/processCard/getSelectPrintLabel1`,data.value).then((res) => {
- if (res.code == 200) {
- produceList.value = deepClone(res.data.data)
- for (let i = 0; i < produceList.value.length; i++) {
- let count= produceList.value[i].data.length
- for (let j = 0; j < count; j++) {
- for (let k = 0; k < produceList.value[i].data[j].quantity; k++){
- labelList.value.push(produceList.value[i].data[j])
- }
-
- }
+ if (localStorage.getItem('hasRefreshed')=="false") {
+ localStorage.setItem('hasRefreshed', 'true');
+ location.reload();
+ }else{
+ localStorage.setItem('hasRefreshed', 'false');
+ }
+ //宸ョ▼鎵撳嵃鎴愬搧鏍囩
+ if(projectNo.value!=null){
+ request.post(`/processCard/getSelectPrintLabel/${projectNo.value}/${type.value}`).then((res) => {
+ if (res.code == 200) {
+ labelList.value = deepClone(res.data.data)
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
}
- console.log(labelList.value)
- } else {
- ElMessage.warning(res.msg)
- router.push("/login")
- }
- })
+ })
+
+ }else{
+ data.value.printList = JSON.parse(route.query.printList)
+ //娴佺▼鍗＄紪杈戞墦鍗版爣绛� 甯稿窞
+ if (printType == 1) {
+ request.post(`/processCard/getSelectPrintLabel1`, data.value).then((res) => {
+ if (res.code == 200) {
+ produceList.value = deepClone(res.data.data)
+ for (let i = 0; i < produceList.value.length; i++) {
+ let count = produceList.value[i].data.length
+ for (let j = 0; j < count; j++) {
+ for (let k = 0; k < produceList.value[i].data[j].quantity; k++) {
+ labelList.value.push(produceList.value[i].data[j])
+ }
+
+ }
+ }
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
}
+ //鏄庣粏鍒嗘灦鎵撳嵃鏍囩 甯稿窞
+ else if(printType==2){
+ request.post(`/processCard/getSelectPrintLabelDetails`, data.value).then((res) => {
+ if (res.code == 200) {
+ produceList.value = deepClone(res.data.data)
+ for (let i = 0; i < produceList.value.length; i++) {
+ let count = produceList.value[i].data.length
+ for (let j = 0; j < count; j++) {
+ for (let k = 0; k < produceList.value[i].data[j].quantity; k++) {
+ labelList.value.push(produceList.value[i].data[j])
+ }
-)
+ }
+ }
+ } else {
+ ElMessage.warning(res.msg)
+ router.push("/login")
+ }
+ })
+ }
+ }
+
+
+})
// 鎵撳嵃鏂规硶
@@ -76,7 +122,11 @@
style.innerHTML =
"body>#" +
printId +
- "{display:none}@media print{body>:not(#" +
+ "{display:none}@media print{" +
+ "@page {" +
+ " size: auto; " +
+ " margin: 2mm 2mm 2mm 2mm; " +
+ " }body>:not(#" +
printId +
"){display:none !important}body>#" +
printId +
@@ -100,27 +150,52 @@
<template>
<el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
<div id="printFlowCard" >
- <div id="entirety" v-for="(item,id) in labelList" >
- <div class="row1">
+ <template v-for="(item,id) in labelList">
+ <div id="entirety" >
+
+ <div class="row1" v-if="item.customer_name!==undefined">
<span>{{ item.customer_name }}</span>
<span>{{ item.order_id }}</span>
- <span v-if="item.process.includes('澶硅兌')">鑳剁墖</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>
- <div class="row2">
+
+
+
+ <div class="row2" v-if="item.customer_name!==undefined">
<span>{{item.project}}</span>
<span>{{ item.building_number }}</span>
<span v-if="item.bend_radius!=null">R={{item.bend_radius}}</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)}}*{{Math.round(item.height)}}={{item.quantity}}</div>
- <div class="row5">
+ <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" v-if="item.customer_name!==undefined">
<span>{{item.glass_child}}</span>
<span>{{item.processing_note}}</span>
</div>
</div>
+ <div style="width: 19px" v-if="id%2===0"></div>
+ <div class="element-to-break-after" style="width: 1px" v-if="id%2===1"></div>
+ </template>
</div>
</template>
@@ -140,14 +215,15 @@
display: flex;
justify-content: left;
flex-wrap: wrap;
- width: 400px;
+ width: 500px;
}
#entirety{
text-align: center;
- width: 50%;
- height: 140px;
+ width: 48%;
+ height: 160px;
border: black 1px;
+ word-wrap: break-word;
}
.row1 {
@@ -155,11 +231,16 @@
font-weight: bold;
height: 35px;
}
-
+.row1 span {
+ font-size: 14pt;
+}
.row2 {
font-size: 12pt;
font-weight: bold;
- height: 25px;
+ height: 35px;
+}
+.row2 span {
+ font-size: 17pt;
}
span {
font-size: 12pt;
@@ -168,39 +249,52 @@
.row3 {
margin-top: -5px;
- height: 30px;
+ height: 35px;
font-size: 20pt;
font-weight: bolder;
- line-height: 30px;
+ line-height: 35px;
+}
+.row3 span{
+ font-size: 24pt;
}
.row5 {
- height: 40px;
+ height: 50px;
font-weight: bold;
- font-size: 12pt;
+ font-size: 14pt;
}
.row5 span {
- font-size: 12pt;
+ font-size: 16pt;
}
.row6 {
- height: 20px;
+ height: 25px;
font-weight: bold;
font-size: 10pt;
}
-
-
-
-@page {
- size: auto; /* auto is the initial value */
- margin: 2mm 2mm 2mm 2mm /* this affects the margin in the printer settings */
-
+.row6 span {
+ font-size: 16pt;
}
-@media print {
- div {
- page-break-inside: avoid;
- }
+.cell{
+ position: absolute;
+ font-weight: bold;
+ margin-left: 5px;
+ margin-top: 0px;
}
+.cell1{
+ position: absolute;
+ font-weight: bold;
+ margin-left: 225px;
+ margin-top: -30px;
+}
+
+
+.element-to-break-after {
+ page-break-after: always;
+}
+
+
+
</style>
\ No newline at end of file
--
Gitblit v1.8.0