Commit e8305e49 authored by 黄媛媛's avatar 黄媛媛

财务简易报表新增跳转

parent efc37be8
...@@ -125,6 +125,11 @@ export default { ...@@ -125,6 +125,11 @@ export default {
},mounted(){ },mounted(){
//默认查询当月第一个到最后一天日期 //默认查询当月第一个到最后一天日期
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 now = new Date();
var month = now.getMonth() + 1;//js获取到的是月份是 0-11 所以要加1 var month = now.getMonth() + 1;//js获取到的是月份是 0-11 所以要加1
var year = now.getFullYear(); var year = now.getFullYear();
...@@ -134,9 +139,12 @@ export default { ...@@ -134,9 +139,12 @@ export default {
if(month<10){ if(month<10){
month='0'+month; month='0'+month;
} }
var startDate = [year,month,1].join('-'); let startDate = [year,month,1].join('-');
var endDate = [year,month,monthLast].join('-'); let endDate = [year,month,monthLast].join('-');
this.value1.push(startDate,endDate); this.value1.push(startDate,endDate);
}
this.getList(); this.getList();
} }
} }
......
...@@ -868,6 +868,7 @@ export default { ...@@ -868,6 +868,7 @@ export default {
}else{ }else{
endDate=that.year+"-"+column.end endDate=that.year+"-"+column.end
} }
if(rowIndex<9){ if(rowIndex<9){
// 联运收入 // 联运收入
if(rowData.ZhaiYao=="联运收入"){ if(rowData.ZhaiYao=="联运收入"){
...@@ -913,6 +914,9 @@ export default { ...@@ -913,6 +914,9 @@ export default {
} }
} }
else if(rowData.ZhaiYao=="歐洲與南亞損失分攤"){
that.goUrl("AirTicketLoss",startDate,endDate,BranchId,"机票分摊")
}
else{ else{
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds) that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment