1

src/components/leaderPay2.vue

@@ -169,7 +169,7 @@ input[type="number"] {
               <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
                 {{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
               </td>
-              <td v-if="childIndex==0" :rowspan="item.data.length*subItem.TicketPriceList.length">
+              <td v-if="childIndex==0 && subIndex ==0" :rowspan="item.data.length*subItem.TicketPriceList.length">
                 {{subItem.TradingTotalPrice}}
               </td>
 
@@ -299,7 +299,7 @@ input[type="number"] {
               <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                 {{diningTotalPrice(subItem, subItem.DiningPriceList)}}
               </td>
-              <td v-if="childIndex==0" :rowspan="item.data.length * subItem.DiningPriceList.length">{{subItem.TradingTotalPrice}}</td>
+              <td v-if="childIndex==0 && subIndex ==0" :rowspan="item.data.length * subItem.DiningPriceList.length">{{subItem.TradingTotalPrice}}</td>
               <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                 {{subItem.Remarks}}
               </td>
@@ -402,7 +402,7 @@ input[type="number"] {
               <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
                 {{hotelTotalPrice(subItem.OrderDetailsList)}}
               </td>
-              <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length * item.data.length">{{subItem.TradingTotalPrice}}</td>
+              <td v-if="childIndex==0 && subIndex ==0" :rowspan="subItem.OrderDetailsList.length * item.data.length">{{subItem.TradingTotalPrice}}</td>
               <td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
                 {{subItem.Remarks}}
               </td>
@@ -962,8 +962,7 @@ export default {
               }
           }
           this.DiningDataList = Diningdest
-          //票
-          console.log(res.data.data.ScenicList)
+          //票 
           let ScenicList = []
           for(let i = 0; i < res.data.data.ScenicList.length; i++) {
             for(let o = 0; o < res.data.data.ScenicList[i].ScenicStatisticsList.length; o++) {
@@ -990,7 +989,7 @@ export default {
                       }
                   }
               }
-          }
+          } 
           this.ScenicDataList = Scenicdest
           //酒 
           let HotelList = []
@@ -1009,18 +1008,17 @@ export default {
                       NewHotelId: ai.NewHotelId,
                       data: [ai]
                   });
-                  Hotelmap[ai.CheckInDateStr] = ai;
-              }else{
+                  Hotelmap[ai.CheckInDateStr] = ai; 
+              }else{ 
                   for(var j = 0; j < Hoteldest.length; j++){
-                      var dj = Hoteldest[j];
+                      var dj = Hoteldest[j]; 
                       if(dj.CheckInDateStr == ai.CheckInDateStr && dj.NewHotelId == ai.NewHotelId){
                           dj.data.push(ai);
                           break;
                       }
                   }
               }
-          }
-          console.log(HotelList)
+          } 
           this.HotelDataList = Hoteldest
         } else {
           this.$message.error(res.data.message);