From 21452b6a9fd9d4c9978ca1ea683f10f74b664581 Mon Sep 17 00:00:00 2001 From: Thanaphon Frappet Date: Fri, 24 Jan 2025 11:56:07 +0700 Subject: [PATCH] refactor: edit value price --- src/pages/09_task-order/document_view/MainPage.vue | 2 +- src/pages/09_task-order/order_view/MainPage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/09_task-order/document_view/MainPage.vue b/src/pages/09_task-order/document_view/MainPage.vue index 8f281dd2..1b7114b7 100644 --- a/src/pages/09_task-order/document_view/MainPage.vue +++ b/src/pages/09_task-order/document_view/MainPage.vue @@ -225,7 +225,7 @@ onMounted(async () => { a.vat = c.product.calcVat ? a.vat + rawVatTotal : a.vat; a.vatExcluded = c.product.calcVat ? a.vatExcluded - : precisionRound(a.vatExcluded + priceNoVat); + : precisionRound(a.vatExcluded + priceDiscountNoVat); 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 3609c1fd..27f6a512 100644 --- a/src/pages/09_task-order/order_view/MainPage.vue +++ b/src/pages/09_task-order/order_view/MainPage.vue @@ -147,7 +147,7 @@ function getPrice( a.vat = c.product.calcVat ? a.vat + rawVatTotal : a.vat; a.vatExcluded = c.product.calcVat ? a.vatExcluded - : precisionRound(a.vatExcluded + priceNoVat); + : precisionRound(a.vatExcluded + priceDiscountNoVat); a.finalPrice = a.totalPrice - a.totalDiscount + a.vat; return a; },