From 441d95cce3ee7a498ac4860cbc2650b64e0a438a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:52:14 +0800
Subject: [PATCH] feat(hrm): 薪酬核算改为先预览再保存
---
src/views/hrm/salary/calculation/index.vue | 40 +++++++++-------------------------------
1 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/src/views/hrm/salary/calculation/index.vue b/src/views/hrm/salary/calculation/index.vue
index 33a1f36..f2ad55a 100644
--- a/src/views/hrm/salary/calculation/index.vue
+++ b/src/views/hrm/salary/calculation/index.vue
@@ -2,7 +2,7 @@
import type { VxeTableGridOptions } from '#/adapter/vxe-table';
import type { HrmSalaryCalculationApi } from '#/api/hrm/salary/calculation';
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
import { Page } from '#/packages/effects/common-ui/src';
import { downloadFileFromBlobPart } from '#/packages/utils/src';
@@ -14,7 +14,6 @@
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
- calculateSalary,
confirmSalary,
deleteSalaryCalculation,
exportSalaryCalculation,
@@ -37,7 +36,6 @@
const previewLoading = ref(false);
const previewData = ref<HrmSalaryCalculationApi.SalaryCalculation[]>([]);
const submitLoading = ref(false);
-const calculateLoading = ref(false);
// 鎵撳紑鏍哥畻寮圭獥
async function openCalculateModal() {
@@ -56,27 +54,7 @@
gridApi.query();
}
-/** 鎵ц钖叕鏍哥畻锛堣嚜鍔ㄨ绠楀苟淇濆瓨锛� */
-async function handleCalculate() {
- if (!calculatePeriod.value) {
- message.warning('璇烽�夋嫨鏍哥畻鍛ㄦ湡');
- return;
- }
- calculateLoading.value = true;
- try {
- await calculateSalary({
- period: calculatePeriod.value,
- deptId: calculateDeptId.value,
- });
- message.success('钖叕鏍哥畻鎵ц鎴愬姛');
- calculateVisible.value = false;
- handleRefresh();
- } finally {
- calculateLoading.value = false;
- }
-}
-
-/** 棰勮鏍哥畻鏁版嵁 */
+/** 棰勮鏍哥畻鏁版嵁锛堟牳绠楀敮涓�鍏ュ彛锛氬繀椤诲厛棰勮锛屽啀淇濆瓨锛� */
async function handlePreview() {
if (!calculatePeriod.value) {
message.warning('璇烽�夋嫨鏍哥畻鍛ㄦ湡');
@@ -95,6 +73,11 @@
previewLoading.value = false;
}
}
+
+// 鍛ㄦ湡/閮ㄩ棬涓�鍙橈紝宸叉湁鐨勯瑙堢粨鏋滃氨浣滃簾锛岄伩鍏嶆妸鏃у懆鏈熺殑鏁版嵁鎸夋柊鍛ㄦ湡淇濆瓨
+watch([calculatePeriod, calculateDeptId], () => {
+ previewData.value = [];
+});
/** 璁$畻瀹炲彂宸ヨ祫 */
function calculateActualSalary(record: HrmSalaryCalculationApi.SalaryCalculation) {
@@ -274,7 +257,7 @@
:maskClosable="false"
>
<Alert
- message="涓ょ鏍哥畻鏂瑰紡锛�1. 鎵ц鏍哥畻 - 鑷姩璁$畻骞朵繚瀛橈紱2. 棰勮鏁版嵁 - 鎵嬪姩璋冩暣鍚庝繚瀛�"
+ message="鏍哥畻娴佺▼锛氶�夋嫨鏍哥畻鍛ㄦ湡鍚庣偣銆岄瑙堟暟鎹�嶆煡鐪嬫牳绠楃粨鏋滐紝纭鎴栬皟鏁村悇鍛樺伐鐨勫伐璧勯」鐩悗鐐广�屼繚瀛樻牳绠椼�嶆墠浼氬啓鍏ユ暟鎹紱鏈瑙堜笉鑳戒繚瀛樸��"
type="info"
show-icon
style="margin-bottom: 16px"
@@ -303,12 +286,7 @@
/>
</FormItem>
<FormItem>
- <a-button type="primary" :loading="calculateLoading" @click="handleCalculate">
- 鎵ц鏍哥畻
- </a-button>
- </FormItem>
- <FormItem>
- <a-button :loading="previewLoading" @click="handlePreview">
+ <a-button type="primary" :loading="previewLoading" @click="handlePreview">
棰勮鏁版嵁
</a-button>
</FormItem>
--
Gitblit v1.9.3