|
@@ -896,7 +896,6 @@
|
|
|
</div>
|
|
</div>
|
|
|
<div style="width: 2%;" v-show="costTypevalue != 'A'"></div>
|
|
<div style="width: 2%;" v-show="costTypevalue != 'A'"></div>
|
|
|
<div style="width: 49%;" v-show="costTypevalue != 'A'">
|
|
<div style="width: 49%;" v-show="costTypevalue != 'A'">
|
|
|
-
|
|
|
|
|
<div class="" style="width: 800px;margin-bottom:0px;margin-top: 20px;visibility: hidden;"
|
|
<div class="" style="width: 800px;margin-bottom:0px;margin-top: 20px;visibility: hidden;"
|
|
|
v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes('签证') && visaCountryInfoArr.length > 0">
|
|
v-if="CheckBoxListSelect.filter(item => item.cbType == 'Left')[0].cbValues.includes('签证') && visaCountryInfoArr.length > 0">
|
|
|
|
|
|
|
@@ -2774,6 +2773,52 @@ export default {
|
|
|
},
|
|
},
|
|
|
]
|
|
]
|
|
|
},
|
|
},
|
|
|
|
|
+ {
|
|
|
|
|
+ label: '公务舱 TBR',
|
|
|
|
|
+ childList: [
|
|
|
|
|
+ {
|
|
|
|
|
+ childLabel: '单人成本(CNY)',
|
|
|
|
|
+ prop: 'costPerson'
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ childLabel: '人数',
|
|
|
|
|
+ prop: 'toll'
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ childLabel: '总成本(CNY)',
|
|
|
|
|
+ prop: 'totalCost'
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ childLabel: '单人报价(CNY)',
|
|
|
|
|
+ prop: 'singleQuote',
|
|
|
|
|
+ title: '报批(单人公务舱总报价):',
|
|
|
|
|
+ tips: '这是一个tips',
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ childLabel: '总报价(CNY)',
|
|
|
|
|
+ prop: 'totalQuote'
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ childLabel: '单人利润(CNY)',
|
|
|
|
|
+ prop: 'singleProfit'
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ childLabel: '总利润(CNY)',
|
|
|
|
|
+ prop: 'totalProfit'
|
|
|
|
|
+ },
|
|
|
|
|
+ ],
|
|
|
|
|
+ sheetInfo: [
|
|
|
|
|
+ {
|
|
|
|
|
+ costPerson: 1,
|
|
|
|
|
+ toll: 11,
|
|
|
|
|
+ totalCost: 137597.76,
|
|
|
|
|
+ singleQuote: 102203.71,
|
|
|
|
|
+ totalQuote: 35394.05,
|
|
|
|
|
+ singleProfit: 35394.05,
|
|
|
|
|
+ totalProfit: 35394.05
|
|
|
|
|
+ },
|
|
|
|
|
+ ]
|
|
|
|
|
+ }
|
|
|
],
|
|
],
|
|
|
costType: [
|
|
costType: [
|
|
|
{
|
|
{
|
|
@@ -4884,14 +4929,17 @@ export default {
|
|
|
var SGRList = that.sumTopPrice.filter((x) => {
|
|
var SGRList = that.sumTopPrice.filter((x) => {
|
|
|
return x.label == 'SGR';
|
|
return x.label == 'SGR';
|
|
|
})
|
|
})
|
|
|
|
|
+
|
|
|
if (SGRList.length > 0) {
|
|
if (SGRList.length > 0) {
|
|
|
SGRsum = SGRList[0].Aprice;
|
|
SGRsum = SGRList[0].Aprice;
|
|
|
BSGRsum = SGRList[0].Bprice;
|
|
BSGRsum = SGRList[0].Bprice;
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
SGRsum = isNaN(SGRsum) ? 0 : SGRsum;
|
|
SGRsum = isNaN(SGRsum) ? 0 : SGRsum;
|
|
|
BSGRsum = isNaN(BSGRsum) ? 0 : BSGRsum;
|
|
BSGRsum = isNaN(BSGRsum) ? 0 : BSGRsum;
|
|
|
SGRsum = (SGRsum * rate).toFixed(2);
|
|
SGRsum = (SGRsum * rate).toFixed(2);
|
|
|
BSGRsum = (BSGRsum * rate).toFixed(2);
|
|
BSGRsum = (BSGRsum * rate).toFixed(2);
|
|
|
|
|
+ console.log(SGRsum,rate);
|
|
|
|
|
|
|
|
|
|
|
|
|
let TBRsum = 0;
|
|
let TBRsum = 0;
|
|
@@ -4955,7 +5003,6 @@ export default {
|
|
|
|
|
|
|
|
Bsgrfilter = Bsgrfilter[0];
|
|
Bsgrfilter = Bsgrfilter[0];
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
sgrfilter = sgrfilter[0];
|
|
sgrfilter = sgrfilter[0];
|
|
|
|
|
|
|
|
let hotelRooms = {
|
|
let hotelRooms = {
|
|
@@ -5057,7 +5104,6 @@ export default {
|
|
|
}
|
|
}
|
|
|
];
|
|
];
|
|
|
if (this.costTypevalue == 'B') {
|
|
if (this.costTypevalue == 'B') {
|
|
|
-
|
|
|
|
|
let BhotelRooms = {
|
|
let BhotelRooms = {
|
|
|
"SGR": Bsgrfilter.sgr,
|
|
"SGR": Bsgrfilter.sgr,
|
|
|
"TBR": Bsgrfilter.tbr,
|
|
"TBR": Bsgrfilter.tbr,
|
|
@@ -5081,8 +5127,8 @@ export default {
|
|
|
this.matchRooms(BhotelRooms, Bflights, ["SUITE", "JSES",], flight, Bresult);
|
|
this.matchRooms(BhotelRooms, Bflights, ["SUITE", "JSES",], flight, Bresult);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
for (var i = 0; i < airByHotelType.length; i++) {
|
|
for (var i = 0; i < airByHotelType.length; i++) {
|
|
|
|
|
+ console.log(Bresult, 'airByHotelType[i].name-------------');
|
|
|
if (Bresult.hasOwnProperty(airByHotelType[i].name)) {
|
|
if (Bresult.hasOwnProperty(airByHotelType[i].name)) {
|
|
|
let count = Bresult[airByHotelType[i].name];
|
|
let count = Bresult[airByHotelType[i].name];
|
|
|
if (airByHotelType[i].name.indexOf("TBR") != -1) {
|
|
if (airByHotelType[i].name.indexOf("TBR") != -1) {
|
|
@@ -5099,7 +5145,6 @@ export default {
|
|
|
that.BcabinDatal[airByHotelType[i].index].sheetInfo[0].toll = 0;
|
|
that.BcabinDatal[airByHotelType[i].index].sheetInfo[0].toll = 0;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
this.BGroupCostParameter.djcb = BDjsum;
|
|
this.BGroupCostParameter.djcb = BDjsum;
|
|
|
this.BGroupCostParameter.gwcb = BGWsum;
|
|
this.BGroupCostParameter.gwcb = BGWsum;
|
|
|
this.BGroupCostParameter.lyjcb = BLYJsum;
|
|
this.BGroupCostParameter.lyjcb = BLYJsum;
|
|
@@ -5137,7 +5182,7 @@ export default {
|
|
|
that.BcabinDatal[paramArr[i].index].sheetInfo[0].singleQuote = (BrightSum + singleQuotePrice).toFixed(2);
|
|
that.BcabinDatal[paramArr[i].index].sheetInfo[0].singleQuote = (BrightSum + singleQuotePrice).toFixed(2);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ console.log('这来了', 'Bresult-------------');
|
|
|
for (var i = 0; i < airByHotelType.length; i++) {
|
|
for (var i = 0; i < airByHotelType.length; i++) {
|
|
|
if (result.hasOwnProperty(airByHotelType[i].name)) {
|
|
if (result.hasOwnProperty(airByHotelType[i].name)) {
|
|
|
let count = result[airByHotelType[i].name];
|
|
let count = result[airByHotelType[i].name];
|
|
@@ -5145,6 +5190,7 @@ export default {
|
|
|
count = count * 2;
|
|
count = count * 2;
|
|
|
}
|
|
}
|
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
|
|
|
+ console.log(that.cabinDatal, 'cabinDatal-------------');
|
|
|
rightCheckArr.push(airByHotelType[i].lable);
|
|
rightCheckArr.push(airByHotelType[i].lable);
|
|
|
that.cabinDatal[airByHotelType[i].index].sheetInfo[0].toll = count;
|
|
that.cabinDatal[airByHotelType[i].index].sheetInfo[0].toll = count;
|
|
|
}
|
|
}
|
|
@@ -5163,7 +5209,7 @@ export default {
|
|
|
////console.log('rightCheckArr', rightCheckArr);
|
|
////console.log('rightCheckArr', rightCheckArr);
|
|
|
this.CheckBoxListSelect.filter(item => item.cbType == 'Right')[0].cbValues = rightCheckArr;
|
|
this.CheckBoxListSelect.filter(item => item.cbType == 'Right')[0].cbValues = rightCheckArr;
|
|
|
} catch (e) { }
|
|
} catch (e) { }
|
|
|
-
|
|
|
|
|
|
|
+ console.log(SGRsum, 'Bresult-------------');
|
|
|
this.AGroupCostParameter.djcb = Djsum;
|
|
this.AGroupCostParameter.djcb = Djsum;
|
|
|
this.AGroupCostParameter.gwcb = GWsum;
|
|
this.AGroupCostParameter.gwcb = GWsum;
|
|
|
this.AGroupCostParameter.lyjcb = LYJsum;
|
|
this.AGroupCostParameter.lyjcb = LYJsum;
|
|
@@ -5171,6 +5217,7 @@ export default {
|
|
|
this.AGroupCostParameter.tbrcb = TBRsum;
|
|
this.AGroupCostParameter.tbrcb = TBRsum;
|
|
|
this.AGroupCostParameter.jsescb = JSESsum;
|
|
this.AGroupCostParameter.jsescb = JSESsum;
|
|
|
this.AGroupCostParameter.suitecb = SUITEsum;
|
|
this.AGroupCostParameter.suitecb = SUITEsum;
|
|
|
|
|
+ console.log(this.AGroupCostParameter, 'AGroupCostParameter-------------');
|
|
|
|
|
|
|
|
var leftSum = this.OtherCost();
|
|
var leftSum = this.OtherCost();
|
|
|
var rightSum = 0;
|
|
var rightSum = 0;
|