From df07366bd1313d8bbe458d47baa0ffae5b581529 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Wed, 22 Nov 2023 18:19:06 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/enterpriseStandardLibraryApi.js | 2 +- src/api/workCenter.js | 15 ++++++ src/enums/commonEnums.js | 24 ++++++++++ .../modules/ContactInitBaseInfo.vue | 6 +-- .../EnterpriseStandardStartUseFlow.vue | 47 ++++++++++++++----- 5 files changed, 77 insertions(+), 17 deletions(-) diff --git a/src/api/enterpriseStandardLibraryApi.js b/src/api/enterpriseStandardLibraryApi.js index e25aa560..196886d2 100644 --- a/src/api/enterpriseStandardLibraryApi.js +++ b/src/api/enterpriseStandardLibraryApi.js @@ -60,7 +60,7 @@ const getEnterpriseStandardPlanPage = (params) => getAction('/process/es/initCha const getEnterpriseRecheckPlanPage = (params) => getAction('/enterprise/recheckPlan/page', params) // 企标复审计划-根据id获取数据 -const getEnterpriseRecheckPlanById = (params) => getAction('', params) +const getEnterpriseRecheckPlanById = (id, params) => getAction(`/enterprise/recheckPlan/getById/${id}`, params) export { getEnterpriseStandardTableHeader, diff --git a/src/api/workCenter.js b/src/api/workCenter.js index d5d9ea97..86646d08 100644 --- a/src/api/workCenter.js +++ b/src/api/workCenter.js @@ -85,6 +85,8 @@ const enStandardChangeAgree = (params) => postAction('/process/es/change/agree', const enStandardChangeReject = (params) => postAction('/process/es/change/reject', params) // 根据id查流程数据 const enStandardChangeGetDataById = (taskId, params) => getAction(`/process/es/change/handle/${taskId}`, params) +// 草稿的办理回显数据 +const enStandardChangeGetDataDraft = (params) => getAction('/process/es/change/draftHandle', params) // 企标复审流程 // 保存 @@ -99,6 +101,8 @@ const enStandardRecheckAgree = (params) => postAction('/process/es/recheck/agree const enStandardRecheckReject = (params) => postAction('/process/es/recheck/reject', params) // 根据id查询流程数据 const enStandardRecheckGetDataById = (taskId, params) => getAction(`/process/es/recheck/handle/${taskId}`, params) +// 草稿的办理回显数据 +const enStandardRecheckGetDataDraft = (params) => getAction('/process/es/recheck/draftHandle', params) // 企标废止流程 // 保存 @@ -115,6 +119,8 @@ const enStandardAnnulReject = (params) => postAction('/process/es/abolish/reject const enStandardAnnulGetDataById = (taskId, params) => getAction(`/process/es/abolish/handle/${taskId}`, params) // 根据企标编号获取企标计划中标准类型字段 const getStandardTypeByNum = (params) => getAction('/process/common/getStandType', params) +// 草稿的办理回显数据 +const enStandardAnnulGetDataDraft = (params) => getAction('/process/es/abolish/draftHandle', params) // 企标封存流程 // 保存 @@ -129,6 +135,8 @@ const enStandardSealSaveAgree = (params) => postAction('/process/es/archive/agre const enStandardSealSaveReject = (params) => postAction('/process/es/archive/reject', params) // 根据id查询流程数据--办理 const enStandardSealSaveGetDataById = (taskId, params) => getAction(`/process/es/archive/handle/${taskId}`, params) +// 草稿的办理回显数据 +const enStandardSealSaveGetDataDraft = (params) => getAction('/process/es/archive/draftHandle', params) // 已封存企标启用流程 // 保存 @@ -143,6 +151,8 @@ const enStandardStartUseAgree = (params) => postAction('/process/es/enable/agree const enStandardStartUseReject = (params) => postAction('/process/es/enable/reject', params) // 根据id查询流程数据--办理 const enStandardStartUseGetDataById = (taskId, params) => getAction(`/process/es/enable/handle/${taskId}`, params) +// 草稿的办理回显数据 +const enStandardStartUseGetDataDraft = (params) => getAction('/process/es/enable/draftHandle', params) // 流程中心 // 待办-转办 @@ -266,6 +276,7 @@ export { enStandardChangeAgree, enStandardChangeReject, enStandardChangeGetDataById, + enStandardChangeGetDataDraft, enStandardRecheckGetDataById, enStandardRecheckSave, @@ -273,6 +284,7 @@ export { enStandardRecheckTurnTo, enStandardRecheckAgree, enStandardRecheckReject, + enStandardRecheckGetDataDraft, enStandardAnnulGetDataById, enStandardAnnulSave, @@ -281,6 +293,7 @@ export { enStandardAnnulAgree, enStandardAnnulReject, getStandardTypeByNum, + enStandardAnnulGetDataDraft, enStandardSealSaveGetDataById, enStandardSealSaveSave, @@ -288,6 +301,7 @@ export { enStandardSealSaveTurnTo, enStandardSealSaveAgree, enStandardSealSaveReject, + enStandardSealSaveGetDataDraft, enStandardStartUseGetDataById, enStandardStartUseSave, @@ -295,6 +309,7 @@ export { enStandardStartUseTurnTo, enStandardStartUseAgree, enStandardStartUseReject, + enStandardStartUseGetDataDraft, toDoTurnTo, compulsoryWithdrawal, diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js index 6d1089e9..3efdb812 100644 --- a/src/enums/commonEnums.js +++ b/src/enums/commonEnums.js @@ -305,3 +305,27 @@ export const EsInitChangeNodes = new EsEnums({ relevantPersonnelWillSign: { text: '相关人员会签', value: 'sid-7BFD2753-B6CD-4637-8D4B-819903511925' }, mainDrafterCopy: { text: '主起草人抄送', value: 'sid-08D0381A-5C20-4708-9D73-C7EB5C51DB02' } }) + +// 企标废止流程 +export const EsAnnulNodes = new EsEnums({ + initiatorStart: { text: '发起人发起', value: 'sid-5F5FC475-64DE-4F98-A52D-5F6837C39B63' }, + relevantPersonnelWillSign: { text: '相关人员会签', value: 'sid-B4157F9F-73E5-48F5-855D-AF87C0DB91C6' }, + leaderApproval: { text: '起草人和会签人主管级领导审批', value: 'sid-0BC5B3BC-ED99-4061-84B4-7320E25DE326' }, + standardizationApproval: { text: '标准化审批', value: 'sid-9C90582D-F71F-4516-B54F-1E9F896C30D8' } +}) + +// 企标封存流程 +export const EsSealSaveNodes = new EsEnums({ + initiatorStart: { text: '发起人发起', value: 'sid-5F5FC475-64DE-4F98-A52D-5F6837C39B63' }, + relevantPersonnelWillSign: { text: '相关人员会签', value: 'sid-B4157F9F-73E5-48F5-855D-AF87C0DB91C6' }, + leaderApproval: { text: '起草人和会签人主管级领导审批', value: 'sid-0BC5B3BC-ED99-4061-84B4-7320E25DE326' }, + standardizationApproval: { text: '标准化审批', value: 'sid-9C90582D-F71F-4516-B54F-1E9F896C30D8' } +}) + +// 已封存企标启用流程 +export const EsStartUseNodes = new EsEnums({ + initiatorStart: { text: '发起人发起', value: 'sid-5F5FC475-64DE-4F98-A52D-5F6837C39B63' }, + relevantPersonnelWillSign: { text: '相关人员会签', value: 'sid-B4157F9F-73E5-48F5-855D-AF87C0DB91C6' }, + leaderApproval: { text: '起草人和会签人主管级领导审批', value: 'sid-0BC5B3BC-ED99-4061-84B4-7320E25DE326' }, + standardizationApproval: { text: '标准化审批', value: 'sid-9C90582D-F71F-4516-B54F-1E9F896C30D8' } +}) diff --git a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue index 55a00703..c6dedefd 100644 --- a/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue +++ b/src/views/workCenter/enterpriseStandardRecheck/modules/ContactInitBaseInfo.vue @@ -182,8 +182,8 @@ export default { }, // 设置表单值，根据id setFormById (recheckPlanId) { - this.loadind = true - getEnterpriseRecheckPlanById({ id: recheckPlanId }).then(res => { + this.loading = true + getEnterpriseRecheckPlanById(recheckPlanId).then(res => { if (res.success) { const result = res.result // 企标编号 @@ -204,8 +204,8 @@ export default { } }).finally(() => { this.loading = false + this.$emit('processNameChange', (this.formInline.standardNumber || '') + '-' + (this.formInline.standardName || '') + '-' + '复审') }) - this.$emit('processNameChange', (this.formInline.standardNumber || '') + '-' + (this.formInline.standardName || '') + '-' + '复审') }, // 选完企标编号了，需要回显内容,返回流程名称 listChange (value) { diff --git a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue index 44919527..ce9a8210 100644 --- a/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue +++ b/src/views/workCenter/enterpriseStandardStartUse/EnterpriseStandardStartUseFlow.vue @@ -115,6 +115,7 @@ import UserSelectModal from '@/components/selection/UserSelectModal' import pick from 'lodash.pick' import { enStandardStartUseGetDataById, + enStandardStartUseGetDataDraft, enStandardStartUseSave, enStandardStartUseApproval, enStandardStartUseTurnTo, @@ -123,7 +124,7 @@ import { } from '@/api/workCenter' import BaseInfoForm from './modules/BaseInfoForm' import { WorkCenterMixin } from '@/mixins/WorkCenterMixin' -import { ProcessKey } from '../../../enums/commonEnums' +import { ProcessKey, EsStartUseNodes } from '@/enums/commonEnums' export default { name: 'EnterpriseStandardStartUseFlow', @@ -142,18 +143,18 @@ export default { }, mounted () { // 初始化节点 - const taskName = this.$route.query.taskName - if (taskName) { - if (taskName === '发起人发起') { + const nodeId = this.$route.query.nodeId + if (nodeId) { + if (nodeId === EsStartUseNodes.initiatorStart.value) { // 发起人发起 this.currentNode = 1 - } else if (taskName === '相关人员会签') { + } else if (nodeId === EsStartUseNodes.relevantPersonnelWillSign.value) { // 相关人员会签 this.currentNode = 2 - } else if (taskName === '起草人和会签人主管级领导审批') { + } else if (nodeId === EsStartUseNodes.leaderApproval.value) { // 起草人部长审批 this.currentNode = 3 - } else if (taskName === '标准化审批') { + } else if (nodeId === EsStartUseNodes.standardizationApproval.value) { // 标准化审批 this.currentNode = 4 } else { @@ -175,9 +176,16 @@ export default { } }) if (this.$route.query.taskId) { - this.currentNodeName = this.$route.query.taskName // 有流程id说明是从流程中心来的，需要初始化数据 - this.getProcessData(this.$route.query.taskId) + this.getProcessData('todo', { taskId: this.$route.query.taskId }) + } + if (this.$route.query.draftId) { + // 有草稿id，说明是从流程中心-草稿来的，需要初始化数据 + this.getProcessData('draft', { draftId: this.$route.query.draftId, projectId: this.$route.query.projectId }) + } + if (this.$route.query.taskName) { + // 说明是已发起流程 + this.currentNodeName = this.$route.query.taskName } else { this.currentNodeName = '发起人发起' } @@ -238,16 +246,27 @@ export default { }, methods: { // 根据流程id获取数据并回显 - getProcessData (taskId) { + getProcessData (type, param) { this.loading = true - enStandardStartUseGetDataById(taskId).then(res => { + let func + let params = {} + if (type === 'todo') { + func = enStandardStartUseGetDataById + params = param.taskId + } else { + func = enStandardStartUseGetDataDraft + params = param + } + func(params).then(res => { if (res.success) { this.model = res.result this.$nextTick(() => { // 初始化流程信息 this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes')) - // 初始化流程审批信息，todo：需要判断是不是草稿进来的，草稿进来的才回显审批信息 - // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile')) + // 初始化流程审批信息，草稿进来的才回显审批信息 + if (type === 'draft') { + this.approvalInfoForm.setFieldsValue(pick(this.model.common, 'commitText', 'commitFile')) + } if (this.$refs.baseInfoRef) { this.$refs.baseInfoRef.initData(this.model.data) } @@ -292,6 +311,8 @@ export default { // 需要传给后端的数据 const paramObj = {} paramObj.common = { ...processInfoForm, ...approvalInfoForm } + paramObj.common.taskId = this.$route.query.taskId || null + paramObj.common.processInstanceId = this.model.common ? this.model.common.processInstanceId : null paramObj.flowUser = personnelObj paramObj.data = baseInfo.formInline this.loading = true