From 7b8b15398df0c2d392706c58619870bc35a5c6d7 Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 28 Jun 2024 14:05:15 +0800 Subject: [PATCH] status --- src/pages/Proof/Search_Public/SearchForm.js | 6 +----- src/utils/ComboData.js | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/pages/Proof/Search_Public/SearchForm.js b/src/pages/Proof/Search_Public/SearchForm.js index 002508e..ef90513 100644 --- a/src/pages/Proof/Search_Public/SearchForm.js +++ b/src/pages/Proof/Search_Public/SearchForm.js @@ -84,8 +84,6 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData gazettGroup: groupSelected?.type, dateFrom: sentDateFrom, dateTo: sentDateTo, - //contact: data.contact, - replyed: (status?.type && status?.type != 'all') ? status?.type : "", }; if(status?.type && status?.type != 'all'){ if (status?.type == "Confirmed"){ @@ -97,8 +95,6 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData }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"; @@ -117,7 +113,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria, issueComboData function resetForm() { setType([]); - setStatus(ComboData.proofStatus[0]); + setStatus(ComboData.proofStatusFull[0]); setIssueSelected({}); setGroupSelected({}); setMinDate(DateUtils.dateValue(new Date().setDate(new Date().getDate()-14))) diff --git a/src/utils/ComboData.js b/src/utils/ComboData.js index cb87f9e..7af8cb4 100644 --- a/src/utils/ComboData.js +++ b/src/utils/ComboData.js @@ -113,10 +113,10 @@ export const proofStatus = [ 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' }, + { key: 2, i18nLabel: 'Re-proofing', labelCht: '未能付印', label:'Re-proofing', type: 'Re-proofing' }, // submitted and reviewed + { key: 3, i18nLabel: 'No Reply', labelCht: '回覆逾時', label:'No Reply', type: 'No Reply' }, + { key: 4, i18nLabel: 'Pending Reply', labelCht: '未回覆', label:'Pending Reply', type: 'Pending Reply' }, + //{ key: 5, i18nLabel: 'Cancelled', labelCht: '已取消', label:'Cancelled', type: 'Cancelled' }, ]; export const paymentStatus = [