Browse Source

报表菜单调整

chenrui 3 years ago
parent
commit
e25aa79ad5
2 changed files with 135 additions and 125 deletions
  1. 7 2
      src/components/Menu/menu.js
  2. 128 123
      src/config/router.config.js

+ 7 - 2
src/components/Menu/menu.js

@@ -112,10 +112,15 @@ export default {
           item.meta = Object.assign(item.meta, { hidden: true })
           item.meta = Object.assign(item.meta, { hidden: true })
         })
         })
       }
       }
-
+      let style = ''
+      if (menu.meta.lineStyle) {
+        style = 'border-bottom: 1px solid rgba(255, 255, 255, 0.65);line-height: 28px;'
+      } else {
+        style = ''
+      }
       return (
       return (
         <Item {...{ key: menu.path }}>
         <Item {...{ key: menu.path }}>
-          <tag {...{ props, attrs }}>
+          <tag {...{ props, attrs, style: style }}>
             <span>{menu.meta.title}</span>
             <span>{menu.meta.title}</span>
           </tag>
           </tag>
         </Item>
         </Item>

+ 128 - 123
src/config/router.config.js

@@ -979,6 +979,80 @@ export const asyncRouterMap = [
               }
               }
             ]
             ]
           },
           },
+          {
+            path: '/reportData/actualSalesReport',
+            redirect: '/reportData/actualSalesReport/list',
+            name: 'actualSalesReport',
+            component: BlankLayout,
+            meta: {
+              title: '实售销售报表',
+              icon: 'profile',
+              permission: 'M_actualSalesReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'actualSalesReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/actualSalesReport/list.vue'),
+                meta: {
+                  title: '实售销售列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_actualSalesReportList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/salesAmountReport',
+            redirect: '/reportData/salesAmountReport/list',
+            name: 'salesAmountReport',
+            component: BlankLayout,
+            meta: {
+              title: '开单销售报表',
+              icon: 'profile',
+              permission: 'M_salesAmountReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'salesAmountReportList',
+              component: () => import(/* webpackChunkName: "reportData" */
+                '@/views/reportData/salesAmountReport/list.vue'),
+              meta: {
+                title: '开单销售报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_salesAmountReportList'
+              }
+            }]
+          },
+          {
+            path: '/reportData/salesSlipReport',
+            redirect: '/reportData/salesSlipReport/list',
+            name: 'salesSlipReport',
+            component: BlankLayout,
+            meta: {
+              title: '开单销售单报表',
+              icon: 'profile',
+              lineStyle: true, // 下划线
+              permission: 'M_salesSlipReportList'
+            },
+            hideChildrenInMenu: true,
+            children: [{
+              path: 'list',
+              name: 'salesSlipReportList',
+              component: () => import(/* webpackChunkName: "reportData" */
+                '@/views/reportData/salesSlipReport/list.vue'),
+              meta: {
+                title: '开单销售单报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_salesSlipReportList'
+              }
+            }]
+          },
           {
           {
             path: '/reportData/allocationOrderTotal',
             path: '/reportData/allocationOrderTotal',
             redirect: '/reportData/allocationOrderTotal/list',
             redirect: '/reportData/allocationOrderTotal/list',
@@ -1012,6 +1086,7 @@ export const asyncRouterMap = [
             meta: {
             meta: {
               title: '调拨明细',
               title: '调拨明细',
               icon: 'profile',
               icon: 'profile',
+              lineStyle: true, // 下划线
               permission: 'M_allocationDetailsList'
               permission: 'M_allocationDetailsList'
             },
             },
             hideChildrenInMenu: true,
             hideChildrenInMenu: true,
@@ -1079,98 +1154,26 @@ export const asyncRouterMap = [
             }]
             }]
           },
           },
           {
           {
-            path: '/reportData/salesSlipReport',
-            redirect: '/reportData/salesSlipReport/list',
-            name: 'salesSlipReport',
-            component: BlankLayout,
-            meta: {
-              title: '开单销售单报表',
-              icon: 'profile',
-              permission: 'M_salesSlipReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'salesSlipReportList',
-              component: () => import(/* webpackChunkName: "reportData" */
-                '@/views/reportData/salesSlipReport/list.vue'),
-              meta: {
-                title: '开单销售单报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_salesSlipReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/returnSlipReport',
-            redirect: '/reportData/returnSlipReport/list',
-            name: 'returnSlipReport',
-            component: BlankLayout,
-            meta: {
-              title: '开单退货单报表',
-              icon: 'profile',
-              permission: 'M_returnSlipReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'returnSlipReportList',
-              component: () => import(/* webpackChunkName: "reportData" */
-                '@/views/reportData/returnSlipReport/list.vue'),
-              meta: {
-                title: '开单退货单报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_returnSlipReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/salesAmountReport',
-            redirect: '/reportData/salesAmountReport/list',
-            name: 'salesAmountReport',
-            component: BlankLayout,
-            meta: {
-              title: '开单销售报表',
-              icon: 'profile',
-              permission: 'M_salesAmountReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [{
-              path: 'list',
-              name: 'salesAmountReportList',
-              component: () => import(/* webpackChunkName: "reportData" */
-                '@/views/reportData/salesAmountReport/list.vue'),
-              meta: {
-                title: '开单销售报表列表',
-                icon: 'profile',
-                hidden: true,
-                permission: 'M_salesAmountReportList'
-              }
-            }]
-          },
-          {
-            path: '/reportData/actualSalesReport',
-            redirect: '/reportData/actualSalesReport/list',
-            name: 'actualSalesReport',
+            path: '/reportData/salesReturnReport',
+            redirect: '/reportData/salesReturnReport/list',
+            name: 'salesReturnReport',
             component: BlankLayout,
             component: BlankLayout,
             meta: {
             meta: {
-              title: '实售销售报表',
+              title: '实售退货报表',
               icon: 'profile',
               icon: 'profile',
-              permission: 'M_actualSalesReportList'
+              permission: 'M_salesReturnReportList'
             },
             },
             hideChildrenInMenu: true,
             hideChildrenInMenu: true,
             children: [
             children: [
               {
               {
                 path: 'list',
                 path: 'list',
-                name: 'actualSalesReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/actualSalesReport/list.vue'),
+                name: 'salesReturnReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnReport/list.vue'),
                 meta: {
                 meta: {
-                  title: '实售销售列表',
+                  title: '实售退货列表',
                   icon: 'profile',
                   icon: 'profile',
                   hidden: true,
                   hidden: true,
-                  permission: 'M_actualSalesReportList'
+                  permission: 'M_salesReturnReportList'
                 }
                 }
               }
               }
             ]
             ]
@@ -1201,29 +1204,29 @@ export const asyncRouterMap = [
             ]
             ]
           },
           },
           {
           {
-            path: '/reportData/salesReturnReport',
-            redirect: '/reportData/salesReturnReport/list',
-            name: 'salesReturnReport',
+            path: '/reportData/returnSlipReport',
+            redirect: '/reportData/returnSlipReport/list',
+            name: 'returnSlipReport',
             component: BlankLayout,
             component: BlankLayout,
             meta: {
             meta: {
-              title: '实售退货报表',
+              title: '开单退货单报表',
               icon: 'profile',
               icon: 'profile',
-              permission: 'M_salesReturnReportList'
+              lineStyle: true, // 下划线
+              permission: 'M_returnSlipReportList'
             },
             },
             hideChildrenInMenu: true,
             hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'salesReturnReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnReport/list.vue'),
-                meta: {
-                  title: '实售退货列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_salesReturnReportList'
-                }
+            children: [{
+              path: 'list',
+              name: 'returnSlipReportList',
+              component: () => import(/* webpackChunkName: "reportData" */
+                '@/views/reportData/returnSlipReport/list.vue'),
+              meta: {
+                title: '开单退货单报表列表',
+                icon: 'profile',
+                hidden: true,
+                permission: 'M_returnSlipReportList'
               }
               }
-            ]
+            }]
           },
           },
           {
           {
             path: '/reportData/hPriceDifferenceDetailReport',
             path: '/reportData/hPriceDifferenceDetailReport',
@@ -1275,6 +1278,32 @@ export const asyncRouterMap = [
               }
               }
             ]
             ]
           },
           },
