From d193f43f30f69d9db9f6e20c3e60e462b61fd870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Tue, 30 Dec 2025 17:49:45 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../klp/hrm/domain/bo/HrmFlowInstanceBo.java | 8 + klp-ui/package.json | 1 + klp-ui/src/api/hrm/flow.js | 2 +- klp-ui/src/api/hrm/站位.txt | 0 klp-ui/src/views/hrm/flow/template.vue | 2 +- klp-ui/src/views/hrm/requests/apply.vue | 12 +- klp-ui/src/views/hrm/requests/leave.vue | 6 +- klp-ui/src/views/hrm/requests/reimburse.vue | 6 +- klp-ui/src/views/hrm/requests/seal.vue | 6 +- klp-ui/src/views/hrm/requests/travel.vue | 235 ++++++++++++------ klp-ui/src/views/hrm/站位.txt | 0 11 files changed, 179 insertions(+), 99 deletions(-) delete mode 100644 klp-ui/src/api/hrm/站位.txt delete mode 100644 klp-ui/src/views/hrm/站位.txt diff --git a/klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmFlowInstanceBo.java b/klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmFlowInstanceBo.java index 1be41751..76a3ceac 100644 --- a/klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmFlowInstanceBo.java +++ b/klp-hrm/src/main/java/com/klp/hrm/domain/bo/HrmFlowInstanceBo.java @@ -29,4 +29,12 @@ public class HrmFlowInstanceBo extends BaseEntity { private Long startUserId; private String remark; + + private String startTime; + + private String endTime; + + private String hours; + + private String bizTitle; } diff --git a/klp-ui/package.json b/klp-ui/package.json index 7e1367ec..a0ca0762 100644 --- a/klp-ui/package.json +++ b/klp-ui/package.json @@ -57,6 +57,7 @@ "jsbarcode": "^3.12.1", "jsencrypt": "3.0.0-rc.1", "jspdf": "^2.5.2", + "pdfjs-dist": "^3.6.172", "konva": "^10.0.2", "mqtt": "^5.13.3", "nprogress": "0.2.0", diff --git a/klp-ui/src/api/hrm/flow.js b/klp-ui/src/api/hrm/flow.js index 6dbde545..fc361d5a 100644 --- a/klp-ui/src/api/hrm/flow.js +++ b/klp-ui/src/api/hrm/flow.js @@ -54,7 +54,7 @@ export function transferFlowTask(taskId, data) { return request({ url: `/hrm/flow/task/${taskId}/transfer`, method: 'post', - data + params: data }) } diff --git a/klp-ui/src/api/hrm/站位.txt b/klp-ui/src/api/hrm/站位.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/klp-ui/src/views/hrm/flow/template.vue b/klp-ui/src/views/hrm/flow/template.vue index efd3ed3a..7985fd95 100644 --- a/klp-ui/src/views/hrm/flow/template.vue +++ b/klp-ui/src/views/hrm/flow/template.vue @@ -131,7 +131,7 @@ - +
同一业务可存在多版本，建议先从 v1 开始
 diff --git a/klp-ui/src/views/hrm/requests/apply.vue b/klp-ui/src/views/hrm/requests/apply.vue index 2700dc9f..c82584ae 100644 --- a/klp-ui/src/views/hrm/requests/apply.vue +++ b/klp-ui/src/views/hrm/requests/apply.vue @@ -72,7 +72,7 @@ > @@ -96,7 +96,7 @@ @@ -202,12 +202,12 @@ export default { return '-' }, statusText(status) { - const map = { pending: '审批中', draft: '草稿', approved: '已通过', rejected: '已驳回', finished: '已完成' } + const map = { running: '审批中', draft: '草稿', approved: '已通过', rejected: '已驳回', finished: '已完成' } return map[status] || status || '-' }, statusType(status) { if (!status) return 'info' - const map = { pending: 'warning', draft: 'info', approved: 'success', rejected: 'danger', finished: 'success' } + const map = { running: 'warning', draft: 'info', approved: 'success', rejected: 'danger', finished: 'success' } return map[status] || 'info' }, formatDate(val) { @@ -244,11 +244,11 @@ export default { } }, goDetail(row) { - if (!row || !row.businessKey) { + if (!row || !row.bizId || !row.bizType) { this.$message.warning('缺少businessKey，无法打开详情') return } - const [type, bizId] = row.businessKey.split(':') + const { bizId, bizType: type } = row if (!bizId) { this.$message.warning('businessKey格式不正确，无法解析业务ID') return diff --git a/klp-ui/src/views/hrm/requests/leave.vue b/klp-ui/src/views/hrm/requests/leave.vue index f4a2f508..27fe9fbc 100644 --- a/klp-ui/src/views/hrm/requests/leave.vue +++ b/klp-ui/src/views/hrm/requests/leave.vue @@ -173,8 +173,8 @@
提交