From ced367b2d15004c076c55171fcb8144733d63ba9 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 11 Mar 2024 18:11:35 +0800 Subject: [PATCH] ind user ui update --- src/pages/Payment/Search_Public/DataGrid.js | 4 +- src/pages/Payment/Search_Public/SearchForm.js | 16 ++--- src/pages/Payment/Search_Public/index.js | 2 +- src/pages/Proof/Search_Public/DataGrid.js | 32 +++++++-- src/pages/Proof/Search_Public/SearchForm.js | 16 ++--- .../User/DetailsPage_Individual/index.js | 2 +- .../User/DetailsPage_Organization/index.js | 2 +- .../UserSearchForm_Individual.js | 2 +- .../UserSearchForm_Organization.js | 2 +- src/translations/en.json | 70 ++++++++++--------- src/translations/zh-CN.json | 36 +++++----- src/translations/zh-HK.json | 32 +++++---- src/utils/ComboData.js | 6 +- src/utils/DateUtils.js | 9 ++- src/utils/statusUtils/DnStatus.js | 2 +- 15 files changed, 128 insertions(+), 105 deletions(-) diff --git a/src/pages/Payment/Search_Public/DataGrid.js b/src/pages/Payment/Search_Public/DataGrid.js index 5d96649..cdd669a 100644 --- a/src/pages/Payment/Search_Public/DataGrid.js +++ b/src/pages/Payment/Search_Public/DataGrid.js @@ -82,7 +82,7 @@ export default function SearchPublicNoticeTable({ recordList }) { }, { field: 'action', - headerName: intl.formatMessage({id: 'payStatus'}), + headerName: intl.formatMessage({id: 'status'}), width: 150, renderCell: (params) => { return locale === 'en' ? @@ -109,7 +109,7 @@ export default function SearchPublicNoticeTable({ recordList }) { rowHeight={80} rows={rows} columns={columns} - customPageSize={5} + customPageSize={10} onRowDoubleClick={handleEditDoubleClick} /> diff --git a/src/pages/Payment/Search_Public/SearchForm.js b/src/pages/Payment/Search_Public/SearchForm.js index 1cd0fc7..b927123 100644 --- a/src/pages/Payment/Search_Public/SearchForm.js +++ b/src/pages/Payment/Search_Public/SearchForm.js @@ -82,7 +82,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { fullWidth {...register("code")} id='code' - label={intl.formatMessage({id: 'applicationId'}) + ":"} + label={intl.formatMessage({id: 'applicationId'})} defaultValue={searchCriteria.code} InputLabelProps={{ shrink: true @@ -91,8 +91,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { - - + + { /> - - - - - + { }} id="dateTo" type="date" - //label="付款日期(到)" + label={intl.formatMessage({id: 'payDateTo'})} defaultValue={searchCriteria.dateTo} /> @@ -166,7 +162,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => { fullWidth {...register("transNo")} id='transNo' - label={intl.formatMessage({id: 'payId'})+":"} + label={intl.formatMessage({id: 'payId'})} defaultValue={searchCriteria.transNo} InputLabelProps={{ shrink: true diff --git a/src/pages/Payment/Search_Public/index.js b/src/pages/Payment/Search_Public/index.js index 1b2e72d..8c991c7 100644 --- a/src/pages/Payment/Search_Public/index.js +++ b/src/pages/Payment/Search_Public/index.js @@ -70,7 +70,7 @@ const Index = () => {
- +
diff --git a/src/pages/Proof/Search_Public/DataGrid.js b/src/pages/Proof/Search_Public/DataGrid.js index c15f6a0..c0d252f 100644 --- a/src/pages/Proof/Search_Public/DataGrid.js +++ b/src/pages/Proof/Search_Public/DataGrid.js @@ -64,6 +64,31 @@ export default function SearchPublicNoticeTable({ recordList }) { return title; } }*/ + + const getIssueLabel=(data) =>{ + let issueYear = data.row.issueYear + let volume = data.row.issueVolume; + let issueNo = data.row.issueNo; + let issueDate = data.row.issueDate; + if (locale === 'zh-HK') { + return issueYear + + " 第" + volume + "卷," + + " 第" + issueNo + "期," + + " " + DateUtils.dateFormat(issueDate, "YYYY年MM月DD日") + + " (" + DateUtils.getWeekdayStr_ZH(issueDate) + ")"; + } else if (locale === 'zh-CN') { + return issueYear + + " 第" + volume + "卷," + + " 第" + issueNo + "期," + + " " + DateUtils.dateFormat(issueDate, "YYYY年MM月DD日") + + " (" + DateUtils.getWeekdayStr_CN(issueDate) + ")"; + } + return issueYear + + " Vol. " + FormatUtils.zeroPad(volume, 3) + + ", No. " + FormatUtils.zeroPad(issueNo, 2) + + ", " + DateUtils.dateFormat(issueDate, "D MMM YYYY (ddd)"); + } + const columns = [ { @@ -85,10 +110,7 @@ export default function SearchPublicNoticeTable({ recordList }) { renderCell: (params) => { // let appNo = params.row.appNo; // let code = params.row.groupNo; - let isssue = params.row.issueYear - + " Vol. " + FormatUtils.zeroPad(params.row.issueVolume, 3) - + ", No. " + FormatUtils.zeroPad(params.row.issueNo, 2) - + ", " + DateUtils.dateFormat(params.row.issueDate, "D MMM YYYY (ddd)"); + let isssue = getIssueLabel(params); // return
{appNo}
{isssue}
{params.row.appRemarks}
return
{isssue}
{isORGLoggedIn()?<>{params.row.appCareOf}
:null}{params.row.appRemarks}
@@ -113,7 +135,7 @@ export default function SearchPublicNoticeTable({ recordList }) { valueGetter: (params) => { let proofPaymentDeadline = DateUtils.convertToDate(params?.value); proofPaymentDeadline = proofPaymentDeadline.setHours(14, 0, 0, 0); - return locale === 'en' ? DateUtils.datetimeStr(proofPaymentDeadline) : DateUtils.datetimeStr_Cht(proofPaymentDeadline); + return DateUtils.datetimeStr(proofPaymentDeadline); } }, { diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js index 803ede0..c721ad3 100644 --- a/src/pages/Proof/Search_Public/SearchForm.js +++ b/src/pages/Proof/Search_Public/SearchForm.js @@ -133,7 +133,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData fullWidth {...register("refNo")} id='refNo' - label={intl.formatMessage({id: 'proofId'}) + ":"} + label={intl.formatMessage({id: 'proofId'}) } defaultValue={searchCriteria.refNo} InputLabelProps={{ shrink: true @@ -146,7 +146,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData fullWidth {...register("code")} id='code' - label={intl.formatMessage({id: 'applicationId'}) + ":"} + label={intl.formatMessage({id: 'applicationId'})} defaultValue={searchCriteria.code} InputLabelProps={{ shrink: true @@ -201,8 +201,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData */} - - + + - - - - - + diff --git a/src/pages/User/DetailsPage_Individual/index.js b/src/pages/User/DetailsPage_Individual/index.js index 45a3718..5831a1d 100644 --- a/src/pages/User/DetailsPage_Individual/index.js +++ b/src/pages/User/DetailsPage_Individual/index.js @@ -73,7 +73,7 @@ const UserMaintainPage_Individual = () => { let modifiedBy = DateUtils.datetimeStr(response.data.modified) + ", " + response.data.modifiedBy; response.data["createDate"] = createDate; response.data["modifieDate"] = modifiedBy; - response.data["verifiedStatus"] = response.data.verifiedBy ? DateUtils.datetimeStr(response.data.verifiedDate) + ", " + response.data.verifiedByName : "Not verified"; + response.data["verifiedStatus"] = response.data.verifiedBy ? DateUtils.datetimeStr(response.data.verifiedDate) + ", " + response.data.verifiedByName : "Not Verified"; response.data["country"] = getObjectByValue(ComboData.country, "key", response.data.address?.country); response.data["district"] = getObjectByValue(ComboData.district, "key", response.data.address?.district); diff --git a/src/pages/User/DetailsPage_Organization/index.js b/src/pages/User/DetailsPage_Organization/index.js index ae3caf8..59b5759 100644 --- a/src/pages/User/DetailsPage_Organization/index.js +++ b/src/pages/User/DetailsPage_Organization/index.js @@ -132,7 +132,7 @@ const UserMaintainPage_Organization = () => { let modifiedBy = DateUtils.datetimeStr(response.data.modified) + ", " + response.data.modifiedBy; response.data["createDate"] = createDate; response.data["modifieDate"] = modifiedBy; - response.data["verifiedStatus"] = response.data.verifiedBy ? DateUtils.datetimeStr(response.data.verifiedDate) + ", " + response.data.verifiedByName : "Not verified"; + response.data["verifiedStatus"] = response.data.verifiedBy ? DateUtils.datetimeStr(response.data.verifiedDate) + ", " + response.data.verifiedByName : "Not Verified"; response.data["lastLoginDate"] = response.data.lastLogin ? DateUtils.datetimeStr(response.data.lastLoginDate) : ""; // console.log(getObjectByValue(ComboData.country, "key", response.data.addressBus?.country)) diff --git a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js index ad8fe65..982245a 100644 --- a/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js +++ b/src/pages/User/SearchPage_Individual/UserSearchForm_Individual.js @@ -115,7 +115,7 @@ const UserSearchForm_Individual = ({ applySearch }) => { disablePortal id="accountFilter" size="small" - options={["All","Active", "Locked", "Not verified"]} + options={["All","Active", "Locked", "Not Verified"]} value={accountFilter} onChange={(event, newValue) => { if (newValue !== null) { diff --git a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js index 52052ad..f9e41e1 100644 --- a/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js +++ b/src/pages/User/SearchPage_Organization/UserSearchForm_Organization.js @@ -142,7 +142,7 @@ const UserSearchForm_Organization = ({applySearch}) => { disablePortal={false} id="accountFilter" size="small" - options={["All", "Active","Locked","Not verified"]} + options={["All", "Active","Locked","Not Verified"]} value={accountFilter} onChange={(event, newValue) => { if (newValue !== null){ diff --git a/src/translations/en.json b/src/translations/en.json index f0fa1cd..dceb667 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -37,7 +37,7 @@ "MSG.registerPersonal": "To complete the online application, you need to upload digital copies of identification documents.
e.g. Hong Kong Identity Card, Passport, Mainland China Identity Card, Professional Practicing Certificate, etc.", "MSG.registerOrg": "You need to upload the proof documents for the online application.
e.g. Business Registration Certificate, Professional Practicing Certificate, etc.", "MSG.paymentMsg": "Your application and payment have been received", - "MSG.expiredApp": "Public notice application has expired", + "MSG.expiredApp": "Public Notice application has expired", "MSG.providedByIAmSmart": "Indicates that the item is provided by \"iAM Smart\".", @@ -65,7 +65,7 @@ "MSG.payMsg1": "We have received the manuscript proofreading confirmation and printing instructions for application number: {appNo}.", "MSG.payMsg2_1": "Please complete the payment before ", "MSG.payMsg2_2": " and we will process the publication after receiving payment confirmation.", - "MSG.payMsg3": "If you have multiple public notice applications within the Year {issueYear}, Volume {issueVolume}, Issue {issueNo} of the Official Gazette, you can choose to merge the payment for all the approved manuscripts within this issue in 'My Public Notice' before the payment deadline.", + "MSG.payMsg3": "If you have multiple Public Notice applications within the Year {issueYear}, Volume {issueVolume}, Issue {issueNo} of the Official Gazette, you can choose to merge the payment for all the approved manuscripts within this issue in 'My Public Notice' before the payment deadline.", "MSG.proofOutOfTime": "Response out of time, please apply again.", "MSG.plzSelectApp": "Please select application", @@ -180,7 +180,7 @@ "requireDialingCode": "Please enter the international dialing code", "requireVerify": "Please enter verification", "dialingCode": "Global Code", - "userFaxNumber": "Fax number", + "userFaxNumber": "Fax Number", "userIdDoc": "Identification document", "userIDNo": "ID Card Number", "userEmailAddress": "Email Address", @@ -302,14 +302,14 @@ "lammaIslandCombo": "Lamma Island District", "pengChauCombo": "Peng Chau District", - "applyPublicNotice": "Apply for public notice", + "applyPublicNotice": "Apply for Public Notice", "attention": "attention", "to": "To", "all": "All", "success": "Success", "reject": "Reject", "cancelledStatus": "Cancelled", - "inProgress": "In progress", + "inProgress": "In Progress", "replied": "Replied", "pendingReply": "PendingReply", "processing": "Processing", @@ -322,16 +322,17 @@ "withdrawn": "Withdrawn", "searchApplyRecord": "Search application record", "applicationId": "Application ID", - "submitDate": "Submit date", - "submitDateFrom": "Submit date (from)", - "submitDateTo": "Submit date (to)", + "submitDate": "Submit Date", + "submitDateFrom": "Submit Date (From)", + "submitDateTo": "Submit Date (To)", "myRemarks": "Remarks", "status": "Status", "viewDetail": "View details", - "price": "Price", + "price": "Amount ($)", "pay": "Pay", "payDate": "Payment Date", - "payDateFrom": "Payment Date (from)", + "payDateFrom": "Payment Date (From)", + "payDateTo": "Payment Date (To)", "payStatus": "Payment Status", "payId": "Payment Code", "payConfirm": "Confirm payment", @@ -364,24 +365,25 @@ "publicNoticeDetailTitle": "Public Notice Application Information", "applyPerson": "Applicant", "applyStatus": "App. Status", - "gazetteCount": "Gazette issues number", - "gazetteCount2" :"Gazette issues number / Remarks", - "gazetteCount2_1" :"Care Of / Remarks", - "gazetteCount3" :"Gazette issues number / Care Of/ Remarks", - "publishDate": "Publish date", + "gazetteCount": "Gazette Issue No.", + "gazetteCount2" :"Gazette Issue No./ Remarks", + "gazetteCount2_1" :"Care Of/ Remarks", + "gazetteCount3" :"Gazette Issue No./ Care Of/ Remarks", + "publishDate": "Publish Date", "draftFile": "Manuscript file", "download": "Download", "paymentHistory": "Payment History", "proofId": "Proof Code", - "proofDate": "Proofing date", - "proofDateFrom": "Proofing date (from)", - "replyDate": "Reply date", - "fee": "Fee", + "proofDate": "Proofing Date", + "proofDateFrom": "Proofing Date (From)", + "proofDateTo": "Proofing Date (To)", + "replyDate": "Reply Date", + "fee": "Amount ($)", "payFeeFor": "Pay for", "payFor": "Pay", "payFee": "Payment Amount", - "replyBefore": "Reply before", - "applicationPublishDate": "Publish date", + "replyBefore": "Reply Before", + "applicationPublishDate": "Publish Date", "pleaseCheckReminder": "Please download the following printed manuscript file and proofread it carefully", "payAnd": "Pay and ", "commentDeadline": "Deadline for proof with revison", @@ -404,19 +406,19 @@ "doubleCol":"Double Column", "transactionNo": "Transaction number", - "transactionDate": "Transaction date", - "transactionTime": "Transaction time", + "transactionDate": "Transaction Date", + "transactionTime": "Transaction Time", "paymentRefCode": "Payment reference number", "paymentInfoRecord": "Payment Notice Record", "paymentRecordId": "Payment record number", - "receiptDate": "Issuance date", - "sendDate": "Send date", - "sendDateFrom": "Send date (from)", - "sendDateTo": "Send date (to)", + "receiptDate": "Issuance Date", + "sendDate": "Send Date", + "sendDateFrom": "Send Date (From)", + "sendDateTo": "Send Date (To)", "files": "File(s)", "loginName": "Login Name", - "lastLoginDate": "Last login date", + "lastLoginDate": "Last Login Date", "lastSubmissionDate": "Last submission date", "locked": "Locked", "unlock": "Unlock", @@ -426,11 +428,11 @@ "MSG.setPrimay": "Are you sure to mark user “{username}” as primary user?", "MSG.revokePrimay": "Are you sure to revoke the primary user from user “{username}”?", - "submitApplication": "Submit public notice application", + "submitApplication": "Submit Public Notice application", "applicationSubheading": "Provide your advertisement content with formatting, proofreading and pricing.", - "announcement": "Announcement", + "announcement": "Announcements", "viewAllAnnouncement": "Show all announcements", - "systemMessage": "System message", + "systemMessage": "System Messages", "viewAllSystemMessage": "Show all messages", "msgDetails": "Message Details", @@ -448,8 +450,8 @@ "rowsPerPage": "Rows Per Page", "date" : "Date", "keyword": "Keyword", - "dateFrom": "Date(From)", - "dateTo": "Date(To)", + "dateFrom": "Date (From)", + "dateTo": "Date (To)", "of": "of", "loading": "Loading...", "ok": "Ok", @@ -460,7 +462,7 @@ "creditorAccount": "Credit Client", "nameEng": "Name (Eng)", "nameChi": "Name (Chi)", - "expiryDate": "Expiry date", + "expiryDate": "Expiry Date", "create": "Create", "confirmTo": "Confirm to ", diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index 6aceb66..e6cf22d 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -317,15 +317,16 @@ "searchApplyRecord": "搜寻申请记录", "applicationId": "申请编号", "submitDate": "提交日期", - "submitDateFrom": "提交日期(从)", - "submitDateTo": "提交日期(到)", + "submitDateFrom": "提交日期 (从)", + "submitDateTo": "提交日期 (到)", "myRemarks": "我的备注", "status": "状态", "viewDetail": "查看详细", - "price": "价钱", + "price": "金额 ($)", "pay": "付款", "payDate": "付款日期", - "payDateFrom": "付款日期(从)", + "payDateFrom": "付款日期 (从)", + "payDateTo": "付款日期 (到)", "payStatus": "付款状况", "payId": "付款编号", "payConfirm": "确认付款", @@ -346,7 +347,7 @@ "close": "关闭", "confirm": "确认", "particulars": "项目", - "currencyPrice": "金额", + "currencyPrice": "金额 ($)", "currencyAmount": "金额", "transactionRefNo": "交易參考編號", "selectedPaymentMethod": "已選擇付款方法", @@ -368,12 +369,13 @@ "paymentHistory": "付款记录", "proofId": "校对编号", "proofDate": "校对日期", - "proofDateFrom": "校对日期(从)", + "proofDateFrom": "校对日期 (从)", + "proofDateTo": "校对日期 (到)", "replyDate": "回复日期", - "fee": "费用", - "payFeeFor": "应缴费用", + "fee": "金额 ($)", + "payFeeFor": "应缴金额 ($)", "payFor": "支付", - "payFee": "支付金額", + "payFee": "支付金额 ($)", "replyBefore": "此日期前回复", "applicationPublishDate": "刊出日期", "pleaseCheckReminder": "请下载下列印刷稿档案，并仔细校对", @@ -406,8 +408,8 @@ "paymentRecordId": "缴款单号", "receiptDate": "签发日期", "sendDate": "发送日期", - "sendDateFrom": "发送日期(从)", - "sendDateTo": "发送日期(到)", + "sendDateFrom": "发送日期 (从)", + "sendDateTo": "发送日期 (到)", "files": "档案", "loginName": "登录名称", "lastLoginDate": "最后登入日期", @@ -422,8 +424,8 @@ "submitApplication": "提交公共启事申请", "applicationSubheading": "提供你的启事内容作排版，校对及计价。", - "announcement": "公共启事", - "viewAllAnnouncement": "显示所有公共启事", + "announcement": "通告", + "viewAllAnnouncement": "显示所有通告", "systemMessage": "系统消息", "viewAllSystemMessage": "显示所有消息", "msgDetails": "消息详情", @@ -442,8 +444,8 @@ "rowsPerPage": "每页项数", "date" : "日期", "keyword": "关键字", - "dateFrom": "日期(从)", - "dateTo": "日期(到)", + "dateFrom": "日期 (从)", + "dateTo": "日期 (到)", "of": "於", "loading": "加载中...", "ok": "好的", @@ -452,8 +454,8 @@ "organizationDetails": "机构详情", "brNo": "商业登记证号码", "creditorAccount": "债权人帐户", - "nameEng": "姓名(英文)", - "nameChi": "姓名(中文)", + "nameEng": "姓名 (英文)", + "nameChi": "姓名 (中文)", "expiryDate": "过期日期", "create": "创建", "confirmTo": "确定", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index f7ea24b..21b26fc 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -320,15 +320,16 @@ "searchApplyRecord": "搜尋申請記錄", "applicationId": "申請編號", "submitDate": "提交日期", - "submitDateFrom": "提交日期(從)", - "submitDateTo": "提交日期(到)", + "submitDateFrom": "提交日期 (從)", + "submitDateTo": "提交日期 (到)", "myRemarks": "我的備註", "status": "狀態", "viewDetail": "查看詳細", - "price": "價錢", + "price": "金額 ($)", "pay": "付款", "payDate": "付款日期", - "payDateFrom": "付款日期(從)", + "payDateFrom": "付款日期 (從)", + "payDateTo": "付款日期 (到)", "payStatus": "付款狀況", "payId": "付款編號", "payConfirm": "確認付款", @@ -349,7 +350,7 @@ "close": "關閉", "confirm": "確認", "particulars": "項目", - "currencyPrice": "金額", + "currencyPrice": "金額 ($)", "currencyAmount": "金額", "transactionRefNo": "交易參考編號", "selectedPaymentMethod": "已選擇付款方法", @@ -371,12 +372,13 @@ "paymentHistory": "付款記錄", "proofId": "校對編號", "proofDate": "校對日期", - "proofDateFrom": "校對日期(從)", + "proofDateFrom": "校對日期 (從)", + "proofDateTo": "校對日期 (到)", "replyDate": "回覆日期", - "fee": "費用", - "payFeeFor": "應繳費用", + "fee": "金額 ($)", + "payFeeFor": "應繳金額 ($)", "payFor": "支付", - "payFee": "支付金額", + "payFee": "支付金額 ($)", "replyBefore": "此日期前回覆", "applicationPublishDate": "刊出日期", "pleaseCheckReminder": "請下載下列印刷稿檔案，並仔細校對", @@ -409,8 +411,8 @@ "paymentRecordId": "繳款單號", "receiptDate": "簽發日期", "sendDate": "發送日期", - "sendDateFrom": "發送日期(從)", - "sendDateTo": "發送日期(到)", + "sendDateFrom": "發送日期 (從)", + "sendDateTo": "發送日期 (到)", "files": "檔案", "loginName": "登錄名稱", "lastLoginDate": "最後登入日期", @@ -445,8 +447,8 @@ "rowsPerPage": "每頁項數", "date" : "日期", "keyword": "關鍵字", - "dateFrom": "日期(從)", - "dateTo": "日期(到)", + "dateFrom": "日期 (從)", + "dateTo": "日期 (到)", "of": "於", "loading": "加載中...", "ok": "好的", @@ -455,8 +457,8 @@ "organizationDetails": "機構詳情", "brNo": "商業登記證號碼", "creditorAccount": "債權人帳戶", - "nameEng": "姓名(英文)", - "nameChi": "姓名(中文)", + "nameEng": "姓名 (英文)", + "nameChi": "姓名 (中文)", "expiryDate": "過期日期", "create": "創建", "confirmTo": "確定", diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js index 7b880f3..cb0feb8 100644 --- a/src/utils/ComboData.js +++ b/src/utils/ComboData.js @@ -35,7 +35,7 @@ export const country = [ { id:3, key: 3, label: '澳門', type: 'macau' } ]; -export const accountFilter = [{ id: 1, key: 1, label: 'Active', type: 'active' }, { id: 2, key: 2, label: 'Locked', type: 'locked' }, { id: 3, key: 3, label: 'Not verified', type: 'notVerified' }]; +export const accountFilter = [{ id: 1, key: 1, label: 'Active', type: 'active' }, { id: 2, key: 2, label: 'Locked', type: 'locked' }, { id: 3, key: 3, label: 'Not Verified', type: 'notVerified' }]; export const publicNoticeStatic = [ { key: 0, label: 'all', type: 'all' }, @@ -70,8 +70,8 @@ export const publicNoticeStatic_GLD = [ { key: 3, label: 'Paid', type: 'paid' }, { key: 4, label: 'Published', type: 'published' }, { key: 5, label: 'Completed', type: 'completed' }, - { key: 6, label: 'Not accepted', type: 'notAccepted' }, - { key: 7, label: 'Re-submit required', type: 'resubmit' }, + { key: 6, label: 'Not Accepted', type: 'notAccepted' }, + { key: 7, label: 'Re-Submit Required', type: 'resubmit' }, { key: 8, label: 'Cancelled', type: 'cancelled' }, { key: 9, label: 'Withdrawn', type: 'withdrawn' }, ]; diff --git a/src/utils/DateUtils.js b/src/utils/DateUtils.js index 3c417f9..aea3c53 100644 --- a/src/utils/DateUtils.js +++ b/src/utils/DateUtils.js @@ -52,15 +52,18 @@ export const convertToDate = (date)=>{ export const dateFormat = (date, format) =>{ date = convertToDate(date); - return dayjs(date).format(format); + if(date) return dayjs(date).format(format); + return ""; }; export const getWeekdayStr_ZH = (date) =>{ date = convertToDate(date); - return days_ZH[date.getDay()] + if(date) return days_ZH[date.getDay()] + return ""; }; export const getWeekdayStr_CN = (date) =>{ date = convertToDate(date); - return days_CN[date.getDay()] + if(date) return days_CN[date.getDay()] + return ""; }; diff --git a/src/utils/statusUtils/DnStatus.js b/src/utils/statusUtils/DnStatus.js index 5e1eda5..eb6fe2c 100644 --- a/src/utils/statusUtils/DnStatus.js +++ b/src/utils/statusUtils/DnStatus.js @@ -1,7 +1,7 @@ import {getStatusTag} from "utils/statusUtils/Base"; const pending = {color:"#f5a83d", eng:"Pending", cht:"待辦"} -const toBePaid = {color:"#f5a83d", eng:"To be paid", cht:"待支付"} +const toBePaid = {color:"#f5a83d", eng:"To be Paid", cht:"待支付"} const paid = {color:"#22a13f", eng:"Paid", cht:"已付費"} export function getStatus_Cht(params) {