wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Hotfix: InvoiceOut List and NegativeBases' (!615) from hotfix_InvoiceOut_List&NegativeBases into master 

Reviewed-on: verdnatura/salix-front#615
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
Jon Elias 2024-08-14 06:56:39 +00:00
parent 0f8e5b8bf0 07e4dca361
commit 71068d3e62
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pages/InvoiceOut/InvoiceOutList.vue
View File

@ -1,5 +1,5 @@
<script setup> <script setup>
import { onMounted, onUnmounted, ref, computed } from 'vue'; import { onMounted, onUnmounted, ref, computed, watchEffect } from 'vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
import VnInputDate from 'src/components/common/VnInputDate.vue'; import VnInputDate from 'src/components/common/VnInputDate.vue';
@ -12,7 +12,6 @@ import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
import { toCurrency, toDate } from 'src/filters/index'; import { toCurrency, toDate } from 'src/filters/index';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { QBtn } from 'quasar'; import { QBtn } from 'quasar';
import { watchEffect } from 'vue';
import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue'; import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
const { t } = useI18n(); const { t } = useI18n();
@ -222,14 +221,17 @@ watchEffect(selectedRows);
</span> </span>
</template> </template>
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<VnSelect <div class="flex no-wrap flex-center">
url="Tickets" <VnSelect
v-model="data.ticketFk" url="Tickets"
:label="t('invoiceOutList.tableVisibleColumns.ticket')" v-model="data.ticketFk"
:options="ticketsOptions" :label="t('invoiceOutList.tableVisibleColumns.ticket')"
option-label="nickname" :options="ticketsOptions"
option-value="id" option-label="nickname"
/> option-value="id"
/>
<span class="q-ml-md">O</span>
</div>
<VnSelect <VnSelect
url="Clients" url="Clients"
v-model="data.clientFk" v-model="data.clientFk"
@ -238,10 +240,6 @@ watchEffect(selectedRows);
option-label="name" option-label="name"
option-value="id" option-value="id"
/> />
<VnInputDate
:label="t('invoiceOutList.tableVisibleColumns.dueDate')"
v-model="data.maxShipped"
/>
<VnSelect <VnSelect
url="InvoiceOutSerials" url="InvoiceOutSerials"
v-model="data.invoiceOutSerial" v-model="data.invoiceOutSerial"
@ -250,6 +248,10 @@ watchEffect(selectedRows);
option-label="description" option-label="description"
option-value="code" option-value="code"
/> />
<VnInputDate
:label="t('invoiceOutList.tableVisibleColumns.dueDate')"
v-model="data.maxShipped"
/>
<VnSelect <VnSelect
url="TaxAreas" url="TaxAreas"
v-model="data.area" v-model="data.area"

3
src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
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,
}, },