Commit 32f739ec authored by 黄奎's avatar 黄奎

11

parent 24ad8cf1
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
.CostNewTable .el-input__inner { .CostNewTable .el-input__inner {
padding: 0 5px; padding: 0 5px;
} }
</style> </style>
<template> <template>
...@@ -311,7 +312,7 @@ ...@@ -311,7 +312,7 @@
</td> </td>
<!--餐小计--> <!--餐小计-->
<td colspan="2"> <td colspan="2">
{{$t('objFill.canxj')}}: {{getDayXiaoJi(4,2)}} {{$t('objFill.canxj')}}:{{getDayXiaoJi(4,2)}}
</td> </td>
<!--门票小计--> <!--门票小计-->
<td colspan="2"> <td colspan="2">
...@@ -655,6 +656,7 @@ ...@@ -655,6 +656,7 @@
xiaoJi += Number(item.ScenicChangeValue) * Number(currencyRate); xiaoJi += Number(item.ScenicChangeValue) * Number(currencyRate);
} }
} }
//早餐 //早餐
if (type == 4) { if (type == 4) {
if (item.IsBreakfastChange) { if (item.IsBreakfastChange) {
...@@ -736,7 +738,13 @@ ...@@ -736,7 +738,13 @@
} }
//景点 //景点
if (type == 3) { if (type == 3) {
xiaoJi += Number(item.ScenicCostPrice) * Number(currencyRate); if (item.ScenicList && item.ScenicList.length > 0) {
item.ScenicList.forEach(sItem => {
if (sItem.TicketName != '' || sItem.TicketId > 0) {
xiaoJi += Number(sItem.TicketCostPrice) * Number(currencyRate);
}
})
}
} }
//早餐 //早餐
if (type == 4) { if (type == 4) {
...@@ -765,7 +773,7 @@ ...@@ -765,7 +773,7 @@
this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) + this.getConvertMoney(this.OtherPrice.AirTicketShareMoney) +
this.getConvertMoney(this.teamPrice.NightPrice) + this.getConvertMoney(this.teamPrice.NightPrice) +
this.getConvertMoney(this.teamPrice.VisaPrice) + this.getConvertMoney(this.teamPrice.VisaPrice) +
this.getConvertMoney(this.OtherPrice.SafeMoney)- this.getConvertMoney(this.OtherPrice.SafeMoney) -
this.getConvertMoney(this.OtherPrice.KBMoney) this.getConvertMoney(this.OtherPrice.KBMoney)
return totalMoney; return totalMoney;
}, },
...@@ -833,4 +841,5 @@ ...@@ -833,4 +841,5 @@
}, },
}; };
</script>
\ No newline at end of file </script>
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