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

src/components/FinancialModule/ReportForm/AirTicketLoss.vue

@@ -97,6 +97,20 @@ export default {
         //跳转至详情
         goToDetail(item){
             if(item.Value!='损失占比'){
+                if(item.IsTravel==1){
+                    this.$router.push({
+                    name: 'TeamRevenueReport',
+                    query: {
+                        StartTime:item.StartTime,
+                        EndTime:item.EndTime,
+                        LineId:item.LineId,
+                        LtIdStr:item.LtIdStr,
+                        IsSelectTravelLoss:1,
+                        blank: "y",
+                    }
+                    });
+                }
+                else{
                     this.$router.push({
                     name: 'AirTicketLossDetail',
                     query: {
@@ -105,6 +119,8 @@ export default {
                         }
                     });
                 }
+                
+            }
         }
  
     },mounted(){

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1664,6 +1664,12 @@ export default {
     this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
     this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
     this.msg.OutBranchId=this.$route.query.OutBranchId?Number(this.$route.query.OutBranchId):this.msg.OutBranchId;
+    if(this.$route.query.LtIdStr){
+      this.msg.LtIdStr=this.$route.query.LtIdStr
+    }
+    if(this.$route.query.IsSelectTravelLoss){
+      this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss
+    }
     if(this.msg.endDate!=""){
       this.productionDate[0]=this.msg.startDate;
       this.productionDate[1]=this.msg.endDate;