From 2555d2b2d1a64c444969b47c305abdfffaf091d4 Mon Sep 17 00:00:00 2001 From: jorgep Date: Wed, 10 Jan 2024 11:21:02 +0100 Subject: [PATCH] feat: refs #6643 create VnUserLink --- src/components/common/VnLog.vue | 22 ++++++------- src/components/ui/VnAvatar.vue | 8 ++--- src/components/ui/VnNotes.vue | 13 ++++---- src/components/ui/VnSms.vue | 16 ++++++---- src/components/ui/VnUserLink.vue | 21 ++++++++++++ src/i18n/en/index.js | 1 + src/i18n/es/index.js | 1 + src/pages/Claim/Card/ClaimDescriptor.vue | 20 ++++++------ src/pages/Claim/Card/ClaimSummary.vue | 32 ++++++------------- src/pages/Claim/ClaimList.vue | 10 +++--- .../Customer/Card/CustomerDescriptor.vue | 10 +++--- src/pages/InvoiceIn/Card/InvoiceInCard.vue | 7 ++-- .../InvoiceOut/InvoiceOutNegativeBases.vue | 6 ++-- .../Shelving/Card/ShelvingDescriptor.vue | 14 ++++---- src/pages/Supplier/Card/SupplierSummary.vue | 13 +++----- src/pages/Ticket/Card/TicketDescriptor.vue | 13 +++----- src/pages/Ticket/Card/TicketSummary.vue | 13 +++----- src/pages/Worker/Card/WorkerSummary.vue | 18 +++++------ src/stores/useStateStore.js | 1 + 19 files changed, 118 insertions(+), 121 deletions(-) create mode 100644 src/components/ui/VnUserLink.vue diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue index 0949fb5cb..781d78ba8 100644 --- a/src/components/common/VnLog.vue +++ b/src/components/common/VnLog.vue @@ -12,8 +12,8 @@ import { useValidator } from 'src/composables/useValidator'; import VnAvatar from '../ui/VnAvatar.vue'; import VnJsonValue from '../common/VnJsonValue.vue'; import FetchData from '../FetchData.vue'; -import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; import VnSelectFilter from './VnSelectFilter.vue'; +import VnUserLink from '../ui/VnUserLink.vue'; const stateStore = useStateStore(); const validationsStore = useValidator(); @@ -421,15 +421,15 @@ setLogTree(); >
- - + + +
@@ -704,7 +704,7 @@ setLogTree(); class="q-pa-xs row items-center" > - + {{ opt.name }} diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue index 85bece243..8915eba2c 100644 --- a/src/components/ui/VnAvatar.vue +++ b/src/components/ui/VnAvatar.vue @@ -1,10 +1,9 @@ + + diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index 679387aa6..815a7b3b4 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -63,6 +63,7 @@ export default { selectRows: 'Select all { numberRows } row(s)', allRows: 'All { numberRows } row(s)', markAll: 'Mark all', + system: 'System', }, errors: { statusUnauthorized: 'Access denied', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index c2d3c2dd9..f3ece1065 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -62,6 +62,7 @@ export default { selectRows: 'Seleccionar las { numberRows } filas(s)', allRows: 'Todo { numberRows } filas(s)', markAll: 'Marcar todo', + system: 'Sistema', }, errors: { statusUnauthorized: 'Acceso denegado', diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index 85ae9f7e1..4f2703e71 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -4,14 +4,12 @@ import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; import { toDate } from 'src/filters'; import { useState } from 'src/composables/useState'; - import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue'; -import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue'; -import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue'; import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue'; import CardDescriptor from 'components/ui/CardDescriptor.vue'; import VnLv from 'src/components/ui/VnLv.vue'; import useCardDescription from 'src/composables/useCardDescription'; +import VnUserLink from 'src/components/ui/VnUserLink.vue'; const $props = defineProps({ id: { @@ -118,18 +116,18 @@ const setData = (entity) => { :value="entity.worker.user.name" > @@ -313,20 +313,6 @@ function openDialog(dmsId) { />
- (data.value = useCardDescription(entity.name, entity -