forked from verdnatura/salix-front
Merge pull request 'fix: routeForm' (!595) from 7129-hotfix into master
Reviewed-on: verdnatura/salix-front#595 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
297ac8592f
|
@ -26,9 +26,6 @@ const defaultInitialData = {
|
||||||
isOk: false,
|
isOk: false,
|
||||||
};
|
};
|
||||||
const maxDistance = ref();
|
const maxDistance = ref();
|
||||||
const workerList = ref([]);
|
|
||||||
const agencyList = ref([]);
|
|
||||||
const vehicleList = ref([]);
|
|
||||||
|
|
||||||
const routeFilter = {
|
const routeFilter = {
|
||||||
fields: [
|
fields: [
|
||||||
|
@ -79,30 +76,6 @@ const onSave = (data, response) => {
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnSubToolbar v-if="isNew" />
|
<VnSubToolbar v-if="isNew" />
|
||||||
<FetchData
|
|
||||||
url="Workers/search"
|
|
||||||
:filter="{ fields: ['id', 'nickname'] }"
|
|
||||||
sort-by="nickname ASC"
|
|
||||||
limit="30"
|
|
||||||
@on-fetch="(data) => (workerList = data)"
|
|
||||||
auto-load
|
|
||||||
/>
|
|
||||||
<FetchData
|
|
||||||
url="AgencyModes/isActive"
|
|
||||||
:filter="{ fields: ['id', 'name'] }"
|
|
||||||
sort-by="name"
|
|
||||||
limit="30"
|
|
||||||
@on-fetch="(data) => (agencyList = data)"
|
|
||||||
auto-load
|
|
||||||
/>
|
|
||||||
<FetchData
|
|
||||||
url="Vehicles"
|
|
||||||
:filter="{ fields: ['id', 'numberPlate'] }"
|
|
||||||
sort-by="numberPlate ASC"
|
|
||||||
limit="30"
|
|
||||||
@on-fetch="(data) => (vehicleList = data)"
|
|
||||||
auto-load
|
|
||||||
/>
|
|
||||||
<FetchData
|
<FetchData
|
||||||
url="RouteConfigs/findOne"
|
url="RouteConfigs/findOne"
|
||||||
@on-fetch="({ kmMax }) => (maxDistance = kmMax)"
|
@on-fetch="({ kmMax }) => (maxDistance = kmMax)"
|
||||||
|
@ -124,12 +97,10 @@ const onSave = (data, response) => {
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Worker')"
|
:label="t('Worker')"
|
||||||
v-model="data.workerFk"
|
v-model="data.workerFk"
|
||||||
:options="workerList"
|
url="Workers/search"
|
||||||
|
sort-by="nickname ASC"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="nickname"
|
option-label="nickname"
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
use-input
|
|
||||||
:input-debounce="0"
|
:input-debounce="0"
|
||||||
>
|
>
|
||||||
<template #option="{ itemProps, opt }">
|
<template #option="{ itemProps, opt }">
|
||||||
|
@ -146,12 +117,10 @@ const onSave = (data, response) => {
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Vehicle')"
|
:label="t('Vehicle')"
|
||||||
v-model="data.vehicleFk"
|
v-model="data.vehicleFk"
|
||||||
:options="vehicleList"
|
url="Vehicles"
|
||||||
|
sort-by="numberPlate ASC"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="numberPlate"
|
option-label="numberPlate"
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
use-input
|
|
||||||
:input-debounce="0"
|
:input-debounce="0"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
|
@ -159,12 +128,10 @@ const onSave = (data, response) => {
|
||||||
<VnSelect
|
<VnSelect
|
||||||
:label="t('Agency')"
|
:label="t('Agency')"
|
||||||
v-model="data.agencyModeFk"
|
v-model="data.agencyModeFk"
|
||||||
:options="agencyList"
|
url="AgencyModes/isActive"
|
||||||
|
sort-by="name"
|
||||||
option-value="id"
|
option-value="id"
|
||||||
option-label="name"
|
option-label="name"
|
||||||
emit-value
|
|
||||||
map-options
|
|
||||||
use-input
|
|
||||||
:input-debounce="0"
|
:input-debounce="0"
|
||||||
/>
|
/>
|
||||||
<VnInputDate v-model="data.created" :label="t('Created')" />
|
<VnInputDate v-model="data.created" :label="t('Created')" />
|
||||||
|
@ -178,7 +145,7 @@ const onSave = (data, response) => {
|
||||||
:rules="[
|
:rules="[
|
||||||
(val) =>
|
(val) =>
|
||||||
val < maxDistance ||
|
val < maxDistance ||
|
||||||
t('Distance must be lesser than 4000'),
|
t('Distance must be lesser than', { maxDistance }),
|
||||||
]"
|
]"
|
||||||
clearable
|
clearable
|
||||||
type="number"
|
type="number"
|
||||||
|
@ -227,5 +194,7 @@ es:
|
||||||
Description: Descripción
|
Description: Descripción
|
||||||
Is served: Se ha servido
|
Is served: Se ha servido
|
||||||
Created: Creado
|
Created: Creado
|
||||||
Distance must be lesser than {maxDistance}: La distancia debe ser inferior a {maxDistance}
|
Distance must be lesser than: La distancia debe ser inferior a {maxDistance}
|
||||||
|
en:
|
||||||
|
Distance must be lesser than: Distance must be lesser than {maxDistance}
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
Loading…
Reference in New Issue