fix: 公积金表单去掉多余的housingBaseMin/Max输入,只保留一套基数上下限
新架构下社保和公积金是不同账户,各自有独立的年度标准, baseMin/baseMax 已各自独立,housingBaseMin/Max是旧架构遗留。 公积金表单标签改为"公积金基数下限/上限",默认值改为2540/35811。 Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
This commit is contained in:
@@ -45,7 +45,7 @@ export function AccountCard({
|
||||
medicalOrg: 9.8, medicalEmp: 2, medicalOrgExtra: 0, medicalEmpExtra: 0,
|
||||
unemploymentOrg: 0.5, unemploymentEmp: 0.5,
|
||||
injuryOrg: 0.2, maternityOrg: 0.8,
|
||||
baseMin: 6326, baseMax: 33891,
|
||||
baseMin: isHousing ? 2540 : 6326, baseMax: isHousing ? 35811 : 33891,
|
||||
medicalBaseMin: 0, medicalBaseMax: 0,
|
||||
minWage: 0,
|
||||
extraInsurances: [],
|
||||
@@ -332,8 +332,8 @@ export function AccountCard({
|
||||
)}
|
||||
<div className="grid md:grid-cols-4 gap-3 text-sm">
|
||||
<div className="flex justify-between border-b pb-1.5"><span className="text-gray-500">账户类型</span><span className="font-medium">{config.accountType === 'SUPPLEMENTARY' ? '补充公积金' : '基本公积金'}</span></div>
|
||||
<div className="flex justify-between border-b pb-1.5"><span className="text-gray-500">缴费基数下限</span><span className="font-medium">¥{fmt(config.housingBaseMin > 0 ? config.housingBaseMin : config.baseMin)}</span></div>
|
||||
<div className="flex justify-between border-b pb-1.5"><span className="text-gray-500">缴费基数上限</span><span className="font-medium">¥{fmt(config.housingBaseMax > 0 ? config.housingBaseMax : config.baseMax)}</span></div>
|
||||
<div className="flex justify-between border-b pb-1.5"><span className="text-gray-500">公积金基数下限</span><span className="font-medium">¥{fmt(config.housingBaseMin > 0 ? config.housingBaseMin : config.baseMin)}</span></div>
|
||||
<div className="flex justify-between border-b pb-1.5"><span className="text-gray-500">公积金基数上限</span><span className="font-medium">¥{fmt(config.housingBaseMax > 0 ? config.housingBaseMax : config.baseMax)}</span></div>
|
||||
<div className="flex justify-between border-b pb-1.5"><span className="text-gray-500">公积金(企业)</span><span className="font-medium">{config.housingOrg}%</span></div>
|
||||
<div className="flex justify-between border-b pb-1.5"><span className="text-gray-500">公积金(个人)</span><span className="font-medium">{config.housingEmp}%</span></div>
|
||||
</div>
|
||||
@@ -609,8 +609,8 @@ export function AccountCard({
|
||||
<Input value={account.city} disabled className="bg-gray-50" />
|
||||
<p className="text-xs text-gray-400 mt-1">从账户继承</p>
|
||||
</div>
|
||||
<div><Label>缴费基数下限</Label><Input type="number" value={newVersion.baseMin} onChange={(e) => setNewVersion({ ...newVersion, baseMin: Number(e.target.value) })} /></div>
|
||||
<div><Label>缴费基数上限</Label><Input type="number" value={newVersion.baseMax} onChange={(e) => setNewVersion({ ...newVersion, baseMax: Number(e.target.value) })} /></div>
|
||||
<div><Label>{isHousing ? '公积金基数下限' : '缴费基数下限'}</Label><Input type="number" value={newVersion.baseMin} onChange={(e) => setNewVersion({ ...newVersion, baseMin: Number(e.target.value) })} /></div>
|
||||
<div><Label>{isHousing ? '公积金基数上限' : '缴费基数上限'}</Label><Input type="number" value={newVersion.baseMax} onChange={(e) => setNewVersion({ ...newVersion, baseMax: Number(e.target.value) })} /></div>
|
||||
</div>
|
||||
{!isHousing && (
|
||||
<div className="grid md:grid-cols-2 gap-3">
|
||||
@@ -647,8 +647,6 @@ export function AccountCard({
|
||||
</div>
|
||||
<div><Label>公积金(企业%)</Label><Input type="number" step="0.1" value={newVersion.housingOrg} onChange={(e) => setNewVersion({ ...newVersion, housingOrg: Number(e.target.value) })} /></div>
|
||||
<div><Label>公积金(个人%)</Label><Input type="number" step="0.1" value={newVersion.housingEmp} onChange={(e) => setNewVersion({ ...newVersion, housingEmp: Number(e.target.value) })} /></div>
|
||||
<div><Label>公积金基数下限</Label><Input type="number" value={newVersion.housingBaseMin} onChange={(e) => setNewVersion({ ...newVersion, housingBaseMin: Number(e.target.value) })} placeholder="0=用社保下限" /><p className="text-xs text-gray-400 mt-1">0 时使用缴费基数下限</p></div>
|
||||
<div><Label>公积金基数上限</Label><Input type="number" value={newVersion.housingBaseMax} onChange={(e) => setNewVersion({ ...newVersion, housingBaseMax: Number(e.target.value) })} placeholder="0=用社保上限" /><p className="text-xs text-gray-400 mt-1">0 时使用缴费基数上限</p></div>
|
||||
</div>
|
||||
</>
|
||||
) : (
|
||||
|
||||
Reference in New Issue
Block a user