diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js index 94bc08f..002508e 100644 --- a/src/pages/Proof/Search_Public/SearchForm.js +++ b/src/pages/Proof/Search_Public/SearchForm.js @@ -87,6 +87,24 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData //contact: data.contact, replyed: (status?.type && status?.type != 'all') ? status?.type : "", }; + if(status?.type && status?.type != 'all'){ + if (status?.type == "Confirmed"){ + temp["replyed"] = "T"; + temp["action"] = true; + }else if(status?.type == "Re-proofing"){ + temp["replyed"] = "T"; + temp["action"] = false; + }else if(status?.type == "No Reply"){ + temp["replyed"] = "F"; + temp["timeOut"] = "T"; + }else if(status?.type == "Cancelled"){ + temp["cancelled"] = true; + }else{ + temp["replyed"] = "F"; + temp["timeOut"] = "F"; + } + } + applySearch(temp); }; @@ -301,7 +319,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData size="small" id="status" filterOptions={(options) => options} - options={ComboData.proofStatus} + options={ComboData.proofStatusFull} value={status} getOptionLabel={(option) => option.type? intl.formatMessage({ id: option.i18nLabel }) : ""} inputValue={status? intl.formatMessage({ id: status.i18nLabel }) : ""} diff --git a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js index db8c422..5194c4d 100644 --- a/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js +++ b/src/pages/PublicNotice/ApplyForm/PublicNoticeApplyForm.js @@ -352,7 +352,11 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => }}> {DateUtils.dateFormat(closeDate, dft)} 2:00 p.m. - {DateUtils.dateFormat(closeDate, dft)} 2:30 p.m. + + + @@ -371,13 +375,20 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) =>
    • + +
    + ); setIsWarningPopUp(true); }}> {DateUtils.dateFormat(closingDateOff, dft)} 5:00 p.m. - {DateUtils.dateFormat(closeDate, dft)} 12:00 p.m. + + + @@ -395,7 +406,11 @@ const PublicNoticeApplyForm = ({ loadedData, _selections, gazetteIssueList }) => }}> {DateUtils.dateFormat(closeDate, dft)} 12:00 p.m. - {DateUtils.dateFormat(closeDate, dft)} 12:30 p.m. + + + diff --git a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js index 18b7bf4..feb3037 100644 --- a/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js +++ b/src/pages/PublicNotice/Details_GLD/ApplicationDetailCard.js @@ -46,6 +46,7 @@ const ApplicationDetailCard = ( const [orgDetail, setOrgDetail] = useState({}); const [verified, setVerified] = useState(null); const [fileDetail, setfileDetail] = useState({}); + const [proofId, setProofId] = useState(null); const [onReady, setOnReady] = useState(false); const { register, handleSubmit } = useForm() @@ -77,6 +78,7 @@ const ApplicationDetailCard = ( setCompanyName(applicationDetailData.companyName); setVerified(applicationDetailData.userData.verifiedBy ? true : false) setfileDetail(applicationDetailData.fileDetail); + setProofId(applicationDetailData.proofId); // setReload(false) } @@ -255,18 +257,23 @@ const ApplicationDetailCard = ( Re-Submit - + { + proofId == null || proofId == 0? + + : + null + } : (currentApplicationDetailData.status == "confirmed" && currentApplicationDetailData.creditor == 1) ? <> diff --git a/src/translations/zh-CN.json b/src/translations/zh-CN.json index f5de497..6d648ed 100644 --- a/src/translations/zh-CN.json +++ b/src/translations/zh-CN.json @@ -41,7 +41,7 @@ "confirmingDealine": "确认校对的截止日期", "PaymentCoonpletDealine": "付款截止日期", - "payOnline":"透过此系统网上支付", + "payOnline":"透过此系统网上付款", "payDn":"透过发出一般缴款单付款", "payNPGO":"在北角政府合署收款处付款", "paymentMeans":"付款方式", diff --git a/src/translations/zh-HK.json b/src/translations/zh-HK.json index a919e65..420a169 100644 --- a/src/translations/zh-HK.json +++ b/src/translations/zh-HK.json @@ -41,7 +41,7 @@ "confirmingDealine": "確認校對的截止日期", "PaymentCoonpletDealine": "付款截止日期", - "payOnline":"透過此系統網上支付", + "payOnline":"透過此系統網上付款", "payDn":"透過發出一般繳款單付款", "payNPGO":"在北角政府合署收款處付款", "paymentMeans":"付款方式", diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js index ddf2427..cb87f9e 100644 --- a/src/utils/ComboData.js +++ b/src/utils/ComboData.js @@ -110,6 +110,15 @@ export const proofStatus = [ { key: 2, i18nLabel: 'pendingReply', labelCht: '未回覆', label:'Pending Reply', type: 'F' }, ]; +export const proofStatusFull = [ + { key: 0, i18nLabel: 'all', labelCht: '全部', label: 'All', type: 'all' }, + { key: 1, i18nLabel: 'Confirmed', labelCht: '可以付印', label:'Confirmed', type: 'Confirmed' }, + { key: 1, i18nLabel: 'Re-proofing', labelCht: '未能付印', label:'Re-proofing', type: 'Re-proofing' }, // submitted and reviewed + { key: 2, i18nLabel: 'No Reply', labelCht: '回覆逾時', label:'No Reply', type: 'No Reply' }, + { key: 2, i18nLabel: 'Pending Reply', labelCht: '未回覆', label:'Pending Reply', type: 'Pending Reply' }, + { key: 2, i18nLabel: 'Cancelled', labelCht: '已取消', label:'Cancelled', type: 'Cancelled' }, +]; + export const paymentStatus = [ { key: 0, i18nLabel: 'all', labelCht: '全部', label: 'All', type: 'all' }, { key: 1, i18nLabel: 'success', labelCht: '成功', label:'Success', type: 'APPR' },