xuemingqiang/jinbooks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改ui

Browse Source
This commit is contained in:
orangebabu
2025-06-10 16:46:54 +08:00
parent 58a0f6a7b4
commit 3d08a777b5
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jinbooks-ui/src/views/hr/calc-salary.vue
View File

@ -124,31 +124,31 @@
<el-table-column prop="totalSocialInsurance" label="代扣社保合计" align="right" width="110" <el-table-column prop="totalSocialInsurance" label="代扣社保合计" align="right" width="110"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.totalSocialInsurance) }}</span> <span :class="{ 'red-font': scope.row.totalSocialInsurance > 0 }">{{ formatAmount(scope.row.totalSocialInsurance) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="providentFund" label="代扣公积金" align="right" width="100" <el-table-column prop="providentFund" label="代扣公积金" align="right" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.providentFund) }}</span> <span :class="{ 'red-font': scope.row.providentFund > 0 }">{{ formatAmount(scope.row.providentFund) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="attendance" label="请假考勤" align="right" width="100" <el-table-column prop="attendance" label="请假考勤" align="right" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.attendance) }}</span> <span :class="{ 'red-font': scope.row.attendance > 0 }">{{ formatAmount(scope.row.attendance) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="otherDeductions" label="其他扣额" align="right" width="100" <el-table-column prop="otherDeductions" label="其他扣额" align="right" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.otherDeductions) }}</span> <span :class="{ 'red-font': scope.row.otherDeductions > 0 }">{{ formatAmount(scope.row.otherDeductions) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="personalTax" label="个税" align="right" width="100" <el-table-column prop="personalTax" label="个税" align="right" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.personalTax) }}</span> <span :class="{ 'red-font': scope.row.personalTax > 0 }">{{ formatAmount(scope.row.personalTax) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>

20
jinbooks-ui/src/views/hr/salary-detail.vue
View File

@ -139,31 +139,31 @@
<el-table-column prop="totalSocialInsurance" label="代扣社保合计" align="center" width="110" <el-table-column prop="totalSocialInsurance" label="代扣社保合计" align="center" width="110"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.totalSocialInsurance) }}</span> <span :class="{ 'red-font': scope.row.totalSocialInsurance > 0 }">{{ formatAmount(scope.row.totalSocialInsurance) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="providentFund" label="代扣公积金" align="center" width="100" <el-table-column prop="providentFund" label="代扣公积金" align="center" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.providentFund) }}</span> <span :class="{ 'red-font': scope.row.providentFund > 0 }">{{ formatAmount(scope.row.providentFund) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="attendance" label="请假考勤" align="center" width="100" <el-table-column prop="attendance" label="请假考勤" align="center" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.attendance) }}</span> <span :class="{ 'red-font': scope.row.attendance > 0 }">{{ formatAmount(scope.row.attendance) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="otherDeductions" label="其他扣额" align="center" width="100" <el-table-column prop="otherDeductions" label="其他扣额" align="center" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.otherDeductions) }}</span> <span :class="{ 'red-font': scope.row.otherDeductions > 0 }">{{ formatAmount(scope.row.otherDeductions) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="personalTax" label="个税" align="center" width="100" <el-table-column prop="personalTax" label="个税" align="center" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.personalTax) }}</span> <span :class="{ 'red-font': scope.row.personalTax > 0 }">{{ formatAmount(scope.row.personalTax) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -374,27 +374,27 @@ const getSummaries = () => {
sums[12] = tableSummary.backPay; sums[12] = tableSummary.backPay;
sums[13] = h('div', { sums[13] = h('div', {
style: { style: {
color: 'red', color: tableSummary.totalSocialInsurance > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.totalSocialInsurance),]); }, [formatAmount(tableSummary.totalSocialInsurance),]);
sums[14] = h('div', { sums[14] = h('div', {
style: { style: {
color: 'red', color: tableSummary.providentFund > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.providentFund),]); }, [formatAmount(tableSummary.providentFund),]);
sums[15] = h('div', { sums[15] = h('div', {
style: { style: {
color: 'red', color: tableSummary.attendance > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.attendance),]); }, [formatAmount(tableSummary.attendance),]);
sums[16] = h('div', { sums[16] = h('div', {
style: { style: {
color: 'red', color: tableSummary.otherDeductions > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.otherDeductions),]); }, [formatAmount(tableSummary.otherDeductions),]);
sums[17] = h('div', { sums[17] = h('div', {
style: { style: {
color: 'red', color: tableSummary.personalTax > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.personalTax),]); }, [formatAmount(tableSummary.personalTax),]);
sums[18] = tableSummary.businessSocialInsurance; sums[18] = tableSummary.businessSocialInsurance;

20
jinbooks-ui/src/views/hr/salary-summary.vue
View File

@ -114,31 +114,31 @@
<el-table-column prop="totalSocialInsurance" label="代扣社保" align="center" width="110" <el-table-column prop="totalSocialInsurance" label="代扣社保" align="center" width="110"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.totalSocialInsurance) }}</span> <span :class="{ 'red-font': scope.row.totalSocialInsurance > 0 }">{{ formatAmount(scope.row.totalSocialInsurance) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="providentFund" label="代扣公积金" align="center" width="100" <el-table-column prop="providentFund" label="代扣公积金" align="center" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.providentFund) }}</span> <span :class="{ 'red-font': scope.row.providentFund > 0 }">{{ formatAmount(scope.row.providentFund) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="attendance" label="请假考勤" align="center" width="100" <el-table-column prop="attendance" label="请假考勤" align="center" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.attendance) }}</span> <span :class="{ 'red-font': scope.row.attendance > 0 }">{{ formatAmount(scope.row.attendance) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="otherDeductions" label="其他扣额" align="center" width="100" <el-table-column prop="otherDeductions" label="其他扣额" align="center" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.otherDeductions) }}</span> <span :class="{ 'red-font': scope.row.otherDeductions > 0 }">{{ formatAmount(scope.row.otherDeductions) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="personalTax" label="个税" align="center" width="100" <el-table-column prop="personalTax" label="个税" align="center" width="100"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true">
<template #default="scope"> <template #default="scope">
<span class="red-font">{{ formatAmount(scope.row.personalTax) }}</span> <span :class="{ 'red-font': scope.row.personalTax > 0 }">{{ formatAmount(scope.row.personalTax) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
@ -371,27 +371,27 @@ const getSummaries = () => {
sums[sumsIndex++] = tableSummary.backPay; sums[sumsIndex++] = tableSummary.backPay;
sums[sumsIndex++] = h('div', { sums[sumsIndex++] = h('div', {
style: { style: {
color: 'red', color: tableSummary.totalSocialInsurance > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.totalSocialInsurance),]); }, [formatAmount(tableSummary.totalSocialInsurance),]);
sums[sumsIndex++] = h('div', { sums[sumsIndex++] = h('div', {
style: { style: {
color: 'red', color: tableSummary.providentFund > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.providentFund),]); }, [formatAmount(tableSummary.providentFund),]);
sums[sumsIndex++] = h('div', { sums[sumsIndex++] = h('div', {
style: { style: {
color: 'red', color: tableSummary.attendance > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.attendance),]); }, [formatAmount(tableSummary.attendance),]);
sums[sumsIndex++] = h('div', { sums[sumsIndex++] = h('div', {
style: { style: {
color: 'red', color: tableSummary.otherDeductions > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.otherDeductions),]); }, [formatAmount(tableSummary.otherDeductions),]);
sums[sumsIndex++] = h('div', { sums[sumsIndex++] = h('div', {
style: { style: {
color: 'red', color: tableSummary.personalTax > 0 ? 'red' : '',
} }
}, [formatAmount(tableSummary.personalTax),]); }, [formatAmount(tableSummary.personalTax),]);
sums[sumsIndex++] = tableSummary.businessSocialInsurance; sums[sumsIndex++] = tableSummary.businessSocialInsurance;

1
jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java
View File

@ -279,6 +279,7 @@ public class EmployeeSalarySummaryServiceImpl extends ServiceImpl<EmployeeSalary
itemDto.setSubjectCode(bookSubject.getCode()); itemDto.setSubjectCode(bookSubject.getCode());
itemDto.setSubjectName(bookSubject.getCode() + "-" + bookSubject.getName()); itemDto.setSubjectName(bookSubject.getCode() + "-" + bookSubject.getName());
itemDto.setDetailedAccounts(""); itemDto.setDetailedAccounts("");
// itemDto.setSubjectBalance(BigDecimal.ZERO);
return itemDto; return itemDto;
} }