Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/lang/zh.js

@@ -229,6 +229,9 @@
     voyagePlanAdd: '制定航次计划',
     voyagePlanView: '航行计划',
     voyagePlanList: '航行计划',
+    //仓库管理
+     warehouseManagementlist:'仓库管理',
+    
     // 首页
     home: '首页',
     // 工作通知
@@ -4665,6 +4668,10 @@
   purchase: {
     purchaseContract: '采购合同',
   },
+  //仓库管理
+  Warehouse:{
+    warehouseManagementlist:'仓库管理'
+  },
   // 年度培训
   annualTraining: {
     trainingResults: '培训结果',

src/views/warehouse/component/router/index.js

@@ -1,26 +1,58 @@
+// 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';
 
 const contractManagementRouter = {
-  path: '/warehouseManagement',
+  path: '/warehouse',
   component: Layout,
-  redirect: '/warehouseManagement',
-  name: 'warehouseManagement',
+  redirect: '/warehouse',
+  name: 'warehouse',
   alwaysShow: true, // will always show the root menu
   meta: {
-    title: 'warehouseManagement',
-    module: 'warehouseManagement',
+    title: 'warehouse',
+    module: 'warehouse',
     icon: 'cg'
   },
   children: [
     {
       path: 'warehouseManagementlist',
       component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/list'),
+        import(/* webpackChunkName: "applDetail" */ '@/views/warehouse/warehouseManagementlist'),
       name: 'warehouseManagementlist',
       meta: {
         title: 'warehouseManagementlist',
-        shortcutEntrance: 'warehouseManagementlist',
-        module: 'warehouseManagement.salesContract.warehouseManagementlist',
+        shortcutEntrance: 'warehouse',
+        module: 'warehouse.warehouseManagementlist',
         permissicon: [],
         keepAlive: true
         // module: 'procurement.sparepart.applDetail'
@@ -28,7 +60,5 @@ const contractManagementRouter = {
       hidden: true
     },
   ],
-
 };
-
-export default contractManagementRouter;
+export default contractManagementRouter;