소스 검색

Merge branch 'develop_yh27bug' of jianguan-web/jg-ocs-html into develop_yh29

李磊 1 년 전
부모
커밋
7013265f61
2개의 변경된 파일5개의 추가작업 그리고 5개의 파일을 삭제
  1. 4 4
      src/config/router.config.js
  2. 1 1
      src/views/reportData/regionTypeSalesReport/list.vue

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

@@ -2692,8 +2692,8 @@ export const asyncRouterMap = [
             component: BlankLayout,
             meta: {
               title: '产品上线信息',
-              icon: 'rise'
-              // permission: 'M_productLaunchInfoList'
+              icon: 'rise',
+              permission: 'M_productLaunchInfoList'
             },
             hideChildrenInMenu: true,
             children: [
@@ -2704,8 +2704,8 @@ export const asyncRouterMap = [
                 meta: {
                   title: '产品上线信息列表',
                   icon: 'rise',
-                  hidden: true
-                  // permission: 'M_productLaunchInfoList'
+                  hidden: true,
+                  permission: 'M_productLaunchInfoList'
                 }
               }
             ]

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

@@ -17,7 +17,7 @@
             @keyup.enter.native="handleSearch">
             <a-row :gutter="15">
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="销售审核时间" prop="time">
+                <a-form-model-item label="时间" prop="time">
                   <rangeDate ref="rangeDate" :value="queryParam.time" @change="dateChange"/>
                 </a-form-model-item>
               </a-col>