diff --git a/src/pages/employeeDeclareTable/index.tsx b/src/pages/employeeDeclareTable/index.tsx index 73e03f9..f623e6c 100644 --- a/src/pages/employeeDeclareTable/index.tsx +++ b/src/pages/employeeDeclareTable/index.tsx @@ -24,13 +24,13 @@ const CommonTable: FC = (props) => { const receiveMessageFromIndex = (event: any) => { const data: any = exceptStr(event.data); if (!_.isEmpty(data)) { - const { columns, dataSource, pageInfo, i18n, selectedRowKeys, selectedKey } = data; + const { columns, dataSource, pageInfo, i18n, selectedRowKeys, selectedKey, azOperate } = data; const { current: pageNum, pageSize: size, total } = pageInfo; setDataSource(dataSource); setI18n(i18n); setPageInfo({ pageNum, size, total }); setSelected(selectedRowKeys); - setColumns([ + setColumns(azOperate ? [ ...columns, { title: i18n["操作"], @@ -46,7 +46,7 @@ const CommonTable: FC = (props) => { ) : null; } } - ]); + ] : columns); } }; const handleEdit = (record: any) => { diff --git a/src/pages/taxDeclareTable/index.tsx b/src/pages/taxDeclareTable/index.tsx index 28d90b0..43e46af 100644 --- a/src/pages/taxDeclareTable/index.tsx +++ b/src/pages/taxDeclareTable/index.tsx @@ -26,11 +26,11 @@ const TaxDeclareTable: FC = (props) => { const receiveMessageFromIndex = (event: any) => { const data: any = exceptStr(event.data); if (!_.isEmpty(data)) { - const { columns, dataSource, pageInfo, i18n, declareStatus } = data; + const { columns, dataSource, pageInfo, i18n, declareStatus, azOperate } = data; setDataSource(dataSource); setI18n(i18n); setPageInfo(pageInfo); - setColumns(["NOT_DECLARE", "DECLARE_FAIL"].includes(declareStatus) ? [ + setColumns((["NOT_DECLARE", "DECLARE_FAIL"].includes(declareStatus) && azOperate) ? [ ...columns, { title: i18n["操作"],