diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue index 0389ba864..8791a575f 100644 --- a/src/pages/Item/ItemRequest.vue +++ b/src/pages/Item/ItemRequest.vue @@ -33,8 +33,7 @@ watch( const columns = computed(() => [ { label: t('item.buyRequest.ticketId'), - name: 'id', - field: 'id', + name: 'ticketFk', align: 'left', isId: true, chip: { @@ -44,7 +43,6 @@ const columns = computed(() => [ }, { label: t('item.buyRequest.shipped'), - field: 'shipped', name: 'shipped', align: 'left', component: 'date', @@ -61,57 +59,46 @@ const columns = computed(() => [ }, { label: t('item.buyRequest.requester'), - field: 'requesterName', - name: 'requesterFk', + name: 'requesterName', align: 'left', }, { label: t('item.buyRequest.requested'), - field: 'quantity', - name: 'requested', + name: 'saleQuantity', align: 'left', }, { label: t('item.buyRequest.price'), - field: 'price', name: 'price', align: 'left', format: (row) => toCurrency(row.price), }, { label: t('item.buyRequest.attender'), - field: 'attender', - name: 'attender', + name: 'attenderName', align: 'left', }, { label: t('item.buyRequest.item'), - field: 'item', name: 'item', align: 'left', component: 'input', - visible: false, }, { label: t('item.buyRequest.achieved'), - field: 'achieved', name: 'achieved', align: 'left', component: 'input', - visible: false, }, { label: t('item.buyRequest.concept'), - field: 'concept', name: 'concept', align: 'left', sortable: true, component: 'input', - visible: false, }, { label: t('item.buyRequest.state'), - field: 'state', name: 'state', align: 'left', }, @@ -123,7 +110,7 @@ const columns = computed(() => [ { title: t('Client ticket list'), icon: 'thumb_down', - action: onDenyAccept, + action: showDenyRequestForm, isPrimary: true, }, ], @@ -348,14 +335,15 @@ onBeforeMount(() => { diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue index c02f9bb43..5ebbec62b 100644 --- a/src/pages/Item/ItemTypeList.vue +++ b/src/pages/Item/ItemTypeList.vue @@ -84,6 +84,7 @@ const columns = computed(() => [ fields: ['id', 'firstName'], }, cardVisible: true, + visible: false, }, { align: 'left', @@ -96,6 +97,7 @@ const columns = computed(() => [ fields: ['id', 'name'], }, cardVisible: true, + visible: false, }, { align: 'left', @@ -108,6 +110,7 @@ const columns = computed(() => [ fields: ['id', 'name'], }, cardVisible: true, + visible: false, }, ]);