From d575c3cdaeddba84fc69899f8fbd85375a640076 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Jul 2024 11:25:44 +0200
Subject: [PATCH 1/3] refs #6898 filters

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 2 +-
 src/pages/Supplier/SupplierList.vue           | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 10d6f8f68..4da375487 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -17,7 +17,7 @@ const workersOptions = ref([]);
 <template>
     <FetchData
         url="Workers/search"
-        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
         @on-fetch="(data) => (workersOptions = data)"
         auto-load
     />
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 763fab812..4aec08141 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -80,11 +80,6 @@ const columns = computed(() => [
 
 <template>
     <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
-    <RightMenu>
-        <template #right-panel>
-            <SupplierListFilter data-key="SuppliersList" />
-        </template>
-    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
@@ -100,8 +95,6 @@ const columns = computed(() => [
         order="id ASC"
         :columns="columns"
         auto-load
-        :right-search="false"
-        :use-model="true"
     />
 </template>
 

From 1ad15869e84995119780ef0fff7ed8fd8112e9f5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Jul 2024 11:45:13 +0200
Subject: [PATCH 2/3] refs #6898 filters select

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 9 +--------
 src/pages/Supplier/SupplierList.vue           | 2 --
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 4da375487..c39a69286 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -2,8 +2,6 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -15,12 +13,6 @@ const { t } = useI18n();
 const workersOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers/search"
-        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
     <FormModel
         :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}`"
@@ -44,6 +36,7 @@ const workersOptions = ref([]);
                     option-label="name"
                     hide-selected
                     map-options
+                    url="Workers/search"
                     :rules="validate('supplier.workerFk')"
                 >
                     <template #append>
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 4aec08141..5d9942536 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -3,8 +3,6 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import RightMenu from 'components/common/RightMenu.vue';
-import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();

From f4c0288ca086e2fbeb23954cf164fb0d276073d1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Jul 2024 12:01:46 +0200
Subject: [PATCH 3/3] refs #6898 filters sortby

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index c39a69286..a2792a26c 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -37,6 +37,7 @@ const workersOptions = ref([]);
                     hide-selected
                     map-options
                     url="Workers/search"
+                    sortby="nickname ASC"
                     :rules="validate('supplier.workerFk')"
                 >
                     <template #append>