瀏覽代碼

前端合并代码

zhongtianhaoyuan 4 年之前
父節點
當前提交
cc9d9e454c

+ 1 - 1
src/views/dataManageMent/components/routers/dataManagement.js

@@ -14,7 +14,7 @@ const dataManagement = {
   children: [
   children: [
     {
     {
       path: 'list',
       path: 'list',
-      component: () => import(/* webpackChunkName: "dataManageMentList" */ '@/views/dataManageMent/warehouseManagementlist'),
+      component: () => import(/* webpackChunkName: "dataManageMentList" */ '@/views/dataManageMent/list'),
       name: 'dataManageMentList',
       name: 'dataManageMentList',
       meta: {
       meta: {
         title: 'dataManageMentView',
         title: 'dataManageMentView',

+ 0 - 0
src/views/dataManageMent/warehouseManagementlist.vue → src/views/dataManageMent/list.vue


+ 13 - 45
src/views/warehouse/component/router/index.js

@@ -1,58 +1,26 @@
-// import Layout from '@/layout/index';
-
-// const contractManagementRouter = {
-//   path: '/warehouseManagement',
-//   component: Layout,
-//   redirect: '/warehouseManagement',
-//   name: 'warehouseManagement',
-//   alwaysShow: true, // will always show the root menu
-//   meta: {
-//     title: 'warehouseManagement',
-//     module: 'warehouseManagement',
-//     icon: 'cg'
-//   },
-//   children: [
-//     {
-//       path: 'warehouseManagementlist',
-//       component: () =>
-//         import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/list'),
-//       name: 'warehouseManagementlist',
-//       meta: {
-//         title: 'warehouseManagementlist',
-//         shortcutEntrance: 'warehouseManagementlist',
-//         module: 'warehouseManagement.salesContract.warehouseManagementlist',
-//         permissicon: [],
-//         keepAlive: true
-//         // module: 'procurement.sparepart.applDetail'
-//       },
-//       hidden: true
-//     },
-//   ],
-// };
-// export default contractManagementRouter;
 import Layout from '@/layout/index';
 import Layout from '@/layout/index';
 
 
-const warehouseRouter = {
-  path: '/warehouse',
+const contractManagementRouter = {
+  path: '/warehouseManagement',
   component: Layout,
   component: Layout,
-  redirect: '/warehouse',
-  name: 'warehouse',
+  redirect: { name: 'warehouseManagementList' },
+  name: 'warehouseManagementList',
   alwaysShow: true, // will always show the root menu
   alwaysShow: true, // will always show the root menu
   meta: {
   meta: {
-    title: 'warehouse',
-    module: 'warehouse',
+    title: 'warehouseManagementList',
+    module: 'warehouseManagement',
     icon: 'cg'
     icon: 'cg'
   },
   },
   children: [
   children: [
     {
     {
-      path: 'warehouseManagementlist',
+      path: 'warehouseManagementList',
       component: () =>
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementlist'),
-      name: 'warehouseManagementlist',
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementList'),
+      name: 'warehouseManagementList',
       meta: {
       meta: {
-        title: 'warehouseManagementlist',
-        shortcutEntrance: 'warehouse',
-        module: 'warehouse.warehouseManagementlist',
+        title: 'warehouseManagementList',
+        shortcutEntrance: 'warehouseManagementList',
+        module: 'warehouseManagement.warehouseManagementList',
         permissicon: [],
         permissicon: [],
         keepAlive: true
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
         // module: 'procurement.sparepart.applDetail'
@@ -61,4 +29,4 @@ const warehouseRouter = {
     },
     },
   ],
   ],
 };
 };
-export default warehouseRouter;
+export default contractManagementRouter;