From 2c98be64470f8298d3083ce337b0ffb948bee5f7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 09 六月 2025 16:45:34 +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/SelectDetailProcessCard.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
index d08400a..81eafed 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectDetailProcessCard.vue
@@ -121,12 +121,18 @@
const route = currentRoute.value
let processId = route.query.processId
+let merge = null
//绗竴娆″姞杞芥暟鎹�
request.post(`/processCard/flowCardDetail/${processId}`, filterData.value).then((res) => {
if (res.code == 200) {
produceList = produceList.value.concat(deepClone(res.data.data))
+ merge = res.data.merge
+ console.log(merge)
+ if(merge != 0){
+ gridOptions.toolbarConfig.buttons[0].name='鍙栨秷鍚堝苟'
+ }
xGrid.value.reloadData(produceList)
gridOptions.loading = false
} else {
@@ -273,7 +279,7 @@
type: 'warning',
}
).then(()=>{
- request.post("/processCard/mergeFlowCard", flowData.value).then((res) => {
+ request.post(`/processCard/mergeFlowCard/${merge}`, flowData.value).then((res) => {
if(res.code==200 && res.data==="true"){
ElMessage.success(t('basicData.msg.saveSuccess'))
router.push({path: '/main/processCard/SelectProcessCard', query:{random:Math.random()}})
--
Gitblit v1.8.0