Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/router/modules/drugs.js

@@ -36,36 +36,37 @@ export default {
         name: 'drugsStockCancel',
         meta: { title: 'drugsStockCancel', noCache: true }
     },
-    {
-        path: '/stock/drugs/stock/adjustPrice',
-        component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
-        name: 'drugsAdjustPrice',
-        meta: { title: 'drugsAdjustPrice', noCache: true }
-    },
-    {
-        path: '/stock/drugs/stock/reportLoss',
-        component: () => import('@/xt_pages/stock/drugs/reportLoss'),
-        name: 'drugsReportLoss',
-        meta: { title: 'drugsReportLoss', noCache: true }
-    },
+    // {
+    //     path: '/stock/drugs/stock/adjustPrice',
+    //     component: () => import('@/xt_pages/stock/drugs/adjustPrice'),
+    //     name: 'drugsAdjustPrice',
+    //     meta: { title: 'drugsAdjustPrice', noCache: true }
+    // },
+    // {
+    //     path: '/stock/drugs/stock/reportLoss',
+    //     component: () => import('@/xt_pages/stock/drugs/reportLoss'),
+    //     name: 'drugsReportLoss',
+    //     meta: { title: 'drugsReportLoss', noCache: true }
+    // },
     {
         path: '/stock/drugs/stock/query',
         component: () => import('@/xt_pages/stock/drugs/query'),
         name: 'drugsQuery',
         meta: { title: 'drugsQuery', noCache: true }
     },
+    // {
+    //     path: '/stock/drugs/stock/drugsSurplus',
+    //     component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
+    //     name: 'drugsSurplus',
+    //     meta: { title: 'drugsSurplus', noCache: true }
+    // },
+    // {
+    //     path: '/stock/drugs/stock/drugsExpiryDate',
+    //     component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
+    //     name: 'drugsExpiryDate',
+    //     meta: { title: 'drugsExpiryDate', noCache: true }
+    // },
     {
-        path: '/stock/drugs/stock/drugsSurplus',
-        component: () => import('@/xt_pages/stock/drugs/drugsSurplus'),
-        name: 'drugsSurplus',
-        meta: { title: 'drugsSurplus', noCache: true }
-    },
-    {
-        path: '/stock/drugs/stock/drugsExpiryDate',
-        component: () => import('@/xt_pages/stock/drugs/drugsExpiryDate'),
-        name: 'drugsExpiryDate',
-        meta: { title: 'drugsExpiryDate', noCache: true }
-    },{
       path: '/drugstock/in/add',
       component: () => import('@/xt_pages/stock/drugs/drugStockInOrderAdd'),
       name: 'drugStockInOrderAdd',