diff --git a/src/components/bill/list.tsx b/src/components/bill/list.tsx index 5d9bcbe..7c311fc 100644 --- a/src/components/bill/list.tsx +++ b/src/components/bill/list.tsx @@ -3,6 +3,7 @@ import {ColumnProps} from "@douyinfe/semi-ui/lib/es/table"; import React, {useMemo, useState} from "react"; import {useTranslation} from "react-i18next"; import dayjs from "dayjs"; +import {IconCheckCircleStroked} from "@douyinfe/semi-icons"; import MoneyFormat from "@/components/money-format.tsx"; import {Card} from "@/components/card"; @@ -20,6 +21,15 @@ type BillListProps = { loading?: boolean; beforeTotalAmount?: React.ReactNode; } +const CheckNumberCorrect = ({origin,confirmed}:{origin: string,confirmed?:string}) => { + if(origin == confirmed && origin){ + return ({origin}) + } + return
+
{origin?.length ?origin: 'N/A'}
+ {confirmed&&{confirmed}} +
+} export const BillList: React.FC = (props) => { const {t, i18n} = useTranslation() @@ -69,12 +79,13 @@ export const BillList: React.FC = (props) => { title: t('base.student_number'), dataIndex: 'student_number', width: 150, - render: (value) => value?.length ?value: 'N/A' + render: (value,record) => () }, { title: t('base.bill_number'), dataIndex: 'application_number', width: 150, + render: (value,record) => () }, { title: t('bill.title_initiated_paid_at'), @@ -139,7 +150,7 @@ export const BillList: React.FC = (props) => { dataIndex: 'detail', ellipsis: {showTitle: true}, width: 220, - render: (_, record) => (
+ render: (_, record) => (
{record.details.map((it, idx) => (
{it.bill_type}:
))}
), }, @@ -148,7 +159,7 @@ export const BillList: React.FC = (props) => { dataIndex: '_detail', ellipsis: {showTitle: true}, width: 220, - render: (_, record) => (
+ render: (_, record) => (
{record.details.filter(s=>s.confirm_status == 'CONFIRMED').map((it) => (
{it.confirm_type}:
))}
), },