diff --git a/src/pages/08_request-list/MainPage.vue b/src/pages/08_request-list/MainPage.vue index e316e376..7f98b870 100644 --- a/src/pages/08_request-list/MainPage.vue +++ b/src/pages/08_request-list/MainPage.vue @@ -3,7 +3,7 @@ import { computed, onMounted, reactive, ref, watch } from 'vue'; import { storeToRefs } from 'pinia'; import { useI18n } from 'vue-i18n'; -import { QSelect, useQuasar } from 'quasar'; +import { useQuasar } from 'quasar'; // NOTE: Components import StatCardComponent from 'src/components/StatCardComponent.vue'; @@ -26,6 +26,7 @@ import { CancelButton, SaveButton } from 'src/components/button'; import { getRole } from 'src/services/keycloak'; import FloatingActionButton from 'src/components/FloatingActionButton.vue'; import RequestListAction from './RequestListAction .vue'; +import AdvanceSearch from 'src/components/shared/AdvanceSearch.vue'; const $q = useQuasar(); const navigatorStore = useNavigator(); @@ -35,7 +36,6 @@ const { t } = useI18n(); const { data, stats, page, pageMax, pageSize } = storeToRefs(requestListStore); const requestListActionData = ref(); -const refFilter = ref>(); // NOTE: Variable const pageState = reactive({ @@ -49,6 +49,7 @@ const pageState = reactive({ rejectCancelReason: '', requestId: '', requestListActionDialog: false, + searchDate: [], }); const fieldSelectedOption = computed(() => { @@ -64,6 +65,8 @@ async function fetchList(opts?: { rotateFlowId?: boolean }) { query: pageState.inputSearch, page: page.value, pageSize: pageSize.value, + startDate: pageState.searchDate[0], + endDate: pageState.searchDate[1], requestDataStatus: pageState.statusFilter === 'None' ? undefined : pageState.statusFilter, // responsibleOnly: true, @@ -170,11 +173,18 @@ onMounted(async () => { await fetchList({ rotateFlowId: true }); }); -watch([() => pageState.inputSearch, () => pageState.statusFilter], () => { - page.value = 1; - data.value = []; - fetchList({ rotateFlowId: true }); -}); +watch( + [ + () => pageState.inputSearch, + () => pageState.statusFilter, + () => pageState.searchDate, + ], + () => { + page.value = 1; + data.value = []; + fetchList({ rotateFlowId: true }); + }, +);