Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/leaderPay2.vue

@@ -1725,7 +1725,7 @@
               }
               Diningdest[i].row = row
             }
-            console.log(Diningdest)
+            // console.log(Diningdest)
             this.DiningDataList = this.unique(Diningdest, 'id');
             // this.DiningDataList = Diningdest
             //票 
@@ -1735,7 +1735,7 @@
                 ScenicList.push(res.data.data.ScenicList[i].ScenicStatisticsList[o])
               }
             }
-            console.log(ScenicList)
+            // console.log(ScenicList)
             var Scenicmap = {},
               Scenicdest = [];
             for (var i = 0; i < ScenicList.length; i++) {
@@ -1783,24 +1783,38 @@
                 HotelList.push(res.data.data.HotelOrderListReport[i].HotelOrderList[o])
               }
             }
-            var Hotelmap = {},
+            var Hotelmap = {},Hotelmap2 = {},
               Hoteldest = [];
+
             for (var i = 0; i < HotelList.length; i++) {
               var ai = HotelList[i];
               if (!Hotelmap[ai.CheckInDateStr]) {
-                Hoteldest.push({
-                  CheckInDateStr: ai.CheckInDateStr,
-                  NewHotelId: ai.NewHotelId,
-                  data: [ai]
-                });
-                Hotelmap[ai.CheckInDateStr] = ai;
-              } else {
+                    Hoteldest.push({
+                      CheckInDateStr: ai.CheckInDateStr,
+                      NewHotelId: ai.NewHotelId,
+                      data: [ai]
+                    });
+                    Hotelmap[ai.CheckInDateStr] = ai;
+                    Hotelmap2[ai.NewHotelId] = ai;
+                
+              }
+              else if (Hotelmap[ai.CheckInDateStr] && !Hotelmap2[ai.NewHotelId]) {
+                    Hoteldest.push({
+                      CheckInDateStr: ai.CheckInDateStr,
+                      NewHotelId: ai.NewHotelId,
+                      data: [ai]
+                    });
+                    Hotelmap2[ai.NewHotelId] = ai;
+                
+              }
+               else {
                 for (var j = 0; j < Hoteldest.length; j++) {
                   var dj = Hoteldest[j];
                   if (dj.CheckInDateStr == ai.CheckInDateStr && dj.NewHotelId == ai.NewHotelId) {
                     dj.data.push(ai);
                     break;
                   }
+                  
                 }
               }
             }
@@ -1811,7 +1825,8 @@
               }
               Hoteldest[i].row = row
             }
-            this.HotelDataList = Hoteldest
+            this.HotelDataList = Hoteldest;
+            console.log("this.HotelDataList",this.HotelDataList)
           } else {
             this.$message.error(res.data.message);
           }