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/PrintCustomLabelDetails.vue | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
index 3946288..ed20b3b 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue
@@ -30,7 +30,9 @@
list:null,//鍕鹃�夌殑鏁版嵁
faceOrientation:null,//鍐呭闈�
type:null,//鏍囩妯℃澘
- lableType:null//鏍囩绫诲瀷
+ lableType:null,//鏍囩绫诲瀷
+ titleList:null,//鏍囬
+ switch:null//鍒ゆ柇鏄惁涓烘柊鎵撳嵃
})
const {currentRoute} = useRouter()
@@ -44,6 +46,7 @@
faceOrientation='OUTSIDE'
}
let lableType = props.lableType
+let switchType = props.switch
data.value.printList = JSON.parse(props.list)
onMounted(() => {
request.post(`/processCard/getSelectPrintCustomLabelDetails/${type}/${lableType}`, data.value).then((res) => {
@@ -53,7 +56,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++) {
@@ -62,10 +69,8 @@
}
}
}
-
} else {
ElMessage.warning(res.msg)
- router.push("/login")
}
})
@@ -103,7 +108,7 @@
// 閬嶅巻 lastList 骞舵洿鏂板搴旂殑灞炴��
lastList.value.forEach(obj => {
// 鑾峰彇鍓嶇紑鍜� orderId
- const prefix = obj.processId.substring(0, 11);
+ const prefix = lastList.value[id].processId.substring(0, 11);
const orderId = obj.orderId;
const glassNumber=lastList.value[id].glassNumber
// 鏍规嵁 propertyName 鏇存柊灞炴��
--
Gitblit v1.8.0