Merge pull request 'feat: refs #7119 show country name' (!1346) from 7119-showCountryName into dev
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
Reviewed-on: #1346 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
de6020626f
|
@ -6,7 +6,7 @@ import VehicleFilter from '../VehicleFilter.js';
|
|||
<template>
|
||||
<VnCardBeta
|
||||
data-key="Vehicle"
|
||||
base-url="Vehicles"
|
||||
url="Vehicles"
|
||||
:filter="VehicleFilter"
|
||||
:descriptor="VehicleDescriptor"
|
||||
/>
|
||||
|
|
|
@ -136,7 +136,7 @@ const columns = computed(() => [
|
|||
/>
|
||||
<FetchData
|
||||
url="Countries"
|
||||
:filter="{ fields: ['code'] }"
|
||||
:filter="{ fields: ['name', 'code'] }"
|
||||
@on-fetch="(data) => (countries = data)"
|
||||
auto-load
|
||||
/>
|
||||
|
@ -209,7 +209,7 @@ const columns = computed(() => [
|
|||
v-model="data.countryCodeFk"
|
||||
:label="$t('globals.country')"
|
||||
option-value="code"
|
||||
option-label="code"
|
||||
option-label="name"
|
||||
:options="countries"
|
||||
/>
|
||||
<VnInput
|
||||
|
|
Loading…
Reference in New Issue