From a660db06773007b1be690e0674829c00a57aeb7b Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 24 十二月 2025 16:21:23 +0800
Subject: [PATCH] 订单首页流程卡新增楼层编号显示
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
index f179426..795289d 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi1.vue
@@ -36,8 +36,15 @@
const printType=route.query.printType
onMounted(() => {
+ if (localStorage.getItem('hasRefreshed')=="false") {
+ localStorage.setItem('hasRefreshed', 'true');
+ location.reload();
+ }else{
+ localStorage.setItem('hasRefreshed', 'false');
+ }
+ //娴佺▼鍗＄紪杈戞墦鍗版爣绛� 甯稿窞
if (printType == 1) {
- request.post(`/processCard/getSelectPrintCustomLabel/${type}/1`, data.value).then((res) => {
+ request.post(`/processCard/getSelectPrintCustomLabel2/${type}/1`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.title)
list.value = deepClone(res.data.data)
@@ -58,24 +65,23 @@
}
})
- }else if(printType==2){
+ }
+ //鏄庣粏鍒嗘灦鎵撳嵃鏍囩 甯稿窞
+ else if(printType==2){
request.post(`/processCard/getSelectPrintCustomLabelDetails/${type}/1`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.title)
list.value = deepClone(res.data.data)
const data = produceList.value[0].value
dataList = JSON.parse(`[${data}]`);
- console.log(switchType)
- if (switchType===true){
- labelList = props.titleList
- }else {
- labelList = dataList[0]
- }
+
+ labelList = dataList[0]
+
for (let i = 0; i < list.value.length; i++) {
let count = list.value[i].data.length
for (let j = 0; j < count; j++) {
for (let k = 0; k < list.value[i].data[j].quantity; k++) {
- props.lastList.push(list.value[i].data[j])
+ lastList.value.push(list.value[i].data[j])
}
}
}
@@ -150,7 +156,8 @@
<span>{{ item.processingNote }}</span>
</div>
</div>
- <div style="width: 20px" v-if="id%2===0"></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>
@@ -188,7 +195,7 @@
height: 35px;
}
.row1 span {
- font-size: 15pt;
+ font-size: 17pt;
}
.row2 {
@@ -197,7 +204,7 @@
height: 35px;
}
.row2 span {
- font-size: 14pt;
+ font-size: 16pt;
}
span {
font-size: 12pt;
@@ -207,7 +214,7 @@
.row3 {
margin-top: -5px;
height: 35px;
- font-size: 22pt;
+ font-size: 24pt;
font-weight: bolder;
line-height: 35px;
}
@@ -219,7 +226,7 @@
margin-left: 20px;
}
.row5 span {
- font-size: 14pt;
+ font-size: 16pt;
}
.row6 {
@@ -228,7 +235,9 @@
font-size: 8pt;
}
-
+.element-to-break-after {
+ page-break-after: always;
+}
@@ -238,7 +247,7 @@
}
@page {
size: auto; /* auto is the initial value */
- margin: 2mm 2mm 2mm 2mm; /* this affects the margin in the printer settings */
+ margin: 2mm 2mm 2mm 2mm !important; /* this affects the margin in the printer settings */
}
}
--
Gitblit v1.8.0