Browse Source

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

chenrui 3 years ago
parent
commit
d2d99389a5

+ 4 - 4
src/config/router.config.js

@@ -1282,8 +1282,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '各省品类实售明细',
-              icon: 'profile'
-              // permission: 'M_nationalCustomerCostStatisticsList'
+              icon: 'profile',
+              permission: 'M_regionTypeSalesReportList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -1294,8 +1294,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '各省品类实售明细',
                   icon: 'profile',
-                  hidden: true
-                  // permission: 'M_nationalCustomerCostStatisticsList'
+                  hidden: true,
+                  permission: 'M_regionTypeSalesReportList'
                 }
               }
             ]

+ 1 - 1
src/views/reportData/regionTypeSalesReport/list.vue

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