From 82a5de6d2ec80b45660149c84be28734032562f6 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 11 十月 2024 15:21:53 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue | 60 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 40 insertions(+), 20 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 04e8503..42f9b7a 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
@@ -33,29 +33,49 @@
const type = route.query.type
const faceOrientation = route.query.faceOrientation
const lableType = route.query.lableType
+const printType=route.query.printType
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 (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 {
- 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")
+ }
+ })
+ }
+
+})
// 鎵撳嵃鏂规硶
@@ -163,7 +183,7 @@
height: 35px;
}
.row1 span {
- font-size: 15pt;
+ font-size: 17pt;
}
.row2 {
font-size: 12pt;
@@ -171,7 +191,7 @@
height: 35px;
}
.row2 span {
- font-size: 14pt;
+ font-size: 17pt;
}
span {
font-size: 12pt;
@@ -186,7 +206,7 @@
line-height: 35px;
}
.row3 span{
- font-size: 22pt;
+ font-size: 24pt;
}
.row5 {
@@ -195,7 +215,7 @@
font-size: 14pt;
}
.row5 span {
- font-size: 14pt;
+ font-size: 16pt;
}
.row6 {
--
Gitblit v1.8.0