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

src/components/busManagement/busStatistics.vue

@@ -153,7 +153,7 @@
 					</div></td>
 					<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
 						<div class="w100 link">
-							<span @click="goUrlX('BusInfo',outItem,'车配信息')">详情</span>
+							<span @click="goUrlX('BusInfo',item,outItem,'车配信息')">详情</span>
 							<span  @click="DownLoadFile(item,outItem.NewCombinationNum)">下载</span>
 						</div>
 					</td>
@@ -291,14 +291,28 @@ totalPrice+=busInfo.CostPrice*(Number(busInfo.TransferNum)+1)*PeopleNum;
         }
       );
     },
-   		 goUrlX(path,obj,title){
-		console.log(obj);
-		//
-		let TotalSeat=0;
-			obj.StaticsReportList.forEach(outItem=>{
-				TotalSeat+=outItem.CommonReport.HouseStatistics.RealityNum;
-			});
-	 	   this.$router.push({ name:path,query:{"TCID":obj.TCIDs,TotalNumber:TotalSeat,blank:'y',tab:title}})
+   		 goUrlX(path,obj,outItem,title){
+			this.$router.push({
+				name: path,
+				query: {
+					"TCID": obj.TCIDS,
+					StartDate: obj.StartDateStr,
+					DayNum: obj.DayNum,
+					TotalNumber: obj.TotalSeat,   //机位总数
+					RealityYSeatNum:obj.CommonReport.HouseStatistics.RealityYSeatNum,
+					RealityESeatNum:obj.CommonReport.HouseStatistics.RealityESeatNum,
+					RealityFSeatNum:obj.CommonReport.HouseStatistics.RealityFSeatNum,
+					LeaderName:obj.LeaderName,
+					GuideName:obj.GuideName,
+					NewCombinationNum: outItem.NewCombinationNum,
+					blank: 'y',
+					title:obj.Titles,
+					TCNUMS:obj.TCNUMS,
+					InOut:obj.InOut,
+					RealityNum:obj.CommonReport.HouseStatistics.RealityNum,
+					tab: title
+				}
+			})
 		},
   		goUrlR(path,obj,title){
 	 	   this.$router.push({ name:path,query:{"ID":obj,blank:'y',tab:title}})