diff --git a/src/views/gh/improvementProposal/ImprovementProposal.api.ts b/src/views/gh/improvementProposal/ImprovementProposal.api.ts index bc8836f..b371f93 100644 --- a/src/views/gh/improvementProposal/ImprovementProposal.api.ts +++ b/src/views/gh/improvementProposal/ImprovementProposal.api.ts @@ -16,6 +16,10 @@ enum Api { improvementInstituteVoteList = '/improvementproposal/improvementProposal/queryImprovementInstituteVoteByMainId', getLatestProposalSequence = '/improvementproposal/improvementProposal/getLatestProposalSequence', startProcess = '/improvementproposal/improvementProposal/startProcess', + bpmInitialReview = '/improvementproposal/improvementProposal/bpm/initialReview', + bpmLeaderAward = '/improvementproposal/improvementProposal/bpm/leaderAward', + bpmArchiveAward = '/improvementproposal/improvementProposal/bpm/archiveAward', + bpmInstituteVote = '/improvementproposal/improvementProposal/bpm/instituteVote', } /** * 导出api @@ -95,3 +99,9 @@ export const getLatestProposalSequence = (year) => defHttp.get({url: Api.getLate /** 发起改善提案审批流程。 */ export const startProposalProcess = (id: string) => defHttp.post({ url: Api.startProcess, params: { id } }); + +/** 流程节点专用接口会在任务提交前保存业务字段和网关变量。 */ +export const saveInitialReview = (params) => defHttp.post({ url: Api.bpmInitialReview, params }); +export const saveLeaderAward = (params) => defHttp.post({ url: Api.bpmLeaderAward, params }); +export const saveArchiveAward = (params) => defHttp.post({ url: Api.bpmArchiveAward, params }); +export const castInstituteVote = (params) => defHttp.post({ url: Api.bpmInstituteVote, params }); diff --git a/src/views/gh/improvementProposal/components/ImprovementProposalBPMForm.vue b/src/views/gh/improvementProposal/components/ImprovementProposalBPMForm.vue index 512bf23..47f06e6 100644 --- a/src/views/gh/improvementProposal/components/ImprovementProposalBPMForm.vue +++ b/src/views/gh/improvementProposal/components/ImprovementProposalBPMForm.vue @@ -1,76 +1,316 @@ - + + 基本信息 + + {{ proposal.proposalNo || '-' }} {{ proposal.proposalName || '-' }} - {{ proposal.proposalDate || '-' }} + {{ formatDate(proposal.proposalDate) }} {{ proposal.proposalCategory || '-' }} {{ proposal.proposalDeptName || '-' }} {{ proposal.applicantName || '-' }} - {{ proposal.teamName || '-' }} - {{ proposal.finalAward || '-' }} + {{ proposal.teamName || '-' }} {{ proposal.problemDesc || '-' }} {{ proposal.improvementMethod || '-' }} - {{ proposal.beforeDesc || '-' }} - {{ proposal.afterDesc || '-' }} + {{ proposal.beforeDesc || '-' }} + {{ proposal.afterDesc || '-' }} {{ proposal.improvementEffect || '-' }} + + + + 改善前附件 + + + + 改善后附件 + + + + 其他附件 + + + + - + - - + + + + 流程办理 + + + + + + {{ item.label }} + + 金奖、银奖进入部门评议小组打分;铜奖、参与奖直接进入部门负责人审核。 + + + + + + + {{ record.scoreStatus === 'completed' ? '已评分' : '待评分' }} + + + + + 打分 + 当前用户不在部门评分名单中。 + + + + + {{ awardLabel(proposal.initialAward) }} + + 平均分:{{ proposal.deptAvgScore ?? '-' }};系统建议奖项:{{ awardLabel(proposal.suggestedAward) }} + + + + {{ item.label }} + + + + + + + + 所级评议人员选择和投票记录初始化将在后续功能中接入。 + + + + + + + 同意 + 不同意 + {{ voteResultLabel(currentVote) }} + + 当前用户不在所级评议投票名单中。 + + + + + {{ awardLabel(proposal.leaderFinalAward) }} + + 同意票:{{ proposal.instituteAgreeCount ?? '-' }};不同意票:{{ proposal.instituteDisagreeCount ?? '-' }};结果:{{ proposal.instituteVoteResult || '-' }} + + + + {{ item.label }} + + + + + + + + + + + {{ currentScore.scorerName || '-' }} + {{ currentScore.scoreStatus === 'completed' ? '已评分' : '待评分' }} + + 四个评分维度录入、加权计算和评分提交将在下一阶段开发。 + - diff --git a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue index 89bd8f4..c27efec 100644 --- a/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue +++ b/src/views/super/bpm/process/personalOffice/myHandleTask/content/TaskHandleInnerContent.vue @@ -34,6 +34,7 @@