diff --git a/src/pages/bill/components/add_bill_modal.tsx b/src/pages/bill/components/add_bill_modal.tsx index 94bd762..2923520 100644 --- a/src/pages/bill/components/add_bill_modal.tsx +++ b/src/pages/bill/components/add_bill_modal.tsx @@ -109,7 +109,8 @@ export const AddBillModal: React.FC = (props) => { details: ConfirmedBillDetail[]; errorMessage?: string; errorConfirmMessage?: string; - values?: CreateBillRecordModel + errorConfirmOk?: boolean; + values?: CreateBillRecordModel; }>({ details: [] }) @@ -132,7 +133,8 @@ export const AddBillModal: React.FC = (props) => { values.paid_date = dayjs(values.paid_date).format("YYYY-MM-DD") values.delivered_date = dayjs(values.delivered_date).format("YYYY-MM-DD") setState({ - loading: true, errorMessage: undefined,values + loading: true, errorMessage: undefined, + values,errorConfirmOk:false }) addBillRecord(values).then(() => { setState({open: false}) @@ -141,9 +143,9 @@ export const AddBillModal: React.FC = (props) => { }).catch((e: BizError) => { if (e.code == -50415) { // STUDENT_INFO_NOT_FOUND // duplicate - setState({errorConfirmMessage: e.message}) + setState({errorConfirmMessage: e.message,errorConfirmOk:true}) } else { - setState({errorMessage: e.message}) + setState({errorConfirmMessage: e.message}) } }).finally(() => { setState({ @@ -360,9 +362,16 @@ export const AddBillModal: React.FC = (props) => { onCancel={handleCloseConfirm} width={600} maskClosable={false} - okText={t('base.confirm_and_add')} - onOk={handleConfirmAdd} - okButtonProps={{loading: state.confirmLoading}} + footer={ +
+ + + {state.errorConfirmOk && } + +
+ } > {t('base.title_error_tip')}