From c3428f67411284fd4cbe23d42320879873ed50b2 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 17 Jul 2024 19:57:25 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E4=BC=A0saveSource=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E6=92=A4=E5=9B=9E=E6=B2=A1=E6=9C=89=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=B5=81=E7=A8=8B=E5=AD=97=E6=AE=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workCenter.js | 5 +++++ .../MarketListReleaseProcess.vue | 1 + .../NewRegulationIntroductionProcess.vue | 1 + .../RegulatoryComplianceCheckProcess.vue | 12 +++++++----- .../modules/FinishAuditBaseInfo.vue | 2 +- .../modules/MainFinderCollectBaseInfo.vue | 2 +- .../modules/MainFinderDistributesBaseInfo.vue | 13 ++++++++++++- .../modules/MainFinderSingleAuditBaseInfo.vue | 2 +- 8 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/api/workCenter.js b/src/api/workCenter.js index f20f789..2e94ac2 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -93,6 +93,9 @@ const compulsoryWithdrawal = (params) => postAction('/workCenter/forcedWithdrawa // 流程中心统一转办 const processTransfer = (params) => postAction('/workCenter/transfer', params) +// 流程中心-统一保存 +const processSave = (params) => getAction('/workCenter/save', params) + // 流程中心-草稿-办理 const getDataDraft = (params) => getAction('/workCenter/draftHandle', params) @@ -160,6 +163,8 @@ export { processTransfer, + processSave, + getDataDraft, getLookData, diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue index 5b261ba..26104f9 100644 --- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue +++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue @@ -514,6 +514,7 @@ export default { paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId } else { func = marketListReleaseApproval + paramObj.saveSource = 3 } func(paramObj).then(res => { if (res.success) { diff --git a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue index 87112b0..2cb25b9 100644 --- a/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue +++ b/src/views/workCenter/newRegulationIntroductionProcess/NewRegulationIntroductionProcess.vue @@ -441,6 +441,7 @@ export default { paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId } else { func = newRegulationImportApproval + paramObj.saveSource = 3 } func(paramObj).then(res => { if (res.success) { diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue index 9f5f0da..746353d 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue @@ -493,15 +493,16 @@ export default { // 流程审批信息 paramObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm) paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId + // 业务信息 + paramObj.businessInfoDTO = baseInfo + // 人员信息 + paramObj.userInfoMap = personnelObj // 草稿id if (this.model.infoJsonStr) { paramObj.draftId = this.model.id } - // 业务基本信息和人员信息 - paramObj.infoJsonStr = JSON.stringify({ - data: baseInfo.formInline, - personnelObj: personnelObj - }) + // 草稿JSON + paramObj.infoJsonStr = JSON.stringify(paramObj) this.loading = true // 保存到草稿 regulatoryComplianceCheckSave(paramObj).then(res => { @@ -550,6 +551,7 @@ export default { paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId } else { func = regulatoryComplianceCheckApproval + paramObj.saveSource = 3 } func(paramObj).then(res => { if (res.success) { diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue index 71d9774..a098e53 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue @@ -128,7 +128,7 @@ export default { title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), align: 'center', width: 180, - dataIndex: 'correctionCycle', + dataIndex: 'correctionCycle_dictText', scopedSlots: { customRender: 'text' } }, { // 整改费用 diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue index 58b381b..f9cadeb 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue @@ -208,7 +208,7 @@ export default { title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), align: 'center', width: 180, - dataIndex: 'correctionCycle', + dataIndex: 'correctionCycle_dictText', scopedSlots: { customRender: 'text' } }, { // 整改费用 diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue index 25b50e4..11312b6 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue @@ -518,6 +518,17 @@ export default { initData (data) { // 给表单赋值 this.formInline = Object.assign({}, data.standardInfo) + const personFormInline = {} + // 会签人员 + personFormInline.countersignUser = data.standardInfo.countersignUser + personFormInline.countersignUser_dictText = data.standardInfo.countersignUser_dictText + // 审核人员 + personFormInline.manager = data.standardInfo.manager + personFormInline.manager_dictText = data.standardInfo.manager_dictText + // 批准人员 + personFormInline.seniorManager = data.standardInfo.seniorManager + personFormInline.seniorManager_dictText = data.standardInfo.seniorManager_dictText + this.personFormInline = Object.assign({}, personFormInline) if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) { this.dataSource = JSON.parse(JSON.stringify(data.detailInfoList)) } else { @@ -530,7 +541,7 @@ export default { getData () { // 把数据抛出，在线编辑不知道要不要抛 const data = {} - data.standardInfo = Object.assign({}, this.formInline) + data.standardInfo = Object.assign({}, this.formInline, this.personFormInline) if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) { data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) } else { diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue index f72689c..a50ab24 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue @@ -143,7 +143,7 @@ export default { title: this.$t('workCenter.regulatoryComplianceCheckProcess.rectificationCycle'), align: 'center', width: 180, - dataIndex: 'correctionCycle', + dataIndex: 'correctionCycle_dictText', scopedSlots: { customRender: 'text' } }, { // 整改费用