From 39b858c36ce5d3dc55abad155fbcca571c0ab3e6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 14 十月 2026 15:51:49 +0800
Subject: [PATCH] fix(hrm): 薪资核算页去掉「执行核算」按钮，强制走「预览数据 → 保存核算」流程
---
src/views/hrm/salary/calculation/index.vue | 38 ++++++++++----------------------------
1 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/src/views/hrm/salary/calculation/index.vue b/src/views/hrm/salary/calculation/index.vue
index 9dbef3e..afd20f0 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,25 +54,14 @@
gridApi.query();
}
-/** 鎵ц钖叕鏍哥畻锛堣嚜鍔ㄨ绠楀苟淇濆瓨锛� */
-async function handleCalculate() {
- if (!calculatePeriod.value) {
- message.warning('璇烽�夋嫨鏍哥畻鍛ㄦ湡');
- return;
+// 鏍哥畻鎴愭灉鍙厑璁稿湪銆岄瑙� 鈫� 淇濆瓨銆嶄箣闂存祦杞細鏀逛簡鍛ㄦ湡/閮ㄩ棬灏卞繀椤婚噸鏂伴瑙堬紝
+// 鍚﹀垯浼氭妸涓婁竴杞殑棰勮缁撴灉鎸夋柊鐨勫懆鏈熷瓨涓嬪幓
+watch([calculatePeriod, calculateDeptId], () => {
+ if (previewData.value.length > 0) {
+ previewData.value = [];
+ message.info('鏍哥畻鍛ㄦ湡鎴栭儴闂ㄥ凡鍙樻洿锛岃閲嶆柊棰勮鏁版嵁');
}
- 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() {
@@ -274,7 +261,7 @@
:maskClosable="false"
>
<Alert
- message="涓ょ鏍哥畻鏂瑰紡锛�1. 鎵ц鏍哥畻 - 鑷姩璁＄畻骞朵繚瀛橈紱2. 棰勮鏁版嵁 - 鎵嬪姩璋冩暣鍚庝繚瀛�"
+ message="鏍哥畻娴佺▼锛氶�夊ソ鏍哥畻鍛ㄦ湡涓庨儴闂ㄥ悗鐐广�岄瑙堟暟鎹�嶁啋 鏍稿/璋冩暣鍚勯」閲戦 鈫� 鐐广�屼繚瀛樻牳绠椼�嶈惤搴�"
type="info"
show-icon
style="margin-bottom: 16px"
@@ -303,12 +290,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