Merge pull request 'feat: refs #7882 Added longitude & latitude' (!1070) from 7882-osrm into dev
gitea/salix-front/pipeline/head This commit looks good Details

Reviewed-on: #1070
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Guillermo Bonet 2024-12-16 06:59:06 +00:00
commit 96ec1ca86b
2 changed files with 47 additions and 27 deletions

View File

@ -12,6 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import VnSelectDialog from 'src/components/common/VnSelectDialog.vue'; import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue'; import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
import VnInputNumber from 'src/components/common/VnInputNumber.vue';
const { t } = useI18n(); const { t } = useI18n();
const route = useRoute(); const route = useRoute();
@ -144,7 +145,6 @@ function handleLocation(data, location) {
:url="`Addresses/${route.params.addressId}`" :url="`Addresses/${route.params.addressId}`"
@on-data-saved="onDataSaved()" @on-data-saved="onDataSaved()"
auto-load auto-load
model="customer"
> >
<template #moreActions> <template #moreActions>
<QBtn <QBtn
@ -220,7 +220,6 @@ function handleLocation(data, location) {
</div> </div>
</VnRow> </VnRow>
<VnRow> <VnRow>
<div class="col">
<VnSelect <VnSelect
:label="t('Incoterms')" :label="t('Incoterms')"
:options="incoterms" :options="incoterms"
@ -229,8 +228,6 @@ function handleLocation(data, location) {
option-value="code" option-value="code"
v-model="data.incotermsFk" v-model="data.incotermsFk"
/> />
</div>
<div class="col">
<VnSelectDialog <VnSelectDialog
:label="t('Customs agent')" :label="t('Customs agent')"
:options="customsAgents" :options="customsAgents"
@ -244,7 +241,14 @@ function handleLocation(data, location) {
<CustomerNewCustomsAgent /> <CustomerNewCustomsAgent />
</template> </template>
</VnSelectDialog> </VnSelectDialog>
</div> </VnRow>
<VnRow>
<VnInputNumber
:label="t('Longitude')"
clearable
v-model="data.longitude"
/>
<VnInputNumber :label="t('Latitude')" clearable v-model="data.latitude" />
</VnRow> </VnRow>
<h4 class="q-mb-xs">{{ t('Notes') }}</h4> <h4 class="q-mb-xs">{{ t('Notes') }}</h4>
<VnRow <VnRow
@ -322,4 +326,6 @@ es:
Description: Descripción Description: Descripción
Add note: Añadir nota Add note: Añadir nota
Remove note: Eliminar nota Remove note: Eliminar nota
Longitude: Longitud
Latitude: Latitud
</i18n> </i18n>

View File

@ -108,7 +108,20 @@ const agencyOptions = ref([]);
clearable clearable
/> />
</VnRow> </VnRow>
<VnRow>
<VnSelect
:label="t('Distribution point')"
v-model="data.addressFk"
option-value="id"
option-label="nickname"
url="Addresses"
:fields="['id', 'nickname']"
sort-by="id"
hide-selected
map-options
:rules="validate('data.addressFk')"
/>
</VnRow>
<VnRow> <VnRow>
<VnInput <VnInput
v-model="data.inflation" v-model="data.inflation"
@ -143,4 +156,5 @@ es:
Inflation: Inflación Inflation: Inflación
Volumetric: Volumétrico Volumetric: Volumétrico
Max length : Medida máxima tumbado Max length : Medida máxima tumbado
Distribution point: Punto de distribución
</i18n> </i18n>