From 92e172fcaf8874678f36f77df9dd04cf9a7a53ac Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Thu, 25 Apr 2024 12:56:02 +0200
Subject: [PATCH] feat: refs #7039 country change column country - name

---
 src/components/CreateBankEntityForm.vue         | 4 ++--
 src/components/CreateNewPostcodeForm.vue        | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 2 +-
 src/pages/Supplier/SupplierListFilter.vue       | 4 ++--
 src/pages/Worker/Card/WorkerBasicData.vue       | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 2d098beb0..6bf0afe56 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -26,7 +26,7 @@ const bankEntityFormData = reactive({
 });
 
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
+    fields: ['id', 'name', 'code'],
 };
 
 const countriesOptions = ref([]);
@@ -83,7 +83,7 @@ onMounted(async () => {
                         v-model="data.countryFk"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         :required="true"
                         :rules="validate('bankEntity.countryFk')"
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 02e84849c..2c546acc3 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -142,7 +142,7 @@ const onProvinceCreated = async ({ name }, formData) => {
                         :label="t('Country')"
                         :options="countriesOptions"
                         hide-selected
-                        option-label="country"
+                        option-label="name"
                         option-value="id"
                         v-model="data.countryFk"
                         :rules="validate('postcode.countryFk')"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 746ee130f..cf1c852a7 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -90,7 +90,7 @@ function getTotal(type) {
         url="Countries"
         auto-load
         @on-fetch="(data) => (countries = data)"
-        sort-by="country"
+        sort-by="name"
     />
     <FetchData
         url="Intrastats"
diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
index ff90df6e1..50b47a782 100644
--- a/src/pages/Supplier/SupplierListFilter.vue
+++ b/src/pages/Supplier/SupplierListFilter.vue
@@ -29,7 +29,7 @@ const countriesOptions = ref([]);
     />
     <FetchData
         url="countries"
-        :filter="{ fields: ['id', 'country'], order: 'country ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
         @on-fetch="(data) => (countriesOptions = data)"
         auto-load
     />
@@ -92,7 +92,7 @@ const countriesOptions = ref([]);
                         @update:model-value="searchFn()"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         dense
                         outlined
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 775472065..5fccd665b 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -36,8 +36,8 @@ const workersFilter = {
     limit: 30,
 };
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
-    order: 'country ASC',
+    fields: ['id', 'name', 'code'],
+    order: 'name ASC',
     limit: 30,
 };
 const educationLevelsFilter = { fields: ['id', 'name'], order: 'name ASC', limit: 30 };
@@ -126,7 +126,7 @@ const maritalStatus = [
                     :label="t('Origin country')"
                     :options="countriesOptions"
                     hide-selected
-                    option-label="country"
+                    option-label="name"
                     option-value="id"
                     v-model="data.originCountryFk"
                 />