From 5e26543d85895c57d614e2e0cfabf1fbc9423681 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期四, 11 七月 2024 10:32:33 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
index 25cf76e..3f89757 100644
--- a/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
+++ b/north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -30,14 +30,14 @@
const {currentRoute} = useRouter()
const route = currentRoute.value
const printMerge = props.printMerge
+let merge=props.printMerge
+if (merge == '') {
+ merge = null
+}
data.value.printList = JSON.parse(props.printList)
let flowCardCount = data.value.printList.length
onMounted(() => {
- // if (id === null || id === undefined || id === '') {
- // return
- // }
-
- request.post(`/processCard/getSelectPrinting`, data.value).then((res) => {
+ request.post(`/processCard/getSelectPrinting/${merge}`, data.value).then((res) => {
if (res.code == 200) {
produceList.value = deepClone(res.data.data)
//澶勭悊鍗曠墖鍘氬害
--
Gitblit v1.8.0