From 26b786444fffb20932d0b6f687e46827296d4ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com> Date: Tue, 8 Aug 2023 15:27:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=9B=E5=BE=AE=E8=96=AA=E8=B5=84=E6=A0=B8?= =?UTF-8?q?=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/atdTable/components/antdTable.tsx | 32 ++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/atdTable/components/antdTable.tsx b/src/pages/atdTable/components/antdTable.tsx index 6357bde..319aee7 100644 --- a/src/pages/atdTable/components/antdTable.tsx +++ b/src/pages/atdTable/components/antdTable.tsx @@ -38,7 +38,7 @@ const AntdTable: FC = (props) => { }, []); const getPCDataList = (params: any = {}) => { - let { type, listType, hasOperate = true, ...extraParams } = params; + let { type, listType, hasOperate = true, i18n: newI18n, ...extraParams } = params; setLoading({ query: true }); setTab(type); setUsertab(listType); @@ -49,7 +49,7 @@ const AntdTable: FC = (props) => { if (type === "PC") { if (listType === "SA") { const { columns = [], list = [], total, pageSize: size, pageNum } = dataCopy; - setColumns(getUserListColumns(columns)); + setColumns(getUserListColumns(columns, newI18n)); setDataSource(list); setPageParams({ ...pageParams, total, size, pageNum }); } else if (listType === "MA") { @@ -61,7 +61,7 @@ const AntdTable: FC = (props) => { } else { const { columns = [], pageInfo = {} } = dataCopy; const { list = [], total, pageSize: size, pageNum } = pageInfo; - setColumns(getColumns(columns, hasOperate)); + setColumns(getColumns(columns, hasOperate, newI18n)); setDataSource(list); setPageParams({ ...pageParams, total, size, pageNum }); const confCode: any = await API.CalculateService.getSysconfcode({ code: "OPEN_ACCT_RESULT_SUM" }); @@ -81,10 +81,10 @@ const AntdTable: FC = (props) => { } }); }; - const getUserListColumns = (acctemployeeListColumns: any) => { + const getUserListColumns = (acctemployeeListColumns: any, newI18n:any) => { let tmpColumns = [...acctemployeeListColumns, { key: "cz", - title: i18n["操作"], + title: newI18n["操作"], render: (text: string, record: any) => { return ( ); } @@ -130,7 +130,7 @@ const AntdTable: FC = (props) => { return tmpColumns; }; //薪资核算页面列表 - const getColumns = (column: any, hasOperate: boolean = true) => { + const getColumns = (column: any, hasOperate: boolean = true, newI18n: any) => { let tmpColumns = [...column]; tmpColumns = tmpColumns.filter(item => item.hide == "FALSE").map((item, index) => { let result = { ...item }; @@ -148,7 +148,7 @@ const AntdTable: FC = (props) => { item.lockStatus && { item.lockStatus === "UNLOCK" && { window.parent.postMessage( { @@ -162,7 +162,7 @@ const AntdTable: FC = (props) => { } { item.lockStatus !== "UNLOCK" && { window.parent.postMessage( { @@ -197,7 +197,7 @@ const AntdTable: FC = (props) => { return {text} { - result.lockStatus === "LOCK" ? : null + result.lockStatus === "LOCK" ? : null } ; }; @@ -220,7 +220,7 @@ const AntdTable: FC = (props) => { { child.lockStatus === "UNLOCK" && { window.parent.postMessage( { @@ -235,7 +235,7 @@ const AntdTable: FC = (props) => { { child.lockStatus !== "UNLOCK" && { window.parent.postMessage( { @@ -257,7 +257,7 @@ const AntdTable: FC = (props) => { return {text} { - child.lockStatus === "LOCK" ? : null + child.lockStatus === "LOCK" ? : null } ; }; @@ -274,7 +274,7 @@ const AntdTable: FC = (props) => { return result; }); hasOperate && tmpColumns.push({ - title: i18n["操作"], + title: newI18n["操作"], key: "cz", width: "100px", fixed: "right", @@ -287,7 +287,7 @@ const AntdTable: FC = (props) => { }, "*" ); - }}>{i18n["编辑"]}; + }}>{newI18n["编辑"]}; } }); return tmpColumns; @@ -298,7 +298,7 @@ const AntdTable: FC = (props) => { if (!_.isEmpty(data)) { const { selectedRowKeys, i18n, ...extraData } = data; setI18n(i18n); - getPCDataList({ ...extraData, ...pageParams }); + getPCDataList({ ...extraData, ...pageParams, i18n }); if (selectedRowKeys) setSelected(selectedRowKeys); } };