Commit 3e3510b9 authored by Mac's avatar Mac

报表

parent 7fb13f3e
<style> <style>
@import "css/cssReset.css"; @import "css/cssReset.css";
.page_EasyReport_set{ .page_EasyReport_set{
position: relative; position: relative;
padding:15px padding:15px
...@@ -51,7 +50,7 @@ ...@@ -51,7 +50,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="出团学校:"> <el-form-item label="学校:">
<el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getData(2)"> <el-select class="w150" :disabled="BranchStatus" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')" @change="getData(2)">
<el-option label="不限" :value="-1"></el-option> <el-option label="不限" :value="-1"></el-option>
<el-option v-for="item in BranchList" :label="item.SName" :key="item.SId" :value="item.SId">{{item.SName}}</el-option> <el-option v-for="item in BranchList" :label="item.SName" :key="item.SId" :value="item.SId">{{item.SName}}</el-option>
...@@ -125,7 +124,7 @@ ...@@ -125,7 +124,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -159,7 +158,7 @@ ...@@ -159,7 +158,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -192,7 +191,7 @@ ...@@ -192,7 +191,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -225,7 +224,7 @@ ...@@ -225,7 +224,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -258,7 +257,7 @@ ...@@ -258,7 +257,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -291,7 +290,7 @@ ...@@ -291,7 +290,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -324,7 +323,7 @@ ...@@ -324,7 +323,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -357,7 +356,7 @@ ...@@ -357,7 +356,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -390,7 +389,7 @@ ...@@ -390,7 +389,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -423,7 +422,7 @@ ...@@ -423,7 +422,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -456,7 +455,7 @@ ...@@ -456,7 +455,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -489,7 +488,7 @@ ...@@ -489,7 +488,7 @@
methods: { methods: {
goUrl(path,month,year,BranchId, ids) { goUrl(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -856,7 +855,7 @@ ...@@ -856,7 +855,7 @@
}, },
GoUrlFan(path,month,year,BranchId, ids) { GoUrlFan(path,month,year,BranchId, ids) {
this.$router.push({ this.$router.push({
path: "/" + path, path: "/financial/" + path,
query: { query: {
year:year, year:year,
month:month, month:month,
...@@ -881,23 +880,31 @@ ...@@ -881,23 +880,31 @@
}else{ }else{
endDate=that.year+"-"+column.end endDate=that.year+"-"+column.end
} }
console.log(rowIndex,rowData,'rowIndex')
if(rowIndex<9){ if(rowIndex<9){
// 联运收入 // 联运收入
if(rowData.ZhaiYao=="联运收入"){ // if(rowData.ZhaiYao=="联运收入"){
that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入") // that.goUrl("CombinedRevenueReport",startDate,endDate,BranchId,"联运收入")
} // }
// 跳转到应收团款查询 // // 跳转到应收团款查询
else if(rowData.ZhaiYao=="营业总收入"){ // else if(rowData.ZhaiYao=="营业总收入"){
that.goUrl("RecPayQueryTeam",startDate,endDate,BranchId,"应收团款查询") // that.goUrl("RecPayQueryTeam",startDate,endDate,BranchId,"应收团款查询")
} // }
else if(rowData.ZhaiYao=="营业总成本"){ // else if(rowData.ZhaiYao=="营业总成本"){
that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询") // that.goUrl("RecPayQueryTeamV2",startDate,endDate,BranchId,"应付团款查询")
} // }
else{ // else{
// that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,blank:'y',tab:"营收报表"} })
that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,blank:'y',tab:"营收报表"} }) that.$router.push({
} path: "/financial/TeamRevenueReport" ,
query: {
StartTime:startDate,
EndTime:endDate,
BranchId:BranchId,
blank: "y"
}
});
// }
}else{ }else{
if(rowData.ZhaiYao=="员工提成"){ if(rowData.ZhaiYao=="员工提成"){
if(Number(this.year)==2019){ if(Number(this.year)==2019){
......
This diff is collapsed.
This diff is collapsed.
...@@ -173,6 +173,11 @@ const routes = [{ ...@@ -173,6 +173,11 @@ const routes = [{
component: () => component: () =>
import("pages/financial/EasyReport.vue") import("pages/financial/EasyReport.vue")
}, },
{
path: "/financial/JumpReport", //单据明细
component: () =>
import("pages/financial/JumpReport.vue")
},
{ {
path: "/financial/institutionsManagement", //金融机构管理 path: "/financial/institutionsManagement", //金融机构管理
component: () => component: () =>
......
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