chamomind/jws-frontend
chamomind/jws-frontend
7
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix: wrong field calculated

Browse source
This commit is contained in:
Methapon2001 2025-01-24 11:09:07 +07:00
parent 519731c68c
commit f08c45379d
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pages/09_task-order/document_view/MainPage.vue
View file

@ -221,7 +221,9 @@ onMounted(async () => {
a.totalPrice = a.totalPrice + priceDiscountNoVat;
a.totalDiscount = a.totalDiscount + Number(c.discount);
a.vat = c.product.calcVat ? a.vat + rawVatTotal : a.vat;
a.vatExcluded = c.product.calcVat ? a.vatExcluded : a.vat + rawVatTotal;
a.vatExcluded = c.product.calcVat
? a.vatExcluded
: a.vatExcluded + rawVatTotal;
a.finalPrice = a.totalPrice - a.totalDiscount + a.vat;
return a;
},

5
src/pages/09_task-order/order_view/MainPage.vue
View file

@ -140,12 +140,13 @@ function getPrice(
const priceDiscountNoVat = priceNoVat * amount - discount;
const rawVatTotal = priceDiscountNoVat * (config.value?.vat || 0.07);
// const rawVat = rawVatTotal / amount;
a.totalPrice = a.totalPrice + priceDiscountNoVat;
a.totalDiscount = a.totalDiscount + Number(discount);
a.vat = c.product.calcVat ? a.vat + rawVatTotal : a.vat;
a.vatExcluded = c.product.calcVat ? a.vatExcluded : a.vat + rawVatTotal;
a.vatExcluded = c.product.calcVat
? a.vatExcluded
: a.vatExcluded + rawVatTotal;
a.finalPrice = a.totalPrice - a.totalDiscount + a.vat;
return a;
},