From 62294084c9c35d35594e9f2d6c41342ae84e9526 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 29 七月 2026 16:39:20 +0800
Subject: [PATCH] 修改工资
---
src/views/personnelManagement/monthlyStatistics/components/auditDia.vue | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/src/views/personnelManagement/monthlyStatistics/components/auditDia.vue b/src/views/personnelManagement/monthlyStatistics/components/auditDia.vue
index e615402..f8f5e18 100644
--- a/src/views/personnelManagement/monthlyStatistics/components/auditDia.vue
+++ b/src/views/personnelManagement/monthlyStatistics/components/auditDia.vue
@@ -13,6 +13,7 @@
<el-descriptions :column="3" border>
<el-descriptions-item label="宸ヨ祫涓婚">{{ auditData?.salaryTitle || '-' }}</el-descriptions-item>
<el-descriptions-item label="宸ヨ祫鏈堜唤">{{ auditData?.salaryMonth || '-' }}</el-descriptions-item>
+ <el-descriptions-item label="宸ヤ綔鏃ュぉ鏁�">{{ auditData?.monthWorkDays ?? '-' }}</el-descriptions-item>
<el-descriptions-item label="宸ヨ祫鎬婚">楼 {{ formatMoney(auditData?.totalSalary) }}</el-descriptions-item>
<el-descriptions-item label="鏀粯閾惰">{{ auditData?.payBank || '-' }}</el-descriptions-item>
<el-descriptions-item label="瀹℃牳浜�">{{ auditData?.auditUserName || '-' }}</el-descriptions-item>
@@ -32,18 +33,43 @@
<div v-else>
<el-table :data="employeeList" border max-height="300" style="width: 100%">
<el-table-column prop="staffName" label="鍛樺伐濮撳悕" width="100" />
+ <el-table-column prop="entryDate" label="鍏ュ徃鏃ユ湡" width="110" />
<el-table-column prop="deptName" label="閮ㄩ棬" width="120" />
<el-table-column prop="basicSalary" label="鍩烘湰宸ヨ祫" width="100" align="right">
<template #default="{ row }">楼 {{ formatMoney(row.basicSalary) }}</template>
</el-table-column>
- <el-table-column prop="pieceSalary" label="璁′欢宸ヨ祫" width="100" align="right">
- <template #default="{ row }">楼 {{ formatMoney(row.pieceSalary) }}</template>
+ <el-table-column prop="attendanceBonus" label="鍏ㄥ嫟濂�" width="100" align="right">
+ <template #default="{ row }">楼 {{ formatMoney(row.attendanceBonus) }}</template>
</el-table-column>
- <el-table-column prop="hourlySalary" label="璁℃椂宸ヨ祫" width="100" align="right">
- <template #default="{ row }">楼 {{ formatMoney(row.hourlySalary) }}</template>
+ <el-table-column prop="dailySalary" label="鏃ヨ宸ヨ祫" width="100" align="right">
+ <template #default="{ row }">楼 {{ formatMoney(row.dailySalary) }}</template>
+ </el-table-column>
+ <el-table-column prop="workDays" label="鍑哄嫟澶╂暟" width="90" align="right">
+ <template #default="{ row }">{{ formatNumber(row.workDays, 0) }}</template>
+ </el-table-column>
+ <el-table-column prop="conversionRatio" label="鏁堢泭" width="90" align="right">
+ <template #default="{ row }">{{ formatRate(row.conversionRatio) }}</template>
+ </el-table-column>
+ <el-table-column prop="monthTimeTotal" label="鏈堟椂闂村悎璁�" width="110" align="right">
+ <template #default="{ row }">{{ formatNumber(row.monthTimeTotal, 2) }}</template>
</el-table-column>
<el-table-column prop="otherIncome" label="鍏朵粬鏀跺叆" width="100" align="right">
<template #default="{ row }">楼 {{ formatMoney(row.otherIncome) }}</template>
+ </el-table-column>
+ <el-table-column prop="personalLeave" label="浜嬪亣" width="80" align="right">
+ <template #default="{ row }">{{ formatNumber(row.personalLeave, 0) }}</template>
+ </el-table-column>
+ <el-table-column prop="sickLeave" label="鐥呭亣" width="80" align="right">
+ <template #default="{ row }">{{ formatNumber(row.sickLeave, 0) }}</template>
+ </el-table-column>
+ <el-table-column prop="bereavementLeave" label="涓у亣" width="80" align="right">
+ <template #default="{ row }">{{ formatNumber(row.bereavementLeave, 0) }}</template>
+ </el-table-column>
+ <el-table-column prop="marriageLeave" label="濠氬亣" width="80" align="right">
+ <template #default="{ row }">{{ formatNumber(row.marriageLeave, 0) }}</template>
+ </el-table-column>
+ <el-table-column prop="allowance" label="娲ヨ创" width="100" align="right">
+ <template #default="{ row }">楼 {{ formatMoney(row.allowance) }}</template>
</el-table-column>
<el-table-column prop="socialPersonal" label="绀句繚涓汉" width="100" align="right">
<template #default="{ row }">楼 {{ formatMoney(row.socialPersonal) }}</template>
@@ -51,8 +77,20 @@
<el-table-column prop="fundPersonal" label="鍏Н閲戜釜浜�" width="120" align="right">
<template #default="{ row }">楼 {{ formatMoney(row.fundPersonal) }}</template>
</el-table-column>
+ <el-table-column prop="otherDeduct" label="鍏朵粬鏀嚭" width="100" align="right">
+ <template #default="{ row }">楼 {{ formatMoney(row.otherDeduct) }}</template>
+ </el-table-column>
+ <el-table-column prop="socialSupplementAmount" label="绀句繚琛ョ即" width="110" align="right">
+ <template #default="{ row }">楼 {{ formatMoney(row.socialSupplementAmount) }}</template>
+ </el-table-column>
<el-table-column prop="salaryTax" label="宸ヨ祫涓◣" width="100" align="right">
<template #default="{ row }">楼 {{ formatMoney(row.salaryTax) }}</template>
+ </el-table-column>
+ <el-table-column prop="grossSalary" label="搴斿彂宸ヨ祫" width="100" align="right">
+ <template #default="{ row }">楼 {{ formatMoney(row.grossSalary) }}</template>
+ </el-table-column>
+ <el-table-column prop="deductSalary" label="搴旀墸宸ヨ祫" width="100" align="right">
+ <template #default="{ row }">楼 {{ formatMoney(row.deductSalary) }}</template>
</el-table-column>
<el-table-column prop="netSalary" label="瀹炲彂宸ヨ祫" width="100" align="right" fixed="right">
<template #default="{ row }">楼 {{ formatMoney(row.netSalary) }}</template>
@@ -123,6 +161,16 @@
return num.toFixed(2);
};
+const formatNumber = (value, digits = 2) => {
+ const num = Number(value) || 0;
+ return num.toFixed(digits);
+};
+
+const formatRate = (value) => {
+ const num = Number(value) || 0;
+ return num.toFixed(4);
+};
+
// 璁＄畻宸ヨ祫鎬婚
const totalSalary = computed(() => {
return employeeList.value.reduce((sum, e) => {
@@ -140,15 +188,29 @@
if (row?.staffSalaryDetailList && Array.isArray(row.staffSalaryDetailList)) {
employeeList.value = row.staffSalaryDetailList.map((e) => ({
staffName: e.staffName ?? "",
+ entryDate: e.entryDate ?? "",
deptName: e.deptName ?? "",
basicSalary: Number(e.basicSalary) || 0,
+ attendanceBonus: Number(e.attendanceBonus) || 0,
+ dailySalary: Number(e.dailySalary) || (Number(e.workDays) > 0 ? (Number(e.basicSalary) / Number(e.workDays)) : 0),
+ workDays: Number(e.workDays) || 0,
pieceSalary: Number(e.pieceSalary) || 0,
- hourlySalary: Number(e.hourlySalary) || 0,
otherIncome: Number(e.otherIncome) || 0,
+ personalLeave: Number(e.personalLeave) || 0,
+ sickLeave: Number(e.sickLeave) || 0,
+ bereavementLeave: Number(e.bereavementLeave) || 0,
+ marriageLeave: Number(e.marriageLeave) || 0,
+ allowance: Number(e.allowance) || 0,
socialPersonal: Number(e.socialPersonal) || 0,
fundPersonal: Number(e.fundPersonal) || 0,
+ otherDeduct: Number(e.otherDeduct) || 0,
+ socialSupplementAmount: Number(e.socialSupplementAmount) || 0,
salaryTax: Number(e.salaryTax) || 0,
+ grossSalary: Number(e.grossSalary) || 0,
+ deductSalary: Number(e.deductSalary) || 0,
netSalary: Number(e.netSalary) || 0,
+ monthTimeTotal: Number(e.monthTimeTotal) || 0,
+ conversionRatio: Number(e.conversionRatio) || 0,
}));
} else {
console.log('娌℃湁鎵惧埌鍛樺伐鏄庣粏鏁版嵁');
@@ -220,4 +282,4 @@
:deep(.el-descriptions__label) {
width: 100px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3