Merge branch 'dev' into 8862-testIsolationFalse
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
commit
148e49b153
|
@ -130,20 +130,22 @@ async function onDataSaved(formData, { id }) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getSupplierClientReferences(value) {
|
async function getSupplierClientReferences(data) {
|
||||||
if (!value) return (initialData.description = '');
|
if (!data) return (initialData.description = '');
|
||||||
const params = { bankAccount: value };
|
const params = { bankAccount: data.compensationAccount };
|
||||||
const { data } = await axios(`Clients/getClientOrSupplierReference`, { params });
|
const { data: reference } = await axios(`Clients/getClientOrSupplierReference`, {
|
||||||
if (!data.clientId) {
|
params,
|
||||||
initialData.description = t('Supplier Compensation Reference', {
|
});
|
||||||
supplierId: data.supplierId,
|
if (reference.supplierId) {
|
||||||
supplierName: data.supplierName,
|
data.description = t('Supplier Compensation Reference', {
|
||||||
|
supplierId: reference.supplierId,
|
||||||
|
supplierName: reference.supplierName,
|
||||||
});
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
initialData.description = t('Client Compensation Reference', {
|
data.description = t('Client Compensation Reference', {
|
||||||
clientId: data.clientId,
|
clientId: reference.clientId,
|
||||||
clientName: data.clientName,
|
clientName: reference.clientName,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -252,7 +254,7 @@ async function getAmountPaid() {
|
||||||
:label="t('Compensation account')"
|
:label="t('Compensation account')"
|
||||||
clearable
|
clearable
|
||||||
v-model="data.compensationAccount"
|
v-model="data.compensationAccount"
|
||||||
@blur="getSupplierClientReferences(data.compensationAccount)"
|
@blur="getSupplierClientReferences(data)"
|
||||||
/>
|
/>
|
||||||
</VnRow>
|
</VnRow>
|
||||||
</div>
|
</div>
|
||||||
|
@ -288,6 +290,9 @@ async function getAmountPaid() {
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<i18n>
|
<i18n>
|
||||||
|
en:
|
||||||
|
Supplier Compensation Reference: ({supplierId}) Ntro Proveedor {supplierName}
|
||||||
|
Client Compensation Reference: ({clientId}) Ntro Cliente {clientName}
|
||||||
es:
|
es:
|
||||||
New payment: Añadir pago
|
New payment: Añadir pago
|
||||||
Date: Fecha
|
Date: Fecha
|
||||||
|
|
Loading…
Reference in New Issue