Merge branch 'develop' of https://gitlab.com/empatnusabangsa/ppob/ppob-frontend into devops-staging
This commit is contained in:
commit
33bc456032
|
@ -283,7 +283,7 @@ export const DetailUser = observer(() => {
|
||||||
render: (text, record) => {
|
render: (text, record) => {
|
||||||
return (
|
return (
|
||||||
<Text>
|
<Text>
|
||||||
{format(parseISO(record.created_at), "dd-MM-yyyy HH:mm:ss")}
|
{format(parseISO(record.created_at), "MM-dd-yyyy HH:mm:ss")}
|
||||||
</Text>
|
</Text>
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
@ -907,13 +907,23 @@ export const DetailUser = observer(() => {
|
||||||
store.transaction.dataDetailHistoryTransactionDetailUser
|
store.transaction.dataDetailHistoryTransactionDetailUser
|
||||||
}
|
}
|
||||||
bordered
|
bordered
|
||||||
pagination={{
|
pagination={store.transaction.total_data > 1000 ? {
|
||||||
|
pageSizeOptions : [10, 20, 50, 100, 1000],
|
||||||
pageSize: store.transaction.pageSize,
|
pageSize: store.transaction.pageSize,
|
||||||
total: store.transaction.total_data,
|
total: store.transaction.total_data,
|
||||||
current: store.transaction.page + 1,
|
current: store.transaction.page + 1,
|
||||||
showSizeChanger: true,
|
showSizeChanger: true,
|
||||||
simple: false,
|
simple: false,
|
||||||
}}
|
} :
|
||||||
|
{
|
||||||
|
pageSize: store.transaction.pageSize,
|
||||||
|
total: store.transaction.total_data,
|
||||||
|
current: store.transaction.page + 1,
|
||||||
|
showSizeChanger: true,
|
||||||
|
simple: false,
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
onChange={async (page) => {
|
onChange={async (page) => {
|
||||||
let pageNumber = page.current;
|
let pageNumber = page.current;
|
||||||
store.transaction.pageSize = page.pageSize;
|
store.transaction.pageSize = page.pageSize;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user