Commit ee5b986a authored by 黄奎's avatar 黄奎

页面修改

parent 496ff208
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
<td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;"> <td v-if="childIndex==0" :rowspan="6" style="white-space:nowrap;">
{{subItem.TotalPrice}} {{subItem.TotalPrice}}
<template v-if="subItem.NewTotalPrice"> <template v-if="subItem.NewTotalPrice">
<br />{{subItem.NewTotalPrice}} <br /><span style="color:red;">{{subItem.NewTotalPrice}}</span>
</template> </template>
</td> </td>
<!-- 付款方式 --> <!-- 付款方式 -->
...@@ -772,7 +772,6 @@ ...@@ -772,7 +772,6 @@
let jpaObj = this.allCurrencyList.find(item => { let jpaObj = this.allCurrencyList.find(item => {
return item.ID === 3; //筛选出匹配数据 return item.ID === 3; //筛选出匹配数据
}); });
//this.allCurrencyList
obj.OrderDetailsList.forEach((item, index) => { obj.OrderDetailsList.forEach((item, index) => {
var tempPrice = 0; var tempPrice = 0;
var coefficient = 1; var coefficient = 1;
...@@ -799,7 +798,14 @@ ...@@ -799,7 +798,14 @@
else if (currentObj.ID == 3) { else if (currentObj.ID == 3) {
obj.NewTotalPrice = ""; obj.NewTotalPrice = "";
} else { } else {
obj.NewTotalPrice = currentObj.Name + ":" + (totalPrice / currentObj.PayRate).toFixed(2); if(currentObj.CurrentRate>1)
{
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)/currentObj.CurrentRate).toFixed(2);
}
else
{
obj.NewTotalPrice = currentObj.Name + ":" + ((totalPrice*jpaObj.PayRate)*currentObj.CurrentRate).toFixed(2);
}
} }
} else { } else {
obj.NewTotalPrice = ""; obj.NewTotalPrice = "";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment