diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 62f963c..9cf3dfa 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -90,7 +90,7 @@ const compulsoryWithdrawal = (params) => postAction('/workCenter/forcedWithdrawa const processTransfer = (params) => postAction('/workCenter/transfer', params) // 流程中心-草稿-办理 -const getDataDraft = (params) => getAction('/process/common/draftHandle', params) +const getDataDraft = (params) => getAction('/workCenter/draftHandle', params) // 在线编辑-生成空白模板 const generateEmptyFileTemplate = (params) => getAction('/onlyOffice/saveEditFile', params) diff --git a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue index cbfeae9..78b9041 100644 --- a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue +++ b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue @@ -343,7 +343,7 @@ export default { // 业务基本信息 const baseInfo = this.$refs.baseInfoRef.getData() // 判断是否每一项都没填 - const param = { ...processInfoForm, ...baseInfo.formInline, ...approvalInfoForm, ...personnelObj } + const param = { ...processInfoForm, ...baseInfo, ...approvalInfoForm, ...personnelObj } const flag = Object.values(param).some(v => !!v || v === 0) if (!flag) { // 提示至少填写一项 @@ -358,15 +358,15 @@ export default { // 流程审批信息 paramObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm) paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId - // 草稿id - if (this.model.infoJsonStr) { - paramObj.draftId = this.model.id - } // 业务信息 paramObj.businessInfoDTO = baseInfo // 人员信息 paramObj.userInfoMap = personnelObj - // 业务基本信息和人员信息 + // 草稿id + if (this.model.infoJsonStr) { + paramObj.draftId = this.model.id + } + // 草稿JSON paramObj.infoJsonStr = JSON.stringify(paramObj) this.loading = true // 保存到草稿 @@ -416,7 +416,7 @@ export default { if (this.$route.query.taskId) { // 有taskId说明是驳回的提交 func = newRegulationImportAgree - paramObj.common.taskId = this.$route.query.taskId + paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId } else { func = newRegulationImportApproval } @@ -472,8 +472,8 @@ export default { if (!err) { this.loading = true const param = {} - param.common = Object.assign({}, values) - param.common.taskId = this.$route.query.taskId + param.basicTaskInfoDTO = Object.assign({}, values) + param.basicTaskInfoDTO.taskId = this.$route.query.taskId newRegulationImportAgree(param).then(res => { if (res.success) { this.$message.success(res.message) @@ -499,8 +499,8 @@ export default { if (!err) { this.loading = true const param = {} - param.common = Object.assign({}, values) - param.common.taskId = this.$route.query.taskId + param.basicTaskInfoDTO = Object.assign({}, values) + param.basicTaskInfoDTO.taskId = this.$route.query.taskId newRegulationImportReject(param).then(res => { if (res.success) { this.$message.success(res.message)