diff --git a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue index a6ee1995..f3dd7d1b 100644 --- a/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue +++ b/src/views/workCenter/noMatchTrackingProcess/NoMatchTrackingProcess.vue @@ -417,7 +417,7 @@ export default { if (res.success) { const { result = {} } = res // 草稿从json里取得 - if (this.$route.query.draftId) { + if (result.infoJsonStr) { const draftResult = JSON.parse(result.infoJsonStr) this.processInfo = draftResult.processInfo this.businessInfo = draftResult.businessInfo @@ -523,6 +523,7 @@ export default { const processInfo = Object.assign(this.processInfo, this.processInfoForm.getFieldsValue()) const businessInfo = Object.assign(this.businessInfo, this.businessInfoForm.getFieldsValue()) const approvalInfo = Object.assign(this.approvalInfo, this.approvalInfoForm.getFieldsValue()) + approvalInfo.taskId = this.$route.query.taskId const userInfo = this.$refs.personnelInfo.getDataObj() const checkValueArr = Object.values({ ...processInfo, ...businessInfo, ...approvalInfo, ...userInfo }) if (!checkValueArr.some(tt => !tt) && this.dataSource.length === 0) { @@ -530,7 +531,11 @@ export default { this.$message.warning(this.$t('pleaseFillInAtLeastOneItem')) return } - const formData = { processInfo, businessInfo, approvalInfo, dataSource: this.dataSource, userInfo } + const formData = { + processInfo, businessInfo, approvalInfo, userInfo, + dataSource: this.dataSource, + basicTaskInfoDTO: approvalInfo + } this.loading = true saveNoMatchTrackingProcess({ infoJsonStr: JSON.stringify(formData) }).then(res => { if (res.success) { diff --git a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue index 16613c92..f1e5cc01 100644 --- a/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue +++ b/src/views/workCenter/projectComplianceEvaluationProcess/ProjectComplianceEvaluationProcess.vue @@ -897,8 +897,8 @@ export default { if (res.success) { const { result = {} } = res this.approvalInfo = Object.assign({}, result.basicTaskInfoDTO) - // 如果是草稿,会从json里取数据 - if (this.$route.query.draftId) { + // 如果有草稿,会从json里取数据 + if (result.infoJsonStr) { const draftResult = JSON.parse(result.infoJsonStr) // 发起节点数据处理 if (this.currentNode === ProjectComplianceEvaluationProcessNode.initiate.value) { @@ -1318,7 +1318,8 @@ export default { const params = { infoJsonStr: JSON.stringify(formData), basicProcessInfoDTO: processInfo, - draftId: this.$route.query.draftId + draftId: this.$route.query.draftId, + basicTaskInfoDTO: Object.assign(formData.approvalInfo, { taskId: this.$route.query.taskId }) } this.loading = true saveProjectComplianceEvaluation(params).then(res => {