Merge branch 'dev' into 6652-improveCustomerDefaulter
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
566ef90cbe
|
@ -28,7 +28,7 @@ const defaultInitialData = {
|
||||||
workerFk: null,
|
workerFk: null,
|
||||||
isOk: false,
|
isOk: false,
|
||||||
};
|
};
|
||||||
|
const maxDistance = ref();
|
||||||
const workerList = ref([]);
|
const workerList = ref([]);
|
||||||
const agencyList = ref([]);
|
const agencyList = ref([]);
|
||||||
const vehicleList = ref([]);
|
const vehicleList = ref([]);
|
||||||
|
@ -81,12 +81,7 @@ const onSave = (data, response) => {
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<template>
|
<template>
|
||||||
<VnSubToolbar />
|
<VnSubToolbar v-if="isNew" />
|
||||||
<template v-if="stateStore.isHeaderMounted()">
|
|
||||||
<Teleport to="#searchbar">
|
|
||||||
<RouteSearchbar />
|
|
||||||
</Teleport>
|
|
||||||
</template>
|
|
||||||
<FetchData
|
<FetchData
|
||||||
url="Workers/search"
|
url="Workers/search"
|
||||||
:filter="{ fields: ['id', 'nickname'] }"
|
:filter="{ fields: ['id', 'nickname'] }"
|
||||||
|
@ -111,6 +106,12 @@ const onSave = (data, response) => {
|
||||||
@on-fetch="(data) => (vehicleList = data)"
|
@on-fetch="(data) => (vehicleList = data)"
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
|
<FetchData
|
||||||
|
url="RouteConfigs/findOne"
|
||||||
|
@on-fetch="({ kmMax }) => (maxDistance = kmMax)"
|
||||||
|
auto-load
|
||||||
|
sort-by="id ASC"
|
||||||
|
/>
|
||||||
<FormModel
|
<FormModel
|
||||||
:url="isNew ? null : `Routes/${route.params?.id}`"
|
:url="isNew ? null : `Routes/${route.params?.id}`"
|
||||||
:url-create="isNew ? 'Routes' : null"
|
:url-create="isNew ? 'Routes' : null"
|
||||||
|
@ -174,7 +175,17 @@ const onSave = (data, response) => {
|
||||||
<template v-if="!isNew">
|
<template v-if="!isNew">
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
|
<VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
|
||||||
<VnInput v-model="data.kmEnd" :label="t('Km End')" clearable />
|
<QInput
|
||||||
|
v-model.number="data.kmEnd"
|
||||||
|
:label="t('Km End')"
|
||||||
|
:rules="[
|
||||||
|
(val) =>
|
||||||
|
val < maxDistance ||
|
||||||
|
t('Distance must be lesser than 4000'),
|
||||||
|
]"
|
||||||
|
clearable
|
||||||
|
type="number"
|
||||||
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
<VnRow class="row q-gutter-md q-mb-md">
|
<VnRow class="row q-gutter-md q-mb-md">
|
||||||
<VnInputTime
|
<VnInputTime
|
||||||
|
@ -221,4 +232,5 @@ 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}
|
||||||
</i18n>
|
</i18n>
|
||||||
|
|
|
@ -222,11 +222,6 @@ const openSmsDialog = async () => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<template v-if="stateStore.isHeaderMounted()">
|
|
||||||
<Teleport to="#searchbar">
|
|
||||||
<RouteSearchbar />
|
|
||||||
</Teleport>
|
|
||||||
</template>
|
|
||||||
<FetchData
|
<FetchData
|
||||||
@on-fetch="(data) => (routeEntity = data)"
|
@on-fetch="(data) => (routeEntity = data)"
|
||||||
auto-load
|
auto-load
|
||||||
|
|
|
@ -170,23 +170,6 @@ watch([year, businessFk], () => refreshData());
|
||||||
ref="WorkerFreelanceRef"
|
ref="WorkerFreelanceRef"
|
||||||
auto-load
|
auto-load
|
||||||
/>
|
/>
|
||||||
<template v-if="stateStore.isHeaderMounted()">
|
|
||||||
<Teleport to="#actions-append">
|
|
||||||
<div class="row q-gutter-x-sm">
|
|
||||||
<QBtn
|
|
||||||
flat
|
|
||||||
@click="stateStore.toggleRightDrawer()"
|
|
||||||
round
|
|
||||||
dense
|
|
||||||
icon="menu"
|
|
||||||
>
|
|
||||||
<QTooltip bottom anchor="bottom right">
|
|
||||||
{{ t('globals.collapseMenu') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</div>
|
|
||||||
</Teleport>
|
|
||||||
</template>
|
|
||||||
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
|
||||||
<QScrollArea class="fit text-grey-8">
|
<QScrollArea class="fit text-grey-8">
|
||||||
<WorkerCalendarFilter
|
<WorkerCalendarFilter
|
||||||
|
|
|
@ -489,23 +489,6 @@ onMounted(async () => {
|
||||||
</QBtnGroup>
|
</QBtnGroup>
|
||||||
</div>
|
</div>
|
||||||
</Teleport>
|
</Teleport>
|
||||||
<template v-if="stateStore.isHeaderMounted()">
|
|
||||||
<Teleport to="#actions-append">
|
|
||||||
<div class="row q-gutter-x-sm">
|
|
||||||
<QBtn
|
|
||||||
flat
|
|
||||||
@click="stateStore.toggleRightDrawer()"
|
|
||||||
round
|
|
||||||
dense
|
|
||||||
icon="menu"
|
|
||||||
>
|
|
||||||
<QTooltip bottom anchor="bottom right">
|
|
||||||
{{ t('globals.collapseMenu') }}
|
|
||||||
</QTooltip>
|
|
||||||
</QBtn>
|
|
||||||
</div>
|
|
||||||
</Teleport>
|
|
||||||
</template>
|
|
||||||
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="260" class="q-pa-md">
|
<QDrawer v-model="stateStore.rightDrawer" side="right" :width="260" class="q-pa-md">
|
||||||
<div class="q-pa-md q-mb-md" style="border: 2px solid #222">
|
<div class="q-pa-md q-mb-md" style="border: 2px solid #222">
|
||||||
<QCardSection horizontal>
|
<QCardSection horizontal>
|
||||||
|
|
Loading…
Reference in New Issue