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

fix: wrong decimal

Browse source
This commit is contained in:
Methapon2001 2025-01-17 09:05:36 +07:00
parent 7cb8dd6000
commit 6d43d4e796
2 changed files with 11 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/components/05_quotation/ProductItem.vue
View file

@ -57,17 +57,13 @@ const currentBtnOpen = ref<{ title: string; opened: boolean[] }[]>([
]); ]);
function calcPrice(c: (typeof rows.value)[number]) { function calcPrice(c: (typeof rows.value)[number]) {
return precisionRound( const price = c.pricePerUnit * c.amount;
c.pricePerUnit * c.amount - const vat = c.product.calcVat
c.discount + ? (c.pricePerUnit * (c.discount ? c.amount : 1) - c.discount) *
precisionRound( (config.value?.vat || 0.07) *
c.product.calcVat (!c.discount ? c.amount : 1)
? (c.pricePerUnit * (c.discount ? c.amount : 1) - c.discount) * : 0;
(config.value?.vat || 0.07) return precisionRound(price + vat);
: 0,
) *
(!c.discount ? c.amount : 1),
);
} }
const discount4Show = ref<string[]>([]); const discount4Show = ref<string[]>([]);

9
src/pages/05_quotation/QuotationForm.vue
View file

@ -242,12 +242,11 @@ function getPrice(
return a; return a;
} }
const price = precisionRound(c.pricePerUnit * c.amount); const price = c.pricePerUnit * c.amount;
const vat = const vat =
precisionRound( (c.pricePerUnit * (c.discount ? c.amount : 1) - c.discount) *
(c.pricePerUnit * (c.discount ? c.amount : 1) - c.discount) * (config.value?.vat || 0.07) *
(config.value?.vat || 0.07), (!c.discount ? c.amount : 1);
) * (!c.discount ? c.amount : 1);
a.totalPrice = precisionRound(a.totalPrice + price); a.totalPrice = precisionRound(a.totalPrice + price);
a.totalDiscount = precisionRound(a.totalDiscount + Number(c.discount)); a.totalDiscount = precisionRound(a.totalDiscount + Number(c.discount));