From 2ad329b52d19e48bcdc9013aaf3fcee460456548 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 29 九月 2025 15:28:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue | 2 ++
north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue | 1 +
north-glass-erp/northglass-erp/public/config.js | 2 +-
north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue | 1 +
north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue | 2 +-
north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue | 2 +-
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 4 +++-
7 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/northglass-erp/public/config.js b/north-glass-erp/northglass-erp/public/config.js
index d380376..db7b4f0 100644
--- a/north-glass-erp/northglass-erp/public/config.js
+++ b/north-glass-erp/northglass-erp/public/config.js
@@ -10,4 +10,4 @@
//鍏徃 bore.pub 10.153.19.150
//娲涢槼 172.17.2.7
//澶╂触 192.168.150.39
-//涓婃捣 192.168.2.8
\ No newline at end of file
+//涓婃捣 10.153.18.3
\ No newline at end of file
diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
index 8ff4838..781c618 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue
@@ -1244,6 +1244,8 @@
gridOptions.loading=false
gridLeftOptions.loading=false
} else {
+ gridOptions.loading=false
+ gridLeftOptions.loading=false
ElMessage.warning(res.msg)
}
})
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
index 23414a7..253ba3c 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/AddReplenish.vue
@@ -207,8 +207,8 @@
router.push({path:'/main/Replenish/AddReplenish',query:{random:Math.random()}})
gridOptions.loading=false
}else{
+ gridOptions.loading=false
ElMessage.warning(t('basicData.msg.saveFail'))
- router.push("/login")
}
}).catch(err =>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
diff --git a/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue b/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
index a2f0fe1..55e4ff2 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/replenish/SelectReplenish.vue
@@ -296,6 +296,7 @@
router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})
gridOptions.loading=false
}else{
+ gridOptions.loading=false
ElMessage.warning(t('basicData.msg.cancelReviewFailWork'))
}
})
diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
index db27df8..f442137 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue
@@ -1092,6 +1092,7 @@
}
gridOptions.toolbarConfig.buttons[0].disabled=true
gridOptions.toolbarConfig.buttons[1].disabled=true
+ gridOptions.loading=true
//鍒ゆ柇淇濆瓨杩樻槸淇敼
if(saveType==='save'){
saveReportingWorkRequest(requestData)
@@ -1109,6 +1110,7 @@
if(storageBtn.value == true){
getStorageWork();
}
+ gridOptions.loading=false
router.push({path:'/main/reportingWorks/AddReportingWork',query:{processId:titleUploadData.value.processId,random:Math.random()}})
}else{
const errorObj = JSON.parse(res.msg)
@@ -1117,7 +1119,7 @@
+t('reportingWorks.pleaseNumber3')+'锛�'+errorObj.processNum+'<'+
+t('reportingWorks.pleaseNumber4')+'锛�'+errorObj.sumNum+'\n'
+t('reportingWorks.pleaseNumber5')
-
+ gridOptions.loading=false
ElMessage.error(msg)
}
}).catch(err =>{
diff --git a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
index 8a92bf8..bb51b5a 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue
@@ -187,8 +187,8 @@
router.push({path:'/main/rework/AddRework',query:{random:Math.random()}})
gridOptions.loading=false
}else{
+ gridOptions.loading=false
ElMessage.warning(t('basicData.msg.saveFail'))
- router.push("/login")
}
}).catch((err)=>{
ElMessage.error(t('basicData.msg.ServerConnectionError'))
diff --git a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
index c795f62..b83babf 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue
@@ -232,6 +232,7 @@
router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:route.query.orderId,random:Math.random()}})
gridOptions.loading=false
} else {
+ gridOptions.loading=false
ElMessage.warning(res.msg)
}
})
--
Gitblit v1.8.0