Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/router/index.js

@@ -125,345 +125,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,
@@ -539,6 +540,83 @@ 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/views/layout/components/Navbar.vue

@@ -5,18 +5,11 @@
     </div>
     <el-menu class="navbar" mode="horizontal">
       <div>
-        <!--<el-dropdown trigger="click" style="color:#fff;">-->
-        <!--<span class="el-dropdown-link">-->
-          <!--南山市人民医院<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
-        <!--</span>-->
-          <!--&lt;!&ndash;<el-dropdown-menu slot="dropdown" style="margin-top:21px;">&ndash;&gt;-->
-            <!--&lt;!&ndash;<el-dropdown-item>深圳市人民医院</el-dropdown-item>&ndash;&gt;-->
-            <!--&lt;!&ndash;<el-dropdown-item>长沙是透析中心</el-dropdown-item>&ndash;&gt;-->
-            <!--&lt;!&ndash;<el-dropdown-item>东莞血液透析中心</el-dropdown-item>&ndash;&gt;-->
-            <!--&lt;!&ndash;<el-dropdown-item>东莞血液透析中心</el-dropdown-item>&ndash;&gt;-->
-            <!--&lt;!&ndash;<el-dropdown-item>东莞血液透析中心</el-dropdown-item>&ndash;&gt;-->
-          <!--&lt;!&ndash;</el-dropdown-menu>&ndash;&gt;-->
-        <!--</el-dropdown>-->
+        <el-dropdown trigger="click" style="color:#fff;">
+        <span class="el-dropdown-link">{{orgname}}
+          <!--<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>-->
+        </span>
+        </el-dropdown>
       </div>
       <div class="system-nav">
         <div class="system-nav-menu">
@@ -62,9 +55,9 @@
             <el-dropdown-item>
               <span @click="modifyUserInfoAction">修改个人信息</span>
             </el-dropdown-item>
-            <el-dropdown-item divided>
+            <!-- <el-dropdown-item divided>
               <span @click="myServe">我的服务</span>
-            </el-dropdown-item>
+            </el-dropdown-item> -->
             <el-dropdown-item divided>
               <span @click="logout" style="display:block;">{{$t('navbar.logOut')}}</span>
             </el-dropdown-item>
