diff --git a/frontend/src/pages/money/BatchTab.tsx b/frontend/src/pages/money/BatchTab.tsx index 8da375f..11c366d 100644 --- a/frontend/src/pages/money/BatchTab.tsx +++ b/frontend/src/pages/money/BatchTab.tsx @@ -970,7 +970,7 @@ function BatchDetail({ batchId, onBack }: { batchId: string; onBack: () => void )} {batch.entries.some((e: any) => (e.minWageApplied || 0) > 0) && ( - {batch.entries.filter((e: any) => (e.minWageApplied || 0) > 0).length} 名员工已补齐到最低工资标准,递延扣款(社保/公积金/补齐差额)将在次月工资中补扣。 + {batch.entries.filter((e: any) => (e.minWageApplied || 0) > 0).length} 名员工实发已补齐到最低工资标准。免扣的社保/公积金及额外补齐差额已递延,将在次月工资中补扣,请在「递延扣款」列查看明细。 )} {batch.entries.some((e: any) => (e.prevDeferredSocialEmp || 0) + (e.prevDeferredHousingEmp || 0) + (e.prevDeferredMinWage || 0) > 0) && ( @@ -1111,7 +1111,7 @@ function BatchDetail({ batchId, onBack }: { batchId: string; onBack: () => void {renderCell(entry, 'housingEmp')} handleTaxDetailClick(entry.employeeId, entry.employee.name)} title="点击查看个税计算明细">{fmt(entry.tax)} {/* 实发:最低工资保护触发时高亮显示 */} - 0 ? 'text-amber-600' : 'text-safe'}`} title={(entry.minWageApplied || 0) > 0 ? `最低工资保护:补齐 ¥${entry.minWageApplied},递延扣款 ¥${(entry.deferredSocialEmp || 0) + (entry.deferredHousingEmp || 0) + (entry.deferredMinWage || 0)} 将在次月补扣` : ''}> + 0 ? 'text-amber-600' : 'text-safe'}`} title={(entry.minWageApplied || 0) > 0 ? `最低工资保护已触发\n应发 ¥${fmt(entry.totalPay)} → 实发补齐到 ¥${fmt(entry.minWage)}\n免扣社保 ¥${fmt(entry.deferredSocialEmp || 0)} + 免扣公积金 ¥${fmt(entry.deferredHousingEmp || 0)} + 额外补齐 ¥${fmt(entry.deferredMinWage || 0)} = 递延 ¥${fmt((entry.deferredSocialEmp || 0) + (entry.deferredHousingEmp || 0) + (entry.deferredMinWage || 0))}(次月补扣)` : ''}> {fmt(entry.netPay)} {(entry.minWageApplied || 0) > 0 && } @@ -1121,10 +1121,10 @@ function BatchDetail({ batchId, onBack }: { batchId: string; onBack: () => void const deferred = (entry.deferredSocialEmp || 0) + (entry.deferredHousingEmp || 0) + (entry.deferredMinWage || 0) const prevDeferred = (entry.prevDeferredSocialEmp || 0) + (entry.prevDeferredHousingEmp || 0) + (entry.prevDeferredMinWage || 0) if (deferred > 0) { - return 递延 ¥{fmt(deferred)} + return 递延 ¥{fmt(deferred)} } if (prevDeferred > 0) { - return 补扣 ¥{fmt(prevDeferred)} + return 补扣 ¥{fmt(prevDeferred)} } return })()} @@ -1135,7 +1135,7 @@ function BatchDetail({ batchId, onBack }: { batchId: string; onBack: () => void ) : (entry.minWageApplied || 0) > 0 ? ( - + ) : (