fix 79311

This commit is contained in:
danshihao
2023-12-19 10:30:14 +08:00
parent 9581db123d
commit 03cdb35e64
7 changed files with 69 additions and 64 deletions
@@ -193,7 +193,7 @@ export default {
// 发起、草稿进来没有nodeId,就默认发起节点
this.currentNode = nodeId || EsInspectionProcess.initiate.value
this.currentNodeName = taskName || EsInspectionProcess.initiate.text
this.projectId = projectId
this.projectId = projectId || ''
this.btn = EsInspectionProcess.propertyOfValue('btn', this.currentNode) || []
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
if (nodeId && !EsInspectionProcess.keyOfValue(nodeId)) {
@@ -388,8 +388,6 @@ export default {
this.loading = true
this.getPageParams().then(res => {
console.log(res)
// 审批意见
res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
return startInspectProcess(res)
}).then(res => {
if (res.success) {
@@ -412,13 +410,17 @@ export default {
if (this.loading) return
this.loading = true
this.getPageParams().then(res => {
res.map.pass = true
// 不是提交按钮 且 如果没有填写注释,就默认同意
if (!isSubmitBtn && !res.processApprovalRecord.commitText) {
res.processApprovalRecord.commitText = '同意'
// 不是提交按钮
if (!isSubmitBtn) {
// 不是提交按钮就一直传true 同意
res.map.pass = true
// 没有填写注释,就默认同意
if (!res.processApprovalRecord.commitText) {
res.processApprovalRecord.commitText = '同意'
}
// 审批意见
res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
}
// 审批意见
res.processApprovalRecord.commitFlag = ApprovalOpinions.AGREE.value
return approvalInspectProcess(res)
}).then(res => {
if (res.success) {