+          {
+            path: '/reportData/provinceTypeSalesDetails',
+            redirect: '/reportData/provinceTypeSalesDetails/list',
+            name: 'provinceTypeSalesDetails',
+            component: BlankLayout,
+            meta: {
+              title: '全国各省品类实际销售明细',
+              icon: 'profile',
+              lineStyle: true, // 下划线
+              permission: 'M_provinceTypeSalesDetailsList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'provinceTypeSalesDetailsList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/provinceTypeSalesDetails/list.vue'),
+                meta: {
+                  title: '全国各省品类实际销售明细列表',
+                  icon: 'profile',
+                  hidden: true,
+                  permission: 'M_provinceTypeSalesDetailsList'
+                }
+              }
+            ]
+          },
           {
           {
             path: '/reportData/warehousingOrder',
             path: '/reportData/warehousingOrder',
             redirect: '/reportData/warehousingOrder/list',
             redirect: '/reportData/warehousingOrder/list',
@@ -1308,6 +1337,7 @@ export const asyncRouterMap = [
             meta: {
             meta: {
               title: '入库单明细报表',
               title: '入库单明细报表',
               icon: 'profile',
               icon: 'profile',
+              lineStyle: true, // 下划线
               permission: 'M_warehousingOrderDetailList'
               permission: 'M_warehousingOrderDetailList'
             },
             },
             hideChildrenInMenu: true,
             hideChildrenInMenu: true,
@@ -1400,31 +1430,6 @@ export const asyncRouterMap = [
               }
               }
             ]
             ]
           },
           },
-          {
-            path: '/reportData/provinceTypeSalesDetails',
-            redirect: '/reportData/provinceTypeSalesDetails/list',
-            name: 'provinceTypeSalesDetails',
-            component: BlankLayout,
-            meta: {
-              title: '全国各省品类实际销售明细',
-              icon: 'profile',
-              permission: 'M_provinceTypeSalesDetailsList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'provinceTypeSalesDetailsList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/provinceTypeSalesDetails/list.vue'),
-                meta: {
-                  title: '全国各省品类实际销售明细列表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_provinceTypeSalesDetailsList'
-                }
-              }
-            ]
-          },
           {
           {
             path: '/reportData/districtTypeSalesDetails',
             path: '/reportData/districtTypeSalesDetails',
             redirect: '/reportData/districtTypeSalesDetails/list',
             redirect: '/reportData/districtTypeSalesDetails/list',