verdnatura/salix-front
verdnatura
/
salix-front
2
2
Fork 1
Code Issues Pull Requests 77 Releases Wiki Activity

8315-devToTest #1094

Merged
alexm merged 253 commits from 8315-devToTest into test 2024-12-18 10:31:55 +00:00
Conversation 0 Commits 253 Files Changed 134 +8 -46
2 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bd12c3bc66 - Show all commits

24
src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
View File

@ -26,7 +26,7 @@ const columns = computed(() => [
options: intrastats.value, options: intrastats.value,
model: 'intrastatFk', model: 'intrastatFk',
optionValue: 'id', optionValue: 'id',
optionLabel: 'description', optionLabel: (row) => `${row.id}: ${row.description}`,
sortable: true, sortable: true,
tabIndex: 1, tabIndex: 1,
align: 'left', align: 'left',
@ -68,12 +68,6 @@ const columns = computed(() => [
align: 'left', align: 'left',
}, },
]); ]);
const formatOpt = (row, { model, options }, prop) => {
const obj = row[model];
const option = options.find(({ id }) => id == obj);
return option ? `${obj}:${option[prop]}` : '';
};
</script> </script>
<template> <template>
<FetchData <FetchData
@ -118,12 +112,9 @@ const formatOpt = (row, { model, options }, prop) => {
<VnSelect <VnSelect
v-model="row[col.model]" v-model="row[col.model]"
:options="col.options" :options="col.options"
option-value="id" :option-value="col.optionValue"
option-label="description" :option-label="col.optionLabel"
:filter-options="['id', 'description']" :filter-options="['id', 'description']"
:hide-selected="false"
:fill-input="false"
:display-value="formatOpt(row, col, 'description')"
> >
<template #option="scope"> <template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem v-bind="scope.itemProps">
@ -138,8 +129,8 @@ const formatOpt = (row, { model, options }, prop) => {
<VnSelect <VnSelect
v-model="row[col.model]" v-model="row[col.model]"
:options="col.options" :options="col.options"
option-value="id" :option-value="col.optionValue"
option-label="code" :option-label="col.optionLabel"
/> />
</QTd> </QTd>
</template> </template>
@ -248,11 +239,6 @@ const formatOpt = (row, { model, options }, prop) => {
} }
} }
</style> </style>
<style lang="scss" scoped>
:deep(.q-table tr .q-td:nth-child(2) input) {
display: none;
}
</style>
<i18n> <i18n>
en: en:
amount: Amount amount: Amount

30
src/pages/InvoiceIn/Card/InvoiceInVat.vue
View File

@ -41,9 +41,8 @@ const columns = computed(() => [
options: expenses.value, options: expenses.value,
model: 'expenseFk', model: 'expenseFk',
optionValue: 'id', optionValue: 'id',
optionLabel: 'id', optionLabel: (row) => `${row.id}: ${row.name}`,
sortable: true, sortable: true,
tabIndex: 1,
align: 'left', align: 'left',
}, },
{ {
@ -52,7 +51,6 @@ const columns = computed(() => [
field: (row) => row.taxableBase, field: (row) => row.taxableBase,
model: 'taxableBase', model: 'taxableBase',
sortable: true, sortable: true,
tabIndex: 2,
align: 'left', align: 'left',
}, },
{ {
@ -62,9 +60,8 @@ const columns = computed(() => [
options: sageTaxTypes.value, options: sageTaxTypes.value,
model: 'taxTypeSageFk', model: 'taxTypeSageFk',
optionValue: 'id', optionValue: 'id',
optionLabel: 'id', optionLabel: (row) => `${row.id}: ${row.vat}`,
sortable: true, sortable: true,
tabindex: 3,
align: 'left', align: 'left',
}, },
{ {
@ -74,16 +71,14 @@ const columns = computed(() => [
options: sageTransactionTypes.value, options: sageTransactionTypes.value,
model: 'transactionTypeSageFk', model: 'transactionTypeSageFk',
optionValue: 'id', optionValue: 'id',
optionLabel: 'id', optionLabel: (row) => `${row.id}: ${row.transaction}`,
sortable: true, sortable: true,
tabIndex: 4,
align: 'left', align: 'left',
}, },
{ {
name: 'rate', name: 'rate',
label: t('Rate'), label: t('Rate'),
sortable: true, sortable: true,
tabIndex: 5,
field: (row) => taxRate(row, row.taxTypeSageFk), field: (row) => taxRate(row, row.taxTypeSageFk),
align: 'left', align: 'left',
}, },
@ -91,7 +86,6 @@ const columns = computed(() => [
name: 'foreignvalue', name: 'foreignvalue',
label: t('Foreign value'), label: t('Foreign value'),
sortable: true, sortable: true,
tabIndex: 6,
field: (row) => row.foreignValue, field: (row) => row.foreignValue,
align: 'left', align: 'left',
}, },
@ -124,12 +118,6 @@ function taxRate(invoiceInTax) {
return ((taxTypeSage / 100) * taxableBase).toFixed(2); return ((taxTypeSage / 100) * taxableBase).toFixed(2);
} }
const formatOpt = (row, { model, options }, prop) => {
const obj = row[model];
const option = options.find(({ id }) => id == obj);
return option ? `${obj}:${option[prop]}` : '';
};
</script> </script>
<template> <template>
<FetchData <FetchData
@ -173,8 +161,6 @@ const formatOpt = (row, { model, options }, prop) => {
:option-label="col.optionLabel" :option-label="col.optionLabel"
:filter-options="['id', 'name']" :filter-options="['id', 'name']"
:tooltip="t('Create a new expense')" :tooltip="t('Create a new expense')"
:hide-selected="false"
:display-value="formatOpt(row, col, 'name')"
@keydown.tab=" @keydown.tab="
row[col.model] = useAccountShortToStandard( row[col.model] = useAccountShortToStandard(
$event.target.value $event.target.value
@ -211,8 +197,6 @@ const formatOpt = (row, { model, options }, prop) => {
:option-value="col.optionValue" :option-value="col.optionValue"
:option-label="col.optionLabel" :option-label="col.optionLabel"
:filter-options="['id', 'vat']" :filter-options="['id', 'vat']"
:hide-selected="false"
:display-value="formatOpt(row, col, 'vat')"
> >
<template #option="scope"> <template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem v-bind="scope.itemProps">
@ -235,9 +219,6 @@ const formatOpt = (row, { model, options }, prop) => {
:option-value="col.optionValue" :option-value="col.optionValue"
:option-label="col.optionLabel" :option-label="col.optionLabel"
:filter-options="['id', 'transaction']" :filter-options="['id', 'transaction']"
:autofocus="col.tabIndex == 1"
:hide-selected="false"
:display-value="formatOpt(row, col, 'transaction')"
> >
<template #option="scope"> <template #option="scope">
<QItem v-bind="scope.itemProps"> <QItem v-bind="scope.itemProps">
@ -428,11 +409,6 @@ const formatOpt = (row, { model, options }, prop) => {
.bg { .bg {
background-color: var(--vn-light-gray); background-color: var(--vn-light-gray);
} }
:deep(.q-table tr td:nth-child(n + 4):nth-child(-n + 5) input) {
display: none;
}
@media (max-width: $breakpoint-xs) { @media (max-width: $breakpoint-xs) {
.q-dialog { .q-dialog {
.q-card { .q-card {