Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/router/modules/drugs.js

   children: [
     {
         path: '/stock/drugs/stock/in',
-        component: () => import('@/xt_pages/stock/drugs/stockIn'),
+        component: () => import('@/xt_pages/stock/drugs/drugStockInOrder'),
         name: 'drugsStockIn',
         meta: { title: 'drugsStockIn', noCache: true }
     },
     {
         path: '/stock/drugs/stock/out',
-        component: () => import('@/xt_pages/stock/drugs/stockOut'),
+        component: () => import('@/xt_pages/stock/drugs/drugStockOutOrder'),
         name: 'drugsStockOut',
         meta: { title: 'drugsStockOut', noCache: true }
     },
     {
         path: '/stock/drugs/stock/return',
-        component: () => import('@/xt_pages/stock/drugs/stockReturn'),
+        component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrder'),
         name: 'drugsStockReturn',
         meta: { title: 'drugsStockReturn', noCache: true }
     },
     {
         path: '/stock/drugs/stock/cancel',
-        component: () => import('@/xt_pages/stock/drugs/stockCancel'),
+        component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrder'),
         name: 'drugsStockCancel',
         meta: { title: 'drugsStockCancel', noCache: true }
     },
         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',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInOrderAdd', noCache: true }
+    },{
+      path: '/drugstock/in/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockInDetail'),
+      name: 'drugStockInDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockInDetail', noCache: true }
+    }, {
+      path: '/drugstock/return/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnDetail'),
+      name: 'drugSalesReturnDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugSalesReturnDetail', noCache: true }
+    }, {
+      path: '/drugstock/return/add',
+      component: () => import('@/xt_pages/stock/drugs/drugSalesReturnOrderAdd'),
+      name: 'drugSalesReturnOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugSalesReturnOrderAdd', noCache: true }
+    }, {
+      path: '/drugstock/out/add',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutOrderAdd'),
+      name: 'drugStockOutOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutOrderAdd', noCache: true }
+    }, {
+      path: '/drugstock/out/detail',
+      component: () => import('@/xt_pages/stock/drugs/drugStockOutDetail'),
+      name: 'drugStockOutDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'drugStockOutDetail', noCache: true }
+    }, {
+      path: '/drugstock/cancel/add',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockOrderAdd'),
+      name: 'cancelDrugStockOrderAdd',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockOrderAdd', noCache: true }
+    },{
+      path: '/drugstock/cancel/detail',
+      component: () => import('@/xt_pages/stock/drugs/cancelDrugStockDetail'),
+      name: 'cancelDrugStockDetail',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'cancelDrugStockDetail', noCache: true }
     },
   ]
 }