From d2008d93877c0ff1628b5d90f034410da3834f07 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 15:33:33 +0800
Subject: [PATCH] 九鸿:薪酬核算预览所有数值列均可手工修改
---
src/views/hrm/salary/calculation/data.ts | 45 ++++++++++++++
src/views/hrm/salary/calculation/index.vue | 88 +++++++++++++++-------------
2 files changed, 91 insertions(+), 42 deletions(-)
diff --git a/src/views/hrm/salary/calculation/data.ts b/src/views/hrm/salary/calculation/data.ts
index 0115d14..322868c 100644
--- a/src/views/hrm/salary/calculation/data.ts
+++ b/src/views/hrm/salary/calculation/data.ts
@@ -131,9 +131,28 @@
];
}
-/** 棰勮琛ㄦ牸閲屽厑璁告墜宸ヨ皟鏁寸殑瀛楁锛堝叾浣欏潎涓鸿嚜鍔ㄨ绠楋級 */
+/**
+ * 棰勮琛ㄦ牸閲屽彲鎵嬪伐璋冩暣鐨勫瓧娈碉細鎵�鏈夎柂閰暟鍊煎瓧娈甸兘鍙湪鑷姩璁$畻缁撴灉涓婁慨鏀广��
+ * 鑷姩璁$畻鍙礋璐g敓鎴愬垵鍊硷紝淇濆瓨鏃朵互椤甸潰涓婄湅鍒扮殑鍊间负鍑嗐��
+ */
export const PREVIEW_EDITABLE_FIELDS = [
+ 'workDays',
+ 'paidAttendanceDays',
+ 'standardSalary',
+ 'baseSalary',
+ 'postSalary',
+ 'overtimeHourlyRate',
+ 'safetyAwardStandard',
+ 'performanceStandard',
+ 'standardWorkHours',
+ 'overtimeHours',
+ 'legalHolidayHours',
+ 'standardAttendancePay',
+ 'overtimePay',
+ 'legalHolidayPay',
+ 'safetyAward',
'floatingPerformancePay',
+ 'payableSalary',
'seniorityPay',
'nightShiftAllowance',
'educationAllowance',
@@ -141,11 +160,35 @@
'excellentEmployeeAward',
'otherSubsidy',
'deptPerformance',
+ 'additionTotal',
'missedPunchDeduction',
'lateEarlyDeduction',
'otherDeduction',
+ 'deductionTotal',
+ 'socialSecurityDeduction',
+ 'housingFundDeduction',
+ 'taxDeduction',
+ 'actualSalary',
] as const;
+/** 搴斾粯宸ヨ祫鐨勬瀯鎴愬瓧娈碉紙浠讳竴鍙樺寲閮介噸绠楀簲浠樺伐璧勶級 */
+export const PREVIEW_PAYABLE_COMPONENTS = [
+ 'standardAttendancePay',
+ 'overtimePay',
+ 'legalHolidayPay',
+ 'safetyAward',
+ 'floatingPerformancePay',
+] as const;
+
+/** 鍚勫瓧娈电殑褰曞叆绮惧害锛堟湭鍒楀嚭鐨勬寜閲戦 2 浣嶅皬鏁帮級 */
+export const PREVIEW_FIELD_PRECISION: Record<string, number> = {
+ workDays: 0,
+ paidAttendanceDays: 1,
+ standardWorkHours: 1,
+ overtimeHours: 1,
+ legalHolidayHours: 1,
+};
+
/** 鍔犻」瀛楁锛堟眹鎬讳负銆屽姞椤瑰悎璁°�嶏級 */
export const PREVIEW_ADDITION_FIELDS = [
'seniorityPay',
diff --git a/src/views/hrm/salary/calculation/index.vue b/src/views/hrm/salary/calculation/index.vue
index e76c2f6..49f18dc 100644
--- a/src/views/hrm/salary/calculation/index.vue
+++ b/src/views/hrm/salary/calculation/index.vue
@@ -30,6 +30,8 @@
PREVIEW_ADDITION_FIELDS,
PREVIEW_DEDUCTION_FIELDS,
PREVIEW_EDITABLE_FIELDS,
+ PREVIEW_FIELD_PRECISION,
+ PREVIEW_PAYABLE_COMPONENTS,
useGridColumns,
useGridFormSchema,
usePreviewColumns,
@@ -92,18 +94,10 @@
}
}
-/** 棰勮琛ㄤ腑鎸夊師鏍峰睍绀虹殑瀛楁锛堥潪閲戦锛� */
-const PLAIN_FIELDS = [
- 'userName',
- 'hireDate',
- 'postName',
- 'deptName',
- 'workDays',
- 'paidAttendanceDays',
- 'standardWorkHours',
- 'overtimeHours',
- 'legalHolidayHours',
-];
+/** 鍚勫瓧娈电殑褰曞叆绮惧害 */
+function fieldPrecision(field: string) {
+ return PREVIEW_FIELD_PRECISION[field] ?? 2;
+}
/** 鏄惁涓哄彲鎵嬪伐璋冩暣鐨勫垪 */
function isEditableField(field: string) {
@@ -118,14 +112,6 @@
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 璁★級 */
@@ -158,23 +144,51 @@
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);
+ record.actualSalary = calculateActualSalary(record);
}
-/** 鏇存柊琛屾暟鎹苟閲嶇畻鍚堣 */
+/** 鎸夊綋鍓嶈鏁版嵁閲嶇畻绋庡悗宸ヨ祫 */
+function calculateActualSalary(
+ record: HrmSalaryCalculationApi.SalaryCalculation,
+) {
+ return (
+ Number(record.payableSalary ?? 0) +
+ Number(record.additionTotal ?? 0) -
+ Number(record.deductionTotal ?? 0) -
+ Number(record.socialSecurityDeduction ?? 0) -
+ Number(record.housingFundDeduction ?? 0) -
+ Number(record.taxDeduction ?? 0)
+ );
+}
+
+/**
+ * 鎵嬪伐淇敼鏌愪釜瀛楁鍚庯紝鍙噸绠楀畠褰卞搷鐨勫悎璁★紝涓嶈鐩栧垰鏀圭殑閭d竴鍒楋細
+ * - 鏀瑰簲浠樺伐璧勬瀯鎴愰」 鈫� 閲嶇畻搴斾粯宸ヨ祫
+ * - 鏀瑰姞椤� 鈫� 閲嶇畻鍔犻」鍚堣
+ * - 鏀规墸娆� 鈫� 閲嶇畻鎵f鍚堣
+ * - 鏀瑰叾浣欎换浣曢噾棰� 鈫� 閲嶇畻绋庡悗宸ヨ祫锛堟敼绋庡悗宸ヨ祫鏈韩鏃朵笉鍐嶅洖鍐欙級
+ */
function updateFieldValue(
record: HrmSalaryCalculationApi.SalaryCalculation,
field: string,
value: number,
) {
(record as Record<string, unknown>)[field] = value;
- recalculateRecord(record);
+ const payableComponents = PREVIEW_PAYABLE_COMPONENTS as readonly string[];
+ const additionFields = PREVIEW_ADDITION_FIELDS as readonly string[];
+ const deductionFields = PREVIEW_DEDUCTION_FIELDS as readonly string[];
+ if (payableComponents.includes(field)) {
+ record.payableSalary = sumFields(record, PREVIEW_PAYABLE_COMPONENTS);
+ }
+ if (additionFields.includes(field)) {
+ record.additionTotal = sumFields(record, PREVIEW_ADDITION_FIELDS);
+ }
+ if (deductionFields.includes(field)) {
+ record.deductionTotal = sumFields(record, PREVIEW_DEDUCTION_FIELDS);
+ }
+ if (field !== 'actualSalary') {
+ record.actualSalary = calculateActualSalary(record);
+ }
}
/** 鎻愪氦钖叕鏍哥畻锛堟墜鍔ㄨ皟鏁村悗淇濆瓨锛� */
@@ -333,7 +347,7 @@
:maskClosable="false"
>
<Alert
- message="鏍哥畻娴佺▼锛氶�夊ソ鏍哥畻鍛ㄦ湡涓庨儴闂ㄥ悗鐐广�岄瑙堟暟鎹�嶁啋 鏍稿鑷姩璁$畻缁撴灉锛屽彲鎵嬪伐璋冩暣娴姩缁╂晥銆佸姞椤逛笌鎵f 鈫� 鐐广�屼繚瀛樻牳绠椼�嶈惤搴撱�傛爣鍑嗗伐璧�/宀椾綅宸ヨ祫/鍔犵彮宸ヨ祫(鏍囧噯)/瀹夊叏鐜繚濂�(鏍囧噯)/缁╂晥(鏍囧噯) 鍦ㄥ憳宸ユ。妗堜腑缁存姢銆�"
+ message="鏍哥畻娴佺▼锛氶�夊ソ鏍哥畻鍛ㄦ湡涓庨儴闂ㄥ悗鐐广�岄瑙堟暟鎹�嶁啋 绯荤粺鎸夊憳宸ユ。妗堣嚜鍔ㄧ畻鍑哄悇椤归噾棰濓紝鎵�鏈夋暟鍊奸兘鍙湪姝ゅ熀纭�涓婃墜宸ヤ慨鏀癸紙鏀规煇涓�椤逛細鑷姩閲嶇畻瀹冨奖鍝嶅埌鐨勫悎璁★級鈫� 鐐广�屼繚瀛樻牳绠椼�嶆寜椤甸潰涓婄殑鍊艰惤搴撱�傛爣鍑嗗伐璧�/宀椾綅宸ヨ祫/鍔犵彮宸ヨ祫(鏍囧噯)/瀹夊叏鐜繚濂�(鏍囧噯)/缁╂晥(鏍囧噯) 榛樿鍙栧憳宸ユ。妗堛��"
type="info"
show-icon
style="margin-bottom: 16px"
@@ -384,9 +398,9 @@
<InputNumber
:value="fieldValue(record, String(column.dataIndex)) as number"
:min="0"
- :precision="2"
+ :precision="fieldPrecision(String(column.dataIndex))"
size="small"
- style="width: 90px"
+ style="width: 96px"
@change="
(val: number | string | null) =>
updateFieldValue(
@@ -397,16 +411,8 @@
"
/>
</template>
- <template v-else-if="column.dataIndex === 'actualSalary'">
- <span class="font-bold text-green-600">{{
- formatAmount(record.actualSalary)
- }}</span>
- </template>
- <template v-else-if="PLAIN_FIELDS.includes(String(column.dataIndex))">
- {{ fieldValue(record, String(column.dataIndex)) ?? '-' }}
- </template>
<template v-else>
- {{ formatAmount(fieldValue(record, String(column.dataIndex))) }}
+ {{ fieldValue(record, String(column.dataIndex)) ?? '-' }}
</template>
</template>
</Table>
--
Gitblit v1.9.3