wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

refactor: refs #7553 merge conflicts

This commit is contained in:
Jon Elias 2024-09-11 10:27:08 +02:00
parent d1138529b2
commit 422907447b
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/Ticket/Card/TicketDescriptorMenu.vue
View File

@ -639,7 +639,6 @@ async function handleInvoiceOutData() {
<i18n> <i18n>
en: en:
addTurn: Add turn addTurn: Add turn
en:
invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}" invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
es: es:

24
src/pages/Ticket/Card/TicketSummary.vue
View File

@ -147,13 +147,13 @@ function toTicketUrl(section) {
:url="toTicketUrl('basic-data')" :url="toTicketUrl('basic-data')"
:text="t('globals.summary.basicData')" :text="t('globals.summary.basicData')"
/> />
<VnLv v-if="ticket.ticketState" :label="t('ticket.summary.state')"> <VnLv v-if="entity.ticketState" :label="t('ticket.summary.state')">
<template #value> <template #value>
<QBadge <QBadge
text-color="black" text-color="black"
:color="ticket.ticketState.state.classColor" :color="entity.ticketState.state.classColor"
> >
{{ ticket.ticketState.state.name }} {{ entity.ticketState.state.name }}
</QBadge> </QBadge>
</template> </template>
</VnLv> </VnLv>
@ -172,8 +172,8 @@ function toTicketUrl(section) {
<VnLv :label="t('ticket.summary.zone')"> <VnLv :label="t('ticket.summary.zone')">
<template #value> <template #value>
<span class="link" @click.stop> <span class="link" @click.stop>
{{ ticket?.zone?.name }} {{ entity?.zone?.name }}
<ZoneDescriptorProxy :id="ticket.zoneFk" /> <ZoneDescriptorProxy :id="entity.zoneFk" />
</span> </span>
</template> </template>
</VnLv> </VnLv>
@ -198,11 +198,11 @@ function toTicketUrl(section) {
<VnLv :label="t('ticket.summary.route')"> <VnLv :label="t('ticket.summary.route')">
<template #value> <template #value>
<span class="link"> <span class="link">
{{ ticket.routeFk }} {{ entity.routeFk }}
<RouteDescriptorProxy <RouteDescriptorProxy :id="entity.routeFk" />
:id="ticket.routeFk" </span>
/> </span></template </template>
></VnLv> </VnLv>
<VnLv :label="t('ticket.summary.invoice')"> <VnLv :label="t('ticket.summary.invoice')">
<template #value> <template #value>
<span :class="{ link: entity.refFk }"> <span :class="{ link: entity.refFk }">
@ -260,9 +260,9 @@ function toTicketUrl(section) {
<VnLv <VnLv
:label="t('ticket.summary.consignee')" :label="t('ticket.summary.consignee')"
:value=" :value="
ticket.client.salesPersonUser.nickname + entity.client.salesPersonUser.nickname +
' #' + ' #' +
ticket.client.salesPersonUser.id entity.client.salesPersonUser.id
" "
> >
</VnLv> </VnLv>