Reviewed-on: #849 Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
This commit is contained in:
commit
93025007f1
|
@ -296,6 +296,8 @@ globals:
|
||||||
from: From
|
from: From
|
||||||
To: To
|
To: To
|
||||||
stateFk: State
|
stateFk: State
|
||||||
|
myTeam: My team
|
||||||
|
departmentFk: Department
|
||||||
errors:
|
errors:
|
||||||
statusUnauthorized: Access denied
|
statusUnauthorized: Access denied
|
||||||
statusInternalServerError: An internal server error has ocurred
|
statusInternalServerError: An internal server error has ocurred
|
||||||
|
|
|
@ -300,6 +300,8 @@ globals:
|
||||||
from: Desde
|
from: Desde
|
||||||
To: Hasta
|
To: Hasta
|
||||||
stateFk: Estado
|
stateFk: Estado
|
||||||
|
myTeam: Mi equipo
|
||||||
|
departmentFk: Departamento
|
||||||
errors:
|
errors:
|
||||||
statusUnauthorized: Acceso denegado
|
statusUnauthorized: Acceso denegado
|
||||||
statusInternalServerError: Ha ocurrido un error interno del servidor
|
statusInternalServerError: Ha ocurrido un error interno del servidor
|
||||||
|
|
|
@ -462,6 +462,9 @@ onMounted(async () => {
|
||||||
userParams.dateFuture = tomorrow;
|
userParams.dateFuture = tomorrow;
|
||||||
userParams.dateToAdvance = today;
|
userParams.dateToAdvance = today;
|
||||||
userParams.warehouseFk = user.value.warehouseFk;
|
userParams.warehouseFk = user.value.warehouseFk;
|
||||||
|
userParams.ipt = 'H';
|
||||||
|
userParams.futureIpt = 'H';
|
||||||
|
userParams.isFullMovable = true;
|
||||||
const filter = { limit: 0 };
|
const filter = { limit: 0 };
|
||||||
await arrayData.addFilter({ filter, userParams });
|
await arrayData.addFilter({ filter, userParams });
|
||||||
});
|
});
|
||||||
|
|
|
@ -10,7 +10,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { onMounted } from 'vue';
|
import { onMounted } from 'vue';
|
||||||
|
|
||||||
const { t } = useI18n();
|
const { t, te } = useI18n();
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
dataKey: {
|
dataKey: {
|
||||||
type: String,
|
type: String,
|
||||||
|
@ -42,6 +42,11 @@ const getItemPackingTypes = async () => {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const getLocale = (val) => {
|
||||||
|
const param = `params.${val}`;
|
||||||
|
return te(param) ? t(param) : t(`globals.${param}`);
|
||||||
|
};
|
||||||
|
|
||||||
onMounted(async () => await getItemPackingTypes());
|
onMounted(async () => await getItemPackingTypes());
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -59,7 +64,7 @@ onMounted(async () => await getItemPackingTypes());
|
||||||
>
|
>
|
||||||
<template #tags="{ tag, formatFn }">
|
<template #tags="{ tag, formatFn }">
|
||||||
<div class="q-gutter-x-xs">
|
<div class="q-gutter-x-xs">
|
||||||
<strong>{{ t(`params.${tag.label}`) }}: </strong>
|
<strong>{{ getLocale(tag.label) }}: </strong>
|
||||||
<span>{{ formatFn(tag.value) }}</span>
|
<span>{{ formatFn(tag.value) }}</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
@ -126,6 +131,19 @@ onMounted(async () => await getItemPackingTypes());
|
||||||
/>
|
/>
|
||||||
</QItemSection>
|
</QItemSection>
|
||||||
</QItem>
|
</QItem>
|
||||||
|
<QItem>
|
||||||
|
<QItemSection>
|
||||||
|
<VnSelect
|
||||||
|
:label="t('globals.params.departmentFk')"
|
||||||
|
v-model="params.departmentFk"
|
||||||
|
url="Departments"
|
||||||
|
:fields="['id', 'name']"
|
||||||
|
dense
|
||||||
|
outlined
|
||||||
|
rounded
|
||||||
|
/>
|
||||||
|
</QItemSection>
|
||||||
|
</QItem>
|
||||||
<QItem>
|
<QItem>
|
||||||
<QItemSection>
|
<QItemSection>
|
||||||
<VnSelect
|
<VnSelect
|
||||||
|
|
|
@ -86,9 +86,9 @@ weeklyTickets:
|
||||||
search: Buscar por tickets programados
|
search: Buscar por tickets programados
|
||||||
searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
|
searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
|
||||||
advanceTickets:
|
advanceTickets:
|
||||||
preparation: Preparación
|
preparation: Preparación
|
||||||
origin: Origen
|
origin: Origen
|
||||||
destination: Destinatario
|
destination: Destino
|
||||||
originAgency: 'Agencia origen: {agency}'
|
originAgency: 'Agencia origen: {agency}'
|
||||||
destinationAgency: 'Agencia destino: {agency}'
|
destinationAgency: 'Agencia destino: {agency}'
|
||||||
ticketId: ID
|
ticketId: ID
|
||||||
|
|
Loading…
Reference in New Issue