From 41be262dee1176d7ac39ceef7c810a733e901a4d Mon Sep 17 00:00:00 2001 From: selfrelease Date: Wed, 19 Aug 2026 10:13:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A4=BE=E4=BF=9D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=9B=9E=E9=80=80SocialYearStandard=E3=80=81=E6=9C=88=E5=BA=A6?= =?UTF-8?q?=E5=8A=9E=E7=90=86tab=E5=88=87=E6=8D=A2=E3=80=81=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=8F=82=E4=BF=9D=E7=AD=9B=E9=80=89=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 后端：dotenv/config 加载 ENCRYPTION_KEY，修复薪资数据解密 - 后端：社保/公积金 calculate API 回退到 SocialYearStandard（通过默认账户） - 后端：getSocialConfigByMonth/getHousingConfigByMonth 回退到 SocialYearStandard - 后端：active-declaration 查询条件改为 lte，当月办理的增员也显示在在保列表 - 后端：employee-enrollment API 增加部门/参保状态筛选和分页 - 后端：updateEmployeeSchema 增加 baseSalary/performanceSalary 字段 - 后端：payroll2.routes 批次详情包含 contracts 合同类型 - 前端：月度办理社保/公积金改为 tab 切换（不再同时展开） - 前端：员工参保列表增加筛选（部门/社保状态/公积金状态）和分页 - 前端：花名册基本信息增加月度工资只读显示（基本+绩效自动计算） - 前端：薪资批次详情表增加合同类型列 Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> --- backend/package-lock.json | 13 ++ backend/package.json | 1 + backend/src/index.ts | 1 + backend/src/routes/payroll2.routes.ts | 5 +- backend/src/routes/social.routes.ts | 194 +++++++++++++++++- frontend/src/lib/api-services.ts | 11 +- frontend/src/pages/SocialInsurance.tsx | 105 ++++++---- frontend/src/pages/roster/BasicInfo.tsx | 6 + .../EmployeeEnrollmentTab.tsx | 131 ++++++++++-- 9 files changed, 395 insertions(+), 72 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index 6bcedbd..5900b50 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -14,6 +14,7 @@ "bcryptjs": "^2.4.3", "compression": "^1.7.4", "cors": "^2.8.5", + "dotenv": "^17.4.2", "exceljs": "^4.4.0", "express": "^4.19.0", "express-rate-limit": "^7.4.0", @@ -1695,6 +1696,18 @@ "integrity": "sha512-98l0sW87ZT58pU4i61wa2OHwxbiYSbuxsCBozaVnYX2iCnr3bLM3fIes1/ej7h1YdOKuKt/MLs706TVnALA65w==", "license": "BSD-2-Clause" }, + "node_modules/dotenv": { + "version": "17.4.2", + "resolved": "https://registry.npmmirror.com/dotenv/-/dotenv-17.4.2.tgz", + "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, "node_modules/duck": { "version": "0.1.12", "resolved": "https://registry.npmmirror.com/duck/-/duck-0.1.12.tgz", diff --git a/backend/package.json b/backend/package.json index 0276ea3..18de1dc 100644 --- a/backend/package.json +++ b/backend/package.json @@ -19,6 +19,7 @@ "bcryptjs": "^2.4.3", "compression": "^1.7.4", "cors": "^2.8.5", + "dotenv": "^17.4.2", "exceljs": "^4.4.0", "express": "^4.19.0", "express-rate-limit": "^7.4.0", diff --git a/backend/src/index.ts b/backend/src/index.ts index 0a639ef..6dd4819 100644 --- a/backend/src/index.ts +++ b/backend/src/index.ts @@ -1,3 +1,4 @@ +import 'dotenv/config' import app from './app' import { validateEnv } from './lib/config' import logger from './lib/logger' diff --git a/backend/src/routes/payroll2.routes.ts b/backend/src/routes/payroll2.routes.ts index 29ab467..bfa5112 100644 --- a/backend/src/routes/payroll2.routes.ts +++ b/backend/src/routes/payroll2.routes.ts @@ -1023,9 +1023,9 @@ router.post('/batches/:batchId/fetch-disciplinary', async (req: AuthRequest, res } // 查询批次月份内的违纪扣款记录（按 violationDate 落在批次月份内） - const monthStart = new Date(batch.month + '-01') + const monthStart = new Date(batch.month + '-01T00:00:00.000Z') const monthEnd = new Date(monthStart) - monthEnd.setMonth(monthEnd.getMonth() + 1) + monthEnd.setUTCMonth(monthEnd.getUTCMonth() + 1) const disciplinaryRecords = await prisma.disciplinaryRecord.findMany({ where: { @@ -1037,6 +1037,7 @@ router.post('/batches/:batchId/fetch-disciplinary', async (req: AuthRequest, res }, select: { employeeId: true, deductionAmount: true }, }) + console.log(`[fetch-disciplinary] batch.month=${batch.month} monthStart=${monthStart.toISOString()} monthEnd=${monthEnd.toISOString()} entries=${entries.length} records=${disciplinaryRecords.length}`) // 按员工汇总扣款金额 const deductionMap = new Map() diff --git a/backend/src/routes/social.routes.ts b/backend/src/routes/social.routes.ts index 2b41194..9609025 100644 --- a/backend/src/routes/social.routes.ts +++ b/backend/src/routes/social.routes.ts @@ -819,6 +819,41 @@ router.post('/calculate', async (req: AuthRequest, res: Response, next: NextFunc where: { ...whereBase, isCurrent: true }, }) } + // 回退到 SocialYearStandard（通过默认社保账户关联） + if (!config) { + const socialAccount = await prisma.socialAccount.findFirst({ + where: { orgId, type: 'SOCIAL', isDefault: true }, + }) + if (socialAccount) { + const standard = await prisma.socialYearStandard.findFirst({ + where: { + accountId: socialAccount.id, + effectiveFrom: { lte: month || '9999-12' }, + OR: [{ effectiveTo: null }, { effectiveTo: { gte: month || '0000-01' } }], + }, + orderBy: { effectiveFrom: 'desc' }, + }) + if (standard) { + config = { + baseMin: standard.baseMin, + baseMax: standard.baseMax, + medicalBaseMin: standard.medicalBaseMin, + medicalBaseMax: standard.medicalBaseMax, + pensionOrg: standard.pensionOrg, + pensionEmp: standard.pensionEmp, + medicalOrg: standard.medicalOrg, + medicalEmp: standard.medicalEmp, + medicalOrgExtra: standard.medicalOrgExtra, + medicalEmpExtra: standard.medicalEmpExtra, + unemploymentOrg: standard.unemploymentOrg, + unemploymentEmp: standard.unemploymentEmp, + injuryOrg: standard.injuryOrg, + maternityOrg: standard.maternityOrg, + extraInsurances: standard.extraInsurances, + } as any + } + } + } if (!config) { return res.status(404).json({ success: false, error: { code: 'NOT_FOUND', message: `未找到${city || ''}的社保配置，请先在社保管理中创建` } }) } @@ -1004,6 +1039,30 @@ router.post('/housing-calculate', async (req: AuthRequest, res: Response, next: where: { ...whereBase, isCurrent: true }, }) } + // 回退到 SocialYearStandard（通过默认公积金账户关联） + if (!config) { + const housingAccount = await prisma.socialAccount.findFirst({ + where: { orgId, type: 'HOUSING', isDefault: true }, + }) + if (housingAccount) { + const standard = await prisma.socialYearStandard.findFirst({ + where: { + accountId: housingAccount.id, + effectiveFrom: { lte: month || '9999-12' }, + OR: [{ effectiveTo: null }, { effectiveTo: { gte: month || '0000-01' } }], + }, + orderBy: { effectiveFrom: 'desc' }, + }) + if (standard) { + config = { + baseMin: standard.housingBaseMin || standard.baseMin, + baseMax: standard.housingBaseMax || standard.baseMax, + housingOrg: standard.housingOrg, + housingEmp: standard.housingEmp, + } as any + } + } + } if (!config) { return res.status(404).json({ success: false, error: { code: 'NOT_FOUND', message: `未找到${city || ''}的公积金配置，请先在公积金管理中创建` } }) } @@ -1251,7 +1310,7 @@ function calcHousingDetail(base: number, config: any) { return { actualBase, orgAmount, empAmount, total: orgAmount + empAmount } } -/** 按月份匹配社保配置版本 */ +/** 按月份匹配社保配置版本（回退到 SocialYearStandard） */ async function getSocialConfigByMonth(orgId: string, month: string, city?: string) { const where: any = { orgId } if (city) where.city = city @@ -1262,10 +1321,73 @@ async function getSocialConfigByMonth(orgId: string, month: string, city?: strin if (!config) { config = await prisma.socialInsuranceConfig.findFirst({ where: { ...where, isCurrent: true } }) } + // 回退到 SocialYearStandard（通过默认社保账户关联） + if (!config) { + const socialAccount = await prisma.socialAccount.findFirst({ + where: { orgId, type: 'SOCIAL', isDefault: true }, + }) + if (socialAccount) { + const standard = await prisma.socialYearStandard.findFirst({ + where: { + accountId: socialAccount.id, + effectiveFrom: { lte: month }, + OR: [{ effectiveTo: null }, { effectiveTo: { gte: month } }], + }, + orderBy: { effectiveFrom: 'desc' }, + }) + if (!standard) { + const fallback = await prisma.socialYearStandard.findFirst({ + where: { accountId: socialAccount.id, isCurrent: true }, + orderBy: { effectiveFrom: 'desc' }, + }) + if (fallback) { + config = { + city: city || '北京', + effectiveFrom: fallback.effectiveFrom, + baseMin: fallback.baseMin, + baseMax: fallback.baseMax, + medicalBaseMin: fallback.medicalBaseMin, + medicalBaseMax: fallback.medicalBaseMax, + pensionOrg: fallback.pensionOrg, + pensionEmp: fallback.pensionEmp, + medicalOrg: fallback.medicalOrg, + medicalEmp: fallback.medicalEmp, + medicalOrgExtra: fallback.medicalOrgExtra, + medicalEmpExtra: fallback.medicalEmpExtra, + unemploymentOrg: fallback.unemploymentOrg, + unemploymentEmp: fallback.unemploymentEmp, + injuryOrg: fallback.injuryOrg, + maternityOrg: fallback.maternityOrg, + extraInsurances: fallback.extraInsurances, + } as any + } + } else { + config = { + city: city || '北京', + effectiveFrom: standard.effectiveFrom, + baseMin: standard.baseMin, + baseMax: standard.baseMax, + medicalBaseMin: standard.medicalBaseMin, + medicalBaseMax: standard.medicalBaseMax, + pensionOrg: standard.pensionOrg, + pensionEmp: standard.pensionEmp, + medicalOrg: standard.medicalOrg, + medicalEmp: standard.medicalEmp, + medicalOrgExtra: standard.medicalOrgExtra, + medicalEmpExtra: standard.medicalEmpExtra, + unemploymentOrg: standard.unemploymentOrg, + unemploymentEmp: standard.unemploymentEmp, + injuryOrg: standard.injuryOrg, + maternityOrg: standard.maternityOrg, + extraInsurances: standard.extraInsurances, + } as any + } + } + } return config } -/** 按月份匹配公积金配置版本 */ +/** 按月份匹配公积金配置版本（回退到 SocialYearStandard） */ async function getHousingConfigByMonth(orgId: string, month: string, city?: string) { const where: any = { orgId } if (city) where.city = city @@ -1276,6 +1398,47 @@ async function getHousingConfigByMonth(orgId: string, month: string, city?: stri if (!config) { config = await prisma.housingFundConfig.findFirst({ where: { ...where, isCurrent: true } }) } + // 回退到 SocialYearStandard（通过默认公积金账户关联） + if (!config) { + const housingAccount = await prisma.socialAccount.findFirst({ + where: { orgId, type: 'HOUSING', isDefault: true }, + }) + if (housingAccount) { + const standard = await prisma.socialYearStandard.findFirst({ + where: { + accountId: housingAccount.id, + effectiveFrom: { lte: month }, + OR: [{ effectiveTo: null }, { effectiveTo: { gte: month } }], + }, + orderBy: { effectiveFrom: 'desc' }, + }) + if (!standard) { + const fallback = await prisma.socialYearStandard.findFirst({ + where: { accountId: housingAccount.id, isCurrent: true }, + orderBy: { effectiveFrom: 'desc' }, + }) + if (fallback) { + config = { + city: city || '北京', + effectiveFrom: fallback.effectiveFrom, + baseMin: fallback.housingBaseMin || fallback.baseMin, + baseMax: fallback.housingBaseMax || fallback.baseMax, + housingOrg: fallback.housingOrg, + housingEmp: fallback.housingEmp, + } as any + } + } else { + config = { + city: city || '北京', + effectiveFrom: standard.effectiveFrom, + baseMin: standard.housingBaseMin || standard.baseMin, + baseMax: standard.housingBaseMax || standard.baseMax, + housingOrg: standard.housingOrg, + housingEmp: standard.housingEmp, + } as any + } + } + } return config } @@ -1547,8 +1710,8 @@ router.get('/active-declaration', async (req: AuthRequest, res: Response, next: const records = await prisma.employeeSocialInsRecord.findMany({ where: { orgId, - startMonth: { lt: month }, - OR: [{ endMonth: null }, { endMonth: { gt: month } }], + startMonth: { lte: month }, + OR: [{ endMonth: null }, { endMonth: { gte: month } }], employee: { contracts: { some: { contractType: { in: ['FIXED', 'UNFIXED'] } } } }, }, include: { employee: { select: { name: true, department: true, idCardNumber: true, hireDate: true, contracts: { orderBy: { createdAt: 'desc' }, take: 1, select: { contractType: true } } } } }, @@ -1715,8 +1878,8 @@ router.get('/housing/active-declaration', async (req: AuthRequest, res: Response const records = await prisma.employeeHousingFundRecord.findMany({ where: { orgId, - startMonth: { lt: month }, - OR: [{ endMonth: null }, { endMonth: { gt: month } }], + startMonth: { lte: month }, + OR: [{ endMonth: null }, { endMonth: { gte: month } }], employee: { contracts: { some: { contractType: { in: ['FIXED', 'UNFIXED'] } } } }, }, include: { employee: { select: { name: true, department: true, idCardNumber: true, hireDate: true, contracts: { orderBy: { createdAt: 'desc' }, take: 1, select: { contractType: true } } } } }, @@ -2180,13 +2343,19 @@ router.get('/employee-enrollment', async (req: AuthRequest, res: Response, next: try { const orgId = req.user!.orgId const keyword = (req.query.keyword as string) || '' + const department = (req.query.department as string) || '' + const socialStatus = (req.query.socialStatus as string) || '' // INSURED | UNINSURED + const housingStatus = (req.query.housingStatus as string) || '' // INSURED | UNINSURED + const page = Math.max(1, parseInt(req.query.page as string) || 1) + const pageSize = Math.min(200, Math.max(1, parseInt(req.query.pageSize as string) || 20)) - // 查询所有在职员工 + // 查询所有在职员工（先全量查，再在内存中按参保状态过滤，最后分页） const employees = await prisma.employee.findMany({ where: { orgId, status: 'ACTIVE', ...(keyword ? { name: { contains: keyword, mode: 'insensitive' } } : {}), + ...(department ? { department } : {}), }, select: { id: true, @@ -2217,7 +2386,7 @@ router.get('/employee-enrollment', async (req: AuthRequest, res: Response, next: const socialMap = new Map(socialRecords.map(r => [r.employeeId, r])) const housingMap = new Map(housingRecords.map(r => [r.employeeId, r])) - const list = employees.map(emp => { + let list = employees.map(emp => { const social = socialMap.get(emp.id) const housing = housingMap.get(emp.id) return { @@ -2236,7 +2405,14 @@ router.get('/employee-enrollment', async (req: AuthRequest, res: Response, next: } }) - res.json({ success: true, data: list }) + // 按参保状态过滤 + if (socialStatus) list = list.filter(e => e.socialInsStatus === socialStatus) + if (housingStatus) list = list.filter(e => e.housingFundStatus === housingStatus) + + const total = list.length + const paged = list.slice((page - 1) * pageSize, page * pageSize) + + res.json({ success: true, data: paged, total, page, pageSize }) } catch (err) { next(err) } diff --git a/frontend/src/lib/api-services.ts b/frontend/src/lib/api-services.ts index 6b2e4ef..2a83243 100644 --- a/frontend/src/lib/api-services.ts +++ b/frontend/src/lib/api-services.ts @@ -674,9 +674,14 @@ export const socialInsuranceApi = { /** 公积金活跃申报 */ housingActiveDeclaration: (month: string) => get('/social/housing/active-declaration', { params: { month } }).then(unwrap()), - /** 员工参保信息列表 */ - employeeEnrollment: (keyword?: string) => - get('/social/employee-enrollment', { params: keyword ? { keyword } : {} }).then(unwrap()), + /** 员工参保信息列表（支持筛选和分页，返回 { data, total, page, pageSize }） */ + employeeEnrollment: (params?: { keyword?: string; department?: string; socialStatus?: string; housingStatus?: string; page?: number; pageSize?: number }) => + get('/social/employee-enrollment', { params: params || {} }).then((res: any) => { + const body = res?.data ?? res + // 兼容旧格式（纯数组）和新格式（{ data, total, page, pageSize }） + if (Array.isArray(body)) return { data: body, total: body.length, page: 1, pageSize: body.length } + return { data: body.data || [], total: body.total ?? 0, page: body.page ?? 1, pageSize: body.pageSize ?? 20 } + }), /** 办理社保增员（批量创建社保记录） */ enrollSocial: (employeeIds: string[], startMonth: string) => post('/social/enroll-social', { employeeIds, startMonth }).then(unwrap()), diff --git a/frontend/src/pages/SocialInsurance.tsx b/frontend/src/pages/SocialInsurance.tsx index 7285efa..c17378e 100644 --- a/frontend/src/pages/SocialInsurance.tsx +++ b/frontend/src/pages/SocialInsurance.tsx @@ -27,6 +27,7 @@ export default function SocialInsurance() { const [monthlyMonth, setMonthlyMonth] = useState(new Date().toISOString().slice(0, 7)) const [monthlyProcessed, setMonthlyProcessed] = useState(false) const [processStatus, setProcessStatus] = useState<{ social: any; housing: any } | null>(null) + const [monthlySubTab, setMonthlySubTab] = useState<'social' | 'housing'>('social') // 账户管理相关 state const [showAccountForm, setShowAccountForm] = useState(false) const [editAccount, setEditAccount] = useState(null) @@ -495,52 +496,72 @@ export default function SocialInsurance() {
{city} - 向{city}社保/公积金经办机构申报 + 向{city}{monthlySubTab === 'social' ? '社保' : '公积金'}经办机构申报
-
- } - summary={`${sAddCity.length + sSubCity.length + sNormalCity.length} 人 | 企业 ¥${fmt([...sAddCity, ...sNormalCity].reduce((s: number, i: any) => s + (i.detail?.totalOrg || 0), 0))} + 个人 ¥${fmt([...sAddCity, ...sNormalCity].reduce((s: number, i: any) => s + (i.detail?.totalEmp || 0), 0))} = ¥${fmt(sTotal)}`} - defaultOpen={true} - action={sAddCity.filter((i: any) => i.changeType === 'PENDING').length > 0 ? ( - - ) : undefined} + {/* 子 Tab 切换 */} +
+ - ) : undefined} + 社保 + （{sAddCity.length + sSubCity.length + sNormalCity.length}人） + + +
+
+ {monthlySubTab === 'social' ? ( +
+
+
+ 企业 ¥{fmt([...sAddCity, ...sNormalCity].reduce((s: number, i: any) => s + (i.detail?.totalOrg || 0), 0))} + 个人 ¥{fmt([...sAddCity, ...sNormalCity].reduce((s: number, i: any) => s + (i.detail?.totalEmp || 0), 0))} = ¥{fmt(sTotal)} +
+ {sAddCity.filter((i: any) => i.changeType === 'PENDING').length > 0 && ( + + )} +
+ {sTable} +
+ ) : ( +
+
+
+ 企业 ¥{fmt([...hAddCity, ...hNormalCity].reduce((s: number, i: any) => s + (i.detail?.orgAmount || 0), 0))} + 个人 ¥{fmt([...hAddCity, ...hNormalCity].reduce((s: number, i: any) => s + (i.detail?.empAmount || 0), 0))} = ¥{fmt(hTotal)} +
+ {hAddCity.filter((i: any) => i.changeType === 'PENDING').length > 0 && ( + + )} +
+ {hTable} +
+ )}
) diff --git a/frontend/src/pages/roster/BasicInfo.tsx b/frontend/src/pages/roster/BasicInfo.tsx index fa6d6ef..44129b8 100644 --- a/frontend/src/pages/roster/BasicInfo.tsx +++ b/frontend/src/pages/roster/BasicInfo.tsx @@ -362,6 +362,12 @@ export default function BasicInfo({ profile, employeeId, attachments }: { profil setForm({ ...form, performanceSalary: e.target.value, monthlySalary: base + perf }) }} placeholder="可为0" /> +
+ +
+ ¥{fmt(Number(form.monthlySalary) || 0)} （自动计算：基本 + 绩效） +
+
setForm({ ...form, emergencyContact: e.target.value })} placeholder="选填" />
setForm({ ...form, emergencyPhone: e.target.value })} placeholder="选填" />
setForm({ ...form, address: e.target.value })} placeholder="选填" />
diff --git a/frontend/src/pages/social-insurance/EmployeeEnrollmentTab.tsx b/frontend/src/pages/social-insurance/EmployeeEnrollmentTab.tsx index e7d00bb..a22703c 100644 --- a/frontend/src/pages/social-insurance/EmployeeEnrollmentTab.tsx +++ b/frontend/src/pages/social-insurance/EmployeeEnrollmentTab.tsx @@ -1,7 +1,7 @@ -import { useState } from 'react' +import { useState, useMemo } from 'react' import { useQuery } from '@tanstack/react-query' -import { Search, CheckCircle, XCircle } from 'lucide-react' -import { socialInsuranceApi } from '../../lib/api-services' +import { Search, CheckCircle, XCircle, ChevronLeft, ChevronRight } from 'lucide-react' +import { socialInsuranceApi, rosterApi } from '../../lib/api-services' import { Input } from '../../components/ui/Input' import { useDebouncedValue } from '../../hooks/useDebouncedValue' @@ -10,34 +10,107 @@ const fmt = (n: number) => (n || 0).toLocaleString('zh-CN', { minimumFractionDig export default function EmployeeEnrollmentTab() { const [keyword, setKeyword] = useState('') const debouncedSearch = useDebouncedValue(keyword, 300) + const [department, setDepartment] = useState('') + const [socialStatus, setSocialStatus] = useState('') + const [housingStatus, setHousingStatus] = useState('') + const [page, setPage] = useState(1) + const [pageSize, setPageSize] = useState(20) - const { data: list = [], isLoading } = useQuery({ - queryKey: ['social-employee-enrollment', debouncedSearch], - queryFn: () => socialInsuranceApi.employeeEnrollment(debouncedSearch || undefined), + const params = useMemo(() => ({ + keyword: debouncedSearch || undefined, + department: department || undefined, + socialStatus: socialStatus || undefined, + housingStatus: housingStatus || undefined, + page, + pageSize, + }), [debouncedSearch, department, socialStatus, housingStatus, page, pageSize]) + + const { data: result, isLoading } = useQuery({ + queryKey: ['social-employee-enrollment', params], + queryFn: () => socialInsuranceApi.employeeEnrollment(params), + placeholderData: (prev: any) => prev, }) - const insuredCount = list.filter(e => e.socialInsStatus === 'INSURED').length - const housingCount = list.filter(e => e.housingFundStatus === 'INSURED').length + const { data: departments = [] } = useQuery({ + queryKey: ['roster-departments'], + queryFn: () => rosterApi.departments(), + }) + + const list = result?.data || [] + const total = result?.total || 0 + const totalPages = Math.max(1, Math.ceil(total / pageSize)) + + const insuredCount = list.filter((e: any) => e.socialInsStatus === 'INSURED').length + const housingCount = list.filter((e: any) => e.housingFundStatus === 'INSURED').length + + // 筛选变化时重置到第一页 + const handleFilterChange = (setter: (v: string) => void) => (v: string) => { + setter(v) + setPage(1) + } return (
-
-
- 共 {list.length} 人 - 社保参保 {insuredCount} - 公积金参保 {housingCount} -
+ {/* 筛选栏 */} +
setKeyword(e.target.value)} + onChange={(e) => { setKeyword(e.target.value); setPage(1) }} placeholder="搜索员工姓名" className="pl-9" />
+ + + +
+ +
+ {/* 统计 */} +
+ 共 {total} 人 + 社保参保 {insuredCount} + 公积金参保 {housingCount} +
+ + {/* 表格 */}
@@ -59,7 +132,7 @@ export default function EmployeeEnrollmentTab() { {isLoading ? ( ) : list.length === 0 ? ( - + ) : list.map((emp: any) => ( @@ -98,6 +171,32 @@ export default function EmployeeEnrollmentTab() {
加载中...
暂无员工参保信息
暂无符合条件的员工
{emp.name}
+ + {/* 分页 */} + {total > 0 && ( +
+ + 第 {(page - 1) * pageSize + 1}-{Math.min(page * pageSize, total)} 条，共 {total} 条 + +
+ + {page} / {totalPages} + +
+
+ )}
) }