0
0
Fork 0

feat: refs #8087 Traspasar redadas a travels

This commit is contained in:
Carlos Andrés 2024-10-24 12:35:11 +02:00
parent 735ee09ef8
commit 64f36c7d4b
8 changed files with 14 additions and 23 deletions

View File

@ -106,6 +106,7 @@ globals:
weight: Weight weight: Weight
error: Ups! Something went wrong error: Ups! Something went wrong
recalc: Recalculate recalc: Recalculate
daysInForward: Forward days
pageTitles: pageTitles:
logIn: Login logIn: Login
addressEdit: Update address addressEdit: Update address
@ -369,7 +370,6 @@ entry:
companyFk: Company companyFk: Company
travelFk: Travel travelFk: Travel
isExcludedFromAvailable: Inventory isExcludedFromAvailable: Inventory
isRaid: Raid
invoiceAmount: Import invoiceAmount: Import
summary: summary:
commission: Commission commission: Commission
@ -380,7 +380,6 @@ entry:
ordered: Ordered ordered: Ordered
confirmed: Confirmed confirmed: Confirmed
booked: Booked booked: Booked
raid: Raid
excludedFromAvailable: Inventory excludedFromAvailable: Inventory
travelReference: Reference travelReference: Reference
travelAgency: Agency travelAgency: Agency
@ -413,7 +412,6 @@ entry:
ordered: Ordered ordered: Ordered
confirmed: Confirmed confirmed: Confirmed
booked: Booked booked: Booked
raid: Raid
excludedFromAvailable: Inventory excludedFromAvailable: Inventory
agency: Agency agency: Agency
warehouseOut: Warehouse Out warehouseOut: Warehouse Out
@ -476,7 +474,6 @@ entry:
packingOut: Package out packingOut: Package out
landing: Landing landing: Landing
isExcludedFromAvailable: Es inventory isExcludedFromAvailable: Es inventory
isRaid: Raid
ticket: ticket:
pageTitles: pageTitles:
tickets: Tickets tickets: Tickets

View File

@ -108,6 +108,7 @@ globals:
weight: Peso weight: Peso
error: ¡Ups! Algo salió mal error: ¡Ups! Algo salió mal
recalc: Recalcular recalc: Recalcular
daysInForward: Días en el futuro
pageTitles: pageTitles:
logIn: Inicio de sesión logIn: Inicio de sesión
addressEdit: Modificar consignatario addressEdit: Modificar consignatario
@ -371,7 +372,6 @@ entry:
companyFk: Empresa companyFk: Empresa
travelFk: Envio travelFk: Envio
isExcludedFromAvailable: Inventario isExcludedFromAvailable: Inventario
isRaid: Redada
invoiceAmount: Importe invoiceAmount: Importe
summary: summary:
commission: Comisión commission: Comisión
@ -382,7 +382,6 @@ entry:
ordered: Pedida ordered: Pedida
confirmed: Confirmada confirmed: Confirmada
booked: Contabilizada booked: Contabilizada
raid: Redada
excludedFromAvailable: Inventario excludedFromAvailable: Inventario
travelReference: Referencia travelReference: Referencia
travelAgency: Agencia travelAgency: Agencia
@ -415,7 +414,6 @@ entry:
ordered: Pedida ordered: Pedida
confirmed: Confirmado confirmed: Confirmado
booked: Asentado booked: Asentado
raid: Redada
excludedFromAvailable: Inventario excludedFromAvailable: Inventario
agency: Agencia agency: Agencia
warehouseOut: Alm. salida warehouseOut: Alm. salida
@ -478,7 +476,6 @@ entry:
packingOut: Embalaje envíos packingOut: Embalaje envíos
landing: Llegada landing: Llegada
isExcludedFromAvailable: Es inventario isExcludedFromAvailable: Es inventario
isRaid: Redada
ticket: ticket:
pageTitles: pageTitles:
tickets: Tickets tickets: Tickets

View File

@ -168,12 +168,6 @@ const onFilterTravelSelected = (formData, id) => {
v-model="data.isExcludedFromAvailable" v-model="data.isExcludedFromAvailable"
:label="t('entry.basicData.excludedFromAvailable')" :label="t('entry.basicData.excludedFromAvailable')"
/> />
<QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
<QCheckbox
v-if="isAdministrative()"
v-model="data.isBooked"
:label="t('entry.basicData.booked')"
/>
</VnRow> </VnRow>
</template> </template>
</FormModel> </FormModel>

View File

@ -32,7 +32,6 @@ const entryFilter = {
{ {
relation: 'travel', relation: 'travel',
scope: { scope: {
fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'],
include: [ include: [
{ {
relation: 'agency', relation: 'agency',
@ -143,8 +142,9 @@ watch;
> >
<QTooltip>{{ t('Inventory entry') }}</QTooltip> <QTooltip>{{ t('Inventory entry') }}</QTooltip>
</QIcon> </QIcon>
{{ console.log('currentEntry', currentEntry) }}
<QIcon <QIcon
v-if="currentEntry?.isRaid" v-if="currentEntry?.travel?.daysInForward"
name="vn:net" name="vn:net"
color="primary" color="primary"
size="xs" size="xs"

View File

@ -259,11 +259,6 @@ const fetchEntryBuys = async () => {
v-model="entry.isBooked" v-model="entry.isBooked"
:disable="true" :disable="true"
/> />
<QCheckbox
:label="t('entry.summary.raid')"
v-model="entry.isRaid"
:disable="true"
/>
<QCheckbox <QCheckbox
:label="t('entry.summary.excludedFromAvailable')" :label="t('entry.summary.excludedFromAvailable')"
v-model="entry.isExcludedFromAvailable" v-model="entry.isExcludedFromAvailable"

View File

@ -168,8 +168,8 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
label: t('entry.list.tableVisibleColumns.isRaid'), label: t('entry.list.tableVisibleColumns.daysInForward'),
name: 'isRaid', name: 'daysInForward',
chip: { chip: {
color: null, color: null,
condition: (value) => value, condition: (value) => value,

View File

@ -72,6 +72,10 @@ const agenciesOptions = ref([]);
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnInput v-model="data.m3" label="m3" /> <VnInput v-model="data.m3" label="m3" />
<VnInput
:label="t('globals.daysInForward')"
v-model="data.daysInForward"
/>
</VnRow> </VnRow>
<VnRow> <VnRow>
<QCheckbox <QCheckbox

View File

@ -303,6 +303,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
<VnLv :label="t('globals.reference')" :value="travel.ref" /> <VnLv :label="t('globals.reference')" :value="travel.ref" />
<VnLv label="m³" :value="travel.m3" /> <VnLv label="m³" :value="travel.m3" />
<VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" /> <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
<VnLv
:label="t('globals.daysInForward')"
:value="travel?.daysInForward"
/>
</QCard> </QCard>
<QCard class="full-width"> <QCard class="full-width">
<VnTitle :text="t('travel.summary.entries')" /> <VnTitle :text="t('travel.summary.entries')" />