Commit f92f8e1e authored by Mac's avatar Mac

跳转带的名称

parent aa7e8d59
......@@ -441,8 +441,7 @@
query: {
ClassId: item.ClassId,
School_Id: item.School_Id,
ClassName: item.ClassName,
ClassName: encodeURI(item.ClassName),
blank: 'y'
}
})
......
......@@ -856,7 +856,7 @@
}
})
},
GoUrlFan(path, month, year, BranchId, ids) {
GoUrlFan(path, startDate,endDate, year, BranchId, ids) {
// this.$router.push({
// path: "/financial/" + path,
// query: {
......@@ -869,7 +869,8 @@
// });
this.OpenNewUrl('/financial/'+ path, {
year: year,
month: month,
startDate: startDate,
endDate: endDate,
BranchId: BranchId,
CostIds: ids,
});
......@@ -905,11 +906,9 @@
this.OpenNewUrl('/financial/reportform/RecPayQueryTeam', {
StartTime: startDate,
EndTime: endDate,
SchoolId:this.msg.BranchId
});
}
} else {
if (rowData.ZhaiYao == "员工提成") {
if (Number(this.year) == 2019) {
......@@ -918,17 +917,17 @@
let CostTypeIds = "";
CostTypeIds = rowData.CostTypeIds.replace('112,', '');
CostTypeIds = CostTypeIds.replace('16,', '');
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, CostTypeIds)
} else {
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
} else if (Number(this.year) > 2019) {
let CostTypeIds = "";
CostTypeIds = rowData.CostTypeIds.replace('112,', '');
CostTypeIds = CostTypeIds.replace('16,', '');
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, CostTypeIds)
} else {
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
} else if (rowData.ZhaiYao == "歐洲與南亞損失分攤") {
that.goUrl("AirTicketLoss", startDate, endDate, BranchId, "机票分摊")
......@@ -961,13 +960,13 @@
});
} else {
if(rowData.CostTypeIds && rowData.CostTypeIds !=''){
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
}
} else {
if(rowData.CostTypeIds && rowData.CostTypeIds !=''){
that.GoUrlFan('JumpReport', month, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
that.GoUrlFan('JumpReport', startDate,endDate, rowData.Year, rowData.BranchId, rowData.CostTypeIds)
}
}
}
......
<style scoped>
@import "css/cssReset.css";
.page_fnDm{background-color: white}
.query-box{overflow: inherit}
/* .page_fnDm{background-color: white} */
.page_fnDm{padding: 20px;}
.query-box{overflow: inherit;}
._nav{margin: 20px 0 0 0 ;background-color: #f5f5f5;}
._nav li{float: left;font-size: 14px;color: #666666;padding: 15px 20px;cursor: pointer;position: relative;background-color: #f1f1f1;margin-right: 5px}
._nav li._active{background-color:#FFFFFF;color: #333333 }
......@@ -108,7 +109,7 @@
<template >
<div class="page_fnDm page_RecPayQuery" @keyup.enter="resetPageIndex(),getPageList()">
<div class="query-box">
<div class="query-box" style="background: #FFFFFF;border-radius: 6px;">
<el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;">
<!-- <el-col :span="4">
......@@ -298,19 +299,21 @@
</template>
</el-row>
</el-form>
<ul class="clearfix">
<ul class="clearfix" style="padding-right:20px ;">
<li class="hight_query">
<!-- <span>
<em @click.stop="heightQueryBox=!heightQueryBox">高级查询 <i class="iconfont icon-gengduo"></i></em>
</span> -->
<button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()">{{$t('pub.searchBtn')}}</button>
<!-- <button class="hollowFixedBtn" @click="resetPageIndex(),getPageList()" style="margin: 0;">{{$t('pub.searchBtn')}}</button> -->
<q-btn color="primary" size="11px" label="查询" @click="resetPageIndex(),getPageList()" style="marginRight:10px"/>
<!-- <button class="normalBtn" @click="method5()">导出</button> -->
</li>
</ul>
<div class="JumpDivTitleOne">应收金额:{{SumYingShou}} <span class="JumpSpan">实收金额:{{SumShiShou}}</span> 待收金额:{{SumDaiShou}}</div>
<div class="JumpDivTitleTwo">应付金额:{{SumYingFu}} <span class="JumpSpan">实付金额:{{SumShiFu}}</span> 待付金额:{{SumDaiFu}}</div>
</div>
<div class="_fnDm_content" v-loading='loading'>
<div class="_fnDm_content" v-loading='loading' style="padding: 20px;background: #FFFFFF;">
<!-- <v-table-->
<!-- is-horizontal-resize-->
<!-- column-width-drag-->
......@@ -330,7 +333,7 @@
<el-table
:data="DataList"
border
style="width: 100%;font-size: 12px">
style="width: 100%;font-size: 12px;padding: ;">
<el-table-column prop="FrID" label="单号" width="80">
<template slot-scope='scope'>
<el-popover
......@@ -547,6 +550,7 @@
path: '/' + path,
query: {id:this.rowData.FrID,blank:'y',tab:this.rowData.FrID+'单据详情'}
})
},
}
})
......@@ -1069,6 +1073,12 @@
this.transactionDate[0]=this.msg.sTradeDate;
this.transactionDate[1]= this.msg.eTradeDate;
}
if(this.$route.query.startDate && this.$route.query.endDate){//7月8号新加 因为从简易报表跳转过来的 季度那种情况时间带不过来 然后从新处理了
this.msg.sTradeDate=this.$route.query.startDate;
this.msg.eTradeDate=this.$route.query.endDate;
this.transactionDate[0]=this.msg.sTradeDate;
this.transactionDate[1]= this.msg.eTradeDate;
}
if(this.$route.query.BranchId){
this.msg.RB_Branch_Id=parseInt(this.$route.query.BranchId);
}
......@@ -1546,7 +1556,11 @@
this.currentPage = 1;
},
goUrl(path,rowData,){
this.$router.push({ path:'/financial/financalDocument/'+ path,query:{"id":rowData.FrID,blank:'y',tab:'单据详情'} })
// this.$router.push({ path:'/financial/financalDocument/'+ path,query:{"id":rowData.FrID,blank:'y',tab:'单据详情'} })
this.OpenNewUrl('/financial/financalDocument/'+ path, {
"id":rowData.FrID,
tab:'单据详情'
});
},
goEit(path,type,id,edit,Conditon,pageIndex){
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex} })
......
......@@ -364,7 +364,7 @@
this.CourseList();
this.GetTeacherList();
if (this.$route.query && this.$route.query.ClassName) {
this.msg.ClassName = this.$route.query.ClassName;
this.msg.ClassName = decodeURI(this.$route.query.ClassName) ;
}
if (this.$route.query && this.$route.query.ClassNo) {
this.msg.ClassNo = this.$route.query.ClassNo;
......
......@@ -221,7 +221,7 @@
this.msg.EnterID = Number(this.$route.query.EnterID) ;
}
if (this.$route.query.ClassName) {
this.msg.ClassName = this.$route.query.ClassName;
this.msg.ClassName = decodeURI(this.$route.query.ClassName) ;
}
this.getOrderState();
this.getCourseList();
......
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