财务简易报表新增跳转

src/components/FinancialModule/ReportForm/AirTicketLoss.vue

@@ -125,18 +125,26 @@ export default {
  
     },mounted(){
         //默认查询当月第一个到最后一天日期
-        var now = new Date();
-        var month = now.getMonth() + 1;//js获取到的是月份是 0-11 所以要加1
-        var year = now.getFullYear();
-        var nextMonthFirstDay = new Date([year,month + 1,1].join('-')).getTime();
-        var oneDay = 1000 * 24 * 60 * 60;
-        var monthLast = new Date(nextMonthFirstDay - oneDay).getDate()
-        if(month<10){
-            month='0'+month;
+        if(this.$route.query.startDate && this.$route.query.endDate){
+            let startDate=this.$route.query.startDate;
+            let endDate=this.$route.query.endDate;
+            this.value1.push(startDate,endDate);
+        }else{
+            var now = new Date();
+            var month = now.getMonth() + 1;//js获取到的是月份是 0-11 所以要加1
+            var year = now.getFullYear();
+            var nextMonthFirstDay = new Date([year,month + 1,1].join('-')).getTime();
+            var oneDay = 1000 * 24 * 60 * 60;
+            var monthLast = new Date(nextMonthFirstDay - oneDay).getDate()
+            if(month<10){
+                month='0'+month;
+            }
+            let startDate = [year,month,1].join('-');
+            let endDate = [year,month,monthLast].join('-');
+            this.value1.push(startDate,endDate);
+
         }
-        var startDate = [year,month,1].join('-');
-        var endDate = [year,month,monthLast].join('-');
-        this.value1.push(startDate,endDate);
+        
         this.getList();
     }
 }

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -868,6 +868,7 @@ export default {
       }else{
         endDate=that.year+"-"+column.end
       }
+      
       if(rowIndex<9){
         // 联运收入
         if(rowData.ZhaiYao=="联运收入"){
@@ -913,6 +914,9 @@ export default {
           }
           
         }
+        else if(rowData.ZhaiYao=="歐洲與南亞損失分攤"){
+          that.goUrl("AirTicketLoss",startDate,endDate,BranchId,"机票分摊")
+        }
         else{
           that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
         }