diff --git a/src/components/super/DateSelect.vue b/src/components/super/DateSelect.vue index 9292fd3..39c91e1 100644 --- a/src/components/super/DateSelect.vue +++ b/src/components/super/DateSelect.vue @@ -11,7 +11,7 @@
- +
@@ -62,6 +62,10 @@ onlyYear:{ type:Boolean, default:false + }, + onlyMonth:{ + type:Boolean, + default:false } }, data() { diff --git a/src/router/index.js b/src/router/index.js index 193dc39..eb14b0d 100755 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,7 +10,7 @@ const whiteSecondSider = [ const blackSliderList = [ '/franchise', '/agreement', '/customizeDoc', '/agent/siteAdd', '/agent/siteServiceList', '/agent/siteTemplate','/agent/siteAddFinally','/agent/siteServiceAdd', '/agent/supplyList', '/agent/domainList','/agent/siteAddChooseService' - , '/agent/noticeList' + , '/agent/noticeList' , '/agent/statisticalDetails', '/agent/siteRank', '/agent/serviceRank' ]; // 一级路由 let first_child_router = [] @@ -326,7 +326,6 @@ const routes = [{ name: '收支统计', component: () => import( /* webpackChunkName: "expenseStatistics" */ '../views/agent/expenseStatistics.vue'), meta: { - title:'各站点统计列表', hideBreadcrumb: true // 一级页面不显示面包屑 } }, @@ -342,16 +341,22 @@ const routes = [{ path: '/agent/siteRank', name: '站点排行', component: () => import( /* webpackChunkName: "statisticalDetails" */ '../views/agent/statisticalDetails.vue'), + props: { + rankFlag: 'site' + }, meta: { - breadcrumbParent: '各站点统计列表' // 手动指定父级 + breadcrumbParent: '收支统计' // 手动指定父级 } }, { path: '/agent/serviceRank', name: '服务排行', component: () => import( /* webpackChunkName: "statisticalDetails" */ '../views/agent/statisticalDetails.vue'), + props: { + rankFlag: 'chktype' + }, meta: { - breadcrumbParent: '各站点统计列表' // 手动指定父级 + breadcrumbParent: '收支统计' // 手动指定父级 } }, diff --git a/src/views/agent/expenseStatistics.vue b/src/views/agent/expenseStatistics.vue index 4236f6b..dfd1437 100644 --- a/src/views/agent/expenseStatistics.vue +++ b/src/views/agent/expenseStatistics.vue @@ -5,127 +5,138 @@
- +
- - + + + + +
-
-
+
+
月利润
- 亏损 + 亏损
- 8900 - 元 + {{monthTotal.profit}}
- 淘宝:200.89元 - 微信:200.89元 - 淘宝:200.89元 +
- 淘宝:200.89元 - 支付宝:200.89元 +
-
- 月利润 + 月收入
- 亏损 +
- 8900 - 元 + {{this.monthTotal.income}}
- 淘宝:200.89元 - 微信:200.89元 - 淘宝:200.89元 +
- 淘宝:200.89元 - 支付宝:200.89元 +
-
- 月利润 + 月支出
- 亏损 +
- 8900 - 元 + {{this.monthTotal.cost}}
-
+
- 淘宝:200.89元 - 微信:200.89元 - 淘宝:200.89元 +
- 淘宝:200.89元 - 支付宝:200.89元 +
-
- 月利润 + 月单量
- 亏损 +
- 8900 - 元 + {{this.monthTotal.check_num}}
- 淘宝:200.89元 - 微信:200.89元 - 淘宝:200.89元 +
- 淘宝:200.89元 - 支付宝:200.89元 +
-
- - - + + + + + + @@ -139,43 +150,48 @@ - + + -