From b74d628be8ff57a22e4e4a5a164e755a509820ec Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 07 七月 2026 16:50:18 +0800
Subject: [PATCH] 银川 1.员工管理页面开发、联调 2.薪资发放页面开发联调 3.薪酬管理页面开发联调 4.添加请假扣薪管理页面开发联调
---
src/views/hrm/salary/calculation/index.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/views/hrm/salary/calculation/index.vue b/src/views/hrm/salary/calculation/index.vue
index 59551ab..8536a41 100644
--- a/src/views/hrm/salary/calculation/index.vue
+++ b/src/views/hrm/salary/calculation/index.vue
@@ -7,7 +7,10 @@
import { Page } from '#/packages/effects/common-ui/src';
import { downloadFileFromBlobPart } from '#/packages/utils/src';
-import { message, Modal, Form, FormItem, DatePicker, TreeSelect, Table, InputNumber, Alert } from 'ant-design-vue';
+import { message, Modal, Form, FormItem, DatePicker, TreeSelect, Table, InputNumber, Alert, Tag } from 'ant-design-vue';
+
+import { DICT_TYPE } from '#/packages/constants/src';
+import { getDictLabel } from '#/packages/effects/hooks/src';
import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
import {
@@ -102,7 +105,8 @@
const deduction = (record.socialSecurityDeduction || 0) +
(record.housingFundDeduction || 0) +
(record.taxDeduction || 0) +
- (record.otherDeduction || 0);
+ (record.otherDeduction || 0) +
+ (record.leaveDeduction || 0);
return income - deduction;
}
@@ -365,6 +369,16 @@
@change="(val: number) => updateFieldValue(record, 'otherDeduction', val)"
/>
</template>
+ <template v-else-if="column.dataIndex === 'leaveDeduction'">
+ <InputNumber
+ v-model:value="record.leaveDeduction"
+ :min="0"
+ :precision="2"
+ size="small"
+ style="width: 90px"
+ @change="(val: number) => updateFieldValue(record, 'leaveDeduction', val)"
+ />
+ </template>
<template v-else-if="column.dataIndex === 'actualSalary'">
<span class="font-bold text-green-600">{{ record.actualSalary?.toFixed(2) }}</span>
</template>
@@ -425,6 +439,11 @@
]"
/>
</template>
+ <template #status="{ row }">
+ <Tag :color="row.status === 0 ? 'warning' : row.status === 10 ? 'success' : 'processing'">
+ {{ getDictLabel(DICT_TYPE.HRM_SALARY_STATUS, row.status) }}
+ </Tag>
+ </template>
<template #actions="{ row }">
<TableAction
:actions="[
--
Gitblit v1.9.3