From 7763f23f3224a0f609c4c483351edd656b0dfb26 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 16:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/hrm/overtime/index.vue | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/views/hrm/overtime/index.vue b/src/views/hrm/overtime/index.vue
index 9b58111..b4e116e 100644
--- a/src/views/hrm/overtime/index.vue
+++ b/src/views/hrm/overtime/index.vue
@@ -1,4 +1,5 @@
<script lang="ts" setup>
+import { automaticApproval } from '#/store/audit-policy';
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { HrmOvertimeApi } from '#/api/hrm/overtime';
@@ -64,9 +65,14 @@
const submitLoading = ref(false);
async function handleSubmit(row: HrmOvertimeApi.Overtime) {
- processList.value = await getOvertimeApproveProcessDefinitionList();
+ processList.value = automaticApproval.value ? [] : await getOvertimeApproveProcessDefinitionList();
currentRow.value = row;
selectedProcessKey.value = undefined;
+ if (automaticApproval.value) {
+ selectedProcessKey.value = 'hrm_overtime';
+ await confirmSubmit();
+ return;
+ }
submitModalVisible.value = true;
}
@@ -78,7 +84,7 @@
submitLoading.value = true;
try {
await submitOvertime(currentRow.value!.id!, selectedProcessKey.value);
- message.success('宸叉彁浜よ嚦鍗忓悓鍔炲叕瀹℃壒');
+ message.success(automaticApproval.value ? '宸叉彁浜ょ敓鏁�' : '宸叉彁浜よ嚦鍗忓悓鍔炲叕瀹℃壒');
submitModalVisible.value = false;
handleRefresh();
} finally {
--
Gitblit v1.9.3