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

refactor: handle agent

Browse source
This commit is contained in:
Thanaphon Frappet 2025-01-29 16:17:19 +07:00 • committed by Methapon2001
parent fd62732642
commit c1afeee1da
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -445,7 +445,9 @@ watch(
<q-td align="right"> <q-td align="right">
{{ {{
formatNumberDecimal( formatNumberDecimal(
props.row.product.calcVat props.row.product[
agentPrice ? 'agentPriceCalcVat' : 'calcVat'
]
? precisionRound( ? precisionRound(
(props.row.pricePerUnit * props.row.amount - (props.row.pricePerUnit * props.row.amount -
props.row.discount) * props.row.discount) *

6
src/pages/05_quotation/QuotationFormProductSelect.vue
View file

@ -307,7 +307,11 @@ function mapNode() {
const price = prop.agentPrice const price = prop.agentPrice
? p.product.agentPrice ? p.product.agentPrice
: p.product.price; : p.product.price;
const pricePerUnit = p.product.vatIncluded const pricePerUnit = (
prop.agentPrice
? p.product.agentPriceVatIncluded
: p.product.vatIncluded
)
? precisionRound(price / (1 + (config.value?.vat || 0.07))) ? precisionRound(price / (1 + (config.value?.vat || 0.07)))
: price; : price;
productCount.value++; productCount.value++;

2
src/pages/05_quotation/preview/ViewForm.vue
View file

@ -398,7 +398,7 @@ function print() {
<td style="text-align: right"> <td style="text-align: right">
{{ {{
formatNumberDecimal( formatNumberDecimal(
v.product.calcVat v.product[agentPrice ? 'agentPriceCalcVat' : 'calcVat']
? precisionRound( ? precisionRound(
(v.pricePerUnit * v.amount - v.discount) * (v.pricePerUnit * v.amount - v.discount) *
(config?.vat || 0.07), (config?.vat || 0.07),