0
0
Fork 0

fix: InvoiceOut List and negative bases

This commit is contained in:
Jon Elias 2024-08-13 11:18:07 +02:00
parent b5ea6b70c5
commit de7251e16d
2 changed files with 75 additions and 40 deletions

View File

@ -222,6 +222,8 @@ watchEffect(selectedRows);
</span> </span>
</template> </template>
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<div class="create-dialog">
<div class="field-row">
<VnSelect <VnSelect
url="Tickets" url="Tickets"
v-model="data.ticketFk" v-model="data.ticketFk"
@ -230,6 +232,7 @@ watchEffect(selectedRows);
option-label="nickname" option-label="nickname"
option-value="id" option-value="id"
/> />
<span class="separator">O</span>
<VnSelect <VnSelect
url="Clients" url="Clients"
v-model="data.clientFk" v-model="data.clientFk"
@ -238,10 +241,8 @@ watchEffect(selectedRows);
option-label="name" option-label="name"
option-value="id" option-value="id"
/> />
<VnInputDate </div>
:label="t('invoiceOutList.tableVisibleColumns.dueDate')" <div class="field-row">
v-model="data.maxShipped"
/>
<VnSelect <VnSelect
url="InvoiceOutSerials" url="InvoiceOutSerials"
v-model="data.invoiceOutSerial" v-model="data.invoiceOutSerial"
@ -250,6 +251,12 @@ watchEffect(selectedRows);
option-label="description" option-label="description"
option-value="code" option-value="code"
/> />
<VnInputDate
:label="t('invoiceOutList.tableVisibleColumns.dueDate')"
v-model="data.maxShipped"
/>
</div>
<div class="field-row">
<VnSelect <VnSelect
url="TaxAreas" url="TaxAreas"
v-model="data.area" v-model="data.area"
@ -262,10 +269,35 @@ watchEffect(selectedRows);
v-model="data.reference" v-model="data.reference"
:label="t('invoiceOutList.tableVisibleColumns.ref')" :label="t('invoiceOutList.tableVisibleColumns.ref')"
/> />
</div>
</div>
</template> </template>
</VnTable> </VnTable>
</template> </template>
<style scoped lang="scss">
.create-dialog {
display: flex;
flex-direction: column;
gap: 16px;
}
.field-row {
display: flex;
gap: 16px;
align-items: flex-end;
> * {
flex: 1;
}
.separator {
flex: 0 0 auto;
align-self: center;
padding: 0 8px;
}
}
</style>
<i18n> <i18n>
en: en:
searchInvoice: Search issued invoice searchInvoice: Search issued invoice

View File

@ -74,6 +74,9 @@ const columns = computed(() => [
align: 'left', align: 'left',
name: 'amount', name: 'amount',
label: t('invoiceOutModule.amount'), label: t('invoiceOutModule.amount'),
columnFilter: {
type: 'number',
},
format: (row) => toCurrency(row.amount), format: (row) => toCurrency(row.amount),
cardVisible: true, cardVisible: true,
}, },