diff --git a/src/api/calculate.service.ts b/src/api/calculate.service.ts index 29a29b9..09e2391 100644 --- a/src/api/calculate.service.ts +++ b/src/api/calculate.service.ts @@ -10,12 +10,13 @@ class CalculateService extends BasicService { //获取人员确认列表信息 getPCDataList = async ({ url, queryParams }: any) => { - const { departmentIds = "", positionIds = "", subcompanyIds = "", ...extraParams } = queryParams || {}; + const { departmentIds = "", positionIds = "", subcompanyIds = "", statuses, ...extraParams } = queryParams || {}; queryParams = { ...extraParams, departmentIds: departmentIds ? departmentIds.split(",") : undefined, positionIds: positionIds ? positionIds.split(",") : undefined, - subcompanyIds: subcompanyIds ? subcompanyIds.split(",") : undefined + subcompanyIds: subcompanyIds ? subcompanyIds.split(",") : undefined, + statuses: statuses ? statuses.split(",") : [], }; for (let key in queryParams) { if (queryParams[key] === "" || queryParams[key] === "0") { diff --git a/src/pages/payrollFilesTable/index.tsx b/src/pages/payrollFilesTable/index.tsx index 3defd26..524c399 100644 --- a/src/pages/payrollFilesTable/index.tsx +++ b/src/pages/payrollFilesTable/index.tsx @@ -107,7 +107,7 @@ const payrollFilesTable: FC = (props) => { ; - } else if (selectedKey === "fixed") { + } else if (selectedKey === "fixed" || selectedKey === "ext") { dom =