Commit 7360e663 authored by 黄奎's avatar 黄奎

页面修改

parent d264972e
...@@ -651,7 +651,7 @@ ...@@ -651,7 +651,7 @@
人民币小计 人民币小计
</td> </td>
<td colspan="5"> <td colspan="5">
{{zazhiXiaoJi(1)}} {{zazhiXiaoJi(1)}}
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -660,8 +660,8 @@ ...@@ -660,8 +660,8 @@
<tr> <tr>
<td class="CP_ComTitle2" colspan="2">其他支出</td> <td class="CP_ComTitle2" colspan="2">其他支出</td>
<td class="CP_ComTitle2" colspan="3" style="display:none;">机票</td> <td class="CP_ComTitle2" colspan="3" style="display:none;">机票</td>
<td class="CP_ComTitle2" colspan="3">收入</td> <td class="CP_ComTitle2" colspan="4">收入</td>
<td class="CP_ComTitle2" colspan="6">团负费</td> <td class="CP_ComTitle2" colspan="5">团负费</td>
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2 CostcomCenter">摘要</td> <td class="CP_ComTitle2 CostcomCenter">摘要</td>
...@@ -669,9 +669,9 @@ ...@@ -669,9 +669,9 @@
<td class="CP_ComTitle2 CostcomCenter" colspan="2" style="display:none;">摘要</td> <td class="CP_ComTitle2 CostcomCenter" colspan="2" style="display:none;">摘要</td>
<td class="CP_ComTitle2 CostcomCenter" style="display:none;">金额<br />(人民币)</td> <td class="CP_ComTitle2 CostcomCenter" style="display:none;">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td> <td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
<td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td> <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
<td class="CP_ComTitle2 CostcomCenter">摘要</td> <td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
<td class="CP_ComTitle2 CostcomCenter" colspan="5">金额<br />(人民币)</td> <td class="CP_ComTitle2 CostcomCenter" colspan="3">金额<br />(人民币)</td>
</tr> </tr>
<tr> <tr>
<td style="white-space:nowrap; " class="CP_ComTitle2">销售提成1%</td> <td style="white-space:nowrap; " class="CP_ComTitle2">销售提成1%</td>
...@@ -689,14 +689,14 @@ ...@@ -689,14 +689,14 @@
</el-form-item> </el-form-item>
</td> </td>
<td class="CP_ComTitle2" colspan="2">客人小费收入</td> <td class="CP_ComTitle2" colspan="2">客人小费收入</td>
<td> <td colspan="2">
<el-form-item> <el-form-item>
<el-input type='text' class="w70" v-model="OtherPrice.TripMoney" <el-input type='text' class="w70" v-model="OtherPrice.TripMoney"
@keyup.native="checkPrice(OtherPrice,'TripMoney',true),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'TripMoney',true),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td class="CP_ComTitle2">KB</td> <td class="CP_ComTitle2" colspan="2">KB</td>
<td colspan="5"> <td colspan="3">
<el-form-item> <el-form-item>
<el-input type='text' class="w120" v-model="OtherPrice.KBMoney" <el-input type='text' class="w120" v-model="OtherPrice.KBMoney"
@keyup.native="checkPrice(OtherPrice,'KBMoney',true)"></el-input> @keyup.native="checkPrice(OtherPrice,'KBMoney',true)"></el-input>
...@@ -713,13 +713,13 @@ ...@@ -713,13 +713,13 @@
</td> </td>
<td colspan="3" style="display:none;"></td> <td colspan="3" style="display:none;"></td>
<td class="CP_ComTitle2" colspan="2">导游人头费</td> <td class="CP_ComTitle2" colspan="2">导游人头费</td>
<td> <td colspan="2">
<el-form-item> <el-form-item>
<el-input type='text' class="w70" v-model="OtherPrice.GuidePeopleMoney" <el-input type='text' class="w70" v-model="OtherPrice.GuidePeopleMoney"
@keyup.native="checkPrice(OtherPrice,'GuidePeopleMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'GuidePeopleMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="6"></td> <td colspan="5"></td>
</tr> </tr>
<tr> <tr>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2">
...@@ -734,16 +734,16 @@ ...@@ -734,16 +734,16 @@
<td colspan="2" style="display:none;"> <td colspan="2" style="display:none;">
{{Number(OtherPrice.AirTicketMoeny)}} {{Number(OtherPrice.AirTicketMoeny)}}
</td> </td>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2" colspan="2">
人民币小计 人民币小计
</td> </td>
<td colspan="2"> <td colspan="2">
{{Number(OtherPrice.TripMoney)+Number(OtherPrice.GuidePeopleMoney)}} {{Number(OtherPrice.TripMoney)+Number(OtherPrice.GuidePeopleMoney)}}
</td> </td>
<td class="CP_ComTitle2"> <td class="CP_ComTitle2" colspan="2">
人民币小计 人民币小计
</td> </td>
<td colspan="6"> <td colspan="5">
{{Number(OtherPrice.KBMoney)}} {{Number(OtherPrice.KBMoney)}}
</td> </td>
</tr> </tr>
...@@ -865,7 +865,6 @@ ...@@ -865,7 +865,6 @@
currencyTypeArr: [], //币种下拉列表 currencyTypeArr: [], //币种下拉列表
LineTeamList: [], //系列下拉列表 LineTeamList: [], //系列下拉列表
} }
}, },
methods: { methods: {
//交通部分小计 //交通部分小计
...@@ -875,12 +874,21 @@ ...@@ -875,12 +874,21 @@
if (currencyType == 1) { if (currencyType == 1) {
if (this.OtherPrice.InlandAirTicketCurrency == 1) { if (this.OtherPrice.InlandAirTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InlandAirTicketMoney); trafficTotal += Number(this.OtherPrice.InlandAirTicketMoney);
} else {
trafficTotal += Number(this.OtherPrice.InlandAirTicketMoney) * this.getCurrencyMoney(this.OtherPrice
.InlandAirTicketCurrency);
} }
if (this.OtherPrice.InlandShipTicketCurrency == 1) { if (this.OtherPrice.InlandShipTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InlandShipTicketMoney); trafficTotal += Number(this.OtherPrice.InlandShipTicketMoney);
} else {
trafficTotal += Number(this.OtherPrice.InlandShipTicketMoney) * this.getCurrencyMoney(this.OtherPrice
.InlandShipTicketCurrency);
} }
if (this.OtherPrice.InlandTrainTicketCurrency == 1) { if (this.OtherPrice.InlandTrainTicketCurrency == 1) {
trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney); trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney);
} else {
trafficTotal += Number(this.OtherPrice.InlandTrainTicketMoney) * this.getCurrencyMoney(this.OtherPrice
.InlandTrainTicketCurrency);
} }
} }
//外币 //外币
...@@ -904,15 +912,27 @@ ...@@ -904,15 +912,27 @@
if (currencyType == 1) { if (currencyType == 1) {
if (this.OtherPrice.VisaMoneyCurrencyId == 1) { if (this.OtherPrice.VisaMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.VisaMoney); zazhiTotal += Number(this.OtherPrice.VisaMoney);
} else {
zazhiTotal += Number(this.OtherPrice.VisaMoney) * this.getCurrencyMoney(this.OtherPrice
.VisaMoneyCurrencyId);
} }
if (this.OtherPrice.SafeMoneyCurrencyId == 1) { if (this.OtherPrice.SafeMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.SafeMoney); zazhiTotal += Number(this.OtherPrice.SafeMoney);
} else {
zazhiTotal += Number(this.OtherPrice.SafeMoney) * this.getCurrencyMoney(this.OtherPrice
.SafeMoneyCurrencyId);
} }
if (this.OtherPrice.LeaderTripMoneyCurrencyId == 1) { if (this.OtherPrice.LeaderTripMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.LeaderTripMoney); zazhiTotal += Number(this.OtherPrice.LeaderTripMoney);
} else {
zazhiTotal += Number(this.OtherPrice.LeaderTripMoney) * this.getCurrencyMoney(this.OtherPrice
.LeaderTripMoneyCurrencyId);
} }
if (this.OtherPrice.DriverGuideMoneyCurrencyId == 1) { if (this.OtherPrice.DriverGuideMoneyCurrencyId == 1) {
zazhiTotal += Number(this.OtherPrice.DriverGuideMoney); zazhiTotal += Number(this.OtherPrice.DriverGuideMoney);
} else {
zazhiTotal += Number(this.OtherPrice.DriverGuideMoney) * this.getCurrencyMoney(this.OtherPrice
.DriverGuideMoneyCurrencyId);
} }
} }
//外币 //外币
...@@ -1003,11 +1023,11 @@ ...@@ -1003,11 +1023,11 @@
let totalMoney = 0.0; let totalMoney = 0.0;
this.CurrencyNumberListExt.forEach(x => { this.CurrencyNumberListExt.forEach(x => {
x.currencyNumberList.forEach(y => { x.currencyNumberList.forEach(y => {
if (peopleNumber === y.PeopleNumber) { // if (peopleNumber === y.PeopleNumber) {
totalMoney += // totalMoney +=
this.getConvertMoney(y.Money) * // this.getConvertMoney(y.Money) *
this.getCurrencyMoney(y.CurrencyId); // this.getCurrencyMoney(y.CurrencyId);
} // }
}); });
}); });
return totalMoney; return totalMoney;
......
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