|
|
@@ -1870,7 +1870,7 @@ export default {
|
|
|
|
|
|
],
|
|
|
//cabinoneList: ['经济舱 TBR', '经济舱 SGR', '核酸检测', '团组预算明细'],
|
|
|
- cabinoneOptions: ['经济舱 TBR', '经济舱 SGR', '公务舱 SGR', '公务舱 JS/ES', '公务舱 SUITE', '经济舱 SUITE', '头等舱 JS/ES', '头等舱 SUITE', '经济舱 JS/ES'],
|
|
|
+ cabinoneOptions: ['经济舱 TBR', '经济舱 SGR', '公务舱 SGR', '公务舱 JS/ES', '公务舱 SUITE', '经济舱 SUITE', '头等舱 JS/ES', '头等舱 SUITE', '经济舱 JS/ES', "公务舱 TBR"],
|
|
|
cabinDatal: [
|
|
|
{
|
|
|
label: '经济舱 TBR',
|
|
|
@@ -2287,6 +2287,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
|
|
|
+ },
|
|
|
+ ]
|
|
|
+ },
|
|
|
{
|
|
|
label: '团组预算明细',
|
|
|
childList: [
|
|
|
@@ -3444,7 +3490,7 @@ export default {
|
|
|
visitPNumber: 0,
|
|
|
visitDays: 0
|
|
|
},
|
|
|
- excludeGroupList: [2836],
|
|
|
+ excludeGroupList: [2836, 2948],
|
|
|
groupModuleOperators: [],
|
|
|
hideGroupModuleId: [98],
|
|
|
groupcostXSVisible: false,
|
|
|
@@ -4936,14 +4982,14 @@ export default {
|
|
|
if (flight === "经济舱") {
|
|
|
this.matchRooms(hotelRooms, flights, ["TBR", "SGR", "JSES", "SUITE"], flight, result);
|
|
|
} else if (flight === "公务舱") {
|
|
|
- this.matchRooms(hotelRooms, flights, ["SUITE", "JSES", "SGR",], flight, result);
|
|
|
+ this.matchRooms(hotelRooms, flights, ["SUITE", "JSES", "SGR", "TBR"], flight, result);
|
|
|
} else if (flight === "头等舱") {
|
|
|
this.matchRooms(hotelRooms, flights, ["SUITE", "JSES",], flight, result);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ // 添加公务舱双人间
|
|
|
|
|
|
var rightCheckArr = [];
|
|
|
const airByHotelType = [
|
|
|
@@ -4955,7 +5001,8 @@ export default {
|
|
|
{ name: "经济舱SUITE", index: 5, lable: "经济舱 SUITE" },
|
|
|
{ name: "头等舱JSES", index: 6, lable: "头等舱 JS/ES" },
|
|
|
{ name: "头等舱SUITE", index: 7, lable: "头等舱 SUITE" },
|
|
|
- { name: "经济舱JSES", index: 8, lable: "经济舱 JS/ES" }
|
|
|
+ { name: "经济舱JSES", index: 8, lable: "经济舱 JS/ES" },
|
|
|
+ { name: "公务舱TBR", index: 9, lable: "公务舱 TBR" }
|
|
|
];
|
|
|
const paramArr = [
|
|
|
{
|
|
|
@@ -5003,6 +5050,11 @@ export default {
|
|
|
singleQuote: ['jjc', 'jses'],
|
|
|
index: 8,
|
|
|
},
|
|
|
+ {
|
|
|
+ costPerson: ['tbrcb', 'gwccb'],
|
|
|
+ singleQuote: ['gwc', 'tbr'],
|
|
|
+ index: 9,
|
|
|
+ }
|
|
|
];
|
|
|
if (this.costTypevalue == 'B') {
|
|
|
|
|
|
@@ -5024,7 +5076,7 @@ export default {
|
|
|
if (flight === "经济舱") {
|
|
|
this.matchRooms(BhotelRooms, Bflights, ["SGR", "TBR", "JSES", "SUITE"], flight, Bresult);
|
|
|
} else if (flight === "公务舱") {
|
|
|
- this.matchRooms(BhotelRooms, Bflights, ["SUITE", "JSES", "SGR",], flight, Bresult);
|
|
|
+ this.matchRooms(BhotelRooms, Bflights, ["SUITE", "JSES", "SGR", "TBR"], flight, Bresult);
|
|
|
} else if (flight === "头等舱") {
|
|
|
this.matchRooms(BhotelRooms, Bflights, ["SUITE", "JSES",], flight, Bresult);
|
|
|
}
|