|
|
@@ -530,7 +530,7 @@
|
|
|
} else {
|
|
|
formData.exchangeRate = 1;
|
|
|
}
|
|
|
- changeDiscountOrExchangeRate();
|
|
|
+ await changeDiscountOrExchangeRate();
|
|
|
}
|
|
|
//编辑方法
|
|
|
async function edit(row) {
|
|
|
@@ -1000,8 +1000,8 @@
|
|
|
salePriceAll+=Number(item.taxAmount)
|
|
|
purchasePriceAll+=Number(item.purchaseAmount)
|
|
|
})
|
|
|
- formData.grossMarginHead = (salePriceAll-customerCommisionAll-platformCommisionAll-purchasePriceAll)/salePriceAll
|
|
|
- formData.grossMarginHead =Number( formData.grossMarginHead).toFixed(2)*100
|
|
|
+ formData.grossMarginHead = (salePriceAll-customerCommisionAll-platformCommisionAll-(purchasePriceAll/Number(formData.exchangeRate)))/salePriceAll
|
|
|
+ formData.grossMarginHead =(Number( formData.grossMarginHead)*100).toFixed(2)
|
|
|
}
|
|
|
return {
|
|
|
saleQuotationFormShipTableRef,
|
