diff --git a/src/components/bill/list.tsx b/src/components/bill/list.tsx index 93429ee..899caf8 100644 --- a/src/components/bill/list.tsx +++ b/src/components/bill/list.tsx @@ -354,7 +354,6 @@ export const BillList: React.FC = (props) => { }
- {JSON.stringify(state.selectedKeys)} bordered columns={columns} diff --git a/src/pages/bill/components/bill_type_confirm.tsx b/src/pages/bill/components/bill_type_confirm.tsx index 78f58ab..f1331fa 100644 --- a/src/pages/bill/components/bill_type_confirm.tsx +++ b/src/pages/bill/components/bill_type_confirm.tsx @@ -1,4 +1,4 @@ -import {Button, Select, Space, Divider, InputNumber, Modal,} from "@douyinfe/semi-ui"; +import {Button, Select, Space, Divider, InputNumber, Modal} from "@douyinfe/semi-ui"; import React, {useEffect} from "react"; import {useSetState} from "ahooks"; import MoneyFormat from "@/components/money-format.tsx"; @@ -121,6 +121,11 @@ export const BillTypeConfirmModal: React.FC = (props) => { ...state }]).then(() => { props.onClose?.(true) + }).catch(e=>{ + Modal.error({ + title: 'Error', + content: `Confirmed Fail: ${e.message}` + }) }).finally(() => { setState({loading: false}) }) diff --git a/src/pages/bill/reconciliation.tsx b/src/pages/bill/reconciliation.tsx index ec2d637..ac89cac 100644 --- a/src/pages/bill/reconciliation.tsx +++ b/src/pages/bill/reconciliation.tsx @@ -1,4 +1,4 @@ -import {Button, Space, TabPane, Tabs, Notification, Popconfirm, Toast, Modal} from "@douyinfe/semi-ui"; +import {Button, Space, TabPane, Tabs, Popconfirm, Toast, Modal} from "@douyinfe/semi-ui"; import {useRequest, useSetState} from "ahooks"; import {useTranslation} from "react-i18next"; import {useState} from "react"; @@ -19,7 +19,7 @@ const BillReconciliation = () => { confirm_status: 'CONFIRMED' }), { refreshDeps: [queryParams], - onSuccess:()=>{ + onSuccess: () => { setState({checkingId: -1}) }, onError: (e: Error) => { @@ -36,16 +36,16 @@ const BillReconciliation = () => { }) const confirmBill = (records: number[]) => { if (records.length == 0) { - Notification.error({title: 'Notice', content: t('bill.confirm_select_empty')}) + Toast.error({content: t('bill.confirm_select_empty')}) return } - const arr = data?.list.filter(item =>records.includes(item.id)); - if(!arr) return; + const arr = data?.list.filter(item => records.includes(item.id)); + if (!arr) return; for (let i = 0; i < arr.length; i++) { const item = arr[i]; // 判断confirm的总金额是否和实付金额相等 - const total = item.detail_confirms? item.detail_confirms.reduce((total, item) => { + const total = item.detail_confirms ? item.detail_confirms.reduce((total, item) => { return total + Number(item.amount) }, 0) : 0; @@ -60,7 +60,7 @@ const BillReconciliation = () => { setState({checkingId: records.length > 1 ? 0 : Number(records[0])}) confirmBills(records).then(() => { - Notification.success({title: 'Notice', content: t('bill.confirm_success')}) + Toast.success({content: t('bill.confirm_success')}) refresh() }).catch((e: BizError) => { Toast.error({ @@ -109,18 +109,18 @@ const BillReconciliation = () => { source={data} type={'reconciliation'} operationRender={queryParams.apply_status == 'CHECKED' ? undefined : operation} beforeTotalAmount={
{queryParams.apply_status != 'CHECKED' && ( - (selectKeys.length == 0 )? : - confirmBill(selectKeys as number[])} - > - - + : + confirmBill(selectKeys as number[])} + > + + )}
} onRowSelection={queryParams.apply_status == 'CHECKED' ? undefined : (keys: (number | string)[]) => { setSelectedKeys(keys);