diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue index 344267ef7..aaf197d74 100644 --- a/src/components/ui/VnSearchbar.vue +++ b/src/components/ui/VnSearchbar.vue @@ -81,14 +81,14 @@ async function search() { const staticParams = Object.entries(store.userParams).filter( ([key, value]) => value && (props.staticParams || []).includes(key) ); - // const filter =props?.where? { where: JSON.parse(props.where) }: {} + store.skip = 0; await arrayData.applyFilter({ params: { - // filter , ...Object.fromEntries(staticParams), search: searchText.value, }, }); + if (!props.redirect) return; if (props.customRouteRedirectName) diff --git a/src/pages/Monitor/MonitorList.vue b/src/pages/Monitor/MonitorList.vue index 60c6ca164..1b1ccb5b3 100644 --- a/src/pages/Monitor/MonitorList.vue +++ b/src/pages/Monitor/MonitorList.vue @@ -6,6 +6,7 @@ import { useStateStore } from 'stores/useStateStore'; import SalesClientTable from './SalesClientsTable.vue'; import SalesOrdersTable from './SalesOrdersTable.vue'; import SalesTicketsTable from './SalesTicketsTable.vue'; +import VnSearchbar from 'components/ui/VnSearchbar.vue'; const { t } = useI18n(); const stateStore = useStateStore(); @@ -20,6 +21,17 @@ onUnmounted(() => (stateStore.rightDrawer = false));