md
This commit is contained in:
parent
dcc248fe47
commit
e3a60c6245
@ -1794,13 +1794,9 @@ export default {
|
|||||||
expr=expr.replace("s",row.initialWeightFee);
|
expr=expr.replace("s",row.initialWeightFee);
|
||||||
expr=expr.replace("d",row.addWeightPrice);
|
expr=expr.replace("d",row.addWeightPrice);
|
||||||
expr=expr.replace("w",this.form.settlementWeight);
|
expr=expr.replace("w",this.form.settlementWeight);
|
||||||
row.realFee=parseFloat(eval(expr)).toFixed(2);
|
row.realFee=parseFloat(eval(expr));
|
||||||
|
row.realFee=realFee.toFixed(2);
|
||||||
if(row.blAutoGen==0){
|
|
||||||
row.fee=row.realFee;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let totalFee=Number(0);
|
let totalFee=Number(0);
|
||||||
@ -1813,10 +1809,16 @@ export default {
|
|||||||
let res= await getValidExchangeRate({from:item.currency,to:'CNY'});
|
let res= await getValidExchangeRate({from:item.currency,to:'CNY'});
|
||||||
if(res.code==200){
|
if(res.code==200){
|
||||||
newFee=newFee*Number(res.data);
|
newFee=newFee*Number(res.data);
|
||||||
|
newFee=newFee.toFixed(2);
|
||||||
item.remark="汇率:"+res.data+","+newFee+"(CNY)"
|
item.remark="汇率:"+res.data+","+newFee+"(CNY)"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if(item.blAutoGen==0){
|
||||||
|
item.fee=item.realFee;
|
||||||
|
}
|
||||||
|
|
||||||
newFee=newFee.toFixed(2);
|
newFee=newFee.toFixed(2);
|
||||||
totalFee=Number(totalFee)+Number(newFee);
|
totalFee=Number(totalFee)+Number(newFee);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user