From 7f6313626df7f49b0e45e1d9d9f197753152e29e Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 15:19:00 +0800
Subject: [PATCH] 九鸿:薪酬核算表按客户工资表重排字段,员工档案补标准项
---
src/views/hrm/salary/calculation/index.vue | 254 ++++++++++++++++++++++----------------------------
1 files changed, 111 insertions(+), 143 deletions(-)
diff --git a/src/views/hrm/salary/calculation/index.vue b/src/views/hrm/salary/calculation/index.vue
index 3b58d12..e76c2f6 100644
--- a/src/views/hrm/salary/calculation/index.vue
+++ b/src/views/hrm/salary/calculation/index.vue
@@ -26,7 +26,14 @@
import { handleTree } from '#/packages/utils/src';
import { $t } from '#/locales';
-import { useGridColumns, useGridFormSchema, usePreviewColumns } from './data';
+import {
+ PREVIEW_ADDITION_FIELDS,
+ PREVIEW_DEDUCTION_FIELDS,
+ PREVIEW_EDITABLE_FIELDS,
+ useGridColumns,
+ useGridFormSchema,
+ usePreviewColumns,
+} from './data';
// 鏍哥畻寮圭獥鐩稿叧
const calculateVisible = ref(false);
@@ -75,6 +82,8 @@
period: calculatePeriod.value,
deptId: calculateDeptId.value,
});
+ // 棰勮琛屽厛鎸夊綋鍓嶅彛寰勯噸绠楀悎璁★紝淇濊瘉寮圭獥閲屾樉绀虹殑鍚堣涓庝繚瀛樼粨鏋滀竴鑷�
+ previewData.value.forEach((record) => recalculateRecord(record));
if (previewData.value.length === 0) {
message.info('璇ユ潯浠朵笅娌℃湁闇�瑕佹牳绠楃殑鍛樺伐');
}
@@ -83,26 +92,89 @@
}
}
-/** 璁$畻瀹炲彂宸ヨ祫 */
-function calculateActualSalary(record: HrmSalaryCalculationApi.SalaryCalculation) {
- const income = (record.baseSalary || 0) +
- (record.performanceSalary || 0) +
- (record.overtimePay || 0) +
- (record.mealAllowance || 0) +
- (record.transportAllowance || 0) +
- (record.otherAllowance || 0);
- const deduction = (record.socialSecurityDeduction || 0) +
- (record.housingFundDeduction || 0) +
- (record.taxDeduction || 0) +
- (record.otherDeduction || 0) +
- (record.leaveDeduction || 0);
- return income - deduction;
+/** 棰勮琛ㄤ腑鎸夊師鏍峰睍绀虹殑瀛楁锛堥潪閲戦锛� */
+const PLAIN_FIELDS = [
+ 'userName',
+ 'hireDate',
+ 'postName',
+ 'deptName',
+ 'workDays',
+ 'paidAttendanceDays',
+ 'standardWorkHours',
+ 'overtimeHours',
+ 'legalHolidayHours',
+];
+
+/** 鏄惁涓哄彲鎵嬪伐璋冩暣鐨勫垪 */
+function isEditableField(field: string) {
+ return (PREVIEW_EDITABLE_FIELDS as readonly string[]).includes(field);
}
-/** 鏇存柊琛屾暟鎹苟璁$畻瀹炲彂宸ヨ祫 */
-function updateFieldValue(record: HrmSalaryCalculationApi.SalaryCalculation, field: keyof HrmSalaryCalculationApi.SalaryCalculation, value: number) {
- (record as any)[field] = value;
- record.actualSalary = calculateActualSalary(record);
+/** 璇诲彇琛屽瓧娈靛�� */
+function fieldValue(
+ record: HrmSalaryCalculationApi.SalaryCalculation,
+ field: string,
+): number | string | undefined {
+ return (record as unknown as Record<string, number | string | undefined>)[
+ field
+ ];
+}
+
+/** 閲戦灞曠ず锛氫繚鐣欎袱浣嶅皬鏁� */
+function formatAmount(value?: number | string) {
+ if (value === null || value === undefined || value === '' || Number.isNaN(Number(value))) {
+ return '-';
+ }
+ return Number(value).toFixed(2);
+}
+
+/** 姹傚拰锛堢┖鍊兼寜 0 璁★級 */
+function sumFields(
+ record: HrmSalaryCalculationApi.SalaryCalculation,
+ fields: readonly string[],
+) {
+ return fields.reduce(
+ (total, field) =>
+ total + Number((record as Record<string, unknown>)[field] ?? 0),
+ 0,
+ );
+}
+
+/**
+ * 鎸変節娉撳伐璧勮〃鍙e緞閲嶇畻锛�
+ * 搴斾粯宸ヨ祫 = 鏍囧噯鍑哄嫟宸ヨ祫 + 鍔犵彮宸ヨ祫 + 娉曞畾鍋囧伐璧� + 瀹夊叏鐜繚濂� + 娴姩缁╂晥宸ヨ祫
+ * 鍔犻」鍚堣 = 宸ラ緞宸ヨ祫 + 澶滅彮琛ュ姪 + 瀛﹀巻琛ヨ创 + 浣撴 + 浼樼鍛樺伐濂� + 鍏朵粬琛ュ姪 + 閮ㄩ棬缁╂晥
+ * 鎵f鍚堣 = 婕忔墦鍗� + 杩熷埌鏃╅�� + 鍏朵粬鎵f
+ * 绋庡悗宸ヨ祫 = 搴斾粯宸ヨ祫 + 鍔犻」鍚堣 - 鎵f鍚堣 - 绀句繚 - 鍏Н閲� - 涓◣
+ */
+function recalculateRecord(
+ record: HrmSalaryCalculationApi.SalaryCalculation,
+) {
+ record.payableSalary =
+ Number(record.standardAttendancePay ?? 0) +
+ Number(record.overtimePay ?? 0) +
+ Number(record.legalHolidayPay ?? 0) +
+ Number(record.safetyAward ?? 0) +
+ Number(record.floatingPerformancePay ?? 0);
+ record.additionTotal = sumFields(record, PREVIEW_ADDITION_FIELDS);
+ record.deductionTotal = sumFields(record, PREVIEW_DEDUCTION_FIELDS);
+ record.actualSalary =
+ record.payableSalary +
+ record.additionTotal -
+ record.deductionTotal -
+ Number(record.socialSecurityDeduction ?? 0) -
+ Number(record.housingFundDeduction ?? 0) -
+ Number(record.taxDeduction ?? 0);
+}
+
+/** 鏇存柊琛屾暟鎹苟閲嶇畻鍚堣 */
+function updateFieldValue(
+ record: HrmSalaryCalculationApi.SalaryCalculation,
+ field: string,
+ value: number,
+) {
+ (record as Record<string, unknown>)[field] = value;
+ recalculateRecord(record);
}
/** 鎻愪氦钖叕鏍哥畻锛堟墜鍔ㄨ皟鏁村悗淇濆瓨锛� */
@@ -256,12 +328,12 @@
<Modal
v-model:open="calculateVisible"
title="钖叕鏍哥畻"
- width="1200px"
+ width="95%"
:footer="null"
:maskClosable="false"
>
<Alert
- message="鏍哥畻娴佺▼锛氶�夊ソ鏍哥畻鍛ㄦ湡涓庨儴闂ㄥ悗鐐广�岄瑙堟暟鎹�嶁啋 鏍稿/璋冩暣鍚勯」閲戦 鈫� 鐐广�屼繚瀛樻牳绠椼�嶈惤搴�"
+ message="鏍哥畻娴佺▼锛氶�夊ソ鏍哥畻鍛ㄦ湡涓庨儴闂ㄥ悗鐐广�岄瑙堟暟鎹�嶁啋 鏍稿鑷姩璁$畻缁撴灉锛屽彲鎵嬪伐璋冩暣娴姩缁╂晥銆佸姞椤逛笌鎵f 鈫� 鐐广�屼繚瀛樻牳绠椼�嶈惤搴撱�傛爣鍑嗗伐璧�/宀椾綅宸ヨ祫/鍔犵彮宸ヨ祫(鏍囧噯)/瀹夊叏鐜繚濂�(鏍囧噯)/缁╂晥(鏍囧噯) 鍦ㄥ憳宸ユ。妗堜腑缁存姢銆�"
type="info"
show-icon
style="margin-bottom: 16px"
@@ -301,144 +373,40 @@
:columns="usePreviewColumns()"
:data-source="previewData"
:pagination="{ pageSize: 20, showSizeChanger: true, showTotal: (t) => `鍏� ${t} 浜篳 }"
- :scroll="{ x: 1800, y: 400 }"
+ :scroll="{ x: 4000, y: 420 }"
size="small"
row-key="userId"
bordered
class="mb-4"
>
<template #bodyCell="{ column, record }">
- <template v-if="column.dataIndex === 'baseSalary'">
+ <template v-if="isEditableField(String(column.dataIndex))">
<InputNumber
- v-model:value="record.baseSalary"
+ :value="fieldValue(record, String(column.dataIndex)) as number"
:min="0"
:precision="2"
size="small"
style="width: 90px"
- @change="(val: number) => updateFieldValue(record, 'baseSalary', val)"
- />
- </template>
- <template v-else-if="column.dataIndex === 'performanceSalary'">
- <InputNumber
- v-model:value="record.performanceSalary"
- :min="0"
- :precision="2"
- size="small"
- style="width: 90px"
- @change="(val: number) => updateFieldValue(record, 'performanceSalary', val)"
- />
- </template>
- <template v-else-if="column.dataIndex === 'overtimePay'">
- <InputNumber
- v-model:value="record.overtimePay"
- :min="0"
- :precision="2"
- size="small"
- style="width: 90px"
- @change="(val: number) => updateFieldValue(record, 'overtimePay', val)"
- />
- </template>
- <template v-else-if="column.dataIndex === 'mealAllowance'">
- <InputNumber
- v-model:value="record.mealAllowance"
- :min="0"
- :precision="2"
- size="small"
- style="width: 80px"
- @change="(val: number) => updateFieldValue(record, 'mealAllowance', val)"
- />
- </template>
- <template v-else-if="column.dataIndex === 'transportAllowance'">
- <InputNumber
- v-model:value="record.transportAllowance"
- :min="0"
- :precision="2"
- size="small"
- style="width: 80px"
- @change="(val: number) => updateFieldValue(record, 'transportAllowance', val)"
- />
- </template>
- <template v-else-if="column.dataIndex === 'otherAllowance'">
- <InputNumber
- v-model:value="record.otherAllowance"
- :min="0"
- :precision="2"
- size="small"
- style="width: 80px"
- @change="(val: number) => updateFieldValue(record, 'otherAllowance', val)"
- />
- </template>
- <template v-else-if="column.dataIndex === 'socialSecurityDeduction'">
- <InputNumber
- v-model:value="record.socialSecurityDeduction"
- :min="0"
- :precision="2"
- size="small"
- style="width: 90px"
- @change="(val: number) => updateFieldValue(record, 'socialSecurityDeduction', val)"
- />
- </template>
- <template v-else-if="column.dataIndex === 'housingFundDeduction'">
- <InputNumber
- v-model:value="record.housingFundDeduction"
- :min="0"
- :precision="2"
- size="small"
- style="width: 90px"
- @change="(val: number) => updateFieldValue(record, 'housingFundDeduction', val)"
- />
- </template>
- <template v-else-if="column.dataIndex === 'taxDeduction'">
- <InputNumber
- v-model:value="record.taxDeduction"
- :min="0"
- :precision="2"
- size="small"
- style="width: 90px"
- @change="(val: number) => updateFieldValue(record, 'taxDeduction', val)"
- />
- </template>
- <template v-else-if="column.dataIndex === 'otherDeduction'">
- <InputNumber
- v-model:value="record.otherDeduction"
- :min="0"
- :precision="2"
- size="small"
- style="width: 80px"
- @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)"
+ @change="
+ (val: number | string | null) =>
+ updateFieldValue(
+ record,
+ String(column.dataIndex),
+ Number(val ?? 0),
+ )
+ "
/>
</template>
<template v-else-if="column.dataIndex === 'actualSalary'">
- <span class="font-bold text-green-600">{{ record.actualSalary?.toFixed(2) }}</span>
+ <span class="font-bold text-green-600">{{
+ formatAmount(record.actualSalary)
+ }}</span>
</template>
- <template v-else-if="column.dataIndex === 'workDays'">
- <InputNumber
- v-model:value="record.workDays"
- :min="0"
- :max="31"
- :precision="0"
- size="small"
- style="width: 70px"
- />
+ <template v-else-if="PLAIN_FIELDS.includes(String(column.dataIndex))">
+ {{ fieldValue(record, String(column.dataIndex)) ?? '-' }}
</template>
- <template v-else-if="column.dataIndex === 'overtimeHours'">
- <InputNumber
- v-model:value="record.overtimeHours"
- :min="0"
- :precision="1"
- size="small"
- style="width: 80px"
- />
+ <template v-else>
+ {{ formatAmount(fieldValue(record, String(column.dataIndex))) }}
</template>
</template>
</Table>
--
Gitblit v1.9.3