🚀 feat: add confirm status

src/components/bill/list.tsx

@@ -1,9 +1,9 @@
-import {Button, Checkbox, CheckboxGroup, Space, Table, Typography} from "@douyinfe/semi-ui";
+import {Button, Checkbox, CheckboxGroup, Space, Table, Tag, Typography} from "@douyinfe/semi-ui";
 import {ColumnProps} from "@douyinfe/semi-ui/lib/es/table";
 import React, {ReactNode, useMemo, useState} from "react";
 import {useTranslation} from "react-i18next";
 import dayjs from "dayjs";
-import {IconCheckCircleStroked, IconSetting} from "@douyinfe/semi-icons";
+import {IconCheckCircleStroked, IconSetting, IconTickCircle} from "@douyinfe/semi-icons";
 
 import MoneyFormat from "@/components/money-format.tsx";
 import {Card} from "@/components/card";
@@ -23,7 +23,7 @@ type BillListProps = {
 	loading?: boolean;
 	beforeTotalAmount?: React.ReactNode;
 }
-const CheckNumberCorrect = ({origin, confirmed}: { origin: string, confirmed?: string|null }) => {
+const CheckNumberCorrect = ({origin, confirmed}: { origin: string, confirmed?: string | null }) => {
 	if (origin == confirmed && origin) {
 		return (<Space style={{marginTop: 2, color: 'green'}}><span>{origin}</span><IconCheckCircleStroked/></Space>)
 	}
@@ -42,7 +42,7 @@ export const BillList: React.FC<BillListProps> = (props) => {
 		showCols: string[]
 	}>({
 		showCols: [
-			"id", "merchant_ref", "student_number", "application_number", "initiated_paid_at", "delivered_at", "paid_at", "student_english_name", "student_email", "programme_english_name",
+			"id", "merchant_ref", "student_number", "application_number", 'confirm_status', "initiated_paid_at", "delivered_at", "paid_at", "student_english_name", "student_email", "programme_english_name",
 			"intake_year", "detail", "detail_confirms", "amount", "pay_amount", "actual_payment_amount", "pay_method", "status", "apply_status"
 		]
 	})
@@ -90,7 +90,7 @@ export const BillList: React.FC<BillListProps> = (props) => {
 				title: t('base.student_number'),
 				dataIndex: 'student_number',
 				width: 150,
-				render: (value:string) => (value|| 'N/A')
+				render: (value: string) => (value || 'N/A')
 			},
 			{
 				title: t('base.bill_number'),
@@ -99,13 +99,16 @@ export const BillList: React.FC<BillListProps> = (props) => {
 				render: (value, record) => (
 					<CheckNumberCorrect origin={value} confirmed={record.confirm_application_number}/>)
 			},
-			// {
+			{
-			// 	title: t('bill.title_application_number_confirmed'),
+				title: t('bill.title_bill_confirm_status'),
-			// 	dataIndex: 'application_number',
+				dataIndex: 'confirm_status',
-			// 	width: 150,
+				width: 160,
-			// 	render: (value, record) => (
+				render: (value) => (
-			// 		<CheckNumberCorrect origin={value} confirmed={value || record.application_number_confirm}/>)
+					<Tag
-			// },
+						shape='circle' prefixIcon={value == 'CONFIRMED' ? <IconTickCircle/> : null}
+						color={value == 'CONFIRMED' ? 'green' : 'grey'}>{value}</Tag>
+				)
+			},
 			{
 				title: <div className="table-header-title">{t('bill.title_initiated_paid_at')}
 					<div className="tips">(PPS Input Date)</div>
@@ -300,9 +303,10 @@ export const BillList: React.FC<BillListProps> = (props) => {
 	return <Card
 		title={<Space>
 			<span>{t('bill.title_bill_list')}</span>
-			<span className={'cursor-pointer'} onClick={() => setState({showColumnsConfig: true})}>
+			<span
-                <IconSetting size={'small'}/>
+				className={'cursor-pointer'} style={{color:'pink'}}
-            </span>
+				onClick={() => setState({showColumnsConfig: !state.showColumnsConfig})}
+			><IconSetting /></span>
 		</Space>}
 		headerRight={<Space spacing={20}>
 			{props.beforeTotalAmount}
@@ -335,7 +339,7 @@ export const BillList: React.FC<BillListProps> = (props) => {
             </div>
             <div className="table-column-action" style={{marginTop: 20}}>
                 <Space>
-                    <Button onClick={()=>setState({showColumnsConfig:false})}>{t('base.close')}</Button>
+                    <Button onClick={() => setState({showColumnsConfig: false})}>{t('base.close')}</Button>
                 </Space>
             </div>
 

src/i18n/translations/en.json

@@ -60,6 +60,7 @@
     "status_unconfirmed": "UNCONFIRMED",
     "title_actual_payment_amount": "Actually Paid",
     "title_amount": "Amount",
+    "title_bill_confirm_status": "Confirm Status",
     "title_bill_detail": "Bill Detail",
     "title_bill_list": "Bill List",
     "title_bill_status": "Bill Status",

src/i18n/translations/sc.json

@@ -60,6 +60,7 @@
     "status_unconfirmed": "未确认",
     "title_actual_payment_amount": "实付金额",
     "title_amount": "账单金额",
+    "title_bill_confirm_status": "确认状态",
     "title_bill_detail": "账单详情",
     "title_bill_list": "账单列表",
     "title_bill_status": "账单状态",

src/i18n/translations/tc.json

@@ -60,6 +60,7 @@
     "status_unconfirmed": "未確認",
     "title_actual_payment_amount": "實付金額",
     "title_amount": "帳單金額",
+    "title_bill_confirm_status": "確認狀態",
     "title_bill_detail": "帳單詳情",
     "title_bill_list": "帳單清單",
     "title_bill_status": "帳單狀態",