verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 71 Releases Wiki Activity

Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2024-05-16 08:52:03 +02:00
parent c7cb591008 f4053b5d7c
commit cf16db2e33
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/CreateBankEntityForm.vue
View File

@ -26,7 +26,7 @@ const bankEntityFormData = reactive({
}); });
const countriesFilter = { const countriesFilter = {
fields: ['id', 'country', 'code'], fields: ['id', 'name', 'code'],
}; };
const countriesOptions = ref([]); const countriesOptions = ref([]);
@ -79,7 +79,7 @@ onMounted(async () => {
v-model="data.countryFk" v-model="data.countryFk"
:options="countriesOptions" :options="countriesOptions"
option-value="id" option-value="id"
option-label="country" option-label="name"
hide-selected hide-selected
:required="true" :required="true"
:rules="validate('bankEntity.countryFk')" :rules="validate('bankEntity.countryFk')"

2
src/components/CreateNewPostcodeForm.vue
View File

@ -134,7 +134,7 @@ const onProvinceCreated = async ({ name }, formData) => {
:label="t('Country')" :label="t('Country')"
:options="countriesOptions" :options="countriesOptions"
hide-selected hide-selected
option-label="country" option-label="name"
option-value="id" option-value="id"
v-model="data.countryFk" v-model="data.countryFk"
:rules="validate('postcode.countryFk')" :rules="validate('postcode.countryFk')"

2
src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
View File

@ -90,7 +90,7 @@ function getTotal(type) {
url="Countries" url="Countries"
auto-load auto-load
@on-fetch="(data) => (countries = data)" @on-fetch="(data) => (countries = data)"
sort-by="country" sort-by="name"
/> />
<FetchData <FetchData
url="Intrastats" url="Intrastats"

4
src/pages/Supplier/SupplierListFilter.vue
View File

@ -29,7 +29,7 @@ const countriesOptions = ref([]);
/> />
<FetchData <FetchData
url="countries" 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)" @on-fetch="(data) => (countriesOptions = data)"
auto-load auto-load
/> />
@ -92,7 +92,7 @@ const countriesOptions = ref([]);
@update:model-value="searchFn()" @update:model-value="searchFn()"
:options="countriesOptions" :options="countriesOptions"
option-value="id" option-value="id"
option-label="country" option-label="name"
hide-selected hide-selected
dense dense
outlined outlined

6
src/pages/Worker/Card/WorkerBasicData.vue
View File

@ -35,8 +35,8 @@ const workersFilter = {
limit: 30, limit: 30,
}; };
const countriesFilter = { const countriesFilter = {
fields: ['id', 'country', 'code'], fields: ['id', 'name', 'code'],
order: 'country ASC', order: 'name ASC',
limit: 30, limit: 30,
}; };
const educationLevelsFilter = { fields: ['id', 'name'], order: 'name ASC', limit: 30 }; const educationLevelsFilter = { fields: ['id', 'name'], order: 'name ASC', limit: 30 };
@ -124,7 +124,7 @@ const maritalStatus = [
:label="t('Origin country')" :label="t('Origin country')"
:options="countriesOptions" :options="countriesOptions"
hide-selected hide-selected
option-label="country" option-label="name"
option-value="id" option-value="id"
v-model="data.originCountryFk" v-model="data.originCountryFk"
/> />