添加jjc jses

src/components/Finance/Cost.vue

@@ -1664,7 +1664,7 @@ export default {
 
             ],
             //cabinoneList: ['经济舱 TBR', '经济舱 SGR', '核酸检测', '团组预算明细'],
-            cabinoneOptions: ['经济舱 TBR', '经济舱 SGR', '公务舱 SGR', '公务舱 JS/ES', '公务舱 SUITE', '经济舱 SUITE', '头等舱 JS/ES', '头等舱 SUITE'],
+            cabinoneOptions: ['经济舱 TBR', '经济舱 SGR', '公务舱 SGR', '公务舱 JS/ES', '公务舱 SUITE', '经济舱 SUITE', '头等舱 JS/ES', '头等舱 SUITE', '经济舱 JS/ES'],
             cabinDatal: [
                 {
                     label: '经济舱 TBR',
@@ -2035,6 +2035,52 @@ export default {
                         },
                     ]
                 },
+                {
+                    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
+                        },
+                    ]
+                },
                 {
                     label: '团组预算明细',
                     childList: [
@@ -4478,16 +4524,33 @@ export default {
             };
 
             let result = {};
-            for (let flight of ["经济舱", "公务舱", "头等舱"]) {
-                if (flight === "经济舱") {
-                    this.matchRooms(hotelRooms, flights, ["TBR", "SGR", "JSES", "SUITE"], flight, result);
-                } else if (flight === "公务舱") {
-                    this.matchRooms(hotelRooms, flights, ["SUITE", "JSES", "SGR", "TBR"], flight, result);
-                } else if (flight === "头等舱") {
-                    this.matchRooms(hotelRooms, flights, ["JSES", "SUITE", "SGR", "TBR"], flight, result);
+
+            if (this.diid == 2615) {
+                for (let flight of ["经济舱", "头等舱", "公务舱"]) {
+                    if (flight === "经济舱") {
+                        this.matchRooms(hotelRooms, flights, ["JSES", "TBR", "SGR", "SUITE"], flight, result);
+                    } else if (flight === "公务舱") {
+                        this.matchRooms(hotelRooms, flights, ["SUITE", "JSES", "SGR",], flight, result);
+                    } else if (flight === "头等舱") {
+                        this.matchRooms(hotelRooms, flights, ["SUITE", "JSES"], flight, result);
+                    }
+                }
+            } else {
+                for (let flight of ["经济舱", "头等舱", "公务舱"]) {
+                    if (flight === "经济舱") {
+                        this.matchRooms(hotelRooms, flights, ["TBR", "SGR", "JSES", "SUITE"], flight, result);
+                    } else if (flight === "公务舱") {
+                        this.matchRooms(hotelRooms, flights, ["SUITE", "JSES", "SGR",], flight, result);
+                    } else if (flight === "头等舱") {
+                        this.matchRooms(hotelRooms, flights, ["SUITE", "JSES",], flight, result);
+                    }
                 }
             }
 
+
+
+
+
             var rightCheckArr = [];
             if (this.costTypevalue == 'B') {
 
@@ -4603,6 +4666,7 @@ export default {
             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) {
@@ -4632,6 +4696,10 @@ export default {
                 rightCheckArr.push('头等舱 SUITE');
             }
 
+            if (txtJJCJSESRS > 0) {
+                rightCheckArr.push('经济舱 JS/ES');
+            }
+
             rightCheckArr.push('团组预算明细');
             rightCheckArr = [...new Set(rightCheckArr)];
 
@@ -4650,6 +4718,8 @@ export default {
             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;
             this.AGroupCostParameter.lyjcb = LYJsum;
@@ -4668,6 +4738,8 @@ export default {
             //头等舱金额计算
             let TDCJSES = (leftSum + Number(this.AGroupCostParameter.jsescb) + Number(this.AGroupCostParameter.tdccb)).toFixed(2);
             let TDCSUITES = (leftSum + Number(this.AGroupCostParameter.suitecb) + Number(this.AGroupCostParameter.tdccb)).toFixed(2);
+
+            let JJCJSES = (leftSum + Number(this.AGroupCostParameter.jsescb) + Number(this.AGroupCostParameter.jjccb)).toFixed(2);
             ////////console.log(JJCSGR, JJCTBR, JJCSUITE, GWCSUITE, GWCSGR, GWCJSES, '666--------------------------');
 
             var rightSum = 0;
@@ -4685,6 +4757,8 @@ export default {
             let TDCJSESDRBJ = (rightSum + Number(that.calculateDRBJ('jses')) + Number(that.calculateDRBJ('tdc'))).toFixed(2);
             let TDCSUITEDRBJ = (rightSum + Number(that.calculateDRBJ('suite')) + Number(that.calculateDRBJ('tdc'))).toFixed(2);
 
+            let JJCJSESDRBJ = (rightSum + Number(that.calculateDRBJ('jses')) + Number(that.calculateDRBJ('jjc'))).toFixed(2);
+
             this.cabinDatal[0].sheetInfo[0].costPerson = JJCTBR;
             this.cabinDatal[0].sheetInfo[0].singleQuote = JJCTBRDRBJ;
             this.cabinDatal[1].sheetInfo[0].costPerson = JJCSGR;
@@ -4703,6 +4777,9 @@ export default {
             this.cabinDatal[7].sheetInfo[0].costPerson = TDCSUITES;
             this.cabinDatal[7].sheetInfo[0].singleQuote = TDCSUITEDRBJ;
 
+            this.cabinDatal[8].sheetInfo[0].costPerson = JJCJSES;
+            this.cabinDatal[8].sheetInfo[0].singleQuote = JJCJSESDRBJ;
+
             let groupCosts = 0;
             let gtroupQuotes = 0;
             for (var i = 0; i < this.cabinDatal.length; i++) {