update

This commit is contained in:
LittleBoy 2024-08-10 00:46:56 +08:00
parent dc2b34f013
commit fc31bddddc
6 changed files with 28 additions and 6 deletions

View File

@ -104,6 +104,24 @@ body #root{
}
}
.table-header-title{
position: relative;
top:8px;
line-height: 1.2;
margin-bottom: 5px;
.tips {
font-size: 12px;
color: #ccc;
//position: absolute;
}
}
.semi-checkbox-addon{
.table-header-title{
top:2px;
}
}
/***************** semi overrides ****************/
.semi-dropdown-item{
max-width: 500%;

View File

@ -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_chinese_name",
"id", "merchant_ref", "student_number", "application_number", "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"
]
})
@ -149,13 +149,15 @@ export const BillList: React.FC<BillListProps> = (props) => {
},
{
title: t('bill.title_program_name'),
dataIndex: 'programme_english_name',
width: 250,
dataIndex: i18n.language == 'en-US' ? 'programme_english_name' : 'programme_chinese_name',
render: (_, record) => (i18n.language == 'en-US' ? record.programme_english_name : record.programme_chinese_name),
// dataIndex: i18n.language == 'en-US' ? 'programme_english_name' : 'programme_chinese_name',
},
{
title: t('bill.title_department'),
width: 200,
dataIndex: '',
dataIndex: 'department_english_name',
render: (_, record) => (i18n.language == 'en-US' ? record.department_english_name : record.department_chinese_name),
},
{

View File

@ -31,7 +31,7 @@
"confirm_bill_number": "Confirm Bill Number",
"confirm_bill_type": "Confirm Bill",
"confirm_bill_type_batch": "Batch confirm Bill Type",
"confirm_confirm_title": "Confirm check the Bill?",
"confirm_confirm_title": "Confirm check and sync the Bill?",
"confirm_select_empty": "Require confirm bill data",
"confirm_student_number": "Confirm Student Number",
"confirm_success": "Confirm success!",

View File

@ -31,7 +31,7 @@
"confirm_bill_number": "确认账单编号",
"confirm_bill_type": "确认账单",
"confirm_bill_type_batch": "批量确认账单",
"confirm_confirm_title": "请确定对账此账单?",
"confirm_confirm_title": "请确定对账并同步此账单?",
"confirm_select_empty": "对账账单为空",
"confirm_student_number": "确认学号",
"confirm_success": "对账成功!",

View File

@ -31,7 +31,7 @@
"confirm_bill_number": "確認帳單編號",
"confirm_bill_type": "確認賬單",
"confirm_bill_type_batch": "批次確認帳單",
"confirm_confirm_title": "請確定對帳此帳單?",
"confirm_confirm_title": "請確定對帳并同步此帳單?",
"confirm_select_empty": "對帳帳單為空",
"confirm_student_number": "確認學號",
"confirm_success": "對帳成功!",

View File

@ -58,6 +58,8 @@ const BillReconciliation = () => {
title={'Notice'}
content={t('bill.confirm_confirm_title')}
onConfirm={() => confirmBill([_record.id])}
okText={t('base.confirm')}
cancelText={t('base.cancel')}
>
<Button
loading={state.checkingId == _record.id} size={'small'} theme={'solid'}