Ver código fonte

Merge branch 'develop_yh59' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh59

lilei 1 mês atrás
pai
commit
aa8f706d26

+ 26 - 26
src/config/report/salesReport.js

@@ -242,8 +242,8 @@ export default {
       component: BlankLayout,
       meta: {
         title: '促销费用报表',
-        icon: 'profile'
-        // permission: 'M_promotionFeeReportList'
+        icon: 'profile',
+        permission: 'M_promotionFeeReportList'
       },
       hideChildrenInMenu: true,
       children: [
@@ -254,8 +254,8 @@ export default {
           meta: {
             title: '促销费用报表',
             icon: 'profile',
-            hidden: true
-            // permission: 'M_promotionFeeReportList'
+            hidden: true,
+            permission: 'M_promotionFeeReportList'
           }
         }
       ]
@@ -434,51 +434,51 @@ export default {
       ]
     },
     {
-      path: '/reportData/returnGoodsPresentation',
-      redirect: '/reportData/returnGoodsPresentation/list',
-      name: 'returnGoodsPresentation',
+      path: '/reportData/billingStatistics',
+      redirect: '/reportData/billingStatistics/index',
+      name: 'billingStatistics',
       component: BlankLayout,
       meta: {
-        title: '退货交单报表',
+        title: '开单统计报表',
         icon: 'profile',
-        permission: 'M_returnGoodsPresentationList'
+        permission: 'M_billingStatisticsList'
       },
       hideChildrenInMenu: true,
       children: [
         {
-          path: 'list',
-          name: 'returnGoodsPresentationList',
-          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/returnGoodsPresentation/list.vue'),
+          path: 'index',
+          name: 'billingStatisticsIndex',
+          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingStatistics/index.vue'),
           meta: {
-            title: '退货交单报表列表',
+            title: '开单统计报表',
             icon: 'profile',
             hidden: true,
-            permission: 'M_returnGoodsPresentationList'
+            permission: 'M_billingStatisticsList'
           }
         }
       ]
     },
     {
-      path: '/reportData/billingStatistics',
-      redirect: '/reportData/billingStatistics/index',
-      name: 'billingStatistics',
+      path: '/reportData/returnGoodsPresentation',
+      redirect: '/reportData/returnGoodsPresentation/list',
+      name: 'returnGoodsPresentation',
       component: BlankLayout,
       meta: {
-        title: '开单统计报表',
-        icon: 'profile'
-        // permission: 'M_billingStatisticsList'
+        title: '退货交单报表',
+        icon: 'profile',
+        permission: 'M_returnGoodsPresentationList'
       },
       hideChildrenInMenu: true,
       children: [
         {
-          path: 'index',
-          name: 'billingStatisticsIndex',
-          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingStatistics/index.vue'),
+          path: 'list',
+          name: 'returnGoodsPresentationList',
+          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/returnGoodsPresentation/list.vue'),
           meta: {
-            title: '开单统计报表',
+            title: '退货交单报表列表',
             icon: 'profile',
-            hidden: true
-            // permission: 'M_billingStatisticsList'
+            hidden: true,
+            permission: 'M_returnGoodsPresentationList'
           }
         }
       ]

+ 2 - 3
src/views/reportData/billingStatistics/customerCountList.vue

@@ -78,7 +78,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireFeeExport')"
+                v-if="$hasPermissions('B_billingStatisticsExport')"
                 id="customerCountList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
@@ -101,7 +101,7 @@
           :style="{ height: tableHeight+70+'px' }"
           :columns="columns"
           :data="loadData"
-          :scroll="{x:2200, y: tableHeight-120}"
+          :scroll="{x:2200, y: tableHeight-130}"
           :defaultLoadData="false"
           bordered>
           <template slot="footer" v-if="totalData&&totalData.length">
@@ -231,7 +231,6 @@ export default {
       const _this = this
       const tableTitle = await salesStatsDealerTitle().then(res => res.data)
       this.columns = tableTitle.list
-      this.columns.unshift({ title: '序号', dataIndex: 'no', fixed: 'left', align: 'center' })
       this.countLabel = tableTitle.count
       this.columns.map(item => {
         item.titleNum = item.title

+ 2 - 3
src/views/reportData/billingStatistics/provinceCountList.vue

@@ -55,7 +55,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-
+                v-if="$hasPermissions('B_billingStatisticsExport')"
                 id="provinceCountList-export">导出</a-button>
             </a-col>
           </a-row>
@@ -74,7 +74,7 @@
           :style="{ height: tableHeight+70+'px' }"
           :columns="columns"
           :data="loadData"
-          :scroll="{x:2200, y: tableHeight-120}"
+          :scroll="{x:2200, y: tableHeight-130}"
           :defaultLoadData="false"
           :showPagination="false"
           bordered>
@@ -191,7 +191,6 @@ export default {
       const _this = this
       const tableTitle = await salesStatsProvinceTit().then(res => res.data)
       this.columns = tableTitle.list
-      this.columns.unshift({ title: '序号', dataIndex: 'no', fixed: 'left', align: 'center' })
       this.countLabel = tableTitle.count
       this.columns.map(item => {
         item.titleNum = item.title

+ 1 - 1
src/views/reportData/promotionFeeReport/customerFeeList.vue

@@ -78,7 +78,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireFeeExport')"
+                v-if="$hasPermissions('B_promotionFeeExport')"
                 id="customerFeeList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}

+ 1 - 1
src/views/reportData/promotionFeeReport/promoFeeList.vue

@@ -73,7 +73,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireFeeExport')"
+                v-if="$hasPermissions('B_promotionFeeExport')"
                 id="promotionFeeList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}

+ 1 - 1
src/views/reportData/promotionFeeReport/provinceFeeList.vue

@@ -55,7 +55,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireFeeExport')"
+                v-if="$hasPermissions('B_promotionFeeExport')"
                 id="provinceFeeList-export">导出</a-button>
             </a-col>
           </a-row>