| @@ -67,11 +67,11 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue | |||||
| }, [maxDate]); | }, [maxDate]); | ||||
| React.useEffect(() => { | React.useEffect(() => { | ||||
| setFromDueDateValue(minDueDate); | |||||
| setFromDueDateValue(minDueDate??"dd / mm / yyyy"); | |||||
| }, [minDueDate]); | }, [minDueDate]); | ||||
| React.useEffect(() => { | React.useEffect(() => { | ||||
| setToDueDateValue(maxDueDate); | |||||
| setToDueDateValue(maxDueDate??"dd / mm / yyyy"); | |||||
| }, [maxDueDate]); | }, [maxDueDate]); | ||||
| function FormDateInputComponent({ inputRef, ...props }) { | function FormDateInputComponent({ inputRef, ...props }) { | ||||
| @@ -219,6 +219,8 @@ const SearchDemandNoteForm = ({ applySearch, orgComboData, searchCriteria, issue | |||||
| setOrgSelected({}); | setOrgSelected({}); | ||||
| setIssueSelected({}); | setIssueSelected({}); | ||||
| setSelectedStatus(ComboData.denmandNoteStatus[0]); | setSelectedStatus(ComboData.denmandNoteStatus[0]); | ||||
| setFromDueDateValue("dd / mm / yyyy"); | |||||
| setToDueDateValue("dd / mm / yyyy"); | |||||
| reset(); | reset(); | ||||
| } | } | ||||
| @@ -38,8 +38,8 @@ const SearchPage_DemandNote = () => { | |||||
| const [searchCriteria, setSearchCriteria] = React.useState({ | const [searchCriteria, setSearchCriteria] = React.useState({ | ||||
| dateTo: DateUtils.dateValue(new Date()), | dateTo: DateUtils.dateValue(new Date()), | ||||
| dateFrom: DateUtils.dateValue(new Date().setDate(new Date().getDate() - 14)), | 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); | const [onReady, setOnReady] = React.useState(false); | ||||