diff --git a/src/pages/09_task-order/document_view/MainPage.vue b/src/pages/09_task-order/document_view/MainPage.vue index 593c13c1..7233fcb3 100644 --- a/src/pages/09_task-order/document_view/MainPage.vue +++ b/src/pages/09_task-order/document_view/MainPage.vue @@ -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; }, diff --git a/src/pages/09_task-order/order_view/MainPage.vue b/src/pages/09_task-order/order_view/MainPage.vue index 541eb1cb..703acf9b 100644 --- a/src/pages/09_task-order/order_view/MainPage.vue +++ b/src/pages/09_task-order/order_view/MainPage.vue @@ -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; },