From ce1dd73640f6cb0efb60d1febaf414f3cd4a4103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 10 Jul 2023 10:46:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/calculate.service.ts | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
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") {
From 9b0abc08ae41a1f051817785865fc6350d75c9a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Mon, 10 Jul 2023 15:30:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/reportTable/index.tsx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/pages/reportTable/index.tsx b/src/pages/reportTable/index.tsx
index fd3859c..ab77c3b 100644
--- a/src/pages/reportTable/index.tsx
+++ b/src/pages/reportTable/index.tsx
@@ -24,7 +24,10 @@ const ReportTable: FC = (props) => {
setDataSource(dataSource);
setShowSumrow(showSum);
setSumRow(countResult);
- setColumns(_.map(columns, item => {
+ setColumns(_.map(columns, (item, index: number) => {
+ if (index === 0) {
+ return { ...item, fixed: "left" };
+ }
return {
...item,
children: _.map(item.children, child => {
From 64dfc7da078ce50175381bb6cebe02e3665330ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 12 Jul 2023 13:38:18 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84?=
=?UTF-8?q?=E6=A0=B8=E7=AE=97iframe=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/payrollFilesTable/index.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/payrollFilesTable/index.tsx b/src/pages/payrollFilesTable/index.tsx
index 301c0dc..cabac38 100644
--- a/src/pages/payrollFilesTable/index.tsx
+++ b/src/pages/payrollFilesTable/index.tsx
@@ -104,7 +104,7 @@ const payrollFilesTable: FC = (props) => {
;
- } else if (selectedKey === "fixed") {
+ } else if (selectedKey === "fixed" || selectedKey === "ext") {
dom =