0
0
Fork 0

Merge pull request 'Fix: #6899 fix invoiceOut descriptor and VnTable' (!596) from hotfix_InvoiceOutMigration into master

Reviewed-on: verdnatura/salix-front#596
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Jon Elias 2024-08-07 07:43:49 +00:00
commit 019fc96c1b
5 changed files with 31 additions and 3 deletions

View File

@ -28,7 +28,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
delete params.filter; delete params.filter;
store.userParams = { ...params, ...store.userParams }; store.userParams = { ...params, ...store.userParams };
store.userFilter = { ...filter, ...store.userFilter }; store.userFilter = { ...filter, ...store.userFilter };
if (filter.order) store.order = filter.order; if (filter?.order) store.order = filter.order;
} }
}); });

View File

@ -100,7 +100,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
color="primary" color="primary"
:to="{ :to="{
name: 'TicketList', name: 'TicketList',
query: { q: ticketFilter(entity) }, query: { table: ticketFilter(entity) },
}" }"
> >
<QTooltip>{{ t('invoiceOut.card.ticketList') }}</QTooltip> <QTooltip>{{ t('invoiceOut.card.ticketList') }}</QTooltip>

View File

@ -13,6 +13,7 @@ import { toCurrency, toDate } from 'src/filters/index';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { QBtn } from 'quasar'; import { QBtn } from 'quasar';
import { watchEffect } from 'vue'; import { watchEffect } from 'vue';
import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
const { t } = useI18n(); const { t } = useI18n();
const stateStore = useStateStore(); const stateStore = useStateStore();
@ -214,6 +215,12 @@ watchEffect(selectedRows);
selection: 'multiple', selection: 'multiple',
}" }"
> >
<template #column-clientSocialName="{ row }">
<span class="link" @click.stop>
{{ row.clientSocialName }}
<CustomerDescriptorProxy :id="row.clientFk" />
</span>
</template>
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<VnSelect <VnSelect
url="Tickets" url="Tickets"

View File

@ -6,6 +6,9 @@ import { toCurrency } from 'src/filters';
import VnTable from 'src/components/VnTable/VnTable.vue'; import VnTable from 'src/components/VnTable/VnTable.vue';
import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js'; import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
import { useArrayData } from 'src/composables/useArrayData'; import { useArrayData } from 'src/composables/useArrayData';
import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue';
import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
const { t } = useI18n(); const { t } = useI18n();
const tableRef = ref(); const tableRef = ref();
@ -168,6 +171,24 @@ const downloadCSV = async () => {
:is-editable="false" :is-editable="false"
:use-model="true" :use-model="true"
> >
<template #column-clientId="{ row }">
<span class="link" @click.stop>
{{ row.clientId }}
<CustomerDescriptorProxy :id="row.clientId" />
</span>
</template>
<template #column-ticketFk="{ row }">
<span class="link" @click.stop>
{{ row.ticketFk }}
<TicketDescriptorProxy :id="row.ticketFk" />
</span>
</template>
<template #column-workerName="{ row }">
<span class="link" @click.stop>
{{ row.workerName }}
<WorkerDescriptorProxy :id="row.comercialId" />
</span>
</template>
</VnTable> </VnTable>
</template> </template>

View File

@ -181,7 +181,7 @@ async function changeState(value) {
<span :class="{ link: ticket.refFk }"> <span :class="{ link: ticket.refFk }">
{{ dashIfEmpty(ticket.refFk) }} {{ dashIfEmpty(ticket.refFk) }}
<InvoiceOutDescriptorProxy <InvoiceOutDescriptorProxy
:id="ticket.id" :id="ticket.invoiceOut.id"
v-if="ticket.refFk" v-if="ticket.refFk"
/> />
</span> </span>