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

refactor: refs #6802 update InvoiceOutNegativeBases to use Department instead of Worker

This commit is contained in:
Javi Gallego 2025-02-27 08:14:13 +01:00
parent 15ac8c36c7
commit aaa6a44f88
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
View File

@ -8,7 +8,7 @@ import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
import { useArrayData } from 'src/composables/useArrayData'; import { useArrayData } from 'src/composables/useArrayData';
import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue'; import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue'; import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue';
import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue'; import DepartmentDescriptorProxy from '../Worker/Department/Card/DepartmentDescriptorProxy.vue';
import VnInputDate from 'components/common/VnInputDate.vue'; import VnInputDate from 'components/common/VnInputDate.vue';
import InvoiceOutNegativeBasesFilter from './InvoiceOutNegativeBasesFilter.vue'; import InvoiceOutNegativeBasesFilter from './InvoiceOutNegativeBasesFilter.vue';
import RightMenu from 'src/components/common/RightMenu.vue'; import RightMenu from 'src/components/common/RightMenu.vue';
@ -196,10 +196,10 @@ const downloadCSV = async () => {
<TicketDescriptorProxy :id="row.ticketFk" /> <TicketDescriptorProxy :id="row.ticketFk" />
</span> </span>
</template> </template>
<template #column-workerName="{ row }"> <template #column-departmentFk="{ row }">
<span class="link" @click.stop> <span class="link" @click.stop>
{{ row.workerName }} {{ row.departmentName }}
<WorkerDescriptorProxy :id="row.comercialId" /> <DepartmentDescriptorProxy :id="row.departmentFk" />
</span> </span>
</template> </template>
<template #moreFilterPanel="{ params }"> <template #moreFilterPanel="{ params }">

15
src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
View File

@ -129,12 +129,15 @@ const props = defineProps({
</QItem> </QItem>
<QItem> <QItem>
<QItemSection> <QItemSection>
<VnSelectWorker <VnSelect
:label="t('invoiceOut.negativeBases.comercial')" outlined
v-model="params.workerName" dense
option-value="name" rounded
is-outlined :label="t('globals.params.departmentFk')"
@update:model-value="searchFn()" v-model="params.departmentFk"
option-value="id"
option-label="name"
url="Departments"
/> />
</QItemSection> </QItemSection>
</QItem> </QItem>

2
src/pages/InvoiceOut/locale/en.yml
View File

@ -11,7 +11,6 @@ invoiceOut:
isActive: Active isActive: Active
hasToInvoice: Has to invoice hasToInvoice: Has to invoice
hasVerifiedData: Verified data hasVerifiedData: Verified data
workerName: Worker
isTaxDataChecked: Verified data isTaxDataChecked: Verified data
amount: Amount amount: Amount
clientFk: Client clientFk: Client
@ -25,6 +24,7 @@ invoiceOut:
max: Max max: Max
hasPdf: Has PDF hasPdf: Has PDF
search: Contains search: Contains
departmentFk: Department
card: card:
issued: Issued issued: Issued
customerCard: Customer card customerCard: Customer card

2
src/pages/InvoiceOut/locale/es.yml
View File

@ -11,7 +11,6 @@ invoiceOut:
isActive: Activo isActive: Activo
hasToInvoice: Debe facturar hasToInvoice: Debe facturar
hasVerifiedData: Datos verificados hasVerifiedData: Datos verificados
workerName: Comercial
isTaxDataChecked: Datos comprobados isTaxDataChecked: Datos comprobados
amount: Importe amount: Importe
clientFk: Cliente clientFk: Cliente
@ -25,6 +24,7 @@ invoiceOut:
max: Max max: Max
hasPdf: Tiene PDF hasPdf: Tiene PDF
search: Contiene search: Contiene
departmentFk: Departamento
card: card:
issued: Fecha emisión issued: Fecha emisión
customerCard: Ficha del cliente customerCard: Ficha del cliente

4
test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
View File

@ -16,9 +16,9 @@ describe('InvoiceOut negative bases', () => {
cy.get(getDescriptors('ticketFk')).click(); cy.get(getDescriptors('ticketFk')).click();
cy.get('.descriptor').should('be.visible'); cy.get('.descriptor').should('be.visible');
cy.get('.q-item > .q-item__label').should('include.text', '23'); cy.get('.q-item > .q-item__label').should('include.text', '23');
cy.get(getDescriptors('workerName')).click(); cy.get(getDescriptors('departmentFk')).click();
cy.get('.descriptor').should('be.visible'); cy.get('.descriptor').should('be.visible');
cy.get('.q-item > .q-item__label').should('include.text', '18'); cy.get('.q-item > .q-item__label').should('include.text', '155');
}); });
it('should filter and download as CSV', () => { it('should filter and download as CSV', () => {