diff --git a/src/pages/04_flow-managment/MainPage.vue b/src/pages/04_flow-managment/MainPage.vue
index ba335b77..1285a99c 100644
--- a/src/pages/04_flow-managment/MainPage.vue
+++ b/src/pages/04_flow-managment/MainPage.vue
@@ -283,8 +283,8 @@ async function fetchWorkflowList(mobileFetch?: boolean) {
         : statusFilter.value === 'statusACTIVE'
           ? 'ACTIVE'
           : 'INACTIVE',
-    startDate: pageState.searchDate[0] || undefined,
-    endDate: pageState.searchDate[1] || undefined,
+    startDate: pageState.searchDate[0],
+    endDate: pageState.searchDate[1],
   });
   if (res) {
     workflowData.value =
@@ -533,12 +533,12 @@ watch(
           class="col surface-2 flex items-center justify-center"
         >
           <NoData
-            v-if="pageState.total !== 0"
+            v-if="pageState.total !== 0 || pageState.searchDate.length > 0"
             :not-found="!!pageState.inputSearch"
           />
 
           <CreateButton
-            v-if="pageState.total === 0"
+            v-if="pageState.total === 0 && pageState.searchDate.length === 0"
             @click="triggerDialog('add')"
             label="general.add"
             :i18n-args="{ text: $t('flow.title') }"
diff --git a/src/pages/04_property-managment/MainPage.vue b/src/pages/04_property-managment/MainPage.vue
index aa913f85..2ced8354 100644
--- a/src/pages/04_property-managment/MainPage.vue
+++ b/src/pages/04_property-managment/MainPage.vue
@@ -2,7 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 import { onMounted, reactive, ref } from 'vue';
-import { QSelect, QTableProps } from 'quasar';
+import { QTableProps } from 'quasar';
 import { useNavigator } from 'src/stores/navigator';
 import { useProperty } from 'src/stores/property';
 import { useQuasar } from 'quasar';
@@ -17,6 +17,7 @@ import { Property } from 'src/stores/property/types';
 import { dialog, toCamelCase } from 'src/stores/utils';
 import CreateButton from 'src/components/AddButton.vue';
 import useOptionStore from 'stores/options';
+import AdvanceSearch from 'src/components/shared/AdvanceSearch.vue';
 
 const { t, locale } = useI18n();
 const $q = useQuasar();
@@ -38,7 +39,6 @@ const formProperty = ref<Property>({
   type: {},
 });
 const statusFilter = ref<'all' | 'statusACTIVE' | 'statusINACTIVE'>('all');
-const refFilter = ref<InstanceType<typeof QSelect>>();
 const fieldSelected = ref<('order' | 'name' | 'type')[]>([
   'order',
   'name',
@@ -118,6 +118,7 @@ const pageState = reactive({
   addModal: false,
   viewDrawer: false,
   isDrawerEdit: true,
+  searchDate: [],
 });
 
 async function fetchPropertyList(mobileFetch?: boolean) {
@@ -134,6 +135,8 @@ async function fetchPropertyList(mobileFetch?: boolean) {
         : statusFilter.value === 'statusACTIVE'
           ? 'ACTIVE'
           : 'INACTIVE',
+    startDate: pageState.searchDate[0],
+    endDate: pageState.searchDate[1],
   });
   if (res) {
     propertyData.value =
@@ -317,11 +320,14 @@ watch(
     fetchPropertyList();
   },
 );
-watch([() => pageState.inputSearch, propertyPageSize], () => {
-  propertyData.value = [];
-  propertyPage.value = 1;
-  fetchPropertyList();
-});
+watch(
+  [() => pageState.inputSearch, propertyPageSize, () => pageState.searchDate],
+  () => {
+    propertyData.value = [];
+    propertyPage.value = 1;
+    fetchPropertyList();
+  },
+);
 </script>
 <template>
   <FloatingActionButton
@@ -398,26 +404,44 @@ watch([() => pageState.inputSearch, propertyPageSize], () => {
               <template #prepend>
                 <q-icon name="mdi-magnify" />
               </template>
-              <template v-if="$q.screen.lt.md" v-slot:append>
-                <span class="row">
-                  <q-separator vertical />
-                  <q-btn
-                    icon="mdi-filter-variant"
-                    unelevated
-                    class="q-ml-sm"
-                    padding="4px"
-                    size="sm"
-                    rounded
-                    @click="refFilter?.showPopup"
+              <template v-slot:append>
+                <q-separator vertical inset class="q-mr-xs" />
+                <AdvanceSearch
+                  v-model="pageState.searchDate"
+                  :active="$q.screen.lt.md && statusFilter !== 'all'"
+                >
+                  <div
+                    v-if="$q.screen.lt.md"
+                    class="q-mt-sm text-weight-medium"
+                  >
+                    {{ $t('general.status') }}
+                  </div>
+                  <q-select
+                    v-if="$q.screen.lt.md"
+                    v-model="statusFilter"
+                    outlined
+                    dense
+                    option-value="value"
+                    option-label="label"
+                    map-options
+                    emit-value
+                    :for="'field-select-status'"
+                    :options="[
+                      { label: $t('general.all'), value: 'all' },
+                      { label: $t('general.active'), value: 'statusACTIVE' },
+                      {
+                        label: $t('general.inactive'),
+                        value: 'statusINACTIVE',
+                      },
+                    ]"
                   />
-                </span>
+                </AdvanceSearch>
               </template>
             </q-input>
 
             <div class="row col-md-5" style="white-space: nowrap">
               <q-select
-                v-show="$q.screen.gt.sm"
-                ref="refFilter"
+                v-if="$q.screen.gt.sm"
                 v-model="statusFilter"
                 outlined
                 dense
@@ -512,11 +536,11 @@ watch([() => pageState.inputSearch, propertyPageSize], () => {
           class="col surface-2 flex items-center justify-center"
         >
           <NoData
-            v-if="pageState.total !== 0"
+            v-if="pageState.total !== 0 || pageState.searchDate.length > 0"
             :not-found="!!pageState.inputSearch"
           />
           <CreateButton
-            v-if="pageState.total === 0"
+            v-if="pageState.total === 0 && pageState.searchDate.length === 0"
             @click="triggerDialog('add')"
             label="general.add"
             :i18n-args="{ text: $t('flow.title') }"
diff --git a/src/stores/property/index.ts b/src/stores/property/index.ts
index c840c053..2765ed80 100644
--- a/src/stores/property/index.ts
+++ b/src/stores/property/index.ts
@@ -25,6 +25,8 @@ export const useProperty = defineStore('property-store', () => {
     query?: string;
     status?: Status;
     activeOnly?: boolean;
+    startDate?: string;
+    endDate?: string;
   }) {
     const res = await api.get<PaginationResult<Property>>('/property', {
       params,