diff --git a/src/api/project/acceptance/index.ts b/src/api/project/acceptance/index.ts index 3bea5d718..2f912d261 100644 --- a/src/api/project/acceptance/index.ts +++ b/src/api/project/acceptance/index.ts @@ -159,3 +159,8 @@ export const cancelAcceptance = (acceptanceId: number, reason: string) => { export const getTodoList = () => { return request.get({ url: '/project/acceptance/todo' }) } + +// 获取验收状态列表 +export const getStatusList = () => { + return request.get<{ code: string; name: string }[]>({ url: '/project/acceptance/status-list' }) +} diff --git a/src/views/project/acceptance/detail/index.vue b/src/views/project/acceptance/detail/index.vue index a24a473cf..4d6eb0e13 100644 --- a/src/views/project/acceptance/detail/index.vue +++ b/src/views/project/acceptance/detail/index.vue @@ -1,225 +1,469 @@ diff --git a/src/views/project/acceptance/todo/index.vue b/src/views/project/acceptance/todo/index.vue index a90e8b0e6..d6e4c87d9 100644 --- a/src/views/project/acceptance/todo/index.vue +++ b/src/views/project/acceptance/todo/index.vue @@ -81,22 +81,27 @@ const getList = async () => { const auditFormRef = ref() const handleProcess = (row: AcceptanceApi.AcceptanceTodoVO) => { // 根据任务类型打开不同的处理界面 + // taskType 来自 BPMN 的 taskDefinitionKey const taskType = row.taskType - if (['LIAISON_REVIEW', 'LEADER_REVIEW', 'ADMIN_REVIEW', 'EXPERT_CHECK'].includes(taskType)) { - // 打开审核表单 + + // 审核类任务:打开审核弹窗 + if (['task_pre_liaison_review', 'task_pre_leader_review', 'task_expert_check', 'task_rectify_review', 'task_meeting_review'].includes(taskType)) { auditFormRef.value.open({ id: row.acceptanceId, acceptanceType: row.acceptanceType, status: row.status }, getAuditType(taskType)) - } else if (taskType === 'RECTIFY_SUBMIT' || taskType === 'task_pre_rectify' || taskType === 'task_final_rectify') { - // 整改任务,跳转到详情页的材料tab让用户完善材料 + } + // 管理员终验初审:跳转到详情页 + else if (taskType === 'task_final_admin_review') { + router.push({ path: '/project/acceptance/detail/' + row.acceptanceId, query: { tab: 'info' } }) + } + // 材料提交类任务:跳转到详情页的材料tab + else if (['task_liaison_submit', 'task_pre_rectify', 'task_final_rectify', 'task_final_apply'].includes(taskType)) { router.push({ path: '/project/acceptance/detail/' + row.acceptanceId, query: { tab: 'materials' } }) - } else if (taskType === 'LIAISON_SUBMIT' || taskType === 'task_liaison_submit') { - // 联络人提交材料,跳转到详情页的材料tab - router.push({ path: '/project/acceptance/detail/' + row.acceptanceId, query: { tab: 'materials' } }) - } else { - // 默认查看详情 + } + // 默认查看详情 + else { handleView(row) } } @@ -104,12 +109,16 @@ const handleProcess = (row: AcceptanceApi.AcceptanceTodoVO) => { /** 获取审核类型 */ const getAuditType = (taskType: string) => { switch (taskType) { - case 'LIAISON_REVIEW': - case 'LEADER_REVIEW': + case 'task_pre_liaison_review': // 对口人预验收初审 + case 'task_pre_leader_review': // 预验收组长审核 return 'pre-audit' - case 'ADMIN_REVIEW': + case 'task_final_admin_review': // 管理员终验初审 return 'final-admin' - case 'EXPERT_CHECK': + case 'task_meeting_review': // 会议评审 + return 'meeting-review' + case 'task_rectify_review': // 整改审核 + return 'rectify-review' + case 'task_expert_check': // 专家复核 return 'expert-check' default: return 'pre-audit'