From 78877556cf5798dc17716c079a3af07d58ad4597 Mon Sep 17 00:00:00 2001 From: carlossa Date: Wed, 31 Jan 2024 12:52:50 +0100 Subject: [PATCH 01/57] refs #6763 click --- src/components/ui/VnTree.vue | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue index c382ef9f2..3998135ca 100644 --- a/src/components/ui/VnTree.vue +++ b/src/components/ui/VnTree.vue @@ -1,7 +1,8 @@ + + + {{ t('claim.summary.development') }} + + + + + + {{ t('claim.summary.photos') }} @@ -275,21 +290,7 @@ function openDialog(dmsId) { - - - {{ t('claim.summary.development') }} - - - - - - + {{ t('claim.summary.actions') }} diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue index 1b5979f5a..8c28b7a6a 100644 --- a/src/pages/Claim/ClaimList.vue +++ b/src/pages/Claim/ClaimList.vue @@ -75,7 +75,7 @@ function viewSummary(id) { - - + + diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js index 3f031f1d1..b6b81f2d5 100644 --- a/src/composables/useArrayData.js +++ b/src/composables/useArrayData.js @@ -105,7 +105,8 @@ export function useArrayData(key, userOptions) { for (const row of response.data) store.data.push(row); } else { store.data = response.data; - updateRouter && updateStateParams(); + if (!document.querySelectorAll('[role="dialog"]')) + updateRouter && updateStateParams(); } store.isLoading = false; diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 3eb47d623..01f28e5f7 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -496,6 +496,7 @@ export default { responsible: 'Responsible', worker: 'Worker', redelivery: 'Redelivery', + returnOfMaterial: 'RMA', }, basicData: { customer: 'Customer', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index c4082cd71..793982b30 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -495,6 +495,7 @@ export default { responsible: 'Responsable', worker: 'Trabajador', redelivery: 'Devolución', + returnOfMaterial: 'RMA', }, basicData: { customer: 'Cliente', diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index deaed94f8..2fa1ae528 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -1,5 +1,5 @@ diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue index eeaffc85a..ed4c2040d 100644 --- a/src/pages/Claim/Card/ClaimNotes.vue +++ b/src/pages/Claim/Card/ClaimNotes.vue @@ -19,6 +19,12 @@ const claimFilter = { relation: 'worker', scope: { fields: ['id', 'firstName', 'lastName'], + include: { + relation: 'user', + scope: { + fields: ['id', 'nickname'], + }, + }, }, }, }; @@ -30,7 +36,8 @@ const body = { + + + + + - + {{ t('claim.summary.notes') }} @@ -248,6 +261,7 @@ function openDialog(dmsId) { + {{ t('claim.summary.photos') }} @@ -291,7 +305,7 @@ function openDialog(dmsId) { - + {{ t('claim.summary.actions') }} diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue index 8c28b7a6a..945543822 100644 --- a/src/pages/Claim/ClaimList.vue +++ b/src/pages/Claim/ClaimList.vue @@ -118,12 +118,6 @@ function viewSummary(id) { - +