From ecb3045fb71d05b7ee3bf73fdf413f5091d65f65 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 19 三月 2024 09:22:33 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
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 c3fe5c1..c6c71a8 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
@@ -98,6 +98,11 @@
name: '淇敼',
status: 'primary',
}
+ if(route.query.reviewStatus === "1"){
+ button.name='瀹℃牳'
+ titleUploadData.value.qualityInspector=user.user.userName
+ }
+
gridOptions.toolbarConfig.buttons.push(button)
}
inputDisabled.value = true
@@ -648,6 +653,7 @@
}
gridOptions.toolbarConfig.buttons[0].disabled=true
gridOptions.toolbarConfig.buttons[1].disabled=true
+ //鍒ゆ柇淇濆瓨杩樻槸淇敼
if(saveType==='save'){
saveReportingWorkRequest(requestData)
}else{
@@ -682,7 +688,11 @@
//鏇存柊鎶ュ伐鏁版嵁
const updateReportingWorkRequest = (requestData) =>{
- request.post(`/reportingWork/updateReportingWork`,requestData).then(res =>{
+ let reviewState = 'update'
+ if(route.query.reviewStatus==="1"){
+ reviewState = 'review'
+ }
+ request.post(`/reportingWork/updateReportingWork/${reviewState}`,requestData).then(res =>{
if (res.code == 200){
ElMessage.success("鎶ュ伐淇敼鎴愬姛")
router.push({path:'/main/reportingWorks/AddReportingWork',
@@ -731,7 +741,7 @@
}
let indexOfChar = processId.indexOf("/")
let leftString = processId.slice(0, indexOfChar)
- if (leftString.length !== 13) {
+ if (leftString.length !== 14) {
ElMessage.warning("璇疯緭鍏ユ纭綅鏁扮殑娴佺▼鍗�")
return
}
@@ -793,10 +803,14 @@
ElMessage.warning("姝ゅ伐搴忎笉灞炰簬璇ユ祦绋嬪崱")
return
}
+ //鍖归厤鈥�/鈥濆墠鍚庡瓧绗︿覆
+ const regex = /([^\/]+)\/([^\/]+)/;
+ //鏌ユ壘鍖归厤鐨勫瓧绗︿覆
+ const result = processId.match(regex);
//娴佺▼鍗″彿
- let processIdStr = processId.substring(0, 13);
+ let processIdStr = result[1];
//灞傚彿
- let technologyStr = processId.substring(14);
+ let technologyStr = result[2];
request.post(`/reportingWork/addSelectLastWork/${processIdStr}/${technologyStr}/${process}`).then((res) => {
if (res.code == 200) {
--
Gitblit v1.8.0