fix: 补全工资兼职方案月度个税及兼职工资公式 (#754)

AI 月度个税与 AN 月度兼职工资改为自动公式,AT 同步计算。
This commit is contained in:
chenxi 2026-10-28 20:35:55 +08:00
parent a9a6132b61
commit 4ba3a72caf
3 changed files with 17 additions and 6 deletions

View File

@ -45,12 +45,12 @@ return [
['key' => 'AF', 'label' => '新月度应纳税所得额', 'group' => 'salary_parttime', 'kind' => 'formula_number', 'formula' => '=AE#-G#-I#-P#-R#'],
['key' => 'AG', 'label' => '新月度个税比列', 'group' => 'salary_parttime', 'kind' => 'formula_percent', 'formula' => '=IF(AF#<=0,"",IF(AF#<=3000,0.03,IF(AF#<=12000,0.1,IF(AF#<=25000,0.2,IF(AF#<=35000,0.25,IF(AF#<=55000,0.3,IF(AF#<=80000,0.35,0.45)))))))'],
['key' => 'AH', 'label' => '新月度新速算扣除数', 'group' => 'salary_parttime', 'kind' => 'formula_number', 'formula' => '=IF(AF#<=0,"",IF(AF#<=3000,0,IF(AF#<=12000,210,IF(AF#<=25000,1410,IF(AF#<=35000,2660,IF(AF#<=55000,4410,IF(AF#<=80000,7160,15160)))))))'],
['key' => 'AI', 'label' => '新月度个税金额', 'group' => 'salary_parttime', 'kind' => 'number'],
['key' => 'AI', 'label' => '新月度个税金额', 'group' => 'salary_parttime', 'kind' => 'formula_number', 'formula' => '=AF#*AG#-AH#'],
['key' => 'AJ', 'label' => '全年应纳税所得额', 'group' => 'salary_parttime', 'kind' => 'formula_number', 'formula' => '=AF#*12'],
['key' => 'AK', 'label' => '年度税率', 'group' => 'salary_parttime', 'kind' => 'formula_percent', 'formula' => '=IF(AJ#=0,"",IF(AJ#<=0,0,IF(AJ#<=36000,0.03,IF(AJ#<=144000,0.1,IF(AJ#<=300000,0.2,IF(AJ#<=420000,0.25,IF(AJ#<=660000,0.3,IF(AJ#<=960000,0.35,0.45))))))))'],
['key' => 'AL', 'label' => '年度速算扣除数', 'group' => 'salary_parttime', 'kind' => 'formula_number', 'formula' => '=IF(AJ#=0,"",IF(AJ#<=0,0,IF(AJ#<=36000,0,IF(AJ#<=144000,2520,IF(AJ#<=300000,16920,IF(AJ#<=420000,31920,IF(AJ#<=660000,52920,IF(AJ#<=960000,85920,181920))))))))'],
['key' => 'AM', 'label' => '全年工资个税', 'group' => 'salary_parttime', 'kind' => 'formula_number', 'formula' => '=AJ#*AK#-AL#'],
['key' => 'AN', 'label' => '月度兼职工资', 'group' => 'salary_parttime', 'kind' => 'number'],
['key' => 'AN', 'label' => '月度兼职工资', 'group' => 'salary_parttime', 'kind' => 'formula_number', 'formula' => '=AD#'],
['key' => 'AO', 'label' => '月扣除额', 'group' => 'salary_parttime', 'kind' => 'formula_number', 'formula' => '=IF(AN#<=0,0,IF(AN#<=4000,800,AN#*0.2))'],
['key' => 'AP', 'label' => '月应纳税所得额', 'group' => 'salary_parttime', 'kind' => 'formula_number', 'formula' => '=AN#-AO#'],
['key' => 'AQ', 'label' => '月个税预扣率', 'group' => 'salary_parttime', 'kind' => 'formula_percent', 'formula' => '=IF(AN#<=0,0,IF(AP#<=20000,0.2,IF(AP#<=50000,0.3,0.4)))'],

View File

@ -599,6 +599,9 @@
const salaryTaxable = newSalary - v('G') - monthlyBasicDeduction
- numeric(newEmployerHousingFund) - numeric(excessHousingFundWithholding);
const salaryMonthlyBracket = monthlyWageBracket(salaryTaxable);
const salaryMonthlyTax = salaryMonthlyBracket === null
? null
: salaryTaxable * salaryMonthlyBracket.rate - salaryMonthlyBracket.deduction;
const salaryAnnualTaxable = salaryTaxable * 12;
const salaryBracket = annualBracket(salaryAnnualTaxable);
const salaryRate = salaryAnnualTaxable === 0 ? null : salaryBracket.rate;
@ -606,7 +609,7 @@
const salaryAnnualTax = salaryRate === null || salaryDeduction === null
? null
: salaryAnnualTaxable * salaryRate - salaryDeduction;
const monthlyParttime = v('AN');
const monthlyParttime = parttimeSalary;
const parttimeDeduction = monthlyParttime <= 0
? 0
: (monthlyParttime <= 4000 ? 800 : monthlyParttime * 0.2);
@ -618,7 +621,7 @@
? 0
: (parttimeTaxable <= 20000 ? 0 : (parttimeTaxable <= 50000 ? 2000 : 7000));
const parttimeMonthlyTax = parttimeTaxable * parttimeRate - parttimeDeductionAmount;
const monthlyTaxTotal = v('AI') + parttimeMonthlyTax;
const monthlyTaxTotal = numeric(salaryMonthlyTax) + parttimeMonthlyTax;
const annualParttimeTax = parttimeMonthlyTax * 12;
const annualTotalTax = salaryAnnualTax === null ? null : salaryAnnualTax + annualParttimeTax;
const salaryIncome = newSalary * 12;
@ -672,10 +675,12 @@
AF: salaryTaxable,
AG: salaryMonthlyBracket?.rate ?? null,
AH: salaryMonthlyBracket?.deduction ?? null,
AI: salaryMonthlyTax,
AJ: salaryAnnualTaxable,
AK: salaryRate,
AL: salaryDeduction,
AM: salaryAnnualTax,
AN: monthlyParttime,
AO: parttimeDeduction,
AP: parttimeTaxable,
AQ: parttimeRate,

View File

@ -73,7 +73,7 @@ class LaborExpensePageAccessTest extends FeatureTestCase
);
$this->assertCount(61, $fields);
$this->assertCount(50, $formulaFields);
$this->assertCount(52, $formulaFields);
$response = $this->loginAs($chenxi)->get(route('business.pages.show', [
'section' => 'financial-operations',
@ -99,11 +99,13 @@ class LaborExpensePageAccessTest extends FeatureTestCase
->assertSee('=IF(T#&lt;=0.03,0,IF(T#&lt;=0.1,3000,12000))', false)
->assertSee('=IF(F#&lt;=0,0,IF(O#=10000', false)
->assertSee('=IF(F#&lt;=0,0,IF(O#=5025', false)
->assertSee('=AF#*AG#-AH#', false)
->assertSee('=AD#', false)
->assertDontSee('data-labor-row="0"', false);
$html = $response->getContent();
$this->assertSame(61, substr_count($html, 'data-labor-header="'));
$this->assertSame(50, substr_count($html, 'class="labor-expense-formula"'));
$this->assertSame(52, substr_count($html, 'class="labor-expense-formula"'));
}
public function test_basic_deduction_tax_amount_and_housing_fund_base_are_formula_driven(): void
@ -141,6 +143,10 @@ class LaborExpensePageAccessTest extends FeatureTestCase
'=IF(F#<=0,0,IF(O#=5025,IF(F#<=5025,0,F#-O#),IF(O#=8000,IF(T#<=0.03,0,S#-AA#),IF(O#=10000,IF(S#-AA#<=5000,S#-AA#,0),0))))',
$fields['AC']['formula']
);
$this->assertSame('formula_number', $fields['AI']['kind']);
$this->assertSame('=AF#*AG#-AH#', $fields['AI']['formula']);
$this->assertSame('formula_number', $fields['AN']['kind']);
$this->assertSame('=AD#', $fields['AN']['formula']);
}
public function test_monthly_and_annual_tax_quick_deductions_are_formula_driven(): void