Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Cost.vue

@@ -1961,7 +1961,7 @@ export default {
                         {
                             childLabel: '单人报价(CNY)',
                             prop: 'singleQuote',
-                            title: '报批(单人经济舱总报价):',
+                            title: '报批(单人头等舱总报价):',
                             tips: '这是一个tips',
                         },
                         {
@@ -2007,7 +2007,7 @@ export default {
                         {
                             childLabel: '单人报价(CNY)',
                             prop: 'singleQuote',
-                            title: '报批(单人经济舱总报价):',
+                            title: '报批(单人头等舱总报价):',
                             tips: '这是一个tips',
                         },
                         {
@@ -2383,7 +2383,145 @@ export default {
                             totalProfit: 35394.05
                         },
                     ]
-                }
+                },
+                {
+                    label: '头等舱 JS/ES',
+                    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: '头等舱 SUITE',
+                    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: '经济舱 JS/ES',
+                    childList: [
+                        {
+                            childLabel: '单人成本(CNY)',
+                            prop: 'costPerson'
+                        },
+                        {
+                            childLabel: '人数',
+                            prop: 'toll'
+                        },
+                        {
+                            childLabel: '总成本(CNY)',
+                            prop: 'totalCost'
+                        },
+                        {
+                            childLabel: '单人报价(CNY)',
+                            prop: 'singleQuote',
+                            title: '报批(单人经济舱总报价):',
+                            tips: '0',
+                        },
+                        {
+                            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: [
                 {
@@ -2497,7 +2635,10 @@ export default {
                 "costType": "A",
                 "costTypeStartTime": "",
                 "costTypeendTime": "",
-                "costTypenumber": 0
+                "costTypenumber": 0,
+                "tdccb": 0,
+                "tdcxs": 0,
+                "tdcrs": 0
             },
             BGroupCostParameter: {
                 "id": 0,
@@ -2553,7 +2694,10 @@ export default {
                 "costType": "B",
                 "costTypeStartTime": "",
                 "costTypeendTime": "",
-                "costTypenumber": 0
+                "costTypenumber": 0,
+                "tdccb": 0,
+                "tdcxs": 0,
+                "tdcrs": 0
             },
             dialogColumn: [
                 {
@@ -2675,7 +2819,8 @@ export default {
                 { "HeSuan": "hs" },
                 { "Insurance": "bx" },
                 { "JJC": "jjc" },
-                { "GWC": "gwc" }
+                { "GWC": "gwc" },
+                { "TDC": "tdc" }
             ],
             ShowBaoPi: [
 
@@ -3296,7 +3441,7 @@ export default {
                     })
                 }
 
-            }, 1000);
+            }, 600);
 
             return prices;
         },
@@ -3485,7 +3630,10 @@ export default {
                     localStorage.setItem('costLoadData', JSON.stringify({
                         diid: that.diid
                     }))
-                    that.QueryRate();
+
+                    setTimeout(() => {
+                        that.QueryRate();
+                    }, 500)
 
                     for (var i = 0; i < that.CheckBoxListSelect.length; i++) {
                         that.CheckBoxListSelect[i].diid = that.diid;
@@ -3664,7 +3812,10 @@ export default {
                                 "costType": "A",
                                 "costTypeStartTime": "",
                                 "costTypeendTime": "",
-                                "costTypenumber": 0
+                                "costTypenumber": 0,
+                                "tdccb": 0,
+                                "tdcxs": 0,
+                                "tdcrs": 0
                             };
                         }
                         var bcostvalue = resp.data.data.groupCostParameter.filter(x => x.costType == 'B')[0];
@@ -3725,7 +3876,10 @@ export default {
                                 "costType": "B",
                                 "costTypeStartTime": "",
                                 "costTypeendTime": "",
-                                "costTypenumber": 0
+                                "costTypenumber": 0,
+                                "tdccb": 0,
+                                "tdcxs": 0,
+                                "tdcrs": 0
                             };
                         }
 
@@ -3803,7 +3957,10 @@ export default {
                             "costType": "A",
                             "costTypeStartTime": "",
                             "costTypeendTime": "",
-                            "costTypenumber": 0
+                            "costTypenumber": 0,
+                            "tdccb": 0,
+                            "tdcxs": 0,
+                            "tdcrs": 0
                         };
                         that.BGroupCostParameter = {
                             "id": 0,
@@ -3859,7 +4016,10 @@ export default {
                             "costType": "B",
                             "costTypeStartTime": "",
                             "costTypeendTime": "",
-                            "costTypenumber": 0
+                            "costTypenumber": 0,
+                            "tdccb": 0,
+                            "tdcxs": 0,
+                            "tdcrs": 0
                         };
                         that.AGroupCostParameter.diId = that.diid;
                         that.BGroupCostParameter.diId = that.diid;
@@ -3914,9 +4074,13 @@ export default {
                     }
 
                     that.ShowBaoPi = [];
+                    const rightBaoPiShow = [
+                        { apiType: "SumAirJJC", containValue: "经济舱" },
+                        { apiType: "SumAirGWC", containValue: "公务舱" },
+                        { apiType: "SumAirTDC", containValue: "头等舱" }];
                     if (resp.data.data.baoPi.length > 0) {
-                        //that.sheetDatal
                         const baoPi = resp.data.data.baoPi;
+                        //left 报批
                         for (var i = 0; i < baoPi.length; i++) {
                             for (var j = 0; j < that.equalWhere.length; j++) {
                                 let item = that.equalWhere[j];
@@ -3936,53 +4100,33 @@ export default {
 
                         }
 
-                        var Meals = baoPi.filter(x => {
-                            return x.type == "Meals"
-                        })
-
-                        var Hotel = baoPi.filter(x => {
-                            return x.type == "Hotel"
-                        })
-
-                        var GongZa = baoPi.filter(x => {
-                            return x.type == "GongZa"
-                        })
-
-                        var SumAirJJC = baoPi.filter(x => {
-                            return x.type == "SumAirJJC"
-                        })
-
-                        var SumAirGWC = baoPi.filter(x => {
-                            return x.type == "SumAirGWC"
-                        })
-
+                        for (var i = 0; i < rightBaoPiShow.length; i++) {
+                            var val = baoPi.filter(x => {
+                                return x.type == rightBaoPiShow[i].apiType
+                            })
 
-                        if (SumAirJJC.length > 0) {
-                            for (var i = 0; i < that.cabinDatal.length; i++) {
-                                if (that.cabinDatal[i].label.indexOf('经济舱') != -1) {
-                                    that.cabinDatal[i].childList[3].tips = SumAirJJC[0].price
+                            if (val.length > 0) {
+                                for (var j = 0; j < that.cabinDatal.length; j++) {
+                                    if (that.cabinDatal[j].label.indexOf(rightBaoPiShow[i].containValue) != -1) {
+                                        that.cabinDatal[j].childList[3].tips = val[0].price;
+                                    }
                                 }
                             }
                         }
 
-                        if (SumAirGWC.length > 0) {
-                            for (var i = 0; i < that.cabinDatal.length; i++) {
-                                if (that.cabinDatal[i].label.indexOf('公务舱') != -1) {
-                                    that.cabinDatal[i].childList[3].tips = SumAirGWC[0].price
-                                }
-                            }
-                        }
+                        const centerBaoPiShow = [
+                            "Meals", "Hotel", "GongZa"
+                        ]
 
-                        if (Meals.length > 0) {
-                            that.ShowBaoPi.push(Meals[0]);
-                        }
-                        if (Hotel.length > 0) {
-                            that.ShowBaoPi.push(Hotel[0]);
-                        }
-                        if (GongZa.length > 0) {
-                            that.ShowBaoPi.push(GongZa[0]);
-                        }
+                        for (var i = 0; i < centerBaoPiShow.length; i++) {
+                            var val = baoPi.filter(x => {
+                                return x.type == centerBaoPiShow[i]
+                            })
 
+                            if (val.length > 0) {
+                                that.ShowBaoPi.push(val[0]);
+                            }
+                        }
 
                     } else {
                         for (var m = 0; m < that.sheetDatal.length; m++) {
@@ -3991,12 +4135,11 @@ export default {
                             }
                         }
 
-                        for (var i = 0; i < that.cabinDatal.length; i++) {
-                            if (that.cabinDatal[i].label.indexOf('经济舱') != -1) {
-                                that.cabinDatal[i].childList[3].tips = '暂无！'
-                            }
-                            if (that.cabinDatal[i].label.indexOf('公务舱') != -1) {
-                                that.cabinDatal[i].childList[3].tips = '暂无！'
+                        for (var j = 0; j < rightBaoPiShow.length; j++) {
+                            for (var i = 0; i < that.cabinDatal.length; i++) {
+                                if (that.cabinDatal[i].label.indexOf(rightBaoPiShow[j].containValue) != -1) {
+                                    that.cabinDatal[i].childList[3].tips = '暂无！';
+                                }
                             }
                         }
                     }
@@ -4536,6 +4679,17 @@ export default {
             }
 
             var rightCheckArr = [];
+            const airByHotelType = [
+                { name: "经济舱TBR", index: 0, lable: "经济舱 TBR" },
+                { name: "经济舱SGR", index: 1, lable: "经济舱 SGR" },
+                { name: "公务舱SGR", index: 2, lable: "公务舱 SGR" },
+                { name: "公务舱JSES", index: 3, lable: "公务舱 JS/ES" },
+                { name: "公务舱SUITE", index: 4, lable: "公务舱 SUITE" },
+                { 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" }
+            ];
             if (this.costTypevalue == 'B') {
 
                 let BhotelRooms = {
@@ -4547,52 +4701,39 @@ export default {
 
                 let Bflights = {
                     "经济舱": this.BGroupCostParameter.jjcrs,
-                    "公务舱": this.BGroupCostParameter.gwcrs
+                    "公务舱": this.BGroupCostParameter.gwcrs,
+                    "头等舱": this.BGroupCostParameter.tdcrs,
                 };
 
                 let Bresult = {};
-                for (let flight of ["经济舱", "公务舱"]) {
+                for (let flight of ["经济舱", "头等舱", "公务舱"]) {
                     if (flight === "经济舱") {
                         this.matchRooms(BhotelRooms, Bflights, ["SGR", "TBR", "JSES", "SUITE"], flight, Bresult);
                     } else if (flight === "公务舱") {
-                        this.matchRooms(BhotelRooms, Bflights, ["SUITE", "JSES", "SGR", "TBR"], flight, Bresult);
+                        this.matchRooms(BhotelRooms, Bflights, ["SUITE", "JSES", "SGR",], flight, Bresult);
+                    } else if (flight === "头等舱") {
+                        this.matchRooms(BhotelRooms, Bflights, ["SUITE", "JSES",], flight, Bresult);
                     }
                 }
 
-                var BtxtJJCSGRRS = (Bresult.hasOwnProperty("经济舱SGR") ? Bresult["经济舱SGR"] : 0)
-                var BlblGWCSGRRS = (Bresult.hasOwnProperty("公务舱SGR") ? Bresult["公务舱SGR"] : 0)
-                var BtxtJJCTBRRS = (Bresult.hasOwnProperty("经济舱TBR") ? Bresult["经济舱TBR"] * 2 : 0)
-                var BtxtGWCJSESRS = (Bresult.hasOwnProperty("公务舱JSES") ? Bresult["公务舱JSES"] : 0)
-                var BJJCSUITERS = (Bresult.hasOwnProperty("经济舱SUITE") ? Bresult["经济舱SUITE"] : 0)
-                var BtxtGWCSUITERS = (Bresult.hasOwnProperty("公务舱SUITE") ? Bresult["公务舱SUITE"] : 0)
-
-
-                if (BtxtJJCSGRRS > 0) {
-                    rightCheckArr.push('经济舱 SGR');
-                }
-                if (BlblGWCSGRRS > 0) {
-                    rightCheckArr.push('公务舱 SGR');
-                }
-                if (BtxtJJCTBRRS > 0) {
-                    rightCheckArr.push('经济舱 TBR');
-                }
-                if (BtxtGWCJSESRS > 0) {
-                    rightCheckArr.push('公务舱 JSES');
-                }
-                if (BJJCSUITERS > 0) {
-                    rightCheckArr.push('经济舱 SUITE');
-                }
-                if (BtxtGWCSUITERS > 0) {
-                    rightCheckArr.push('公务舱 SUITE');
+                for (var i = 0; i < airByHotelType.length; i++) {
+                    if (Bresult.hasOwnProperty(airByHotelType[i].name)) {
+                        let count = Bresult[airByHotelType[i].name];
+                        if (airByHotelType[i].name.indexOf("TBR") != -1) {
+                            count = count * 2;
+                        }
+                        if (count > 0) {
+                            rightCheckArr.push(airByHotelType[i].lable);
+                            that.BcabinDatal[airByHotelType[i].index].sheetInfo[0].toll = count;
+                        }
+                        else {
+                            that.BcabinDatal[airByHotelType[i].index].sheetInfo[0].toll = 0;
+                        }
+                    } else {
+                        that.BcabinDatal[airByHotelType[i].index].sheetInfo[0].toll = 0;
+                    }
                 }
 
-                this.BcabinDatal[0].sheetInfo[0].toll = BtxtJJCTBRRS;
-                this.BcabinDatal[1].sheetInfo[0].toll = BtxtJJCSGRRS;
-                this.BcabinDatal[2].sheetInfo[0].toll = BlblGWCSGRRS;
-                this.BcabinDatal[3].sheetInfo[0].toll = BtxtGWCJSESRS;
-                this.BcabinDatal[4].sheetInfo[0].toll = BtxtGWCSUITERS;
-                this.BcabinDatal[5].sheetInfo[0].toll = BJJCSUITERS;
-
                 this.BGroupCostParameter.djcb = BDjsum;
                 this.BGroupCostParameter.gwcb = BGWsum;
                 this.BGroupCostParameter.lyjcb = BLYJsum;
@@ -4609,6 +4750,11 @@ export default {
                 let BGWCSGR = BleftSum + Number(this.BGroupCostParameter.sgrcb) + Number(this.BGroupCostParameter.gwccb);
                 let BGWCJSES = BleftSum + Number(this.BGroupCostParameter.jsescb) + Number(this.BGroupCostParameter.gwccb);
 
+                //头等舱金额计算
+                let BTDCJSES = (BleftSum + Number(this.BGroupCostParameter.jsescb) + Number(this.BGroupCostParameter.tdccb)).toFixed(2);
+                let BTDCSUITES = (BleftSum + Number(this.BGroupCostParameter.suitecb) + Number(this.BGroupCostParameter.tdccb)).toFixed(2);
+                let BJJCJSES = (BleftSum + Number(this.BGroupCostParameter.jsescb) + Number(this.BGroupCostParameter.jjccb)).toFixed(2);
+
                 BJJCSGR = BJJCSGR.toFixed(2);
 
                 var BrightSum = 0;
@@ -4616,13 +4762,16 @@ export default {
                     BrightSum += Number(that.BcalculateDRBJ(x));
                 })
 
-
                 let BJJCSGRDRBJ = (BrightSum + Number(that.BcalculateDRBJ('jjc')) + Number(that.BcalculateDRBJ('sgr'))).toFixed(2);
                 let BJJCTBRDRBJ = BrightSum + (Number(that.BcalculateDRBJ('tbr')) / 2) + Number(that.BcalculateDRBJ('jjc'));
                 let BJJCSUITEDRBJ = BrightSum + Number(that.BcalculateDRBJ('suite')) + Number(that.BcalculateDRBJ('jjc'));
                 let BGWCSUITEDRBJ = BrightSum + Number(that.BcalculateDRBJ('suite')) + Number(that.BcalculateDRBJ('gwc'));
                 let BGWCSGRDRBJ = BrightSum + Number(that.BcalculateDRBJ('sgr')) + Number(that.BcalculateDRBJ('gwc'));
                 let BGWCJSESDRBJ = BrightSum + Number(that.BcalculateDRBJ('jses')) + Number(that.BcalculateDRBJ('gwc'));
+                //头等舱单人报价
+                let BTDCJSESDRBJ = (BrightSum + Number(that.BcalculateDRBJ('jses')) + Number(that.BcalculateDRBJ('tdc'))).toFixed(2);
+                let BTDCSUITEDRBJ = (BrightSum + Number(that.BcalculateDRBJ('suite')) + Number(that.BcalculateDRBJ('tdc'))).toFixed(2);
+                let BJJCJSESDRBJ = (BrightSum + Number(that.BcalculateDRBJ('jses')) + Number(that.BcalculateDRBJ('jjc'))).toFixed(2);
 
 
                 this.BcabinDatal[0].sheetInfo[0].costPerson = BJJCTBR;
@@ -4637,52 +4786,78 @@ export default {
                 this.BcabinDatal[4].sheetInfo[0].singleQuote = BGWCSUITEDRBJ;
                 this.BcabinDatal[5].sheetInfo[0].costPerson = BJJCSUITE;
                 this.BcabinDatal[5].sheetInfo[0].singleQuote = BJJCSUITEDRBJ;
+                this.BcabinDatal[6].sheetInfo[0].costPerson = BTDCJSES;
+                this.BcabinDatal[6].sheetInfo[0].singleQuote = BTDCJSESDRBJ;
+                this.BcabinDatal[7].sheetInfo[0].costPerson = BTDCSUITES;
+                this.BcabinDatal[7].sheetInfo[0].singleQuote = BTDCSUITEDRBJ;
+                this.BcabinDatal[8].sheetInfo[0].costPerson = BJJCJSES;
+                this.BcabinDatal[8].sheetInfo[0].singleQuote = BJJCJSESDRBJ;
             }
 
-            var txtJJCSGRRS = (result.hasOwnProperty("经济舱SGR") ? result["经济舱SGR"] : 0)
-            var lblGWCSGRRS = (result.hasOwnProperty("公务舱SGR") ? result["公务舱SGR"] : 0)
-            var txtJJCTBRRS = (result.hasOwnProperty("经济舱TBR") ? result["经济舱TBR"] * 2 : 0)
-            var txtGWCJSESRS = (result.hasOwnProperty("公务舱JSES") ? result["公务舱JSES"] : 0)
-            var JJCSUITERS = (result.hasOwnProperty("经济舱SUITE") ? result["经济舱SUITE"] : 0)
-            var txtGWCSUITERS = (result.hasOwnProperty("公务舱SUITE") ? result["公务舱SUITE"] : 0)
+            for (var i = 0; i < airByHotelType.length; i++) {
+                if (result.hasOwnProperty(airByHotelType[i].name)) {
+                    let count = result[airByHotelType[i].name];
+                    if (airByHotelType[i].name.indexOf("TBR") != -1) {
+                        count = count * 2;
+                    }
+                    if (count > 0) {
+                        rightCheckArr.push(airByHotelType[i].lable);
+                        that.cabinDatal[airByHotelType[i].index].sheetInfo[0].toll = count;
+                    }
+                    else {
+                        that.cabinDatal[airByHotelType[i].index].sheetInfo[0].toll = 0;
+                    }
+                } else {
+                    that.cabinDatal[airByHotelType[i].index].sheetInfo[0].toll = 0;
+                }
+            }
 
-            //头等舱人数判断
-            var txtTDCJSESRS = (result.hasOwnProperty("头等舱JSES") ? result["头等舱JSES"] : 0)
-            var txtTDCSUITERS = (result.hasOwnProperty("头等舱SUITE") ? result["头等舱SUITE"] : 0)
 
-            var txtJJCJSESRS = (result.hasOwnProperty("经济舱JSES") ? result["经济舱JSES"] : 0)
-            //console.log(txtJJCSGRRS, lblGWCSGRRS, txtJJCTBRRS, txtGWCJSESRS, JJCSUITERS, txtGWCSUITERS, 'test');
 
-            if (txtJJCSGRRS > 0) {
-                rightCheckArr.push('经济舱 SGR');
-            }
-            if (lblGWCSGRRS > 0) {
-                rightCheckArr.push('公务舱 SGR');
-            }
-            if (txtJJCTBRRS > 0) {
-                rightCheckArr.push('经济舱 TBR');
-            }
-            if (txtGWCJSESRS > 0) {
-                rightCheckArr.push('公务舱 JS/ES');
-            }
-            if (JJCSUITERS > 0) {
-                rightCheckArr.push('经济舱 SUITE');
-            }
-            if (txtGWCSUITERS > 0) {
-                rightCheckArr.push('公务舱 SUITE');
-            }
+            // var txtJJCSGRRS = (result.hasOwnProperty("经济舱SGR") ? result["经济舱SGR"] : 0)
+            // var lblGWCSGRRS = (result.hasOwnProperty("公务舱SGR") ? result["公务舱SGR"] : 0)
+            // var txtJJCTBRRS = (result.hasOwnProperty("经济舱TBR") ? result["经济舱TBR"] * 2 : 0)
+            // var txtGWCJSESRS = (result.hasOwnProperty("公务舱JSES") ? result["公务舱JSES"] : 0)
+            // var JJCSUITERS = (result.hasOwnProperty("经济舱SUITE") ? result["经济舱SUITE"] : 0)
+            // var txtGWCSUITERS = (result.hasOwnProperty("公务舱SUITE") ? result["公务舱SUITE"] : 0)
 
-            //头等舱人数判断
-            if (txtTDCJSESRS > 0) {
-                rightCheckArr.push('头等舱 JS/ES');
-            }
-            if (txtTDCSUITERS > 0) {
-                rightCheckArr.push('头等舱 SUITE');
-            }
+            // //头等舱人数判断
+            // var txtTDCJSESRS = (result.hasOwnProperty("头等舱JSES") ? result["头等舱JSES"] : 0)
+            // var txtTDCSUITERS = (result.hasOwnProperty("头等舱SUITE") ? result["头等舱SUITE"] : 0)
 
-            if (txtJJCJSESRS > 0) {
-                rightCheckArr.push('经济舱 JS/ES');
-            }
+            // var txtJJCJSESRS = (result.hasOwnProperty("经济舱JSES") ? result["经济舱JSES"] : 0)
+            // //console.log(txtJJCSGRRS, lblGWCSGRRS, txtJJCTBRRS, txtGWCJSESRS, JJCSUITERS, txtGWCSUITERS, 'test');
+
+            // if (txtJJCSGRRS > 0) {
+            //     rightCheckArr.push('经济舱 SGR');
+            // }
+            // if (lblGWCSGRRS > 0) {
+            //     rightCheckArr.push('公务舱 SGR');
+            // }
+            // if (txtJJCTBRRS > 0) {
+            //     rightCheckArr.push('经济舱 TBR');
+            // }
+            // if (txtGWCJSESRS > 0) {
+            //     rightCheckArr.push('公务舱 JS/ES');
+            // }
+            // if (JJCSUITERS > 0) {
+            //     rightCheckArr.push('经济舱 SUITE');
+            // }
+            // if (txtGWCSUITERS > 0) {
+            //     rightCheckArr.push('公务舱 SUITE');
+            // }
+
+            // //头等舱人数判断
+            // if (txtTDCJSESRS > 0) {
+            //     rightCheckArr.push('头等舱 JS/ES');
+            // }
+            // if (txtTDCSUITERS > 0) {
+            //     rightCheckArr.push('头等舱 SUITE');
+            // }
+
+            // if (txtJJCJSESRS > 0) {
+            //     rightCheckArr.push('经济舱 JS/ES');
+            // }
 
             rightCheckArr.push('团组预算明细');
             rightCheckArr = [...new Set(rightCheckArr)];
@@ -4692,17 +4867,17 @@ export default {
                 this.CheckBoxListSelect.filter(item => item.cbType == 'Right')[0].cbValues = rightCheckArr;
             } catch (e) { }
 
-            this.cabinDatal[0].sheetInfo[0].toll = txtJJCTBRRS;
-            this.cabinDatal[1].sheetInfo[0].toll = txtJJCSGRRS;
-            this.cabinDatal[2].sheetInfo[0].toll = lblGWCSGRRS;
-            this.cabinDatal[3].sheetInfo[0].toll = txtGWCJSESRS;
-            this.cabinDatal[4].sheetInfo[0].toll = txtGWCSUITERS;
-            this.cabinDatal[5].sheetInfo[0].toll = JJCSUITERS;
-            //头等舱人数
-            this.cabinDatal[6].sheetInfo[0].toll = txtTDCJSESRS;
-            this.cabinDatal[7].sheetInfo[0].toll = txtTDCSUITERS;
-
-            this.cabinDatal[8].sheetInfo[0].toll = txtJJCJSESRS;
+            // this.cabinDatal[0].sheetInfo[0].toll = txtJJCTBRRS;
+            // this.cabinDatal[1].sheetInfo[0].toll = txtJJCSGRRS;
+            // this.cabinDatal[2].sheetInfo[0].toll = lblGWCSGRRS;
+            // this.cabinDatal[3].sheetInfo[0].toll = txtGWCJSESRS;
+            // this.cabinDatal[4].sheetInfo[0].toll = txtGWCSUITERS;
+            // this.cabinDatal[5].sheetInfo[0].toll = JJCSUITERS;
+            // //头等舱人数
+            // this.cabinDatal[6].sheetInfo[0].toll = txtTDCJSESRS;
+            // this.cabinDatal[7].sheetInfo[0].toll = txtTDCSUITERS;
+
+            // this.cabinDatal[8].sheetInfo[0].toll = txtJJCJSESRS;
 
             this.AGroupCostParameter.djcb = Djsum;
             this.AGroupCostParameter.gwcb = GWsum;