From 9f4fa9bdfb08c1b932f8f430db5ec807073ca9ff Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 19 Apr 2024 17:04:30 +0800 Subject: [PATCH] clear demand note due date search --- src/pages/DemandNote/Search/SearchForm.js | 6 ++++-- src/pages/DemandNote/Search/index.js | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/DemandNote/Search/SearchForm.js b/src/pages/DemandNote/Search/SearchForm.js index 117bd58..c0c5e1e 100644 --- a/src/pages/DemandNote/Search/SearchForm.js +++ b/src/pages/DemandNote/Search/SearchForm.js @@ -67,11 +67,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue }, [maxDate]); React.useEffect(() => { - setFromDueDateValue(minDueDate); + setFromDueDateValue(minDueDate??"dd / mm / yyyy"); }, [minDueDate]); React.useEffect(() => { - setToDueDateValue(maxDueDate); + setToDueDateValue(maxDueDate??"dd / mm / yyyy"); }, [maxDueDate]); function FormDateInputComponent({ inputRef, ...props }) { @@ -219,6 +219,8 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue setOrgSelected({}); setIssueSelected({}); setSelectedStatus(ComboData.denmandNoteStatus[0]); + setFromDueDateValue("dd / mm / yyyy"); + setToDueDateValue("dd / mm / yyyy"); reset(); } diff --git a/src/pages/DemandNote/Search/index.js b/src/pages/DemandNote/Search/index.js index cced1f0..383efbb 100644 --- a/src/pages/DemandNote/Search/index.js +++ b/src/pages/DemandNote/Search/index.js @@ -38,8 +38,8 @@ const SearchPage_DemandNote = () => { const [searchCriteria, setSearchCriteria] = React.useState({ dateTo: DateUtils.dateValue(new Date()), dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)), - dueDateTo: DateUtils.dateValue(new Date()), - dueDateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)), + // dueDateTo: DateUtils.dateValue(new Date()), + // dueDateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)), }); const [onReady, setOnReady] = React.useState(false);