update 稽查整改-强制撤回部分
This commit is contained in:
+14
-7
@@ -202,11 +202,11 @@ export default {
|
||||
this.currentNode = nodeId || ''
|
||||
this.currentNodeName = taskName || ''
|
||||
this.projectId = projectId || ''
|
||||
this.btn = EsInspectionRectification.propertyOfValue('btn', this.currentNode) || []
|
||||
// 强制撤回默认节点1
|
||||
if (this.isForceRevoke) {
|
||||
this.currentNode = EsInspectionRectification.uploadRectificationResult.value
|
||||
}
|
||||
this.btn = EsInspectionRectification.propertyOfValue('btn', this.currentNode) || []
|
||||
// 如果有nodeId,但是匹配不到任何节点,就是是增加的审批节点
|
||||
if (nodeId && !EsInspectionRectification.keyOfValue(nodeId)) {
|
||||
// 同意按钮
|
||||
@@ -380,17 +380,22 @@ export default {
|
||||
})
|
||||
|
||||
// 流程业务信息
|
||||
params.processEsInspectRectify = Object.assign({}, formDataList[2], {
|
||||
id: this.formInfo.id
|
||||
})
|
||||
params.processEsInspectRectify = Object.assign({}, this.formInfo, formDataList[2])
|
||||
|
||||
// 发起保存草稿信息
|
||||
if (this.isUploadRectificationResult) {
|
||||
// 发起保存草稿信息(强制撤回 && 第一个节点)
|
||||
if (this.isUploadRectificationResult && this.isForceRevoke) {
|
||||
const draftData = Object.assign({}, params.processEsInspectRectify)
|
||||
// 清空表单信息
|
||||
delete draftData.operationType
|
||||
delete draftData.rectifyResult
|
||||
delete draftData.attachment
|
||||
delete draftData.applyDelayDate
|
||||
delete draftData.delayDetail
|
||||
params.infoJsonStr = JSON.stringify({
|
||||
// 人员信息(要重新获取,流程里的信息不能直接用,后端需要多选人员处理成数组了)
|
||||
personInfo: this.$refs.personnelInfo.getDataObj(),
|
||||
// 业务表格数据,用于强制撤回后回显
|
||||
draftData: params.processEsInspectRectify
|
||||
draftData
|
||||
})
|
||||
}
|
||||
|
||||
@@ -471,6 +476,8 @@ export default {
|
||||
// 是否强制撤回(强制撤回的话,就发起接口)
|
||||
if (this.isForceRevoke) {
|
||||
fn = startInspectRectify
|
||||
// 重新发起置空业务id
|
||||
delete res.processEsInspectRectify.id
|
||||
}
|
||||
return fn(res)
|
||||
}).then(res => {
|
||||
|
||||
Reference in New Issue
Block a user