project/chuhai-payment-frontend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ update

Browse Source
This commit is contained in:
LittleBoy 2024-08-10 01:08:32 +08:00
parent fc31bddddc
commit e32b3853a3
2 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/components/bill/search-form.tsx
View File

@ -15,6 +15,7 @@ type SearchFormProps = {
} }
type SearchFormFields = { type SearchFormFields = {
dateRange?: Date[]; dateRange?: Date[];
delivered_at?: Date[];
student_number?: string; student_number?: string;
merchant_ref?: string; merchant_ref?: string;
id?: string; id?: string;
@ -32,8 +33,12 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
const params: BillQueryParams = {} const params: BillQueryParams = {}
if (value.dateRange && value.dateRange.length == 2) { if (value.dateRange && value.dateRange.length == 2) {
params.start_date = dayjs(value.dateRange[0]).format('YYYY-MM-DD'); params.start_initiated = dayjs(value.dateRange[0]).format('YYYY-MM-DD');
params.end_date = dayjs(value.dateRange[1]).format('YYYY-MM-DD'); params.end_initiated = dayjs(value.dateRange[1]).format('YYYY-MM-DD');
}
if (value.delivered_at && value.delivered_at.length == 2) {
params.start_delivered = dayjs(value.delivered_at[0]).format('YYYY-MM-DD');
params.end_delivered = dayjs(value.delivered_at[1]).format('YYYY-MM-DD');
} }
if (value.id) { if (value.id) {
params.id = value.id; params.id = value.id;
@ -52,6 +57,11 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
if (value.confirm_status) { if (value.confirm_status) {
params.confirm_status = value.confirm_status; params.confirm_status = value.confirm_status;
} }
// 支付方式
if (value.payment_channel) {
params.payment_channel = value.payment_channel;
}
// 账单状态 // 账单状态
if (value.bill_status) { if (value.bill_status) {
params.status = value.bill_status; params.status = value.bill_status;
@ -59,10 +69,6 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
if(!props.showApply){ if(!props.showApply){
params.status = 'PAID' params.status = 'PAID'
} }
// 支付方式
if (value.payment_channel) {
params.payment_channel = value.payment_channel;
}
// 排序 // 排序
if(value.sort_by){ if(value.sort_by){
const [field, order] = value.sort_by.split(' ') const [field, order] = value.sort_by.split(' ')
@ -72,7 +78,11 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
params.sort_field = 'id' params.sort_field = 'id'
params.sort_order = 'DESC' params.sort_order = 'DESC'
} }
props.onSearch?.(params);
props.onSearch?.({
...params,
...value
});
} }
const {t, i18n} = useTranslation(); const {t, i18n} = useTranslation();
// 根据语言变化更新订单状态options // 根据语言变化更新订单状态options
@ -106,7 +116,10 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
</Form.DatePicker> </Form.DatePicker>
</Col> </Col>
<Col xxl={4} xl={6} md={8}> <Col xxl={4} xl={6} md={8}>
<Form.Input showClear field='id' label="ID / Merchant Ref" trigger='blur' placeholder={t('base.please_enter')}/> <Form.Input type={'number'} showClear field='id' label="ID" trigger='blur' placeholder={t('base.please_enter')}/>
</Col>
<Col xxl={4} xl={6} md={8}>
<Form.Input showClear field='merchant_ref' label="Merchant Ref" trigger='blur' placeholder={t('base.please_enter')}/>
</Col> </Col>
<Col xxl={4} xl={6} md={8}> <Col xxl={4} xl={6} md={8}>
<Form.Input showClear field='student_number' label={t('base.student_number')} trigger='blur' <Form.Input showClear field='student_number' label={t('base.student_number')} trigger='blur'
@ -142,7 +155,7 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
</Col> </Col>
<Col xxl={4} xl={6} md={8}> <Col xxl={4} xl={6} md={8}>
<Form.Select <Form.Select
field="bill_type" style={{width: '100%'}} field="confirm_bill_type" style={{width: '100%'}}
label={t('manual.bill_type')} label={t('manual.bill_type')}
placeholder={t('manual.bill_type')} placeholder={t('manual.bill_type')}
> >

18
src/types/bill.d.ts vendored
View File

@ -33,12 +33,30 @@ declare type BillQueryParam = {
apply_status:string; apply_status:string;
id:string|number; id:string|number;
merchant_ref:string; merchant_ref:string;
/**
* @deprecated
*/
bill_type:string; bill_type:string;
confirm_bill_type:string;
student_number:string; student_number:string;
application_number:string; application_number:string;
payment_channel:string; payment_channel:string;
/**
* @deprecated
*/
start_date:string; start_date:string;
/**
* @deprecated
*/
end_date:string; end_date:string;
start_initiated:string;
end_initiated:string;
start_delivered:string;
end_delivered:string;
merchant_ref:string;
/**
* @deprecated
*/
department:string; department:string;
confirm_status: ConfirmStatus; confirm_status: ConfirmStatus;
sort_field:string; sort_field:string;