Compare commits

..

No commits in common. "09804e06c751ae1702300a36c52b2be7295f0175" and "7325be23664a6198fe907f8ac4feea94710b6b86" have entirely different histories.

2 changed files with 50 additions and 51 deletions

View File

@ -6,8 +6,9 @@ import { useAcl } from 'src/composables/useAcl';
import axios from 'axios'; import axios from 'axios';
import { useQuasar } from 'quasar'; import { useQuasar } from 'quasar';
import { getSupplierRisk } from 'src/composables/getRisk'; import { getSupplierRisk } from 'src/composables/getRisk';
import RightMenu from 'src/components/common/RightMenu.vue';
import { dashIfEmpty, toCurrency, toDate, toDateHourMin } from 'src/filters'; import { toCurrency, toDate, toDateHourMin } from 'src/filters';
import { useState } from 'composables/useState'; import { useState } from 'composables/useState';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { usePrintService } from 'composables/usePrintService'; import { usePrintService } from 'composables/usePrintService';
@ -73,41 +74,40 @@ const companyFilterColumn = {
}; };
const columns = computed(() => [ const columns = computed(() => [
// {
// align: 'left',
// name: 'payed',
// label: t('Date'),
// format: ({ payed }) => toDate(payed),
// cardVisible: true,
// },
{ {
align: 'left', align: 'left',
name: 'dated', name: 'payed',
label: t('Creation date'), label: t('Date'),
format: ({ dated }) => toDateHourMin(dated), format: ({ payed }) => toDate(payed),
cardVisible: true, cardVisible: true,
}, },
// {
// align: 'left',
// label: t('Employee'),
// columnField: {
// component: 'userLink',
// attrs: ({ row }) => {
// return {
// workerId: row.workerFk,
// name: row.userName,
// };
// },
// },
// cardVisible: true,
// },
{ {
align: 'left', align: 'left',
name: 'sref', name: 'created',
label: t('Creation date'),
format: ({ created }) => toDateHourMin(created),
cardVisible: true,
},
{
align: 'left',
label: t('Employee'),
columnField: {
component: 'userLink',
attrs: ({ row }) => {
return {
workerId: row.workerFk,
name: row.userName,
};
},
},
cardVisible: true,
},
{
align: 'left',
name: 'description',
label: t('Reference'), label: t('Reference'),
isTitle: true, isTitle: true,
class: 'extend', class: 'extend',
format: ({ sref }) => dashIfEmpty(sref),
}, },
{ {
align: 'left', align: 'left',
@ -117,23 +117,23 @@ const columns = computed(() => [
}, },
{ {
align: 'left', align: 'left',
name: 'invoiceEuros', name: 'debit',
label: t('Debit'), label: t('Debit'),
format: ({ invoiceEuros }) => invoiceEuros && toCurrency(invoiceEuros), format: ({ debit }) => debit && toCurrency(debit),
isId: true, isId: true,
}, },
{ {
align: 'left', align: 'left',
name: 'paymentEuros', name: 'credit',
label: t('Havings'), label: t('Havings'),
format: ({ paymentEuros }) => paymentEuros && toCurrency(paymentEuros), format: ({ credit }) => credit && toCurrency(credit),
cardVisible: true, cardVisible: true,
}, },
{ {
align: 'left', align: 'left',
name: 'euroBalance', name: 'balance',
label: t('Balance'), label: t('Balance'),
format: ({ euroBalance }) => toCurrency(euroBalance), format: ({ balance }) => toCurrency(balance),
cardVisible: true, cardVisible: true,
}, },
{ {
@ -146,23 +146,23 @@ const columns = computed(() => [
align: 'left', align: 'left',
name: 'tableActions', name: 'tableActions',
actions: [ actions: [
// { {
// title: t('globals.downloadPdf'), title: t('globals.downloadPdf'),
// icon: 'cloud_download', icon: 'cloud_download',
// show: (row) => row.isInvoice, show: (row) => row.isInvoice,
// action: (row) => showBalancePdf(row), action: (row) => showBalancePdf(row),
// }, },
// { {
// title: t('Send compensation'), title: t('Send compensation'),
// icon: 'outgoing_mail', icon: 'outgoing_mail',
// show: (row) => !!row.isCompensation, show: (row) => !!row.isCompensation,
// action: ({ id }) => action: ({ id }) =>
// openConfirmationModal( openConfirmationModal(
// t('Send compensation'), t('Send compensation'),
// t('Do you want to report compensation to the supplier by mail?'), t('Do you want to report compensation to the supplier by mail?'),
// () => sendEmail(`Receipts/${id}/balance-compensation-email`) () => sendEmail(`Receipts/${id}/balance-compensation-email`)
// ), ),
// }, },
], ],
}, },
]); ]);

View File

@ -23,7 +23,6 @@ defineProps({
</div> </div>
</template> </template>
<template #body="{ params, searchFn }"> <template #body="{ params, searchFn }">
{{ params }}
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnInputDate <VnInputDate