liuhj hai 1 mes
pai
achega
c9dc48ecdb
Modificáronse 1 ficheiros con 40 adicións e 11 borrados
  1. 40 11
      src/components/Finance/Cost.vue

+ 40 - 11
src/components/Finance/Cost.vue

@@ -4533,7 +4533,6 @@ export default {
                             }
                         }
                     }
-
                     var isChange = await this.getGroupInfo();
                     if (isChange) {
                         var number = this.grouptitleinfo.visitPNumber;
@@ -4549,8 +4548,17 @@ export default {
                         this.$message.error('团组人数与房间人数不一致!')
                         return resolve(false);
                     }
+                }else{
+                    var isChange = await this.getGroupInfo();
+                    if (isChange) {
+                        var numbers=this.BGroupCostParameter.costTypenumber
+                        this.BGroupCostParameter.visaRS = numbers;
+                        this.BGroupCostParameter.bxrs = numbers;
+                        this.BGroupCostParameter.djrs = numbers;
+                        this.BGroupCostParameter.gwrs = numbers;
+                        this.BGroupCostParameter.lyjrs = numbers;
+                    }
                 }
-
                 var that = this;
                 var Data = { diid: this.diid, userid: this.userId };
                 var isTrue = await this.formVerify();
@@ -4939,7 +4947,6 @@ export default {
             BSGRsum = isNaN(BSGRsum) ? 0 : BSGRsum;
             SGRsum = (SGRsum * rate).toFixed(2);
             BSGRsum = (BSGRsum * rate).toFixed(2);
-            console.log(SGRsum,rate);
 
 
             let TBRsum = 0;
@@ -5128,7 +5135,6 @@ export default {
                     }
                 }
                 for (var i = 0; i < airByHotelType.length; i++) {
-                    console.log(Bresult, 'airByHotelType[i].name-------------');
                     if (Bresult.hasOwnProperty(airByHotelType[i].name)) {
                         let count = Bresult[airByHotelType[i].name];
                         if (airByHotelType[i].name.indexOf("TBR") != -1) {
@@ -5182,7 +5188,6 @@ export default {
                     that.BcabinDatal[paramArr[i].index].sheetInfo[0].singleQuote = (BrightSum + singleQuotePrice).toFixed(2);
                 }
             }
-            console.log('这来了', 'Bresult-------------');
             for (var i = 0; i < airByHotelType.length; i++) {
                 if (result.hasOwnProperty(airByHotelType[i].name)) {
                     let count = result[airByHotelType[i].name];
@@ -5190,7 +5195,6 @@ export default {
                         count = count * 2;
                     }
                     if (count > 0) {
-                        console.log(that.cabinDatal, 'cabinDatal-------------');
                         rightCheckArr.push(airByHotelType[i].lable);
                         that.cabinDatal[airByHotelType[i].index].sheetInfo[0].toll = count;
                     }
@@ -5209,7 +5213,7 @@ export default {
                 ////console.log('rightCheckArr', rightCheckArr);
                 this.CheckBoxListSelect.filter(item => item.cbType == 'Right')[0].cbValues = rightCheckArr;
             } catch (e) { }
-            console.log(SGRsum, 'Bresult-------------');
+ 
             this.AGroupCostParameter.djcb = Djsum;
             this.AGroupCostParameter.gwcb = GWsum;
             this.AGroupCostParameter.lyjcb = LYJsum;
@@ -5217,7 +5221,7 @@ export default {
             this.AGroupCostParameter.tbrcb = TBRsum;
             this.AGroupCostParameter.jsescb = JSESsum;
             this.AGroupCostParameter.suitecb = SUITEsum;
-            console.log(this.AGroupCostParameter, 'AGroupCostParameter-------------');
+
 
             var leftSum = this.OtherCost();
             var rightSum = 0;
@@ -5331,6 +5335,7 @@ export default {
             return sum;
         },
         matchRooms(hotelRooms, flights, roomTypes, flightType, result) {
+            console.log(hotelRooms, flights, roomTypes, flightType, result, 'matchRoomsmatchRooms');
             for (let roomType of roomTypes) {
                 while (hotelRooms[roomType] > 0 && flights[flightType] > 0) {
                     hotelRooms[roomType]--;
@@ -6503,6 +6508,23 @@ export default {
             if (this.AGroupCostParameter.gwrs == 0) {
                 this.AGroupCostParameter.gwrs = number;
             }
+            //b
+            var numbers=this.BGroupCostParameter.costTypenumber
+            if (this.BGroupCostParameter.visaRS == 0) {
+                this.BGroupCostParameter.visaRS = numbers;
+            }
+            if (this.BGroupCostParameter.bxrs == 0) {
+                this.BGroupCostParameter.bxrs = numbers;
+            }
+            if (this.BGroupCostParameter.djrs == 0) {
+                this.BGroupCostParameter.djrs = numbers;
+            }
+            if (this.BGroupCostParameter.lyjrs == 0) {
+                this.BGroupCostParameter.lyjrs = numbers;
+            }
+            if (this.BGroupCostParameter.gwrs == 0) {
+                this.BGroupCostParameter.gwrs = numbers;
+            }
         },
         lableSetPrice(lable, total, single) {
             //遍历this.columnTotalData
@@ -6943,7 +6965,6 @@ export default {
                         }
                     }
                 }
-
                 var isChange = await this.getGroupInfo();
                 if (isChange) {
                     var number = this.grouptitleinfo.visitPNumber;
@@ -6954,11 +6975,20 @@ export default {
                     this.AGroupCostParameter.lyjrs = number;
                 }
 
-                ////console.log(pNumber, 'pNumber-------------');
                 if (this.grouptitleinfo.visitPNumber != pNumber) {
                     this.$message.error('团组人数与房间人数不一致!')
                     return resolve(false);
                 }
+            }else{
+                var isChange = await this.getGroupInfo();
+                if (isChange) {
+                    var numbers=this.BGroupCostParameter.costTypenumber
+                    this.BGroupCostParameter.visaRS = numbers;
+                    this.BGroupCostParameter.bxrs = numbers;
+                    this.BGroupCostParameter.djrs = numbers;
+                    this.BGroupCostParameter.gwrs = numbers;
+                    this.BGroupCostParameter.lyjrs = numbers;
+                }
             }
 
             var that = this;
@@ -7198,7 +7228,6 @@ export default {
                     item.style.display = 'block';
                 })
 
-                console.log(this.rollcallarr.length, 'this.rollcallarr.length');
                 if (this.rollcallarr.length == 0) {
                     return;
                 }