路由

package-lock.json

@@ -5216,9 +5216,9 @@
       }
     },
     "fstream": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
-      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
@@ -6538,8 +6538,7 @@
     },
     "js-yaml": {
       "version": "3.7.0",
-      "resolved": "https://registry.npm.taobao.org/js-yaml/download/js-yaml-3.7.0.tgz",
-      "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=",
+      "resolved": "",
       "dev": true,
       "requires": {
         "argparse": "^1.0.7",
@@ -13345,13 +13344,13 @@
       "dev": true
     },
     "tar": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
-      "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz",
+      "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==",
       "dev": true,
       "requires": {
         "block-stream": "*",
-        "fstream": "^1.0.2",
+        "fstream": "^1.0.12",
         "inherits": "2"
       }
     },

src/router/index.js

@@ -769,94 +769,123 @@ export const xt_asyncRouterMap = [
   //     { path: '/device/numbers', component: () => import('@/xt_pages/device/number_main'), name: 'deviceNumberManage', meta: { title: 'deviceNumberManage' }},
   //     { path: '/device/main', component: () => import('@/xt_pages/device/main'), name: 'dialysisMachineManage', meta: { title: 'dialysisMachineManage' }}
   //   ]
-  // },{
+  // }, {
   //   path: '/stock/',
   //   component: Layout,
   //   redirect: 'noredirect',
   //   name: 'stockManage',
-  //   meta: {title: 'stockManage', icon: 'nested'},
+  //   meta: { title: 'stockManage', icon: 'excel' },
   //   children: [
   //     {
+  //       path: '/stock/config',
+  //       component: () => import('@/xt_pages/stock/index'),
+  //       name: 'config',
+  //       meta: { title: 'config' }
+  //     },
+  //     {
   //       path: '/stock/in',
-  //       component: () => import('@/xt_pages/stock/stockIn'),
-  //       name: 'stockIn',
-  //       meta: {title: 'stockIn',noCache: true }
-
+  //       component: () => import('@/xt_pages/stock/stockInOrder'),
+  //       name: 'stockInOrder',
+  //       meta: { title: 'stockInOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/in/other',
+  //       component: () => import('@/xt_pages/stock/otherStockInOrder'),
+  //       name: 'otherStockInOrder',
+  //       meta: { title: 'otherStockInOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/return',
+  //       component: () => import('@/xt_pages/stock/salesReturnOrder'),
+  //       name: 'salesReturnOrder',
+  //       meta: { title: 'salesReturnOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/return/other',
+  //       component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
+  //       name: 'otherSalesReturnOrder',
+  //       meta: { title: 'otherSalesReturnOrder', noCache: true }
   //     },
-
-  //      {
+  //     {
   //       path: '/stock/out',
-  //       component: () => import('@/xt_pages/stock/stockOut'),
-  //       name: 'stockOut',
-  //       meta: {title: 'stockOut',noCache: true}
-  //     },{
+  //       component: () => import('@/xt_pages/stock/stockOutOrder'),
+  //       name: 'stockOutOrder',
+  //       meta: { title: 'stockOutOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/out/other',
+  //       component: () => import('@/xt_pages/stock/otherStockOutOrder'),
+  //       name: 'otherStockOutOrder',
+  //       meta: { title: 'otherStockOutOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/cancel',
+  //       component: () => import('@/xt_pages/stock/cancelStockOrder'),
+  //       name: 'cancelStockOrder',
+  //       meta: { title: 'cancelStockOrder', noCache: true }
+  //     }, {
+  //       path: '/stock/cancel/other',
+  //       component: () => import('@/xt_pages/stock/otherCancelStockOrder'),
+  //       name: 'otherCancelStockOrder',
+  //       meta: { title: 'otherCancelStockOrder', noCache: true }
+  //     }, {
   //       path: '/stock/query',
   //       component: () => import('@/xt_pages/stock/stockQuery'),
   //       name: 'stockQuery',
-  //       meta: {title: 'stockQuery',noCache: true}
-  //     },
-  //     {
-  //       path: '/stock/config',
-  //       component: () => import('@/xt_pages/stock/index'),
-  //       name: 'config',
-  //       meta: {title: 'config'},
-  //     },{
+  //       meta: { title: 'stockQuery' }
+  //     }, {
   //       path: '/stock/in/add',
-  //       component: () => import('@/xt_pages/stock/addStockIn'),
-  //       name: 'addStockIn',
+  //       component: () => import('@/xt_pages/stock/stockInOrderAdd'),
+  //       name: 'stockInOrderAdd',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'addStockIn',noCache: true}
+  //       meta: { title: 'stockInOrderAdd' }
   //     }, {
-  //       path: '/stock/out/add',
-  //       component: () => import('@/xt_pages/stock/addStockOut'),
-  //       name: 'addStockOut',
+  //       path: '/stock/in/detail',
+  //       component: () => import('@/xt_pages/stock/stockInDetail'),
+  //       name: 'stockInDetail',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'addStockOut',noCache: true }
-  //     },{
-  //       path: '/stock/return',
-  //       component: () => import('@/xt_pages/stock/salesReturn'),
-  //       name: 'salesReturn',
+  //       meta: { title: 'stockInDetail' }
+  //     }, {
+  //       path: '/stock/return/detail',
+  //       component: () => import('@/xt_pages/stock/salesReturnDetail'),
+  //       name: 'salesReturnDetail',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'salesReturn'}
-  //     },{
-  //       path: '/stock/return/record',
-  //       component: () => import('@/xt_pages/stock/salesReutrnRecord'),
-  //       name: 'salesReutrnRecord',
+  //       meta: { title: 'salesReturnDetail' }
+  //     }, {
+  //       path: '/stock/return/add',
+  //       component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
+  //       name: 'salesReturnOrderAdd',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'salesReutrnRecord'}
-  //     },{
-  //       path: '/stock/warehouse/record',
-  //       component: () => import('@/xt_pages/stock/warehouseRecord'),
-  //       name: 'warehouseRecord',
+  //       meta: { title: 'salesReturnOrderAdd' }
+  //     }, {
+  //       path: '/stock/out/add',
+  //       component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
+  //       name: 'stockOutOrderAdd',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'warehouseRecord'}
-  //     },{
-  //       path: '/stock/cancel/',
-  //       component: () => import('@/xt_pages/stock/cancelStock'),
-  //       name: 'cancelStock',
+  //       meta: { title: 'stockOutOrderAdd', noCache: true }
+  //     }, {
+  //       path: '/stock/out/detail',
+  //       component: () => import('@/xt_pages/stock/stockOutDetail'),
+  //       name: 'stockOutDetail',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'cancelStock'}
+  //       meta: { title: 'stockOutDetail', noCache: true }
   //     }, {
-  //       path: '/stock/cancel/record',
-  //       component: () => import('@/xt_pages/stock/cancelStockRecord'),
-  //       name: 'cancelStockRecord',
+  //       path: '/stock/cancel/add',
+  //       component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+  //       name: 'cancelStockOrderAdd',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'cancelStockRecord'}
+  //       meta: { title: 'cancelStockOrderAdd', noCache: true }
   //     }, {
-  //       path: '/stock/out/record',
-  //       component: () => import('@/xt_pages/stock/stockOutRecord'),
-  //       name: 'stockOutRecord',
+  //       path: '/stock/cancel/detail',
+  //       component: () => import('@/xt_pages/stock/cancelStockDetail'),
+  //       name: 'cancelStockDetail',
   //       hidden: true,
   //       is_menu: false,
-  //       meta: {title: 'stockOutRecord'}
-  //     },
+  //       meta: { title: 'cancelStockDetail', noCache: true }
+  //     }
+
   //   ]
   // },
   // {