5月31日下午提交

src/router/index.js

@@ -124,347 +124,346 @@ export const xt_constantRouterMap = [
 
   // ////////////////////////////
   // 本地开始
-  /////////////////////////////
-  // {
-  //   path: '/patients',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'User',
-  //   meta: {
-  //     title: 'user',
-  //     icon: 'bingren'
-  //   },
-  //   children: [
-  //     {
-  //       path: '/patients/patients',
-  //       component: () => import('@/xt_pages/user/patients'),
-  //       name: 'Patient',
-  //       meta: { title: 'patient', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/create',
-  //       component: () => import('@/xt_pages/user/createPatient'),
-  //       name: 'createPatient',
-  //       meta: { title: 'createPatient', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id',
-  //       component: () => import('@/xt_pages/user/patientInfo'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'patient Page',
-  //       meta: { title: 'patientPage', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/edit',
-  //       component: () => import('@/xt_pages/user/editPatient'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'Edit Patient',
-  //       meta: { title: 'editPatient', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/dialysisSolution',
-  //       component: () => import('@/xt_pages/user/dialysisSolution'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'dialysisSolution',
-  //       meta: { title: 'dialysisSolution', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/weight',
-  //       component: () => import('@/xt_pages/user/weight'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'weight',
-  //       meta: { title: 'weight', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/dialysisRecord',
-  //       component: () => import('@/xt_pages/user/dialysisRecord'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'dialysisRecord',
-  //       meta: { title: 'dialysisRecord', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/scheduling',
-  //       component: () => import('@/xt_pages/user/scheduling'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'scheduling',
-  //       meta: { title: 'scheduling', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/doctorAdvice',
-  //       component: () => import('@/xt_pages/user/doctorAdvice'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'doctorAdvice',
-  //       meta: { title: 'doctorAdvice', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/inspection',
-  //       component: () => import('@/xt_pages/user/inspection'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'Inspection',
-  //       meta: { title: 'inspection', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/course',
-  //       component: () => import('@/xt_pages/user/courseOfDisease'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'CourseOfDiseaseManage',
-  //       meta: { title: 'CourseOfDiseaseManage', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/rescue',
-  //       component: () => import('@/xt_pages/user/rescueRecord'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'RescueRecord',
-  //       meta: { title: 'RescueRecord', noCache: true }
-  //     },
-  //     {
-  //       path: '/patients/patient/:id/proeducation',
-  //       component: () => import('@/xt_pages/user/proeducation'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'proeducation',
-  //       meta: { title: 'proeducation', noCache: true }
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/workforce',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'workforce',
-  //   meta: {
-  //     title: 'workforce',
-  //     icon: 'paiban'
-  //   },
-  //   children: [
-  //     {
-  //       path: '/workforce/appointment',
-  //       component: () => import('@/xt_pages/workforce/appointment'),
-  //       name: 'appointment',
-  //       meta: { title: 'appointment', noCache: true }
-  //     },
-  //     {
-  //       path: '/workforce/sign',
-  //       component: () => import('@/xt_pages/workforce/sign'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'workforcesign',
-  //       meta: { title: 'sign', noCache: true }
-  //     },
-  //     {
-  //       path: '/workforce/remind',
-  //       component: () => import('@/xt_pages/workforce/remind'),
-  //       name: 'remind',
-  //       meta: { title: 'remind', noCache: true }
-  //     },
-  //     {
-  //       path: '/workforce/template',
-  //       component: () => import('@/xt_pages/workforce/template'),
-  //       name: 'workforce_template',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'workforce_template', noCache: true }
-  //     },
-  //     {
-  //       path: '/workforce/schedule/print',
-  //       component: () => import('@/xt_pages/workforce/schedule_print'),
-  //       name: 'schedule_print',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'schedule_print', noCache: true }
-  //     }
-  //   ]
-  // },
-  // {
-  //   path: '/sign',
-  //   component: Layout,
-  //   redirct: '/sign/index',
-  //   children: [{
-  //     path: '/sign',
-  //     component: () => import('@/xt_pages/sign/index'),
-  //     name: 'sign',
-  //     meta: { title: 'signWeight', icon: 'sign', noCache: true }
-  //   }]
-  // },
-  // {
-  //   path: '/dialysis/',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'dialysis',
-  //   meta: {
-  //     title: 'dialysis',
-  //     icon: 'touxi'
-  //   },
-  //   children: [
-  //     { path: '/dialysis/dialysisrecord', component: () => import('@/xt_pages/dialysis/schedualPatient'), name: '透析记录', meta: { title: '透析记录' }},
-  //     {
-  //       path: '/dialysis/record/:id',
-  //       component: () => import('@/xt_pages/dialysis/dialysisPage'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'paper',
-  //       meta: { title: 'paper', noCache: true }
-  //     },
-  //     {
-  //       path: '/dialysis/print',
-  //       component: () => import('@/xt_pages/dialysis/dialysisPrintOrder'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'dialysisPrintOrder',
-  //       meta: { title: 'dialysisPrintOrder', noCache: true }
-  //     },
+  // /////////////////////////////
+  {
+    path: '/patients',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'User',
+    meta: {
+      title: 'user',
+      icon: 'bingren'
+    },
+    children: [
+      {
+        path: '/patients/patients',
+        component: () => import('@/xt_pages/user/patients'),
+        name: 'Patient',
+        meta: { title: 'patient', noCache: true }
+      },
+      {
+        path: '/patients/create',
+        component: () => import('@/xt_pages/user/createPatient'),
+        name: 'createPatient',
+        meta: { title: 'createPatient', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id',
+        component: () => import('@/xt_pages/user/patientInfo'),
+        hidden: true,
+        is_menu: false,
+        name: 'patient Page',
+        meta: { title: 'patientPage', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/edit',
+        component: () => import('@/xt_pages/user/editPatient'),
+        hidden: true,
+        is_menu: false,
+        name: 'Edit Patient',
+        meta: { title: 'editPatient', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/dialysisSolution',
+        component: () => import('@/xt_pages/user/dialysisSolution'),
+        hidden: true,
+        is_menu: false,
+        name: 'dialysisSolution',
+        meta: { title: 'dialysisSolution', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/weight',
+        component: () => import('@/xt_pages/user/weight'),
+        hidden: true,
+        is_menu: false,
+        name: 'weight',
+        meta: { title: 'weight', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/dialysisRecord',
+        component: () => import('@/xt_pages/user/dialysisRecord'),
+        hidden: true,
+        is_menu: false,
+        name: 'dialysisRecord',
+        meta: { title: 'dialysisRecord', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/scheduling',
+        component: () => import('@/xt_pages/user/scheduling'),
+        hidden: true,
+        is_menu: false,
+        name: 'scheduling',
+        meta: { title: 'scheduling', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/doctorAdvice',
+        component: () => import('@/xt_pages/user/doctorAdvice'),
+        hidden: true,
+        is_menu: false,
+        name: 'doctorAdvice',
+        meta: { title: 'doctorAdvice', noCache: true }
+      },
+      {
+        path: '/patients/inspection',
+        component: () => import('@/xt_pages/user/inspection'),
+        hidden: true,
+        is_menu: false,
+        name: 'Inspection',
+        meta: { title: 'inspection', noCache: true }
+      },
+      {
+        path: '/patients/course',
+        component: () => import('@/xt_pages/user/courseOfDisease'),
+        hidden: true,
+        is_menu: false,
+        name: 'CourseOfDiseaseManage',
+        meta: { title: 'CourseOfDiseaseManage', noCache: true }
+      },
+      {
+        path: '/patients/rescue',
+        component: () => import('@/xt_pages/user/rescueRecord'),
+        hidden: true,
+        is_menu: false,
+        name: 'RescueRecord',
+        meta: { title: 'RescueRecord', noCache: true }
+      },
+      {
+        path: '/patients/patient/:id/proeducation',
+        component: () => import('@/xt_pages/user/proeducation'),
+        hidden: true,
+        is_menu: false,
+        name: 'proeducation',
+        meta: { title: 'proeducation', noCache: true }
+      }
+    ]
+  },
+  {
+    path: '/workforce',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'workforce',
+    meta: {
+      title: 'workforce',
+      icon: 'paiban'
+    },
+    children: [
+      {
+        path: '/workforce/appointment',
+        component: () => import('@/xt_pages/workforce/appointment'),
+        name: 'appointment',
+        meta: { title: 'appointment', noCache: true }
+      },
+      {
+        path: '/workforce/sign',
+        component: () => import('@/xt_pages/workforce/sign'),
+        hidden: true,
+        is_menu: false,
+        name: 'workforcesign',
+        meta: { title: 'sign', noCache: true }
+      },
+      {
+        path: '/workforce/remind',
+        component: () => import('@/xt_pages/workforce/remind'),
+        name: 'remind',
+        meta: { title: 'remind', noCache: true }
+      },
+      {
+        path: '/workforce/template',
+        component: () => import('@/xt_pages/workforce/template'),
+        name: 'workforce_template',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'workforce_template', noCache: true }
+      },
+      {
+        path: '/workforce/schedule/print',
+        component: () => import('@/xt_pages/workforce/schedule_print'),
+        name: 'schedule_print',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'schedule_print', noCache: true }
+      }
+    ]
+  },
+  {
+    path: '/sign',
+    component: Layout,
+    redirct: '/sign/index',
+    children: [{
+      path: '/sign',
+      component: () => import('@/xt_pages/sign/index'),
+      name: 'sign',
+      meta: { title: 'signWeight', icon: 'sign', noCache: true }
+    }]
+  },
+  {
+    path: '/dialysis/',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'dialysis',
+    meta: {
+      title: 'dialysis',
+      icon: 'touxi'
+    },
+    children: [
+      { path: '/dialysis/dialysisrecord', component: () => import('@/xt_pages/dialysis/schedualPatient'), name: '透析记录', meta: { title: '透析记录' }},
+      {
+        path: '/dialysis/record/:id',
+        component: () => import('@/xt_pages/dialysis/dialysisPage'),
+        hidden: true,
+        is_menu: false,
+        name: 'paper',
+        meta: { title: 'paper', noCache: true }
+      },
+      {
+        path: '/dialysis/print',
+        component: () => import('@/xt_pages/dialysis/dialysisPrintOrder'),
+        hidden: true,
+        is_menu: false,
+        name: 'dialysisPrintOrder',
+        meta: { title: 'dialysisPrintOrder', noCache: true }
+      },
 
-  //     // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
-  //     // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
-  //     { path: '/dialysis/watch', component: () => import('@/xt_pages/dialysis/bloodPresssWatch'), name: 'watch', meta: { title: 'watch' }},
-  //     { path: '/dialysis/details', component: () => import('@/xt_pages/dialysis/details'), name: 'details', meta: { title: 'details' }, hidden: true, is_menu: false },
-  //     {
-  //       path: '/dialysis/print/batch',
-  //       component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order'),
-  //       hidden: true,
-  //       is_menu: false,
-  //       name: 'dialysis_batch_print',
-  //       meta: { title: '批量打印', noCache: true }
-  //     },
-  //     { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }}
-  //   ]
-  // },
-  // {
-  //   path: '/stock/',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'stockManage',
-  //   meta: { title: 'stockManage', icon: 'stock' },
-  //   children: [
-  //     {
-  //       path: '/stock/config',
-  //       component: () => import('@/xt_pages/stock/index'),
-  //       name: 'config',
-  //       meta: { title: 'config' }
-  //     },
-  //     {
-  //       path: '/stock/in',
-  //       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/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' }
-  //     }, {
-  //       path: '/stock/detail',
-  //       component: () => import('@/xt_pages/stock/stockDetailIndex'),
-  //       name: 'stockDetail',
-  //       meta: { title: 'stockDetail' }
-  //     },
-  //     {
-  //       path: '/stock/in/add',
-  //       component: () => import('@/xt_pages/stock/stockInOrderAdd'),
-  //       name: 'stockInOrderAdd',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'stockInOrderAdd' }
-  //     }, {
-  //       path: '/stock/in/detail',
-  //       component: () => import('@/xt_pages/stock/stockInDetail'),
-  //       name: 'stockInDetail',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'stockInDetail' }
-  //     }, {
-  //       path: '/stock/return/detail',
-  //       component: () => import('@/xt_pages/stock/salesReturnDetail'),
-  //       name: 'salesReturnDetail',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'salesReturnDetail' }
-  //     }, {
-  //       path: '/stock/return/add',
-  //       component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
-  //       name: 'salesReturnOrderAdd',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'salesReturnOrderAdd' }
-  //     }, {
-  //       path: '/stock/out/add',
-  //       component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
-  //       name: 'stockOutOrderAdd',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'stockOutOrderAdd' }
-  //     }, {
-  //       path: '/stock/out/detail',
-  //       component: () => import('@/xt_pages/stock/stockOutDetail'),
-  //       name: 'stockOutDetail',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'stockOutDetail' }
-  //     }, {
-  //       path: '/stock/cancel/add',
-  //       component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
-  //       name: 'cancelStockOrderAdd',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'cancelStockOrderAdd' }
-  //     }, {
-  //       path: '/stock/cancel/detail',
-  //       component: () => import('@/xt_pages/stock/cancelStockDetail'),
-  //       name: 'cancelStockDetail',
-  //       hidden: true,
-  //       is_menu: false,
-  //       meta: { title: 'cancelStockDetail' }
-  //     }
-  //   ]
-  // },
+      // { path: 'advice', component: () => import('@/xt_pages/dialysis/doctorAdvice'), name: 'advice', meta: { title: 'advice' }},
+      // { path: 'prepare', component: () => import('@/xt_pages/dialysis/dialysisPrepare'), name: 'prepare', meta: { title: 'prepare' }},
+      { path: '/dialysis/watch', component: () => import('@/xt_pages/dialysis/bloodPresssWatch'), name: 'watch', meta: { title: 'watch' }},
+      { path: '/dialysis/details', component: () => import('@/xt_pages/dialysis/details'), name: 'details', meta: { title: 'details' }, hidden: true, is_menu: false },
+      {
+        path: '/dialysis/print/batch',
+        component: () => import('@/xt_pages/dialysis/batch_print/batch_print_order'),
+        hidden: true,
+        is_menu: false,
+        name: 'dialysis_batch_print',
+        meta: { title: '批量打印', noCache: true }
+      },
+      { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }}
+    ]
+  },
+  {
+    path: '/stock/',
+    component: Layout,
+    redirect: 'noredirect',
+    name: 'stockManage',
+    meta: { title: 'stockManage', icon: 'stock' },
+    children: [
+      {
+        path: '/stock/config',
+        component: () => import('@/xt_pages/stock/index'),
+        name: 'config',
+        meta: { title: 'config' }
+      },
+      {
+        path: '/stock/in',
+        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/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' }
+      }, {
+        path: '/stock/detail',
+        component: () => import('@/xt_pages/stock/stockDetailIndex'),
+        name: 'stockDetail',
+        meta: { title: 'stockDetail' }
+      },
+      {
+        path: '/stock/in/add',
+        component: () => import('@/xt_pages/stock/stockInOrderAdd'),
+        name: 'stockInOrderAdd',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'stockInOrderAdd' }
+      }, {
+        path: '/stock/in/detail',
+        component: () => import('@/xt_pages/stock/stockInDetail'),
+        name: 'stockInDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'stockInDetail' }
+      }, {
+        path: '/stock/return/detail',
+        component: () => import('@/xt_pages/stock/salesReturnDetail'),
+        name: 'salesReturnDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'salesReturnDetail' }
+      }, {
+        path: '/stock/return/add',
+        component: () => import('@/xt_pages/stock/salesReturnOrderAdd'),
+        name: 'salesReturnOrderAdd',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'salesReturnOrderAdd' }
+      }, {
+        path: '/stock/out/add',
+        component: () => import('@/xt_pages/stock/stockOutOrderAdd'),
+        name: 'stockOutOrderAdd',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'stockOutOrderAdd' }
+      }, {
+        path: '/stock/out/detail',
+        component: () => import('@/xt_pages/stock/stockOutDetail'),
+        name: 'stockOutDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'stockOutDetail' }
+      }, {
+        path: '/stock/cancel/add',
+        component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+        name: 'cancelStockOrderAdd',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'cancelStockOrderAdd' }
+      }, {
+        path: '/stock/cancel/detail',
+        component: () => import('@/xt_pages/stock/cancelStockDetail'),
+        name: 'cancelStockDetail',
+        hidden: true,
+        is_menu: false,
+        meta: { title: 'cancelStockDetail' }
+      }
+    ]
+  },
 
-<<<<<<< .mine
   {
     path: '/qcd',
     component: Layout,
@@ -540,83 +539,6 @@ export const xt_constantRouterMap = [
     component: () => import('@/xt_pages/fullscreenboard/index'),
     hidden: true
   },
-=======
-  // {
-  //   path: '/qcd',
-  //   component: Layout,
-  //   redirect: '/qcd/dialysistotal',
-  //   name: 'qcd',
-  //   alwaysShow: true,
-  //   meta: { title: '科室质控', icon: 'statistics' },
-  //   children: [
-  //     { path: '/statistics/index', component: () => import('@/xt_pages/statistics/index'), name: 'statistics', meta: { title: 'statistics' }},
-  //     { path: '/qcd/dialysistotal', component: () => import('@/xt_pages/qcd/dialysisTotal'), name: 'dialysistotal', meta: { title: '透析总量' }},
-  //     { path: '/qcd/processindicators', component: () => import('@/xt_pages/qcd/processIndicators'), name: 'processIndicators', meta: { title: '过程指标' }},
-  //     { path: '/qcd/outcomeIndicators/control', component: () => import('@/xt_pages/qcd/outcomeIndicators/control'), name: 'outcomeIndicatorsControl', meta: { title: '结果指标' }},
-  //     { path: '/qcd/outcomeIndicators/query', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/outcomeIndicators/query'), name: 'outcomeIndicatorsQuery', meta: { title: '指标查询' }},
-  //     { path: '/qcd/patientanalysis/total', component: () => import('@/xt_pages/qcd/patientAnalysis/total'), name: 'patientAnalysisTotal', meta: { title: '患者分析' }},
-  //     { path: '/qcd/patientanalysis/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/weight'), name: 'patientAnalysisWeight', meta: { title: '体重分析' }},
-  //     { path: '/qcd/patientanalysis/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/bloodPressure'), name: 'patientAnalysisBloodPressure', meta: { title: '血压分析' }},
-  //     { path: '/qcd/patientanalysis/dialysisage', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/dialysisAge'), name: 'patientAnalysisDialysisAge', meta: { title: '透析龄分析' }},
-  //     { path: '/qcd/patientanalysis/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/lapseto'), name: 'patientAnalysisLapseto', meta: { title: '转归分析' }},
-  //     { path: '/qcd/patientanalysis/complication', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/complication'), name: 'patientAnalysisComplication', meta: { title: '并发症分析' }},
-  //     { path: '/qcd/patientanalysis/infectiousdiseases', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/infectiousDiseases'), name: 'patientAnalysisInfectiousDiseases', meta: { title: '传染病分析' }},
-  //     { path: '/qcd/pa/person/lapseto', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/lapseto'), name: 'paPersonLapseto', meta: { title: '转归' }},
-  //     { path: '/qcd/pa/person/weight', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/weight'), name: 'paPersonWeight', meta: { title: '体重' }},
-  //     { path: '/qcd/pa/person/bloodpressure', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/bloodPressure'), name: 'paPersonBloodPressure', meta: { title: '血压' }},
-  //     { path: '/qcd/pa/person/indicators', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/indicators'), name: 'paPersonIndicators', meta: { title: '指标控制' }},
-  //     { path: '/qcd/pa/person/oralmedicine', hidden: true, is_menu: false, component: () => import('@/xt_pages/qcd/patientAnalysis/person/oralMedicine'), name: 'paPersonOralMedicine', meta: { title: '口服药' }}
-  //   ]
-  // },
-  // {
-  //   path: '/data/',
-  //   component: Layout,
-  //   redirect: 'noredirect',
-  //   name: 'data',
-  //   meta: { title: 'data_dictionary', icon: 'excel' },
-  //   children: [
-  //     { path: '/data/dictionary', component: () => import('@/xt_pages/data/index'), name: 'dictionary', meta: { title: 'field_config' }},
-  //     { path: '/data/template', component: () => import('@/xt_pages/data/template'), name: 'template', meta: { title: 'template' }},
-  //     { path: '/data/druguse', component: () => import('@/xt_pages/data/druguseTemplate'), name: 'druguse', meta: { title: 'druguse' }}
-  //   ]
-  // },
-  // {
-  //   path: '/device',
-  //   component: Layout,
-  //   redirect: '/device/main',
-  //   name: 'device',
-  //   alwaysShow: true,
-  //   meta: { title: 'deviceManage', icon: 'shebei' },
-  //   children: [
-  //     { path: '/device/zones', component: () => import('@/xt_pages/device/zone_main'), name: 'deviceZoneManage', meta: { title: 'deviceZoneManage' }},
-  //     { path: '/device/groups', component: () => import('@/xt_pages/device/group_main'), name: 'deviceGroupManage', meta: { title: 'deviceGroupManage' }},
-  //     { 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: '/role',
-  //   component: Layout,
-  //   redirect: '/role/admin/manage',
-  //   name: 'role',
-  //   alwaysShow: true,
-  //   meta: { title: 'permissionManage', icon: 'role' },
-  //   children: [
-  //     { path: '/role/admin/manage', component: () => import('@/xt_pages/role/admin'), name: 'adminManage', meta: { title: 'adminManage' }},
-  //     { path: '/role/manage', component: () => import('@/xt_pages/role/role'), name: 'roleManage', meta: { title: 'roleManage' }},
-  //     { path: '/role/admin/create', component: () => import('@/xt_pages/role/CreateAdmin'), name: 'addAdmin', meta: { title: 'addAdmin', noCache: true }, hidden: true, is_menu: false },
-  //     { path: '/role/admin/edit', component: () => import('@/xt_pages/role/EditAdmin'), name: 'editAdmin', meta: { title: 'editAdmin', noCache: true }, hidden: true, is_menu: false },
-  //     { path: '/role/perview', component: () => import('@/xt_pages/role/EditPerview'), name: 'setupPerview', meta: { title: 'setupPerview', noCache: true }, hidden: true, is_menu: false },
-  //     { path: '/role/admin/specialpermission', component: () => import('@/xt_pages/role/special_permission'), name: 'special_permission_manage', meta: { title: 'special_permission_manage' }}
-  //   ]
-  // }, {
-  //   path: '/fullscreenboard',
-  //   component: () => import('@/xt_pages/fullscreenboard/index'),
-  //   hidden: true
-  // },
-
-
->>>>>>> .theirs
   // /////////////本地要end/
 ]
 

src/xt_permission.js

@@ -9,21 +9,21 @@ const loginWhiteList = ['/token/verify', '/401', '/404'] // 登录验证白名
 const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
 
 router.beforeEach((to, from, next) => {
-  // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
-  // 线上注释
+  //线上注释
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
+//线上注释
 
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))