feature/2.9.42310.01-薪资项目拓扑图
This commit is contained in:
parent
2708ff3dc5
commit
1e028bb2ad
|
|
@ -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) => {
|
||||
|
|
|
|||
|
|
@ -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["操作"],
|
||||
|
|
|
|||
Loading…
Reference in New Issue