@@ -80,55 +73,67 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-// import Breadcrumb from "@/components/Breadcrumb";
-// import Hamburger from "@/components/Hamburger";
-import Screenfull from "@/components/Screenfull";
-import ModifyUserInfoDialog from "@/xt_pages/home/modify_user_info_dialog";
-
-export default {
-  components: {
-    // Breadcrumb,
-    // Hamburger,
-    Screenfull,
-    ModifyUserInfoDialog
-  },
-  computed: {
-    ...mapGetters(["sidebar"]),
-    avater: function() {
-      var avatar = this.$store.getters.xt_user.user.avatar;
-      return avatar.length > 0
-        ? avatar
-        : require("../../../assets/home/userData.png");
-    }
-  },
-  methods: {
-    // toggleSideBar() {
-    //   this.$store.dispatch("toggleSideBar");
-    // },
-    logout() {
-      this.$store.dispatch("FrontendLogout");
-      window.location.href = process.env.BASE_API + "/logout";
+  import { mapGetters } from 'vuex'
+  // import Breadcrumb from "@/components/Breadcrumb";
+  // import Hamburger from "@/components/Hamburger";
+  import Screenfull from '@/components/Screenfull'
+  import ModifyUserInfoDialog from '@/xt_pages/home/modify_user_info_dialog'
+
+  export default {
+    data() {
+      return {
+        orgname:'',
+      }
+    },
+    components: {
+      // Breadcrumb,
+      // Hamburger,
+      Screenfull,
+      ModifyUserInfoDialog
     },
-    modifyUserInfoAction() {
-      this.$refs.modify_user_info_dialog.show();
+    computed: {
+      ...mapGetters(['sidebar']),
+      avater: function() {
+        var avatar = this.$store.getters.xt_user.user.avatar
+        return avatar.length > 0
+          ? avatar
+          : require('../../../assets/home/userData.png')
+      }
+    },
+    methods: {
+      // toggleSideBar() {
+      //   this.$store.dispatch("toggleSideBar");
+      // },
+      logout() {
+        this.$store.dispatch('FrontendLogout')
+        window.location.href = process.env.BASE_API + '/logout'
+      },
+      modifyUserInfoAction() {
+        this.$refs.modify_user_info_dialog.show()
+      },
+      myServe() {
+        this.$router.push('/service')
+        return false
+      }
     },
-    myServe() {
-      this.$router.push("/service");
-      return false;
+    create() {
+      var xtuser = this.$store.getters.xt_user
+      this.orgname = xtuser.org.org_name
+      console.log(this.orgname)
+
     }
   }
-};
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-.top-nav {
-  background: #409eff;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 2004;
+  .top-nav {
+    background: #409eff;
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    z-index: 2004;
+
   .nav-logo {
     width: 162px;
     display: flex;
@@ -140,10 +145,11 @@ export default {
     box-sizing: border-box;
     float: left;
 
-    img {
-      display: inline-block;
-      width: 100px;
-    }
+  img {
+    display: inline-block;
+    width: 100px;
+  }
+
   }
   .navbar {
     border-radius: 0px !important;
@@ -156,95 +162,102 @@ export default {
     background: #409eff;
     float: left;
 
-    .breadcrumb-container {
-      float: left;
-    }
+  .breadcrumb-container {
+    float: left;
+  }
 
-    .errLog-container {
-      display: inline-block;
-      vertical-align: top;
-    }
+  .errLog-container {
+    display: inline-block;
+    vertical-align: top;
+  }
 
-    .right-menu {
-      float: right;
-      height: 100%;
-      z-index: 99999;
-      &:focus {
-        outline: none;
-      }
+  .right-menu {
+    float: right;
+    height: 100%;
+    z-index: 99999;
 
-      .right-menu-item {
-        display: inline-block;
-        margin: 0 8px;
+  &
+  :focus {
+    outline: none;
+  }
 
-        .iconfont {
-          font-size: 18px;
-        }
-      }
-      .screenfull {
-        height: 20px;
-      }
+  .right-menu-item {
+    display: inline-block;
+    margin: 0 8px;
 
-      .international {
-        vertical-align: top;
-      }
+  .iconfont {
+    font-size: 18px;
+  }
 
-      .theme-switch {
-        vertical-align: 15px;
-      }
+  }
+  .screenfull {
+    height: 20px;
+  }
 
-      .avatar-container {
-        margin-right: 10px;
-
-        .avatar-wrapper {
-          cursor: pointer;
-          margin-top: 3px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          .user-avatar {
-            width: 40px;
-            height: 40px;
-            border-radius: 50%;
-            object-fit: cover;
-            object-position: center;
-          }
-
-          .user-title {
-            margin: 0 8px;
-            font-size: 14px;
-            color: #fff;
-          }
-
-          .el-icon-caret-bottom {
-            font-size: 12px;
-            color: #fff;
-          }
-        }
-      }
-    }
+  .international {
+    vertical-align: top;
+  }
+
+  .theme-switch {
+    vertical-align: 15px;
+  }
+
+  .avatar-container {
+    margin-right: 10px;
+
+  .avatar-wrapper {
+    cursor: pointer;
+    margin-top: 3px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+  .user-avatar {
+    width: 40px;
+    height: 40px;
+    border-radius: 50%;
+    object-fit: cover;
+    object-position: center;
+  }
+
+  .user-title {
+    margin: 0 8px;
+    font-size: 14px;
+    color: #fff;
+  }
+
+  .el-icon-caret-bottom {
+    font-size: 12px;
+    color: #fff;
+  }
+
+  }
+  }
+  }
   }
   .system-nav {
-    .system-nav-menu {
-      float: left;
-      height: 60px;
-      line-height: 60px;
-      padding: 0 25px;
-
-      a {
-        font-size: 15px;
-
-        .iconfont {
-          font-size: 18px;
-        }
-      }
-    }
-    .active {
-      background: #3090eb;
-      border-left: 1px #5fabf7 solid;
-      border-right: 1px #5fabf7 solid;
-    }
+
+  .system-nav-menu {
+    float: left;
+    height: 60px;
+    line-height: 60px;
+    padding: 0 25px;
+
+  a {
+    font-size: 15px;
+
+  .iconfont {
+    font-size: 18px;
+  }
+
+  }
+  }
+  .active {
+    background: #3090eb;
+    border-left: 1px #5fabf7 solid;
+    border-right: 1px #5fabf7 solid;
+  }
+
   }
   .el-menu::after,
   .el-menu::before {
@@ -254,11 +267,13 @@ export default {
     top: 0;
     left: 0;
   }
-}
-.el-dropdown-menu{
-  z-index: 9999!important;
-}
-.v-modal{
-  z-index: 9999!important;  
-}
+
+  }
+  .el-dropdown-menu {
+    z-index: 9999 !important;
+  }
+
+  .v-modal {
+    z-index: 9999 !important;
+  }
 </style>

src/xt_pages/device/components/add_device_dialog.vue

@@ -1,7 +1,7 @@
 <template>
     <el-dialog title="新增设备" width="854px" top="15vh" :visible.sync="visible" :before-close="_close">
-        <device-info-form ref="device_info_form" :device_numbers="device_numbers" @did_create="didCreateDevice"></device-info-form>
-        <div style="text-align: right; padding-right: 25px; padding-top: 10px; padding-bottom: 10px;">
+        <device-info-form  ref="device_info_form" :device_numbers="device_numbers" @did_create="didCreateDevice"></device-info-form>
+        <div slot="footer" class="dialog-footer">
             <el-button @click="hide">取消</el-button>
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="createAction">保存</el-button>
         </div>
@@ -33,7 +33,7 @@ export default {
             done()
         },
         clear: function() {
-            
+
         },
         show() {
             this.clear()

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -95,14 +95,14 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="mode_name" label="透析模式" align="center"></el-table-column>
+        <el-table-column prop="mode_name" label="透析模式" align="center" width="100"></el-table-column>
 
-        <el-table-column prop="dialysis_before_weight" label="透前体重 (kg)" align="center"></el-table-column>
-        <el-table-column prop="dialysis_after_weight" label="透后体重 (kg)" align="center"></el-table-column>
-        <el-table-column label="透中血压">
-          <el-table-column v-for="(item, index) in labelArr" :key="index" :label="item">
+        <el-table-column prop="dialysis_before_weight" label="透前体重(kg)" align="center" width="120"></el-table-column>
+        <el-table-column prop="dialysis_after_weight" label="透后体重(kg)" align="center" width="120"></el-table-column>
+        <el-table-column label="透中血压(Hgmm)" align="center">
+          <el-table-column v-for="(item, index) in labelArr" :key="index" :label="item" align="center">
             <!-- 数据的遍历  scope.row就代表数据的每一个对象-->
-            <template slot-scope="scope">
+            <template slot-scope="scope" >
               <!--<span>{{scope.row.bp[index].value}}</span>-->
               <span>{{getValue(scope.row.bp[index])}}</span>
             </template>

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -41,22 +41,11 @@
           </template>
 
         </el-table-column>
-        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容">
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
           <template slot-scope="scope">
 
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
-
               <span class="el-dropdown-link">{{getAdviceContent(scope.row,1)}}<i class="el-icon-arrow-down el-icon--right"></i></span>
-              <!--<span>{{scope.row.advice_name }}</span>-->
-              <!--<span>{{scope.row.advice_desc}}</span>-->
-              <!--<span v-if="scope.row.single_dose">{{scope.row.single_dose}}{{scope.row.single_dose_unit}}</span>-->
-              <!--<span v-if="scope.row.drug_spec">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>-->
-              <!--<span v-if="scope.row.prescribing_number">* {{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}</span>-->
-              <!--<span>{{scope.row.delivery_way}}</span>-->
-              <!--<span>{{scope.row.execution_frequency}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i></span>-->
-
-
-
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item @click.native="openEdit(scope.$index, scope.row)">修改医嘱</el-dropdown-item>
                 <el-dropdown-item @click.native="openDelete(scope.$index, scope.row)">删除医嘱</el-dropdown-item>
@@ -64,7 +53,6 @@
               </el-dropdown-menu>
             </el-dropdown>
 
-
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">&emsp;{{getAdviceContent(scope.row,2)}}<i class="el-icon-arrow-down el-icon--right"></i></span>
               <el-dropdown-menu slot="dropdown">
@@ -96,14 +84,7 @@
             <span v-else></span>
           </template>
         </el-table-column>
-        <!--<el-table-column label="操作" min-width="20" align="center">-->
-          <!--<template slot-scope="scope">-->
-            <!--<el-button type="primary" size="small"-->
-                       <!--@click="scope.row.groupno>0?openEditGroupAdvice(scope.row.groupno):openEdit(scope.$index, scope.row)"-->
-                       <!--v-if="isShowStartTime(scope.$index, scope.row)">编辑-->
-            <!--</el-button>-->
-          <!--</template>-->
-        <!--</el-table-column>-->
+
       </el-table>
       <!-- 医嘱列表 end -->
 

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -45,7 +45,7 @@
         <el-row >
           <el-col :span="2">
             &nbsp;&nbsp;
-          </el-col>  
+          </el-col>
           <el-col :span="5">
             <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" round
                        @click="openAdviceTemplate()">选择医嘱模板
@@ -87,11 +87,14 @@
                 label="医嘱名称"
                 property="advice_name"
                 style="word-break: keep-all;white-space:nowrap;"
+                align="center"
               ></el-table-column>
 
               <el-table-column
                 label="规格"
                 property="advice_desc"
+                align="center"
+
               ></el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
@@ -160,6 +163,7 @@
             style="width: 100%">
             <el-table-column
               prop="name"
+              align="center"
               label="模板名称">
             </el-table-column>
           </el-table>
@@ -180,16 +184,19 @@
           >
             <el-table-column
               type="selection"
+              align="center"
               width="55">
             </el-table-column>
             <el-table-column
               label="医嘱内容"
               property="advice_name"
               style="word-break: keep-all;white-space:nowrap;"
+              align="center"
             ></el-table-column>
             <el-table-column
               label="规格"
               property="advice_desc"
+              align="center"
             ></el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -38,7 +38,7 @@
         </el-row>
 
         <el-row>
-          <el-col :span="2">&nbsp;&nbsp;</el-col>          
+          <el-col :span="2">&nbsp;&nbsp;</el-col>
           <el-col :span="5">
             <el-button
               :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
@@ -86,11 +86,15 @@
               <el-table-column
                 label="医嘱名称"
                 property="advice_name"
+                align="center"
+
                 style="word-break: keep-all;white-space:nowrap;"
               ></el-table-column>
               <el-table-column
                 label="规格"
                 property="advice_desc"
+                align="center"
+
               ></el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
@@ -150,6 +154,8 @@
             style="width: 100%">
             <el-table-column
               prop="name"
+              align="center"
+
               label="模板名称">
             </el-table-column>
           </el-table>
@@ -175,10 +181,14 @@
             <el-table-column
               label="医嘱内容"
               property="advice_name"
+              align="center"
+
               style="word-break: keep-all;white-space:nowrap;"
             ></el-table-column>
             <el-table-column
               label="规格"
+              align="center"
+
               property="advice_desc"
             ></el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">

src/xt_pages/qcd/dialysisTotal.vue

@@ -165,7 +165,7 @@ export default {
       statisticalMethods: [
         { value: 0, label: "全部" },
         { value: 1, label: "开始透析" },
-        { value: 2, label: "排班" }
+        // { value: 2, label: "排班" }
       ],
       lapsetoType: 0,
       lapsetoState: [

src/xt_pages/sign/index.vue

@@ -299,6 +299,63 @@ export default {
       this.fetchSignPatients()
     },
     handleCurrentChange(row, old) {
+<<<<<<< .mine
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+=======
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> .theirs
       //     this.weigh_form = {
       //     id:0,
       //     choose:false,
@@ -549,8 +606,13 @@ export default {
                               if((signin.weigh_before_time == 0 && response.data.data.signs.weigh_before_time > 0)||(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)){
                                     this.schedules[j].sign++
                               }
+<<<<<<< .mine
                               if(signin.weigh_before_time == 0 && response.data.data.signs.weigh_before_time > 0){
                               
+=======
+                              if(signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0){
+
+>>>>>>> .theirs
                                    this.schedules[j].before++
                               }
                               if(signin.weigh_time == 0 && response.data.data.signs.weigh_time > 0){

src/xt_pages/user/dialysisRecord.vue

@@ -32,7 +32,7 @@
           </el-form>
         </div>
         <div>
-          <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="recordData" border style="width: 100%" @current-change="clickCurrent">
+          <el-table id="oictable" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="recordData" border style="width: 100%" @current-change="clickCurrent">
               <el-table-column prop="dialysis_date" label="透析日期" align="center" width="110" fixed>
                 <template slot-scope="scope"><span style="color: #579ef8">{{scope.row.dialysis_date | parseTime('{y}-{m}-{d}')}}</span></template>
               </el-table-column>
@@ -360,6 +360,13 @@ export default {
   }
 }
 </script>
+<style>
+  #oictable ::-webkit-scrollbar {
+    height: 15px;
+  }
+
+</style>
+
 <style rel='stylesheet/scss' lang="scss" scoped >
 .total {
   font-size: 14px;

src/xt_permission.js

@@ -10,19 +10,19 @@ 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()