Parcourir la source

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

lilei il y a 1 an
Parent
commit
32592ad6aa

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

@@ -1879,31 +1879,31 @@ export const asyncRouterMap = [
               }
             }]
           },
-          {
-            path: '/reportData/tireSalesReport',
-            redirect: '/reportData/tireSalesReport/index',
-            name: 'tireSalesReport',
-            component: BlankLayout,
-            meta: {
-              title: '轮胎统计报表',
-              icon: 'profile',
-              permission: 'M_tireSalesReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'tireSalesReportIndex',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireSalesReport/index.vue'),
-                meta: {
-                  title: '轮胎统计报表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_tireSalesReportList'
-                }
-              }
-            ]
-          },
+          // {
+          //   path: '/reportData/tireSalesReport',
+          //   redirect: '/reportData/tireSalesReport/index',
+          //   name: 'tireSalesReport',
+          //   component: BlankLayout,
+          //   meta: {
+          //     title: '轮胎统计报表',
+          //     icon: 'profile',
+          //     permission: 'M_tireSalesReportList'
+          //   },
+          //   hideChildrenInMenu: true,
+          //   children: [
+          //     {
+          //       path: 'index',
+          //       name: 'tireSalesReportIndex',
+          //       component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireSalesReport/index.vue'),
+          //       meta: {
+          //         title: '轮胎统计报表',
+          //         icon: 'profile',
+          //         hidden: true,
+          //         permission: 'M_tireSalesReportList'
+          //       }
+          //     }
+          //   ]
+          // },
           {
             path: '/reportData/allocationOrderTotal',
             redirect: '/reportData/allocationOrderTotal/list',

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/permissionSettingNew.vue

@@ -61,7 +61,7 @@
             :virtual-scroll-option="{enable: true}"
             :columns="columns"
             :table-data="dataSource"
-            row-key-field-name="id"
+            row-key-field-name="dealerScopeSn"
             :checkbox-option="checkboxOption"
           />
           <div v-show="showEmpty" class="empty-data"><a-empty description="暂无产品" :image="simpleImage"/></div>