diff --git a/src/api/workCenter.js b/src/api/workCenter.js index 6b3eaad..0318a91 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -52,15 +52,15 @@ const regulatoryComplianceCheckGenerate = (params) => postAction('/process/stand // 市场清单发布流程 // 保存 -const marketListReleaseSave = (params) => postAction('/process/otherDrafterUploadFileJson/save', params) +const marketListReleaseSave = (params) => postAction('/process/marketStandardRelease/save', params) // 发起 -const marketListReleaseApproval = (params) => postAction('/process/otherDrafterUploadFileJson/start', params) +const marketListReleaseApproval = (params) => postAction('/process/marketStandardRelease/start', params) // 同意 -const marketListReleaseAgree = (params) => postAction('/process/otherDrafterUploadFileJson/agree', params) +const marketListReleaseAgree = (params) => postAction('/process/marketStandardRelease/agree', params) // 驳回 -const marketListReleaseReject = (params) => postAction('/process/otherDrafterUploadFileJson/reject', params) +const marketListReleaseReject = (params) => postAction('/process/marketStandardRelease/reject', params) // 根据id查询流程数据--办理 -const marketListReleaseGetDataById = (taskId, params) => getAction(`/process/otherDrafterUploadFileJson/handle/${taskId}`, params) +const marketListReleaseGetDataById = (taskId, params) => getAction(`/process/marketStandardRelease/handle/${taskId}`, params) // 标准解读流程 // 获取项目id diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 4faa11e..fab4a8d 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -149,7 +149,7 @@ export const ProcessKey = { // 法规符合性排查流程 REGULATORY_COMPLIANCE_CHECK: { text: 'laws-evaluation-main', value: 'laws-evaluation-main' }, // 市场清单发布流程 - MARKET_LIST_RELEASE: { text: '', value: '' } + MARKET_LIST_RELEASE: { text: 'market_standard_publish', value: 'market_standard_publish' } } // 流程类型 @@ -188,10 +188,10 @@ export const RegulatoryComplianceCheckNodes = new EsEnums({ // 市场清单发布流程节点 export const MarketListReleaseNodes = new EsEnums({ - initiated: { text: '法规工程师发起', value: '' }, - countersign: { text: '会签', value: '' }, - seniorManagerAudit: { text: '高级经理审核', value: '' }, - directorSApproval: { text: '总监批准', value: '' } + initiated: { text: '法规工程师发起', value: 'SID-8B22BF1A-383D-48E0-B9C4-24DFFEA1C9D0' }, + countersign: { text: '会签', value: 'SID-3CBC410D-D866-4DCA-ACBC-5F667BC376E6' }, + seniorManagerAudit: { text: '高级经理审核', value: 'SID-2F2AEF38-C9E1-48D9-85DC-9DD66109210A' }, + directorSApproval: { text: '总监批准', value: 'SID-97A6B907-5B52-46EE-8E5F-82DFB485C26B' } }) // 标准解读流程节点 diff --git a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue index 4b67cc0..724935e 100644 --- a/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue +++ b/src/views/workCenter/marketListReleaseProcess/modules/BaseInfoForm.vue @@ -90,12 +90,12 @@ - @@ -356,18 +356,24 @@ export default { initData (data) { // 给表单赋值 this.formInline = Object.assign({}, data) + if (this.formInline.country) { + this.formInline.country = this.formInline.country.split(',').map(item => { + return { value: item } + }) + } this.userFormInline.ccPerson = data.ccPerson this.userFormInline.ccPerson_dictText = data.ccPerson_dictText + this.dataSource = JSON.parse(JSON.stringify(data.list)) this.isGetDataAfter = true }, // 外层要获取数据 getData () { // 把数据抛出,在线编辑不知道要不要抛 - const data = {} - data.formInline = this.formInline - data.formInline.ccPerson = this.userFormInline.ccPerson - data.formInline.ccPerson_dictText = this.userFormInline.ccPerson_dictText - data.dataList = JSON.parse(JSON.stringify(this.dataSource)) + const data = Object.assign({}, this.formInline) + data.country = data.country.map(item => item.value).join(',') + data.ccPerson = this.userFormInline.ccPerson + data.ccPerson_dictText = this.userFormInline.ccPerson_dictText + data.list = JSON.parse(JSON.stringify(this.dataSource)) return data }, // 外层获取数据要过校验,返回false表示没有通过校验 @@ -376,10 +382,11 @@ export default { await this.$refs.ruleForm.validate(valid => { this.$refs.userRuleForm.validate(userValid => { if (valid && userValid) { - data.formInline = this.formInline - data.formInline.ccPerson = this.userFormInline.ccPerson - data.formInline.ccPerson_dictText = this.userFormInline.ccPerson_dictText - data.dataList = JSON.parse(JSON.stringify(this.dataSource)) + data = Object.assign({}, this.formInline) + data.country = data.country.map(item => item.value).join(',') + data.ccPerson = this.userFormInline.ccPerson + data.ccPerson_dictText = this.userFormInline.ccPerson_dictText + data.list = JSON.parse(JSON.stringify(this.dataSource)) } else { data = false }