Commit eb18bbc4 authored by 黄奎's avatar 黄奎

页面修改

parent 66c67711
...@@ -166,6 +166,7 @@ ...@@ -166,6 +166,7 @@
{{getCurrencyName(subItem.CurrencyId)}} {{getCurrencyName(subItem.CurrencyId)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="CostNumberList.length"> <td v-if="childIndex==0" :rowspan="CostNumberList.length">
{{subItem.HotelName}}<br/>
<template v-if="subItem.ContainDinnerType==0">含餐类型</template> <template v-if="subItem.ContainDinnerType==0">含餐类型</template>
<template v-if="subItem.ContainDinnerType==1">含早餐</template> <template v-if="subItem.ContainDinnerType==1">含早餐</template>
<template v-if="subItem.ContainDinnerType==2">含晚餐</template> <template v-if="subItem.ContainDinnerType==2">含晚餐</template>
...@@ -284,6 +285,7 @@ ...@@ -284,6 +285,7 @@
{{getCurrencyName(subItem.CurrencyId)}} {{getCurrencyName(subItem.CurrencyId)}}
</td> </td>
<td> <td>
{{subItem.HotelName}}<br/>
<template v-if="subItem.ContainDinnerType==0">含餐类型</template> <template v-if="subItem.ContainDinnerType==0">含餐类型</template>
<template v-if="subItem.ContainDinnerType==1">含早餐</template> <template v-if="subItem.ContainDinnerType==1">含早餐</template>
<template v-if="subItem.ContainDinnerType==2">含晚餐</template> <template v-if="subItem.ContainDinnerType==2">含晚餐</template>
...@@ -455,7 +457,14 @@ ...@@ -455,7 +457,14 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="6"></td> <td class="CP_ComTitle2 CostcomCenter">4</td>
<td class="CP_ComTitle2">国际段机票(每人)</td>
<td colspan="2">
{{getCurrencyName(OtherPrice.InternationalAirTicketCurrency)}}
</td>
<td colspan="2">
{{OtherPrice.InternationalAirTicket}}
</td>
<td class="CP_ComTitle2 CostcomCenter">4</td> <td class="CP_ComTitle2 CostcomCenter">4</td>
<td colspan="2" class="CP_ComTitle2">司机、导游小费</td> <td colspan="2" class="CP_ComTitle2">司机、导游小费</td>
<td> <td>
...@@ -775,6 +784,12 @@ ...@@ -775,6 +784,12 @@
trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney) * this.getCurrencyMoney(this.OtherPrice trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney) * this.getCurrencyMoney(this.OtherPrice
.InlandTrainTicketCurrency); .InlandTrainTicketCurrency);
} }
if (this.OtherPrice.InternationalAirTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InternationalAirTicket);
} else {
trafficTotal += Number(this.OtherPrice.InternationalAirTicket) * this.getCurrencyMoney(this.OtherPrice
.InternationalAirTicketCurrency);
}
} }
//外币 //外币
else { else {
...@@ -787,6 +802,9 @@ ...@@ -787,6 +802,9 @@
if (this.OtherPrice.InlandTrainTicketCurrency != 1) { if (this.OtherPrice.InlandTrainTicketCurrency != 1) {
trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney); trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney);
} }
if (this.OtherPrice.InternationalAirTicketCurrency != 1) {
trafficTotal += Number(this.OtherPrice.InternationalAirTicket);
}
} }
return trafficTotal.toFixed(0); return trafficTotal.toFixed(0);
}, },
......
...@@ -94,6 +94,8 @@ ...@@ -94,6 +94,8 @@
DriverGuideMoneyCurrencyId: 0, //司机小费币种 DriverGuideMoneyCurrencyId: 0, //司机小费币种
GuideMoneyCurrencyId:0,//导游小费币种 GuideMoneyCurrencyId:0,//导游小费币种
GuideMoney:0,//导游小费 GuideMoney:0,//导游小费
InternationalAirTicket:0,//国际段机票
InternationalAirTicketCurrency:0,//国际段机票币种
}, },
CostCurrencyList: [], //选择的币种 CostCurrencyList: [], //选择的币种
CostNumberList: [], //人数 CostNumberList: [], //人数
......
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