Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

fix: merge errors
2024-11-22 12:40:27 +01:00 · 2024-11-22 12:40:07 +01:00
2 changed files with 0 additions and 7 deletions
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@ -226,8 +226,6 @@ function sanitizer(params) {
    }
    return params;
 }
-
-defineExpose({ search, sanitizer, userParams });
 </script>

 <template>
--- 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>
Author	SHA1	Message	Date
Alex Moreno	6276843613	Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev gitea/salix-front/pipeline/head This commit looks good Details	2024-11-22 12:40:27 +01:00
Alex Moreno	14d2ddfa83	fix: merge errors gitea/salix-front/pipeline/head This commit looks good Details	2024-11-22 12:40:07 +01:00