verdnatura/salix-front
verdnatura
/
salix-front
1
2
Fork 1
Code Issues Pull Requests 63 Releases Wiki Activity

Merge branch 'dev' into 5987-redisgnCards
gitea/salix-front/pipeline/head This commit looks good Details

This commit is contained in:
Alex Moreno 2023-08-17 08:39:50 +00:00
parent 76071240d1 ab2e1f4553
commit 831dcfbf6d
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pages/Ticket/Card/TicketDescriptor.vue
View File

@ -102,16 +102,18 @@ const setData = (entity) =>
</span>
</template>
</VnLv>
<VnLv
v-if="entity.client && entity.client.salesPersonUser"
:label="t('ticket.card.salesPerson')"
:value="entity.client.salesPersonUser.name"
/>
<VnLv
v-if="entity.warehouse"
:label="t('ticket.card.warehouse')"
:value="entity.warehouse.name"
<VnLv :label="t('ticket.summary.salesPerson')">
<template #value>
<span class="link">
{{ ticket.client?.salesPersonUser?.name }}
<WorkerDescriptorProxy
:id="ticket.client.salesPersonFk"
v-if="ticket.client.salesPersonFk"
/>
</span>
</template>
</VnLv>
<VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" />
<VnLv
v-if="entity.agencyMode"
:label="t('ticket.card.agency')"

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

@ -160,8 +160,11 @@ async function changeState(value) {
<VnLv :label="t('ticket.summary.salesPerson')">
<template #value>
<span class="link">
{{ ticket.client.salesPersonUser.name }}
<WorkerDescriptorProxy :id="ticket.client.salesPersonFk" />
{{ ticket.client?.salesPersonUser?.name }}
<WorkerDescriptorProxy
:id="ticket.client.salesPersonFk"
v-if="ticket.client.salesPersonFk"
/>
</span>
</template>
</VnLv>
@ -172,7 +175,7 @@ async function changeState(value) {
<VnLv :label="t('ticket.summary.zone')" :value="ticket.zone.name" />
<VnLv
:label="t('ticket.summary.warehouse')"
:value="ticket.warehouse.name"
:value="ticket.warehouse?.name"
/>
<VnLv :label="t('ticket.summary.route')" :value="ticket.routeFk" />
<VnLv :label="t('ticket.summary.invoice')">