diff --git a/src/boot/axios.js b/src/boot/axios.js index 076191d28..2f454188e 100644 --- a/src/boot/axios.js +++ b/src/boot/axios.js @@ -73,3 +73,8 @@ const onResponseError = (error) => { axios.interceptors.request.use(onRequest, onRequestError); axios.interceptors.response.use(onResponse, onResponseError); + +export { + onRequest, + onResponseError +} diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue index 84b924c2f..aa78776a9 100644 --- a/src/pages/Claim/Card/ClaimDescriptor.vue +++ b/src/pages/Claim/Card/ClaimDescriptor.vue @@ -4,7 +4,7 @@ import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; import { toDate } from 'src/filters'; -import TicketDescriptorPopover from 'pages/Ticket/Card/TicketDescriptorPopover.vue'; +import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue'; import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue'; import CardDescriptor from 'components/ui/CardDescriptor.vue'; @@ -86,9 +86,8 @@ function stateColor(code) { {{ entity.ticketFk }} - - - + + diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index 98027b4ad..77b9a6b27 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -4,6 +4,7 @@ import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; import { toDate, toCurrency } from 'src/filters'; import CardSummary from 'components/ui/CardSummary.vue'; +import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue'; const route = useRoute(); const { t } = useI18n(); @@ -109,22 +110,30 @@ function stateColor(code) { - {{ - t('claim.summary.assignedTo') - }} - {{ - claim.worker.user.nickname - }} + + {{ t('claim.summary.assignedTo') }} + + + + {{ claim.worker.user.nickname }} + + + - {{ - t('claim.summary.attendedBy') - }} - {{ - claim.client.salesPersonUser.name - }} + + {{ t('claim.summary.attendedBy') }} + + + + {{ claim.client.salesPersonUser.name }} + + + @@ -169,4 +178,4 @@ function stateColor(code) { - \ No newline at end of file + diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue index dbc3aa1c1..05c074ee0 100644 --- a/src/pages/Claim/ClaimList.vue +++ b/src/pages/Claim/ClaimList.vue @@ -6,7 +6,7 @@ import { useStateStore } from 'stores/useStateStore'; import { toDate } from 'filters/index'; import Paginate from 'components/PaginateData.vue'; import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue'; -import CustomerDescriptorPopover from 'pages/Customer/Card/CustomerDescriptorPopover.vue'; +import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue'; import VnSearchbar from 'components/ui/VnSearchbar.vue'; import ClaimFilter from './ClaimFilter.vue'; @@ -173,9 +173,8 @@ function viewSummary(id) { {{ t('components.smartCard.viewDescription') }} - - - + + diff --git a/src/pages/Customer/Card/CustomerDescriptorPopover.vue b/src/pages/Customer/Card/CustomerDescriptorProxy.vue similarity index 66% rename from src/pages/Customer/Card/CustomerDescriptorPopover.vue rename to src/pages/Customer/Card/CustomerDescriptorProxy.vue index 78d1c5801..6e69ca1a0 100644 --- a/src/pages/Customer/Card/CustomerDescriptorPopover.vue +++ b/src/pages/Customer/Card/CustomerDescriptorProxy.vue @@ -9,7 +9,7 @@ const $props = defineProps({ }); diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue index 31252f3e3..2e13b1438 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue @@ -3,8 +3,8 @@ import { ref, computed } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; import { toCurrency, toDate } from 'src/filters'; -import CardDescriptor from 'src/components/ui/CardDescriptor.vue'; -import CustomerDescriptorPopover from 'src/pages/Customer/Card/CustomerDescriptorPopover.vue'; +import CardDescriptor from 'components/ui/CardDescriptor.vue'; +import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue'; const $props = defineProps({ id: { @@ -80,9 +80,7 @@ function ticketFilter(invoice) { {{ entity.client.name }} - - - + diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorPopover.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue similarity index 66% rename from src/pages/InvoiceOut/Card/InvoiceOutDescriptorPopover.vue rename to src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue index 30d27669d..a3389545b 100644 --- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorPopover.vue +++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue @@ -9,7 +9,7 @@ const $props = defineProps({ }); diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue index 33bd9614b..bdf796893 100644 --- a/src/pages/Ticket/Card/TicketDescriptor.vue +++ b/src/pages/Ticket/Card/TicketDescriptor.vue @@ -3,7 +3,7 @@ import { computed } from 'vue'; import { useRoute } from 'vue-router'; import { useI18n } from 'vue-i18n'; import { toDate } from 'src/filters'; -import CustomerDescriptorPopover from 'src/pages/Customer/Card/CustomerDescriptorPopover.vue'; +import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue'; import CardDescriptor from 'components/ui/CardDescriptor.vue'; import TicketDescriptorMenu from './TicketDescriptorMenu.vue'; @@ -109,9 +109,7 @@ function stateColor(state) { {{ entity.clientFk }} - - - + diff --git a/src/pages/Ticket/Card/TicketDescriptorPopover.vue b/src/pages/Ticket/Card/TicketDescriptorProxy.vue similarity index 66% rename from src/pages/Ticket/Card/TicketDescriptorPopover.vue rename to src/pages/Ticket/Card/TicketDescriptorProxy.vue index 891ffb3a8..0a7a353bb 100644 --- a/src/pages/Ticket/Card/TicketDescriptorPopover.vue +++ b/src/pages/Ticket/Card/TicketDescriptorProxy.vue @@ -9,7 +9,7 @@ const $props = defineProps({ }); diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue index 111a1e957..320437596 100644 --- a/src/pages/Ticket/Card/TicketSummary.vue +++ b/src/pages/Ticket/Card/TicketSummary.vue @@ -7,6 +7,8 @@ import { dashIfEmpty, toDate, toCurrency } from 'src/filters'; import SkeletonSummary from 'components/ui/SkeletonSummary.vue'; import FetchData from 'components/FetchData.vue'; import FetchedTags from 'components/ui/FetchedTags.vue'; +import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue'; +import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue'; onMounted(() => fetch()); onUpdated(() => fetch()); @@ -79,14 +81,20 @@ async function changeState(value) {