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

src/components/SalesModule/VisaFinancialDocuments.vue

@@ -423,12 +423,6 @@ export default {
     },
   }, mounted() {
     this.userId = this.getLocalStorage().EmployeeId;
-    // let obj = this.$route.query.item ? JSON.parse(this.$route.query.item) : ''
-    // this.item = obj
-    // this.orderId = this.msg.OrderID = obj.orderId ? obj.orderId : obj.OrderId
-    // this.tcnum = obj.tcnum ? obj.tcnum : obj.TCNUM
-    // this.tcid = obj.tcid ? obj.tcid : obj.TCID
-    // this.outBranchId = obj.outBranchId ? obj.outBranchId : obj.OutBranchId;
 
      this.tcid= this.$route.query.TCID;
      this.OutBranchId=this.$route.query.OutBranchId;

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -1095,11 +1095,12 @@ export default {
   },
 
   mounted() {
+    
     this.initCity();
     this.getNeedType();
     this.initTicketType();
     this.initAirline();
-    this.getList();
+    this.getList(); 
   }
 };
 </script>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -676,7 +676,7 @@
                       </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">销售
                       </el-dropdown-item>
-                      <el-dropdown-item v-if="item.Status==1&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
+                      <el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
                                         @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">收入确认单
                       </el-dropdown-item>
                       <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"

src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue

@@ -132,7 +132,6 @@
           res => {
             this.loading=false;
             if (res.data.resultCode == 1) {
-                console.log(res,'data');
                 this.dataList = res.data.data;
             } else {
               this.Error(res.data.message);

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}})