From 268570a4b5add73eef3a5f1e90c34fbae97ca23b Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 17 Jul 2024 20:40:05 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workCenter.js | 5 +---- .../MarketListReleaseProcess.vue | 2 +- .../RegulatoryComplianceCheckProcess.vue | 10 +++++----- .../modules/DesignEngineerEvaluation.vue | 6 +++++- .../modules/FinishAuditBaseInfo.vue | 6 +++++- .../modules/MainFinderSingleAuditBaseInfo.vue | 6 +++++- .../modules/MainFinderTwiceDistributesBaseInfo.vue | 8 ++++++-- 7 files changed, 28 insertions(+), 15 deletions(-) diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 2e94ac2..294b13e 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -31,8 +31,6 @@ const newRegulationImportReject = (params) => postAction('/process/newStandardIm const newRegulationImportGetDataById = (taskId, params) => getAction(`/process/newStandardImport/handle/${taskId}`, params) // 法规符合性排查流程 -// 保存 -const regulatoryComplianceCheckSave = (params) => postAction('/process/standardComplianceCheck/save', params) // 发起 const regulatoryComplianceCheckApproval = (params) => postAction('/process/standardComplianceCheck/start', params) // 转办 @@ -94,7 +92,7 @@ const compulsoryWithdrawal = (params) => postAction('/workCenter/forcedWithdrawa const processTransfer = (params) => postAction('/workCenter/transfer', params) // 流程中心-统一保存 -const processSave = (params) => getAction('/workCenter/save', params) +const processSave = (params) => postAction('/workCenter/save', params) // 流程中心-草稿-办理 const getDataDraft = (params) => getAction('/workCenter/draftHandle', params) @@ -131,7 +129,6 @@ export { newRegulationImportReject, newRegulationImportGetDataById, - regulatoryComplianceCheckSave, regulatoryComplianceCheckApproval, regulatoryComplianceCheckTurnTo, regulatoryComplianceCheckAgree, diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue index 26104f9..7c19d64 100644 --- a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue +++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue @@ -438,7 +438,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) { // 提示至少填写一项 diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue index 746353d..2ac3d02 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue @@ -203,13 +203,12 @@ import ProcessDetailList from '@/components/ProcessDetailList' import PersonnelInfo from '@/components/PersonnelInfo' import UserSelectModal from '@/components/selection/UserSelectModal' import { WorkCenterMixin } from '@/mixins/WorkCenterMixin' -import { RegulatoryComplianceCheckNodes, ProcessKey } from '../../../enums/commonEnums' +import { RegulatoryComplianceCheckNodes, ProcessKey, ProcessType } from '../../../enums/commonEnums' import { - getDataDraft, getLookData, processAddSign, + getDataDraft, getLookData, processAddSign, processSave, regulatoryComplianceCheckAgree, regulatoryComplianceCheckApproval, regulatoryComplianceCheckGetDataById, regulatoryComplianceCheckReject, - regulatoryComplianceCheckSave, regulatoryComplianceCheckSubmit, regulatoryComplianceCheckTurnTo } from '../../../api/workCenter' @@ -478,7 +477,7 @@ export default { const personnelObj = this.$refs.personnelInfo.getDataObj() // 业务基本信息 const baseInfo = this.$refs.baseInfoRef.getData() - const param = { ...processInfoForm, ...baseInfo.formInline, ...approvalInfoForm, ...personnelObj } + const param = { ...processInfoForm, ...baseInfo.standardInfo, ...approvalInfoForm, ...personnelObj } const flag = Object.values(param).some(v => !!v || v === 0) if (!flag) { // 提示至少填写一项 @@ -490,6 +489,7 @@ export default { // 流程信息 paramObj.basicProcessInfoDTO = Object.assign({}, processInfoForm) paramObj.basicProcessInfoDTO.processInstanceId = this.$route.query.processInstanceId + paramObj.basicProcessInfoDTO.processType = ProcessType.REGULATORY_COMPLIANCE_CHECK.value // 流程审批信息 paramObj.basicTaskInfoDTO = Object.assign({}, approvalInfoForm) paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId @@ -505,7 +505,7 @@ export default { paramObj.infoJsonStr = JSON.stringify(paramObj) this.loading = true // 保存到草稿 - regulatoryComplianceCheckSave(paramObj).then(res => { + processSave(paramObj).then(res => { if (res.success) { this.$message.success(res.message) this.goBack() diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue index e6ce50e..22efed8 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue @@ -253,13 +253,15 @@ export default { } ] } - } + }, + formInline: {} } }, methods: { // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了 initData (data) { // 给表单赋值 + this.formInline = Object.assign({}, data.standardInfo) this.dataSource = JSON.parse(JSON.stringify(data.detailInfoList)) this.isGetDataAfter = true }, @@ -267,6 +269,7 @@ export default { getData () { // 把数据抛出，在线编辑不知道要不要抛 const data = {} + data.standardInfo = Object.assign({}, this.formInline) data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) return data }, @@ -278,6 +281,7 @@ export default { this.$message.warning(this.$t('pleaseCompleteTableInfo')) data = false } else { + data.standardInfo = Object.assign({}, this.formInline) data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) } return data diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue index a098e53..b593c87 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue @@ -167,13 +167,15 @@ export default { scopedSlots: { customRender: 'material' } } ], - dataSource: [] + dataSource: [], + formInline: {} } }, methods: { // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了 initData (data) { // 给表单赋值 + this.formInline = Object.assign({}, data.standardInfo) this.dataSource = JSON.parse(JSON.stringify(data.detailInfoList)) this.isGetDataAfter = true }, @@ -181,12 +183,14 @@ export default { getData () { // 把数据抛出，在线编辑不知道要不要抛 const data = {} + data.standardInfo = Object.assign({}, this.formInline) data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) return data }, // 外层获取数据要过校验,返回false表示没有通过校验 async getDataValidate () { const data = {} + data.standardInfo = Object.assign({}, this.formInline) data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) return data }, diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue index a50ab24..ace0ddf 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue @@ -185,13 +185,15 @@ export default { dataSource: [], url: { exportXlsUrl: '' - } + }, + formInline: {} } }, methods: { // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了 initData (data) { // 给表单赋值 + this.formInline = Object.assign({}, data.standardInfo) this.dataSource = JSON.parse(JSON.stringify(data.detailInfoList)) this.isGetDataAfter = true }, @@ -199,12 +201,14 @@ export default { getData () { // 把数据抛出，在线编辑不知道要不要抛 const data = {} + data.standardInfo = Object.assign({}, this.formInline) data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) return data }, // 外层获取数据要过校验,返回false表示没有通过校验 async getDataValidate () { const data = {} + data.standardInfo = Object.assign({}, this.formInline) data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) return data }, diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue index c01668e..f1c5761 100644 --- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue +++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderTwiceDistributesBaseInfo.vue @@ -125,25 +125,29 @@ export default { dataSource: [], selectedRowKeys: [], selectionRows: [], - selectNames: '' // 选完人的名字，批量设置人需要用 + selectNames: '', // 选完人的名字，批量设置人需要用 + formInline: {} } }, methods: { // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了 initData (data) { // 给表单赋值 + this.formInline = Object.assign({}, data.standardInfo) this.dataSource = JSON.parse(JSON.stringify(data.detailInfoList)) }, // 外层要获取数据 getData () { // 把数据抛出，在线编辑不知道要不要抛 const data = {} + data.standardInfo = Object.assign({}, this.formInline) data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) return data }, // 外层获取数据要过校验,返回false表示没有通过校验 async getDataValidate () { - let data = {} + const data = {} + data.standardInfo = Object.assign({}, this.formInline) data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource)) return data },