diff --git a/src/pages/unitTable/index.tsx b/src/pages/unitTable/index.tsx index cfcb283..fbd007c 100644 --- a/src/pages/unitTable/index.tsx +++ b/src/pages/unitTable/index.tsx @@ -100,14 +100,7 @@ const UnitTable: FC = (props) => { scroll={{ x: 1200, y: `calc(100vh - ${extraParams?.scrollHeight || 109}px)` }} bordered={_.some(columns, (k) => k.children)} rowSelection={!_.isNil(extraParams?.selectedRowKeys) ? rowSelection : undefined} - pagination={ - !_.isNil(pageInfo) - ? { - ...paginationAction(pageInfo, i18n, onChange), - size: "default" - } - : false - } + pagination={!_.isNil(pageInfo) ? { ...paginationAction(pageInfo, i18n, onChange), size: "default" } : false} summary={() => !extraParams.showTotalCell ? ( <> diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index a587a57..784233f 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -69,7 +69,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, width: 185, fixed: "right", render: (__: string, record: any) => { - const { billStatus } = record; + const { billStatus, customOptAuth } = record; const items: MenuProps["items"] = [ { key: "DeleteList", @@ -111,9 +111,11 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, - + {(_.isEmpty(customOptAuth) || customOptAuth.FILE) && ( + + )} - + {(_.isEmpty(customOptAuth) || customOptAuth.RECALC) && ( + + )}