From 14d2ddfa835205c72483585e7d719b4528523dc9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 22 Nov 2024 12:40:07 +0100
Subject: [PATCH] fix: merge errors

---
 src/components/ui/VnFilterPanel.vue         | 2 --
 src/pages/Order/Card/OrderCatalogFilter.vue | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index bf1fcfdb9..b188bde48 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -227,8 +227,6 @@ function sanitizer(params) {
     }
     return params;
 }
-
-defineExpose({ search, sanitizer, userParams });
 </script>
 
 <template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index b839be55e..6202a6f90 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -143,11 +143,6 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
-
-onMounted(() => {
-    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
-    selectedTypeFk.value = getParamWhere(route, 'typeFk');
-});
 </script>
 
 <template>