|
@@ -480,11 +480,13 @@
|
|
|
if(res){
|
|
|
customerOption.value = []
|
|
|
res.result.records.forEach(item=>{
|
|
|
+ debugger
|
|
|
customerOption.value.push({
|
|
|
label: item.name,
|
|
|
value: item.id,
|
|
|
priority:item.priority,
|
|
|
- intermediatorCommission:item.intermediatorCommission
|
|
|
+ intermediatorCommission:item.intermediatorCommission,
|
|
|
+ commission:item.commission
|
|
|
})
|
|
|
})
|
|
|
}
|
|
@@ -591,7 +593,8 @@
|
|
|
item.taxAmount = 0
|
|
|
customerOption.value.map(event=>{
|
|
|
if(event.value==formData.quotationCustomer){
|
|
|
- item.intermediatorCommission = event.intermediatorCommission
|
|
|
+ item.intermediatorCommission = event.intermediatorCommission,
|
|
|
+ item.customerCommision = event.commission
|
|
|
}
|
|
|
})
|
|
|
})
|
|
@@ -613,12 +616,12 @@
|
|
|
var num= prop.row.purchasePrice/1*(1+prop.row.taxRate/100)*(1+prop.row.tariff/100)*(1-prop.row.discount/100)/(1-prop.row.grossMargin/100-prop.row.customerCommision/100-prop.row.intermediatorCommission/100)
|
|
|
prop.row.salePrice = num.toFixed(2)
|
|
|
if(prop.row.quantity){
|
|
|
- prop.row.taxAmount = prop.row.salePrice*prop.row.quantity
|
|
|
+ prop.row.taxAmount = (prop.row.salePrice*prop.row.quantity).toFixed(2)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if(prop.col.key=='quantity'&&prop.row.salePrice&&prop.row.quantity){
|
|
|
- prop.row.taxAmount = prop.row.salePrice*prop.row.quantity
|
|
|
+ prop.row.taxAmount = (prop.row.salePrice*prop.row.quantity).toFixed(2)
|
|
|
}
|
|
|
}
|
|
|
return {
|