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

8282-testToMaster #1057

Merged
alexm merged 215 commits from 8282-testToMaster into master 2024-12-10 06:23:36 +00:00
Conversation 0 Commits 215 Files Changed 76 +28 -18
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2877ef8a33 - Show all commits

1
src/i18n/locale/en.yml
View File

@ -1154,6 +1154,7 @@ components:
clone: Clone clone: Clone
openCard: View openCard: View
openSummary: Summary openSummary: Summary
viewSummary: Summary
cardDescriptor: cardDescriptor:
mainList: Main list mainList: Main list
summary: Summary summary: Summary

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

@ -6,8 +6,8 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
import VnSearchbar from 'src/components/ui/VnSearchbar.vue'; import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue'; import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import { useSummaryDialog } from 'src/composables/useSummaryDialog'; import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { usePrintService } from 'composables/usePrintService'; import { usePrintService } from 'src/composables/usePrintService';
import VnTable from 'components/VnTable/VnTable.vue'; import VnTable from 'src/components/VnTable/VnTable.vue';
import InvoiceOutSummary from './Card/InvoiceOutSummary.vue'; 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';
@ -133,6 +133,7 @@ const columns = computed(() => [
{ {
title: t('components.smartCard.viewSummary'), title: t('components.smartCard.viewSummary'),
icon: 'preview', icon: 'preview',
isPrimary: true,
action: (row) => viewSummary(row.id, InvoiceOutSummary), action: (row) => viewSummary(row.id, InvoiceOutSummary),
}, },
{ {
@ -230,8 +231,8 @@ watchEffect(selectedRows);
</span> </span>
</template> </template>
<template #more-create-dialog="{ data }"> <template #more-create-dialog="{ data }">
<div class="row q-col-gutter-md"> <div class="row q-col-gutter-md" style="grid-column-start: div 0">
<div class="col-12"> <div class="col-12" style="display: flex">
<VnSelect <VnSelect
url="Tickets" url="Tickets"
v-model="data.ticketFk" v-model="data.ticketFk"
@ -250,14 +251,17 @@ watchEffect(selectedRows);
</QItem> </QItem>
</template> </template>
</VnSelect> </VnSelect>
</div> <!-- </div>
</div> </div>
<div class="row q-col-gutter-md"> <div class="row q-col-gutter-md">
<div class="col-12"> <div class="col-12"> -->
<span class="q-ml-md q-mt-md">O</span> <span class="q-ml-md q-mt-md">O</span>
</div> </div>
</div> </div>
<div class="row q-col-gutter-md"> <div
class="row q-col-gutter-md"
style="border: 1px solid grey; padding-right: 10px; padding-bottom: 10px"
>
<div class="col-12"> <div class="col-12">
<VnSelect <VnSelect
url="Clients" url="Clients"
@ -269,8 +273,8 @@ watchEffect(selectedRows);
@update:model-value="fetchClientAddress" @update:model-value="fetchClientAddress"
/> />
</div> </div>
</div> <!-- </div>
<div class="row q-col-gutter-md"> <div class="row q-col-gutter-md"> -->
<div class="col-12"> <div class="col-12">
<VnSelect <VnSelect
v-model="data.addressFk" v-model="data.addressFk"
@ -284,6 +288,7 @@ watchEffect(selectedRows);
</div> </div>
<VnSelect <VnSelect
style="grid-row: 2; margin-top: 10px"
url="InvoiceOutSerials" url="InvoiceOutSerials"
v-model="data.serial" v-model="data.serial"
:label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')" :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
@ -296,6 +301,7 @@ watchEffect(selectedRows);
v-model="data.maxShipped" v-model="data.maxShipped"
/> />
<VnSelect <VnSelect
style="grid-row: 3; margin-top: 10px"
url="TaxAreas" url="TaxAreas"
v-model="data.taxArea" v-model="data.taxArea"
:label="t('invoiceOutList.tableVisibleColumns.taxArea')" :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
@ -312,14 +318,17 @@ watchEffect(selectedRows);
</template> </template>
<i18n> <i18n>
en: en:
searchInvoice: Search issued invoice searchInvoice: Search issued invoice
fileDenied: Browser denied file download... fileDenied: Browser denied file download...
fileAllowed: Successful download of CSV file fileAllowed: Successful download of CSV file
youCanSearchByInvoiceReference: You can search by invoice reference youCanSearchByInvoiceReference: You can search by invoice reference
createInvoice: Make invoice Create manual invoice: Create manual invoice createInvoice: Make invoice
Create manual invoice: Create manual invoice
es: es:
searchInvoice: Buscar factura emitida fileDenied: El navegador denegó la searchInvoice: Buscar factura emitida
descarga de archivos... fileAllowed: Descarga exitosa de archivo CSV fileDenied: El navegador denegó la descarga de archivos...
youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura fileAllowed: Descarga exitosa de archivo CSV
createInvoice: Crear factura Create manual invoice: Crear factura manual youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
createInvoice: Crear factura
Create manual invoice: Crear factura manual
</i18n> </i18n>