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

View File

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

View File

@ -168,12 +168,6 @@ const onFilterTravelSelected = (formData, id) => {
v-model="data.isExcludedFromAvailable"
: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>
</template>
</FormModel>

View File

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

View File

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

View File

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

View File

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

View File

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