From 01b62adba95bb60a55a826126e173ccd2f1c7949 Mon Sep 17 00:00:00 2001 From: jorgep Date: Thu, 26 Sep 2024 14:30:19 +0200 Subject: [PATCH 1/5] fix: refs #7524 dynamic fetch --- .../Travel/Card/TravelThermographsForm.vue | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue index 1d3410903..3c7c98d4d 100644 --- a/src/pages/Travel/Card/TravelThermographsForm.vue +++ b/src/pages/Travel/Card/TravelThermographsForm.vue @@ -30,18 +30,9 @@ const router = useRouter(); const state = useState(); const { notify } = useNotify(); -const thermographFilter = { - fields: ['id', 'thermographFk'], - where: { - or: [{ travelFk: null }, { travelFk: route.params.id }], - }, - order: 'thermographFk ASC', -}; - const fetchTravelThermographsRef = ref(null); const allowedContentTypes = ref(''); const user = state.getUser(); -const thermographsOptions = ref([]); const dmsTypesOptions = ref([]); const companiesOptions = ref([]); const warehousesOptions = ref([]); @@ -172,13 +163,6 @@ const onThermographCreated = async (data) => { auto-load url="Temperatures" /> - { Date: Tue, 1 Oct 2024 16:12:18 +0200 Subject: [PATCH 2/5] fix: refs #7404 fix style --- src/components/VnTable/VnTable.vue | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue index 3bcd91b1f..53db777df 100644 --- a/src/components/VnTable/VnTable.vue +++ b/src/components/VnTable/VnTable.vue @@ -771,16 +771,6 @@ es: color: var(--vn-text-color); } -.q-table--dark .q-table__bottom, -.q-table--dark thead, -.q-table--dark tr { - border-color: var(--vn-section-color); -} - -.q-table__container > div:first-child { - background-color: var(--vn-page-color); -} - .grid-three { display: grid; grid-template-columns: repeat(auto-fit, minmax(400px, max-content)); From 5e59ecdb43952893a4b98e473e80095df305b733 Mon Sep 17 00:00:00 2001 From: pablone Date: Wed, 2 Oct 2024 17:14:51 +0200 Subject: [PATCH 3/5] fix: refs #7404 with on stockBought mobile version --- src/pages/Entry/EntryStockBought.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue index 0e8013586..0b31dde17 100644 --- a/src/pages/Entry/EntryStockBought.vue +++ b/src/pages/Entry/EntryStockBought.vue @@ -279,7 +279,6 @@ function round(value) { display: flex; flex-direction: column; align-items: center; - width: 35%; } .text-negative { color: $negative !important; From 05a1d0e8fbb0a70d8630e72cf6c5952c3ecd3327 Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 3 Oct 2024 10:52:16 +0200 Subject: [PATCH 4/5] fix: refs #7129 translates from globals to module locals --- src/i18n/locale/en.yml | 30 +----------------------------- src/i18n/locale/es.yml | 15 --------------- src/pages/Route/locale/en.yml | 14 ++++++++++++++ src/pages/Route/locale/es.yml | 14 ++++++++++++++ 4 files changed, 29 insertions(+), 44 deletions(-) diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml index 20a612a82..4c559dfdf 100644 --- a/src/i18n/locale/en.yml +++ b/src/i18n/locale/en.yml @@ -870,35 +870,7 @@ wagon: minHeightBetweenTrays: 'The minimum height between trays is ' maxWagonHeight: 'The maximum height of the wagon is ' uncompleteTrays: There are incomplete trays -route: - pageTitles: - agency: Agency List - routes: Routes - cmrsList: CMRs list - RouteList: List - routeCreate: New route - basicData: Basic Data - summary: Summary - RouteRoadmap: Roadmaps - RouteRoadmapCreate: Create roadmap - tickets: Tickets - log: Log - autonomous: Autonomous - RouteExtendedList: Router - cmr: - list: - results: results - cmrFk: CMR id - hasCmrDms: Attached in gestdoc - 'true': 'Yes' - 'false': 'No' - ticketFk: Ticketd id - routeFk: Route id - country: Country - clientFk: Client id - shipped: Preparation date - viewCmr: View CMR - downloadCmrs: Download CMRs + supplier: list: payMethod: Pay method diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml index ae0274415..7cb17aad3 100644 --- a/src/i18n/locale/es.yml +++ b/src/i18n/locale/es.yml @@ -868,21 +868,6 @@ wagon: minHeightBetweenTrays: 'La distancia mínima entre bandejas es ' maxWagonHeight: 'La altura máxima del vagón es ' uncompleteTrays: Hay bandejas sin completar -route: - cmr: - list: - results: resultados - cmrFk: Id CMR - hasCmrDms: Gestdoc - 'true': Sí - 'false': 'No' - ticketFk: Id ticket - routeFk: Id ruta - country: País - clientFk: Id cliente - shipped: Fecha preparación - viewCmr: Ver CMR - downloadCmrs: Descargar CMRs supplier: list: payMethod: Método de pago diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml index 617d704d2..d113fda67 100644 --- a/src/pages/Route/locale/en.yml +++ b/src/pages/Route/locale/en.yml @@ -23,3 +23,17 @@ route: Summary: Summary Route is closed: Route is closed Route is not served: Route is not served + cmr: + list: + results: results + cmrFk: CMR id + hasCmrDms: Attached in gestdoc + 'true': 'Yes' + 'false': 'No' + ticketFk: Ticketd id + routeFk: Route id + country: Country + clientFk: Client id + shipped: Preparation date + viewCmr: View CMR + downloadCmrs: Download CMRs diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml index ed96ad915..a6ba4f370 100644 --- a/src/pages/Route/locale/es.yml +++ b/src/pages/Route/locale/es.yml @@ -23,3 +23,17 @@ route: Summary: Resumen Route is closed: La ruta está cerrada Route is not served: La ruta no está servida + cmr: + list: + results: resultados + cmrFk: Id CMR + hasCmrDms: Gestdoc + 'true': Sí + 'false': 'No' + ticketFk: Id ticket + routeFk: Id ruta + country: País + clientFk: Id cliente + shipped: Fecha preparación + viewCmr: Ver CMR + downloadCmrs: Descargar CMRs From c04dad38f12a36aa22d85a7c8e459cbbf01bf495 Mon Sep 17 00:00:00 2001 From: pablone Date: Thu, 3 Oct 2024 15:02:14 +0200 Subject: [PATCH 5/5] feat: refs #7404 change travel name and remove buyer filter --- src/pages/Entry/EntryStockBought.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue index 0b31dde17..2b5ec53f5 100644 --- a/src/pages/Entry/EntryStockBought.vue +++ b/src/pages/Entry/EntryStockBought.vue @@ -45,6 +45,7 @@ const columns = [ optionValue: 'id', useLike: false, }, + columnFilter: false, }, { align: 'center', @@ -157,7 +158,7 @@ function round(value) { @on-fetch=" (data) => { travel = data.find( - (data) => data.warehouseIn.code.toLowerCase() === 'vnh' + (data) => data.warehouseIn?.code.toLowerCase() === 'vnh' ); } " @@ -165,7 +166,7 @@ function round(value) {
- {{ t('Booked trucks') }}: + {{ t('Purchase Spaces') }}: {{ travel?.m3 }} @@ -236,6 +237,7 @@ function round(value) { :footer="true" table-height="80vh" auto-load + :column-search="false" >