From 8b2c74fb6842e8af60f70e7df6eef8837d74be07 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 05 九月 2024 11:44:17 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
index 5b4e79a..1309298 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelSemi.vue
@@ -30,7 +30,9 @@
list:null,//鍕鹃�夌殑鏁版嵁
faceOrientation:null,//鍐呭闈�
type:null,//鏍囩妯℃澘
- lableType:null//鏍囩绫诲瀷
+ lableType:null,//鏍囩绫诲瀷
+ titleList:null,//鏍囬
+ switch:null//鍒ゆ柇鏄惁涓烘柊鎵撳嵃
})
const {currentRoute} = useRouter()
@@ -38,8 +40,8 @@
let type = props.type
let faceOrientation = props.faceOrientation
let lableType = props.lableType
+let switchType = props.switch
data.value.printList = JSON.parse(props.list)
-
onMounted(() => {
request.post(`/processCard/getSelectPrintCustomLabel/${type}/${lableType}`, data.value).then((res) => {
if (res.code == 200) {
@@ -48,7 +50,11 @@
list.value = deepClone(res.data.data)
const data = produceList.value[0].value
dataList = JSON.parse(`[${data}]`);
- labelList = dataList[0]
+ if (switchType===true){
+ labelList = props.titleList
+ }else {
+ 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++) {
@@ -59,7 +65,6 @@
}
} else {
ElMessage.warning(res.msg)
- router.push("/login")
}
})
--
Gitblit v1.8.0