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

fix: refs #4466 redirect to rectificatives

This commit is contained in:
Jorge Penadés 2024-01-26 13:09:34 +01:00
parent 21dc1b4eea
commit 8d33408bda
3 changed files with 37 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
View File

@ -165,77 +165,47 @@ const onSave = (data) => data?.deletes && router.push(`/invoice-in/${invoiceId}/
<QList> <QList>
<QItem> <QItem>
<QInput <QInput
class="full-width"
:label="t('Original invoice')" :label="t('Original invoice')"
v-model="props.row['correctedFk']" v-model="props.row['correctedFk']"
readonly readonly
/> />
</QItem> </QItem>
<!-- <QItem>
<QInput
:label="t('Taxable base')"
:class="{
'no-pointer-events': isNotEuro(
invoiceIn.currency.code
),
}"
class="full-width"
:disable="isNotEuro(invoiceIn.currency.code)"
clear-icon="close"
v-model="props.row.taxableBase"
clearable
>
<template #append>
<QIcon name="euro" size="xs" flat />
</template>
</QInput>
</QItem>
<QItem> <QItem>
<VnSelectFilter <VnSelectFilter
:label="t('Sage iva')"
class="full-width" class="full-width"
v-model="props.row['taxTypeSageFk']" v-model="props.row['cplusRectificationTypeFk']"
:options="sageTaxTypes" :options="cplusRectificationTypes"
option-value="id" option-value="id"
option-label="vat" option-label="description"
:filter-options="['id', 'vat']" :label="useFirstUpper(t('globals.type'))"
> :readonly="props.row.invoiceIn.isBooked"
<template #option="scope"> />
<QItem v-bind="scope.itemProps">
<QItemSection>
<QItemLabel>{{
scope.opt.vat
}}</QItemLabel>
<QItemLabel>
{{ `#${scope.opt.id}` }}
</QItemLabel>
</QItemSection>
</QItem>
</template>
</VnSelectFilter>
</QItem> </QItem>
<QItem> <QItem>
<VnSelectFilter <VnSelectFilter
class="full-width" class="full-width"
v-model="props.row['transactionTypeSageFk']" v-model="props.row['siiTypeInvoiceOutFk']"
:options="sageTransactionTypes" :options="siiTypeInvoiceOuts"
option-value="id" option-value="id"
option-label="transaction" option-label="code"
:filter-options="['id', 'transaction']" :label="useFirstUpper(t('globals.class'))"
> :rules="[requiredFieldRule]"
<template #option="scope"> :readonly="props.row.invoiceIn.isBooked"
<QItem v-bind="scope.itemProps"> />
<QItemSection> </QItem>
<QItemLabel>{{ <QItem>
scope.opt.transaction <VnSelectFilter
}}</QItemLabel> class="full-width"
<QItemLabel> v-model="props.row['invoiceCorrectionTypeFk']"
{{ `#${scope.opt.id}` }} :options="invoiceCorrectionTypes"
</QItemLabel> option-value="id"
</QItemSection> option-label="description"
</QItem> :label="useFirstUpper(t('globals.reason'))"
</template> :rules="[requiredFieldRule]"
</VnSelectFilter> :readonly="props.row.invoiceIn.isBooked"
</QItem> --> />
</QItem>
</QList> </QList>
</QCard> </QCard>
</div> </div>

17
src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
View File

@ -112,16 +112,13 @@ const routes = reactive({
}; };
}, },
getCorrection: (invoiceInCorrection) => { getCorrection: (invoiceInCorrection) => {
if (invoiceInCorrection.correcting.length > 1) { if (invoiceInCorrection.correcting.length > 1)
return; return {
// Se crea una sección aparte?
/* return {
name: 'InvoiceInList', name: 'InvoiceInList',
params: { query: {
search: invoiceInCorrection.correcting.join(), params: JSON.stringify({ correctedFk: entityId.value }),
}, },
}; */ };
}
return { return {
name: 'InvoiceInCard', name: 'InvoiceInCard',
@ -161,7 +158,7 @@ async function setInvoiceCorrection(id) {
}, },
}, },
}), }),
await axios.get('InvoiceInCorrections', { axios.get('InvoiceInCorrections', {
params: { params: {
filter: { filter: {
where: { where: {
@ -171,7 +168,7 @@ async function setInvoiceCorrection(id) {
}, },
}), }),
]); ]);
console.log(correctedData, correctedData);
if (correctingData[0]) invoiceInCorrection.corrected = correctingData[0].correctedFk; if (correctingData[0]) invoiceInCorrection.corrected = correctingData[0].correctedFk;
invoiceInCorrection.correcting = correctedData.map( invoiceInCorrection.correcting = correctedData.map(

6
src/pages/InvoiceIn/InvoiceInFilter.vue
View File

@ -61,7 +61,7 @@ const suppliersRef = ref();
<QItem> <QItem>
<QItemSection> <QItemSection>
<QInput <QInput
:label="useFirstUpper(t('params.correctives'))" :label="useFirstUpper(t('params.correctedFk'))"
v-model="params.correctedFk" v-model="params.correctedFk"
> >
<template #prepend> <template #prepend>
@ -295,7 +295,7 @@ en:
serial: Serial serial: Serial
account: Account account: Account
isBooked: is booked isBooked: is booked
correctives: correctives correctedFk: Rectificatives
es: es:
params: params:
search: Contiene search: Contiene
@ -312,7 +312,7 @@ es:
account: Cuenta account: Cuenta
created: Creada created: Creada
dued: Vencida dued: Vencida
correctives: rectificativas correctedFk: Rectificativas
From: Desde From: Desde
To: Hasta To: Hasta
Amount: Importe Amount: Importe