diff --git a/klp-ui/src/api/hrm/flow.js b/klp-ui/src/api/hrm/flow.js index fc361d5a..d6591163 100644 --- a/klp-ui/src/api/hrm/flow.js +++ b/klp-ui/src/api/hrm/flow.js @@ -9,6 +9,14 @@ export function listFlowTask(query) { }) } +export function updateFlowInstance(data) { + return request({ + url: '/hrm/flow/instance', + method: 'put', + data + }) +} + export function listTodoFlowTask(assigneeUserId) { return request({ url: '/hrm/flow/task/todo', diff --git a/klp-ui/src/views/hrm/flow/cc.vue b/klp-ui/src/views/hrm/flow/cc.vue index 0773cbef..99ae2e5b 100644 --- a/klp-ui/src/views/hrm/flow/cc.vue +++ b/klp-ui/src/views/hrm/flow/cc.vue @@ -21,43 +21,31 @@ - + - + - + - + @@ -100,6 +88,34 @@ export default { this.queryParams.readFlag = this.activeTab === 'read' ? 1 : 0 this.getList() }, + handleDetail(row) { + if (!row || !row.bizId || !row.bizType) { + this.$message.warning('缺少businessKey,无法打开详情') + return + } + const { bizId, bizType: type } = row + if (!bizId) { + this.$message.warning('businessKey格式不正确,无法解析业务ID') + return + } + + const pathMap = { + leave: '/hrm/HrmLeaveDetail', + travel: '/hrm/HrmTravelDetail', + seal: '/hrm/HrmSealDetail', + reimburse: '/hrm/HrmReimburseDetail' + } + const routePath = pathMap[type] + + if (routePath) { + this.$router.push({ + path: routePath, + query: { bizId: bizId } + }) + } else { + this.$message.warning('无法确定申请类型对应的详情页面') + } + }, getList() { this.loading = true listCc({ ...this.queryParams, ccUserId: this.currentUserId }) @@ -131,21 +147,26 @@ export default { .flow-cc-container { padding: 20px 20px 0 20px; } + .card-header { display: flex; align-items: center; height: 32px; } + .card-title { font-size: 16px; font-weight: 600; } + .badge { margin-left: 6px; } + /* 未读行高亮(柔和背景,不用渐变) */ .row-unread td { - background-color: #fdf6ec !important; /* Element UI warning-light */ + background-color: #fdf6ec !important; + /* Element UI warning-light */ font-weight: 600; } diff --git a/klp-ui/src/views/hrm/requests/apply.vue b/klp-ui/src/views/hrm/requests/apply.vue index 102cf565..d57a2be6 100644 --- a/klp-ui/src/views/hrm/requests/apply.vue +++ b/klp-ui/src/views/hrm/requests/apply.vue @@ -55,7 +55,7 @@ > - + @@ -82,7 +82,8 @@ -->