Modify pps related time fields

src/assets/index.less

@@ -104,6 +104,18 @@ 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 overrides ****************/
 .semi-dropdown-item-active {
   background-color: var(--semi-color-default-active);

src/components/bill/list.tsx

@@ -68,29 +68,29 @@ export const BillList: React.FC<BillListProps> = (props) => {
                 width: 150,
             },
             {
-                title: '开始支付时间',
+                title: <div className="table-header-title">{t('bill.title_initiated_paid_at')}<div className="tips">(PPS Input Date)</div></div>,
                 dataIndex: 'initiated_paid_at',
-                width: 150,
+                width: 180,
                 render: (value) => value?.length ?value: 'N/A'
             },
             {
-                title: '到账时间',
+                title: <div className="table-header-title">{t('bill.title_delivered_at')}<div className="tips">(PPS Statement Date)</div></div>,
                 dataIndex: 'delivered_at',
-                width: 150,
+                width: 180,
                 render: (value) => value?.length ?value: 'N/A'
             },
             {
                 title: t('bill.title_paid_at'),
                 dataIndex: 'paid_at',
-                width: 150,
-                render: (value) => value?.length ?value: 'N/A'
-            },
-            {
-                title: t('bill.title_create_at'),
-                dataIndex: 'create_at',
-                width: 150,
+                width: 180,
                 render: (value) => value?.length ?value: 'N/A'
             },
+            // {
+            //     title: t('bill.title_create_at'),
+            //     dataIndex: 'create_at',
+            //     width: 150,
+            //     render: (value) => value?.length ?value: 'N/A'
+            // },
             {
                 title: t('bill.title_student_name'),
                 dataIndex: 'student_english_name',

src/components/bill/search-form.tsx

@@ -120,11 +120,11 @@ const SearchForm: React.FC<SearchFormProps> = (props) => {
                             <Form.Select.Option value="student_number asc">{t('base.student_number')} {t('bill.sort_asc')}</Form.Select.Option>
                             <Form.Select.Option value="application_number desc">{t('base.bill_number')} {t('bill.sort_desc')}</Form.Select.Option>
                             <Form.Select.Option value="application_number asc">{t('base.bill_number')} {t('bill.sort_asc')}</Form.Select.Option>
-                            <Form.Select.Option value="paid_at desc">{t('bill.title_paid_at')} {t('bill.sort_desc')}</Form.Select.Option>
-                            <Form.Select.Option value="paid_at asc">{t('bill.title_paid_at')} {t('bill.sort_asc')}</Form.Select.Option>
+                            <Form.Select.Option value="initiated_paid_at desc">{t('bill.title_initiated_paid_at')} {t('bill.sort_desc')}</Form.Select.Option>
+                            <Form.Select.Option value="initiated_paid_at asc">{t('bill.title_initiated_paid_at')} {t('bill.sort_asc')}</Form.Select.Option>
 
-                            <Form.Select.Option value="create_at desc">{t('bill.title_create_at')} {t('bill.sort_desc')}</Form.Select.Option>
-                            <Form.Select.Option value="create_at asc">{t('bill.title_create_at')} {t('bill.sort_asc')}</Form.Select.Option>
+                            <Form.Select.Option value="delivered_at desc">{t('bill.title_delivered_at')} {t('bill.sort_desc')}</Form.Select.Option>
+                            <Form.Select.Option value="delivered_at asc">{t('bill.title_delivered_at')} {t('bill.sort_asc')}</Form.Select.Option>
                         </Form.Select>
                     </Col>
                     {props.showApply && <>

src/i18n/translations/en.json

@@ -51,8 +51,10 @@
     "title_bill_detail": "Bill Detail",
     "title_bill_list": "Bill List",
     "title_bill_status": "Bill Status",
-    "title_create_at": "Input Date",
+    "title_create_at": "Create Date",
+    "title_delivered_at": "Delivered Date",
     "title_department": "Department",
+    "title_initiated_paid_at": "Initiated Date",
     "title_operate": "Operation",
     "title_paid_at": "Transaction Date",
     "title_pay_amount": "Pay Amount",

src/i18n/translations/sc.json

@@ -52,9 +52,11 @@
     "title_bill_list": "账单列表",
     "title_bill_status": "账单状态",
     "title_create_at": "创建时间",
+    "title_delivered_at": "交付学院时间",
     "title_department": "学系",
+    "title_initiated_paid_at": "渠道支付时间",
     "title_operate": "操作",
-    "title_paid_at": "支付时间",
+    "title_paid_at": "付款时间",
     "title_pay_amount": "应付金额",
     "title_pay_channel": "支付渠道",
     "title_pay_method": "支付方式",

src/i18n/translations/tc.json

@@ -52,7 +52,9 @@
     "title_bill_list": "帳單清單",
     "title_bill_status": "帳單狀態",
     "title_create_at": "創建時間",
+    "title_delivered_at": "交付學院時間",
     "title_department": "學系",
+    "title_initiated_paid_at": "渠道支付時間",
     "title_operate": "操作",
     "title_paid_at": "付款時間",
     "title_pay_amount": "應付金額",