diff --git a/src/components/bill/list.tsx b/src/components/bill/list.tsx index e709242..468049d 100644 --- a/src/components/bill/list.tsx +++ b/src/components/bill/list.tsx @@ -27,19 +27,16 @@ export const BillList: React.FC = (props) => { title: '#', dataIndex: 'id', width: 120, - fixed: true, }, { title: t('base.student_number'), dataIndex: 'student_number', width: 150, - fixed: true, render: (value) => value ?? 'N/A' }, { title: t('base.bill_number'), dataIndex: 'application_number', - fixed: true, width: 150, }, { @@ -196,7 +193,7 @@ export const BillList: React.FC = (props) => { formatPageText: (params) => (
{props.tableFooter} - {props.source?.pagination.recordTotal && {t('page.record-show',params)}} + {props.source && props.source.pagination.recordTotal > 0 && {t('page.record-show',params)}}
) }} diff --git a/src/components/bill/search-form.tsx b/src/components/bill/search-form.tsx index cfb7199..b3ad3ad 100644 --- a/src/components/bill/search-form.tsx +++ b/src/components/bill/search-form.tsx @@ -74,20 +74,20 @@ const SearchForm: React.FC = (props) => {
onSubmit={formSubmit}> - + - + - + - + ASIAPAY @@ -95,14 +95,14 @@ const SearchForm: React.FC = (props) => { PPS - + {billStatusOptions.map((item, index) => ( {item.label}))} - {props.showApply && + {props.showApply && {applyStatusOptions.map((item, index) => ( diff --git a/src/pages/bill/query.tsx b/src/pages/bill/query.tsx index a268076..f8d3fcb 100644 --- a/src/pages/bill/query.tsx +++ b/src/pages/bill/query.tsx @@ -59,21 +59,21 @@ const BillQuery = () => { } return (
- + {/**/} { const updateBillSuccess = (billId: number, type: string, ref: string) =>{ updateBillPaymentSuccess(billId, ref, type).then(bill => { setState({bill}) - }).finally(()=>{ + }).catch(()=>{ setState({result:'fail'}) }) } @@ -47,7 +47,7 @@ const PayIndex = () => { return; } if (result == 'success') { - updateBillSuccess(Number(bill), from , (from == 'asia_pay' ? search.get('Ref')! : search.get('callback_id')!)); + updateBillSuccess(Number(bill), from , (from == 'ASIAPAY' ? search.get('Ref')! : search.get('callback_id')!)); } } setState({result, status}) diff --git a/src/types/core.d.ts b/src/types/core.d.ts index 9775105..7258c90 100644 --- a/src/types/core.d.ts +++ b/src/types/core.d.ts @@ -4,7 +4,7 @@ declare type RecordList = { total: number; pageSize: number; current: number; - recordTotal?: number; + recordTotal: number; sort?: string; filter?: string; };