From 64f36c7d4b7a8210df9af7e087660094c0a28c2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Thu, 24 Oct 2024 12:35:11 +0200 Subject: [PATCH 1/4] feat: refs #8087 Traspasar redadas a travels --- src/i18n/locale/en.yml | 5 +---- src/i18n/locale/es.yml | 5 +---- src/pages/Entry/Card/EntryBasicData.vue | 6 ------ src/pages/Entry/Card/EntryDescriptor.vue | 4 ++-- src/pages/Entry/Card/EntrySummary.vue | 5 ----- src/pages/Entry/EntryList.vue | 4 ++-- src/pages/Travel/Card/TravelBasicData.vue | 4 ++++ src/pages/Travel/Card/TravelSummary.vue | 4 ++++ 8 files changed, 14 insertions(+), 23 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index aa8df17e2..d1ea5ceb9 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -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 diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 575e2c6c7..18e580893 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -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 diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue index b81b1db22..d60ed8645 100644 --- a/src/pages/Entry/Card/EntryBasicData.vue +++ b/src/pages/Entry/Card/EntryBasicData.vue @@ -168,12 +168,6 @@ const onFilterTravelSelected = (formData, id) => { v-model="data.isExcludedFromAvailable" :label="t('entry.basicData.excludedFromAvailable')" /> - - diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue index b22d6ba53..d85e5e1a0 100644 --- a/src/pages/Entry/Card/EntryDescriptor.vue +++ b/src/pages/Entry/Card/EntryDescriptor.vue @@ -32,7 +32,6 @@ const entryFilter = { { relation: 'travel', scope: { - fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'], include: [ { relation: 'agency', @@ -143,8 +142,9 @@ watch; > {{ t('Inventory entry') }} + {{ console.log('currentEntry', currentEntry) }} { v-model="entry.isBooked" :disable="true" /> - [ }, { align: 'left', - label: t('entry.list.tableVisibleColumns.isRaid'), - name: 'isRaid', + label: t('entry.list.tableVisibleColumns.daysInForward'), + name: 'daysInForward', chip: { color: null, condition: (value) => value, diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue index a3620a6ba..aaf8abb91 100644 --- a/src/pages/Travel/Card/TravelBasicData.vue +++ b/src/pages/Travel/Card/TravelBasicData.vue @@ -72,6 +72,10 @@ const agenciesOptions = ref([]); + `#/travel/${entityId.value}/${param}`; + From 12c236276d1d321ae657a2a005630df210917af6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= Date: Thu, 24 Oct 2024 19:32:20 +0200 Subject: [PATCH 2/4] feat: refs #8087 Traspasar redadas a travels --- src/i18n/locale/en.yml | 3 +- src/i18n/locale/es.yml | 3 +- src/pages/Entry/Card/EntryDescriptor.vue | 19 +++++----- src/pages/Entry/EntryList.vue | 43 ++++++++++++---------- src/pages/Entry/locale/en.yml | 1 - src/pages/Entry/locale/es.yml | 1 - src/pages/Travel/Card/TravelBasicData.vue | 17 ++++++++- src/pages/Travel/Card/TravelDescriptor.vue | 17 +++++++++ src/pages/Travel/Card/TravelSummary.vue | 2 +- src/pages/Travel/TravelList.vue | 15 ++++++++ 10 files changed, 86 insertions(+), 35 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index d1ea5ceb9..928553293 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -106,7 +106,6 @@ globals: weight: Weight error: Ups! Something went wrong recalc: Recalculate - daysInForward: Forward days pageTitles: logIn: Login addressEdit: Update address @@ -313,6 +312,7 @@ globals: changePass: Change password deleteConfirmTitle: Delete selected elements changeState: Change state + raid: 'Raid {daysInForward} days' errors: statusUnauthorized: Access denied statusInternalServerError: An internal server error has ocurred @@ -1039,6 +1039,7 @@ travel: warehouseIn: Warehouse In delivered: Delivered received: Received + daysInForward: Days in forward thermographs: code: Code temperature: Temperature diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index 18e580893..52bc821d1 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -108,7 +108,6 @@ 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 @@ -317,6 +316,7 @@ globals: changePass: Cambiar contraseña deleteConfirmTitle: Eliminar los elementos seleccionados changeState: Cambiar estado + raid: 'Redada {daysInForward} días' errors: statusUnauthorized: Acceso denegado statusInternalServerError: Ha ocurrido un error interno del servidor @@ -1037,6 +1037,7 @@ travel: warehouseIn: Alm. entrada delivered: Enviada received: Recibida + daysInForward: Días redada thermographs: code: Código temperature: Temperatura diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue index d85e5e1a0..bbfc73138 100644 --- a/src/pages/Entry/Card/EntryDescriptor.vue +++ b/src/pages/Entry/Card/EntryDescriptor.vue @@ -7,7 +7,6 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue'; import VnLv from 'src/components/ui/VnLv.vue'; import useCardDescription from 'src/composables/useCardDescription'; -import { useState } from 'src/composables/useState'; import { toDate } from 'src/filters'; import { usePrintService } from 'composables/usePrintService'; import { getUrl } from 'src/composables/getUrl'; @@ -23,7 +22,6 @@ const $props = defineProps({ const route = useRoute(); const { t } = useI18n(); const { openReport } = usePrintService(); -const state = useState(); const entryDescriptorRef = ref(null); const url = ref(); @@ -74,8 +72,6 @@ const data = ref(useCardDescription()); const setData = (entity) => (data.value = useCardDescription(entity.supplier?.nickname, entity.id)); -const currentEntry = computed(() => state.get('entry')); - const getEntryRedirectionFilter = (entry) => { let entryTravel = entry && entry.travel; @@ -132,24 +128,29 @@ watch; :value="entity.travel?.warehouseOut?.name" /> - +