8231_testToMaster_2448 #997

Merged
alexm merged 400 commits from 8231_testToMaster_2448 into master 2024-11-26 06:28:29 +00:00
2 changed files with 11 additions and 20 deletions
Showing only changes of commit 6ca8ede946 - Show all commits

View File

@ -33,8 +33,7 @@ watch(
const columns = computed(() => [ const columns = computed(() => [
{ {
label: t('item.buyRequest.ticketId'), label: t('item.buyRequest.ticketId'),
name: 'id', name: 'ticketFk',
field: 'id',
align: 'left', align: 'left',
isId: true, isId: true,
chip: { chip: {
@ -44,7 +43,6 @@ const columns = computed(() => [
}, },
{ {
label: t('item.buyRequest.shipped'), label: t('item.buyRequest.shipped'),
field: 'shipped',
name: 'shipped', name: 'shipped',
align: 'left', align: 'left',
component: 'date', component: 'date',
@ -61,57 +59,46 @@ const columns = computed(() => [
}, },
{ {
label: t('item.buyRequest.requester'), label: t('item.buyRequest.requester'),
field: 'requesterName', name: 'requesterName',
name: 'requesterFk',
align: 'left', align: 'left',
}, },
{ {
label: t('item.buyRequest.requested'), label: t('item.buyRequest.requested'),
field: 'quantity', name: 'saleQuantity',
name: 'requested',
align: 'left', align: 'left',
}, },
{ {
label: t('item.buyRequest.price'), label: t('item.buyRequest.price'),
field: 'price',
name: 'price', name: 'price',
align: 'left', align: 'left',
format: (row) => toCurrency(row.price), format: (row) => toCurrency(row.price),
}, },
{ {
label: t('item.buyRequest.attender'), label: t('item.buyRequest.attender'),
field: 'attender', name: 'attenderName',
name: 'attender',
align: 'left', align: 'left',
}, },
{ {
label: t('item.buyRequest.item'), label: t('item.buyRequest.item'),
field: 'item',
name: 'item', name: 'item',
align: 'left', align: 'left',
component: 'input', component: 'input',
visible: false,
}, },
{ {
label: t('item.buyRequest.achieved'), label: t('item.buyRequest.achieved'),
field: 'achieved',
name: 'achieved', name: 'achieved',
align: 'left', align: 'left',
component: 'input', component: 'input',
visible: false,
}, },
{ {
label: t('item.buyRequest.concept'), label: t('item.buyRequest.concept'),
field: 'concept',
name: 'concept', name: 'concept',
align: 'left', align: 'left',
sortable: true, sortable: true,
component: 'input', component: 'input',
visible: false,
}, },
{ {
label: t('item.buyRequest.state'), label: t('item.buyRequest.state'),
field: 'state',
name: 'state', name: 'state',
align: 'left', align: 'left',
}, },
@ -123,7 +110,7 @@ const columns = computed(() => [
{ {
title: t('Client ticket list'), title: t('Client ticket list'),
icon: 'thumb_down', icon: 'thumb_down',
action: onDenyAccept, action: showDenyRequestForm,
isPrimary: true, isPrimary: true,
}, },
], ],
@ -348,14 +335,15 @@ onBeforeMount(() => {
<VnTable <VnTable
ref="tableRef" ref="tableRef"
data-key="itemRequest" data-key="itemRequest"
url="ticketRequests" url="ticketRequests/filter"
order="id DESC" order="id DESC"
:columns="columns" :columns="columns"
:is-editable="false"
auto-load auto-load
> >
<template #column-attender="{ row }"> <template #column-attender="{ row }">
<span class="link" @click.stop> <span class="link" @click.stop>
{{ row.attenderFk }} {{ row }}
<WorkerDescriptorProxy :id="row.attenderFk" /> <WorkerDescriptorProxy :id="row.attenderFk" />
</span> </span>
</template> </template>

View File

@ -84,6 +84,7 @@ const columns = computed(() => [
fields: ['id', 'firstName'], fields: ['id', 'firstName'],
}, },
cardVisible: true, cardVisible: true,
visible: false,
}, },
{ {
align: 'left', align: 'left',
@ -96,6 +97,7 @@ const columns = computed(() => [
fields: ['id', 'name'], fields: ['id', 'name'],
}, },
cardVisible: true, cardVisible: true,
visible: false,
}, },
{ {
align: 'left', align: 'left',
@ -108,6 +110,7 @@ const columns = computed(() => [
fields: ['id', 'name'], fields: ['id', 'name'],
}, },
cardVisible: true, cardVisible: true,
visible: false,
}, },
]); ]);
</script> </script>