Commit dc48e3fb authored by 王悦's avatar 王悦

简易报表

parent df220b11
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<template> <template>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="费用类型:"> <el-form-item label="费用类型:">
<el-select filterable v-model='msg.CostTypeID' > <el-select filterable v-model='msg.CostTypeID'>
<el-option :value="0" label="不限"></el-option> <el-option :value="0" label="不限"></el-option>
<el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option> <el-option v-for="item in GetCostTypeList" :key="item.ID" :value="item.ID" :label="item.Name"></el-option>
</el-select> </el-select>
...@@ -820,6 +820,25 @@ export default { ...@@ -820,6 +820,25 @@ export default {
if(this.$route.query.Type){ if(this.$route.query.Type){
this.msg.Type = this.$route.query.Type+''; this.msg.Type = this.$route.query.Type+'';
} }
if(this.$route.query.year && this.$route.query.month)
{
this.msg.sTradeDate=this.$route.query.year+"-"+this.$route.query.month+"-01";
var d1=new Date( this.msg.sTradeDate);
var d2=new Date(d1);
d2.setMonth(d2.getMonth()+1);
d2.setDate(d2.getDate()-1);
var month = d2.getMonth()+1;
var day = d2.getDate();
this.msg.eTradeDate= d2.getFullYear()+'-'+month+'-'+day;
this.transactionDate[0]=this.msg.sTradeDate;
this.transactionDate[1]= this.msg.eTradeDate;
}
if(this.$route.query.BranchId){
this.msg.RB_Branch_Id=this.$route.query.BranchId;
}
if(this.$route.query.CostIds){
this.msg.CostTypeID=this.$route.query.CostIds;
}
},components: { },components: {
"my-Bill": myBill, "my-Bill": myBill,
"my-RVB-Bill":myrbvBill, "my-RVB-Bill":myrbvBill,
......
...@@ -79,7 +79,7 @@ import Vue from "vue"; ...@@ -79,7 +79,7 @@ import Vue from "vue";
//一月 //一月
Vue.component("YiYueJump", { Vue.component("YiYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.YiYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',1,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.YiYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -99,6 +99,7 @@ Vue.component("YiYueJump", { ...@@ -99,6 +99,7 @@ Vue.component("YiYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -108,7 +109,7 @@ Vue.component("YiYueJump", { ...@@ -108,7 +109,7 @@ Vue.component("YiYueJump", {
//二月 //二月
Vue.component("ErYueJump", { Vue.component("ErYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.ErYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',2,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ErYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -128,6 +129,7 @@ Vue.component("ErYueJump", { ...@@ -128,6 +129,7 @@ Vue.component("ErYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -137,7 +139,7 @@ Vue.component("ErYueJump", { ...@@ -137,7 +139,7 @@ Vue.component("ErYueJump", {
//三月 //三月
Vue.component("SanYueJump", { Vue.component("SanYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.SanYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',3,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SanYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -157,6 +159,7 @@ Vue.component("SanYueJump", { ...@@ -157,6 +159,7 @@ Vue.component("SanYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -166,7 +169,7 @@ Vue.component("SanYueJump", { ...@@ -166,7 +169,7 @@ Vue.component("SanYueJump", {
//四月 //四月
Vue.component("SiYueJump", { Vue.component("SiYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.SiYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',4,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.SiYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -186,6 +189,7 @@ Vue.component("SiYueJump", { ...@@ -186,6 +189,7 @@ Vue.component("SiYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -195,7 +199,7 @@ Vue.component("SiYueJump", { ...@@ -195,7 +199,7 @@ Vue.component("SiYueJump", {
//五月 //五月
Vue.component("WuYueJump", { Vue.component("WuYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.WuYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',5,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.WuYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -215,6 +219,7 @@ Vue.component("WuYueJump", { ...@@ -215,6 +219,7 @@ Vue.component("WuYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -224,7 +229,7 @@ Vue.component("WuYueJump", { ...@@ -224,7 +229,7 @@ Vue.component("WuYueJump", {
//六月 //六月
Vue.component("LiuYueJump", { Vue.component("LiuYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.LiuYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',6,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.LiuYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -244,6 +249,7 @@ Vue.component("LiuYueJump", { ...@@ -244,6 +249,7 @@ Vue.component("LiuYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -253,7 +259,7 @@ Vue.component("LiuYueJump", { ...@@ -253,7 +259,7 @@ Vue.component("LiuYueJump", {
//七月 //七月
Vue.component("QiYueJump", { Vue.component("QiYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.QiYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',7,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.QiYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -273,6 +279,7 @@ Vue.component("QiYueJump", { ...@@ -273,6 +279,7 @@ Vue.component("QiYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -282,7 +289,7 @@ Vue.component("QiYueJump", { ...@@ -282,7 +289,7 @@ Vue.component("QiYueJump", {
//八月 //八月
Vue.component("BaYueJump", { Vue.component("BaYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.BaYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',8,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.BaYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -302,6 +309,7 @@ Vue.component("BaYueJump", { ...@@ -302,6 +309,7 @@ Vue.component("BaYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -311,7 +319,7 @@ Vue.component("BaYueJump", { ...@@ -311,7 +319,7 @@ Vue.component("BaYueJump", {
//九月 //九月
Vue.component("JiuYueJump", { Vue.component("JiuYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.JiuYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',9,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.JiuYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -331,6 +339,7 @@ Vue.component("JiuYueJump", { ...@@ -331,6 +339,7 @@ Vue.component("JiuYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -340,7 +349,7 @@ Vue.component("JiuYueJump", { ...@@ -340,7 +349,7 @@ Vue.component("JiuYueJump", {
//十月 //十月
Vue.component("ShiYueJump", { Vue.component("ShiYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.ShiYue,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',10,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYue}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -360,6 +369,7 @@ Vue.component("ShiYueJump", { ...@@ -360,6 +369,7 @@ Vue.component("ShiYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -369,7 +379,7 @@ Vue.component("ShiYueJump", { ...@@ -369,7 +379,7 @@ Vue.component("ShiYueJump", {
//十一月 //十一月
Vue.component("ShiYiYueJump", { Vue.component("ShiYiYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.ShiYi,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYi}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',11,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiYi}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -389,6 +399,7 @@ Vue.component("ShiYiYueJump", { ...@@ -389,6 +399,7 @@ Vue.component("ShiYiYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
...@@ -398,7 +409,7 @@ Vue.component("ShiYiYueJump", { ...@@ -398,7 +409,7 @@ Vue.component("ShiYiYueJump", {
//十二月 //十二月
Vue.component("ShiErYueJump", { Vue.component("ShiErYueJump", {
// 团队跳转 // 团队跳转
template: `<span style="cursor: pointer" @click="goUrl('JumpReport',rowData.ShiEr,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span>`, template: `<span style="cursor: pointer" @click="goUrl('JumpReport',12,rowData.Year,rowData.BranchId,rowData.CostIds)">{{rowData.ShiEr}}</span>`,
props: { props: {
rowData: { rowData: {
type: Object type: Object
...@@ -418,6 +429,7 @@ Vue.component("ShiErYueJump", { ...@@ -418,6 +429,7 @@ Vue.component("ShiErYueJump", {
year:year, year:year,
month:month, month:month,
BranchId:BranchId, BranchId:BranchId,
CostIds:ids,
blank: "y" blank: "y"
} }
}); });
......
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