1

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -1068,7 +1068,7 @@ export default {
         endDate=that.year+"-"+column.end
       }
 
-      if(rowIndex<20){
+      if(rowIndex<20 || rowData.ZhaiYao=="团内承担燃油费"){
         // if(BranchId == 1245){
         //   that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
         // }
@@ -1077,15 +1077,15 @@ export default {
         }
         // 跳转到应收团款查询
         else if(rowData.ZhaiYao=="营业总收入"){
-          that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
+          that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,DataType:-1,blank:'y',tab:"营收报表"} })
           // that.goUrl("RecPayQueryTeam",startDate,endDate,BranchId,"应收团款查询")
         }
         else if(rowData.ZhaiYao=="营业总成本"){
-          that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
+          that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,DataType:-1,blank:'y',tab:"营收报表"} })
           // that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询")
         }
         else{
-           that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
+           that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,DataType:-1,blank:'y',tab:"营收报表"} })
         }
       }else{
         if(rowData.ZhaiYao=="员工提成"){
@@ -1184,7 +1184,7 @@ export default {
             that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds,StandardCurrencyId)
           //}
         }
-        else if(rowData.ZhaiYao =='车辆折旧'){
+        else if(rowData.ZhaiYao =='车辆折旧' || rowData.ZhaiYao =='营业税金及附加' || rowData.ZhaiYao =='净利润(亏损)' || rowData.ZhaiYao =='营业利润(亏损)'|| rowData.ZhaiYao =='管销费用'){
           //不跳转
         }
         else{

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2482,6 +2482,9 @@ export default {
       this.productionDate[1]=this.msg.endDate;
     }
 
+    if(this.$route.query.DataType){
+      this.msg.DataType=this.$route.query.DataType;
+    }
     if(this.msg.LineId>0){
       this.msg.DataType="1";
     }