freedak/TurboHR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ui: 合计与起止年月列分开，公积金配置显示基数范围

Browse Source
This commit is contained in:
freedakgmail
2026-08-18 07:28:38 +08:00
parent 95b2929768
commit 2ab9e87e6f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/SocialInsurance.tsx
+2 -2
View File
@@ -388,7 +388,7 @@ export default function SocialInsurance() {
<th className="py-2 text-right">企业部分</th> <th className="py-2 text-right">企业部分</th>
<th className="py-2 text-right">个人部分</th> <th className="py-2 text-right">个人部分</th>
<th className="py-2 text-right">合计</th> <th className="py-2 text-right">合计</th>
<th className="py-2 text-left">起止年月</th> <th className="py-2 text-left pl-4">起止年月</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -430,7 +430,7 @@ export default function SocialInsurance() {
<th className="py-2 text-right">企业部分</th> <th className="py-2 text-right">企业部分</th>
<th className="py-2 text-right">个人部分</th> <th className="py-2 text-right">个人部分</th>
<th className="py-2 text-right">合计</th> <th className="py-2 text-right">合计</th>
<th className="py-2 text-left">起止年月</th> <th className="py-2 text-left pl-4">起止年月</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
frontend/src/pages/social-insurance/MonthlyRows.tsx
+2 -2
View File
@@ -61,7 +61,7 @@ export function MonthlyRow({ item: i, type, onCorrected }: { item: any; type: 'a
<td className="py-1.5 text-right text-danger">{d ? `¥${fmt(d.totalOrg)}` : '-'}</td> <td className="py-1.5 text-right text-danger">{d ? `¥${fmt(d.totalOrg)}` : '-'}</td>
<td className="py-1.5 text-right text-warning">{d ? `¥${fmt(d.totalEmp)}` : '-'}</td> <td className="py-1.5 text-right text-warning">{d ? `¥${fmt(d.totalEmp)}` : '-'}</td>
<td className="py-1.5 text-right font-medium text-primary">{d ? `¥${fmt(d.total)}` : '-'}</td> <td className="py-1.5 text-right font-medium text-primary">{d ? `¥${fmt(d.total)}` : '-'}</td>
<td className="py-1.5 text-gray-400 text-xs">{type === 'add' ? `${i.startMonth} →` : type === 'sub' ? `→ ${i.endMonth}` : `${i.startMonth} ~ ${i.endMonth || '在保'}`}</td> <td className="py-1.5 pl-4 text-gray-400 text-xs">{type === 'add' ? `${i.startMonth} →` : type === 'sub' ? `→ ${i.endMonth}` : `${i.startMonth} ~ ${i.endMonth || '在保'}`}</td>
</tr> </tr>
{expanded && d && ( {expanded && d && (
<tr className="bg-gray-50/50"> <tr className="bg-gray-50/50">
@@ -148,7 +148,7 @@ export function MonthlyHousingRow({ item: i, type, onCorrected }: { item: any; t
<td className="py-1.5 text-right text-danger">{d ? `¥${fmt(d.orgAmount)}` : '-'}</td> <td className="py-1.5 text-right text-danger">{d ? `¥${fmt(d.orgAmount)}` : '-'}</td>
<td className="py-1.5 text-right text-warning">{d ? `¥${fmt(d.empAmount)}` : '-'}</td> <td className="py-1.5 text-right text-warning">{d ? `¥${fmt(d.empAmount)}` : '-'}</td>
<td className="py-1.5 text-right font-medium text-primary">{d ? `¥${fmt(d.total)}` : '-'}</td> <td className="py-1.5 text-right font-medium text-primary">{d ? `¥${fmt(d.total)}` : '-'}</td>
<td className="py-1.5 text-gray-400 text-xs">{type === 'add' ? `${i.startMonth} →` : type === 'sub' ? `→ ${i.endMonth}` : `${i.startMonth} ~ ${i.endMonth || '在保'}`}</td> <td className="py-1.5 pl-4 text-gray-400 text-xs">{type === 'add' ? `${i.startMonth} →` : type === 'sub' ? `→ ${i.endMonth}` : `${i.startMonth} ~ ${i.endMonth || '在保'}`}</td>
</tr> </tr>
) )
} }