feat: 薪税管理批次表格增加绩效工资列
前端 BatchTab.tsx: - 表头增加绩效工资列 - 表体渲染 performanceSalary 单元格 - 绩效工资加入可编辑字段列表 后端 payroll2.routes.ts: - updateEntrySchema 增加 performanceSalary 字段 - 更新 entry 时接受前端传来的 performanceSalary 值
This commit is contained in:
@@ -575,6 +575,7 @@ router.post('/batches', async (req: AuthRequest, res: Response, next: NextFuncti
|
||||
// 编辑批次条目(计算依据项 + 社保公积金手动覆盖)
|
||||
const updateEntrySchema = z.object({
|
||||
baseSalary: z.number().optional(),
|
||||
performanceSalary: z.number().optional(),
|
||||
overtimePay: z.number().optional(),
|
||||
allowance: z.number().optional(),
|
||||
deduction: z.number().optional(),
|
||||
@@ -607,9 +608,9 @@ router.put('/batches/:batchId/entries/:employeeId', async (req: AuthRequest, res
|
||||
allowance: data.allowance ?? entry.allowance,
|
||||
deduction: data.deduction ?? entry.deduction,
|
||||
bonus: data.bonus ?? entry.bonus,
|
||||
positionSalary: entry.positionSalary || undefined,
|
||||
performanceSalary: entry.performanceSalary || undefined,
|
||||
senioritySalary: entry.senioritySalary || undefined,
|
||||
positionSalary: (data as any).positionSalary ?? entry.positionSalary ?? undefined,
|
||||
performanceSalary: data.performanceSalary ?? entry.performanceSalary ?? undefined,
|
||||
senioritySalary: (data as any).senioritySalary ?? entry.senioritySalary ?? undefined,
|
||||
transportAllowance: entry.transportAllowance || undefined,
|
||||
mealAllowance: entry.mealAllowance || undefined,
|
||||
housingAllowance: entry.housingAllowance || undefined,
|
||||
|
||||
Reference in New Issue
Block a user