Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-hotfix-fetchOnOutside
gitea/salix-front/pipeline/pr-master This commit looks good
Details
gitea/salix-front/pipeline/pr-master This commit looks good
Details
This commit is contained in:
commit
e54b79fd0d
|
@ -29,7 +29,7 @@ const exprBuilder = (param, value) => {
|
|||
return { 'a.supplierName': value };
|
||||
case 'routeFk':
|
||||
return { 'a.routeFk': value };
|
||||
case 'created':
|
||||
case 'dated':
|
||||
case 'agencyFk':
|
||||
case 'packages':
|
||||
case 'm3':
|
||||
|
@ -145,7 +145,7 @@ const exprBuilder = (param, value) => {
|
|||
<QItem class="q-my-sm">
|
||||
<QItemSection>
|
||||
<VnInputDate
|
||||
v-model="params.created"
|
||||
v-model="params.dated"
|
||||
:label="t('Date')"
|
||||
is-outlined
|
||||
/>
|
||||
|
|
|
@ -28,7 +28,7 @@ const filter = {
|
|||
'id',
|
||||
'workerFk',
|
||||
'agencyModeFk',
|
||||
'created',
|
||||
'dated',
|
||||
'm3',
|
||||
'warehouseFk',
|
||||
'description',
|
||||
|
@ -78,7 +78,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
|
|||
@on-fetch="setData"
|
||||
>
|
||||
<template #body="{ entity }">
|
||||
<VnLv :label="t('Date')" :value="toDate(entity?.created)" />
|
||||
<VnLv :label="t('Date')" :value="toDate(entity?.dated)" />
|
||||
<VnLv :label="t('Agency')" :value="entity?.agencyMode?.name" />
|
||||
<VnLv :label="t('Zone')" :value="entity?.zone?.name" />
|
||||
<VnLv
|
||||
|
|
|
@ -19,7 +19,7 @@ const shelvingId = ref(route.params?.id || null);
|
|||
const isNew = Boolean(!shelvingId.value);
|
||||
const defaultInitialData = {
|
||||
agencyModeFk: null,
|
||||
created: null,
|
||||
dated: null,
|
||||
description: '',
|
||||
vehicleFk: null,
|
||||
workerFk: null,
|
||||
|
@ -32,7 +32,7 @@ const routeFilter = {
|
|||
'id',
|
||||
'workerFk',
|
||||
'agencyModeFk',
|
||||
'created',
|
||||
'dated',
|
||||
'm3',
|
||||
'warehouseFk',
|
||||
'description',
|
||||
|
@ -134,7 +134,7 @@ const onSave = (data, response) => {
|
|||
option-label="name"
|
||||
:input-debounce="0"
|
||||
/>
|
||||
<VnInputDate v-model="data.created" :label="t('Created')" />
|
||||
<VnInputDate v-model="data.dated" :label="t('Dated')" />
|
||||
</VnRow>
|
||||
<template v-if="!isNew">
|
||||
<VnRow>
|
||||
|
@ -188,7 +188,7 @@ es:
|
|||
Hour finished: Hora fin
|
||||
Description: Descripción
|
||||
Is served: Se ha servido
|
||||
Created: Creado
|
||||
Dated: Fecha
|
||||
The km can not exceed: La distancia debe ser inferior a {maxDistance}
|
||||
en:
|
||||
The km can not exceed: Distance must be lesser than {maxDistance}
|
||||
|
|
|
@ -139,7 +139,7 @@ const ticketColumns = ref([
|
|||
<QCard class="vn-one">
|
||||
<VnLv
|
||||
:label="t('route.summary.date')"
|
||||
:value="toDate(entity?.route.created)"
|
||||
:value="toDate(entity?.route.dated)"
|
||||
/>
|
||||
<VnLv
|
||||
:label="t('route.summary.agency')"
|
||||
|
|
|
@ -46,10 +46,10 @@ const columns = computed(() => [
|
|||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'created',
|
||||
name: 'dated',
|
||||
label: t('Date'),
|
||||
columnFilter: false,
|
||||
format: ({ created }) => toDate(created),
|
||||
format: ({ dated }) => toDate(dated),
|
||||
},
|
||||
{
|
||||
align: 'left',
|
||||
|
|
|
@ -111,7 +111,7 @@ const columns = computed(() => [
|
|||
},
|
||||
{
|
||||
align: 'left',
|
||||
name: 'created',
|
||||
name: 'dated',
|
||||
label: t('route.Date'),
|
||||
columnFilter: false,
|
||||
cardVisible: true,
|
||||
|
|
|
@ -45,7 +45,7 @@ const columns = computed(() => [
|
|||
columnFilter: {
|
||||
inWhere: true,
|
||||
},
|
||||
format: ({ created }) => toDate(created),
|
||||
format: ({ dated }) => toDate(dated),
|
||||
cardVisible: true,
|
||||
},
|
||||
{
|
||||
|
|
|
@ -109,7 +109,7 @@ const ticketList = ref([]);
|
|||
|
||||
const cloneRoutes = () => {
|
||||
axios.post('Routes/clone', {
|
||||
created: startingDate.value,
|
||||
dated: startingDate.value,
|
||||
ids: selectedRows.value.map((row) => row?.id),
|
||||
});
|
||||
refreshKey.value++;
|
||||
|
|
|
@ -5,7 +5,7 @@ route:
|
|||
Description: Description
|
||||
hourStarted: H.Start
|
||||
hourFinished: H.End
|
||||
createRoute: Create route
|
||||
dated: Dated
|
||||
From: From
|
||||
To: To
|
||||
Date: Date
|
||||
|
|
Loading…
Reference in New Issue