From 3d08a777b541cca2865771e51bf2857273777cfe Mon Sep 17 00:00:00 2001
From: orangebabu <2409692770@qq.com>
Date: Tue, 10 Jun 2025 16:46:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jinbooks-ui/src/views/hr/calc-salary.vue      | 10 +++++-----
 jinbooks-ui/src/views/hr/salary-detail.vue    | 20 +++++++++----------
 jinbooks-ui/src/views/hr/salary-summary.vue   | 20 +++++++++----------
 .../EmployeeSalarySummaryServiceImpl.java     |  1 +
 4 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/jinbooks-ui/src/views/hr/calc-salary.vue b/jinbooks-ui/src/views/hr/calc-salary.vue
index f1c596b..4b729e7 100644
--- a/jinbooks-ui/src/views/hr/calc-salary.vue
+++ b/jinbooks-ui/src/views/hr/calc-salary.vue
@@ -124,31 +124,31 @@
           <el-table-column prop="totalSocialInsurance" label="代扣社保合计" align="right" width="110"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="providentFund" label="代扣公积金" align="right" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="attendance" label="请假考勤" align="right" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="otherDeductions" label="其他扣额" align="right" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="personalTax" label="个税" align="right" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
         </el-table-column>
diff --git a/jinbooks-ui/src/views/hr/salary-detail.vue b/jinbooks-ui/src/views/hr/salary-detail.vue
index a62c7e1..34d8bb4 100644
--- a/jinbooks-ui/src/views/hr/salary-detail.vue
+++ b/jinbooks-ui/src/views/hr/salary-detail.vue
@@ -139,31 +139,31 @@
           <el-table-column prop="totalSocialInsurance" label="代扣社保合计" align="center" width="110"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="providentFund" label="代扣公积金" align="center" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="attendance" label="请假考勤" align="center" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="otherDeductions" label="其他扣额" align="center" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="personalTax" label="个税" align="center" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
         </el-table-column>
@@ -374,27 +374,27 @@ const getSummaries = () => {
     sums[12] = tableSummary.backPay;
     sums[13] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.totalSocialInsurance > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.totalSocialInsurance),]);
     sums[14] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.providentFund > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.providentFund),]);
     sums[15] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.attendance > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.attendance),]);
     sums[16] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.otherDeductions > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.otherDeductions),]);
     sums[17] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.personalTax > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.personalTax),]);
     sums[18] = tableSummary.businessSocialInsurance;
diff --git a/jinbooks-ui/src/views/hr/salary-summary.vue b/jinbooks-ui/src/views/hr/salary-summary.vue
index 309c332..d81f3ed 100644
--- a/jinbooks-ui/src/views/hr/salary-summary.vue
+++ b/jinbooks-ui/src/views/hr/salary-summary.vue
@@ -114,31 +114,31 @@
           <el-table-column prop="totalSocialInsurance" label="代扣社保" align="center" width="110"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="providentFund" label="代扣公积金" align="center" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="attendance" label="请假考勤" align="center" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="otherDeductions" label="其他扣额" align="center" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
           <el-table-column prop="personalTax" label="个税" align="center" width="100"
                            :show-overflow-tooltip="true">
             <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>
           </el-table-column>
         </el-table-column>
@@ -371,27 +371,27 @@ const getSummaries = () => {
     sums[sumsIndex++] = tableSummary.backPay;
     sums[sumsIndex++] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.totalSocialInsurance > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.totalSocialInsurance),]);
     sums[sumsIndex++] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.providentFund > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.providentFund),]);
     sums[sumsIndex++] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.attendance > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.attendance),]);
     sums[sumsIndex++] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.otherDeductions > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.otherDeductions),]);
     sums[sumsIndex++] = h('div', {
       style: {
-        color: 'red',
+        color: tableSummary.personalTax > 0 ? 'red' : '',
       }
     }, [formatAmount(tableSummary.personalTax),]);
     sums[sumsIndex++] = tableSummary.businessSocialInsurance;
diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java
index f4c8cf8..bd1f78b 100644
--- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java
+++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/EmployeeSalarySummaryServiceImpl.java
@@ -279,6 +279,7 @@ public class EmployeeSalarySummaryServiceImpl extends ServiceImpl<EmployeeSalary
         itemDto.setSubjectCode(bookSubject.getCode());
         itemDto.setSubjectName(bookSubject.getCode() + "-" + bookSubject.getName());
         itemDto.setDetailedAccounts("");
+//        itemDto.setSubjectBalance(BigDecimal.ZERO);
 
         return itemDto;
     }