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

.gitignore

@@ -1,4 +1,5 @@
 node_modules
 .svn
 dist
-.git
+.git
+/.idea

config/dev.env.js

@@ -6,5 +6,5 @@
 module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: '"dev"',
-  BASE_API: '"http://localhost:9529"',//'"http://112.74.16.180:9527"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
+  BASE_API: '"http://112.74.16.180:9527"',//'"http://112.74.16.180:9527"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527
 }

config/index.js

@@ -20,7 +20,7 @@ module.exports = {
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
     host: 'localhost',
-    port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port:9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,
     notifyOnErrors: false,

src/router/index.js

@@ -124,7 +124,7 @@ export const xt_constantRouterMap = [
 
   // ////////////////////////////
   // 本地开始
-  // /////////////////////////////
+  /////////////////////////////
   {
     path: '/patients',
     component: Layout,
@@ -532,11 +532,12 @@ export const xt_constantRouterMap = [
       { 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
-  },
+  }
   // /////////////本地要end/
 ]
 
@@ -548,400 +549,399 @@ export default new Router({
 
 export const xt_asyncRouterMap = [
 // //////////////////////////////////线在开始
-  {
-    path: '/patients',
-    component: Layout,
-    redirect: 'noredirect',
-    name: 'User',
-    alwaysShow: true,
-    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',
-    alwaysShow: true,
-    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',
-    alwaysShow: true,
-    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',
+  //   alwaysShow: true,
+  //   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',
+  //   alwaysShow: true,
+  //   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',
+  //   alwaysShow: true,
+  //   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' }, 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/return',
-        component: () => import('@/xt_pages/stock/salesReturnOrder'),
-        name: 'salesReturnOrder',
-        meta: { title: 'salesReturnOrder', noCache: true }
-      },
-      {
-        path: '/stock/out',
-        component: () => import('@/xt_pages/stock/stockOutOrder'),
-        name: 'stockOutOrder',
-        meta: { title: 'stockOutOrder', noCache: true }
-      }, {
-        path: '/stock/cancel',
-        component: () => import('@/xt_pages/stock/cancelStockOrder'),
-        name: 'cancelStockOrder',
-        meta: { title: 'cancelStockOrder', noCache: true }
-      }, {
-        path: '/stock/in/other',
-        component: () => import('@/xt_pages/stock/otherStockInOrder'),
-        name: 'otherStockInOrder',
-        meta: { title: 'otherStockInOrder', noCache: true }
-      }, {
-        path: '/stock/return/other',
-        component: () => import('@/xt_pages/stock/otherSalesReturnOrder'),
-        name: 'otherSalesReturnOrder',
-        meta: { title: 'otherSalesReturnOrder', noCache: true }
-      },{
-        path: '/stock/out/other',
-        component: () => import('@/xt_pages/stock/otherStockOutOrder'),
-        name: 'otherStockOutOrder',
-        meta: { title: 'otherStockOutOrder', 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', noCache: true }
-      }, {
-        path: '/stock/out/detail',
-        component: () => import('@/xt_pages/stock/stockOutDetail'),
-        name: 'stockOutDetail',
-        hidden: true,
-        is_menu: false,
-        meta: { title: 'stockOutDetail', noCache: true }
-      }, {
-        path: '/stock/cancel/add',
-        component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
-        name: 'cancelStockOrderAdd',
-        hidden: true,
-        is_menu: false,
-        meta: { title: 'cancelStockOrderAdd', noCache: true }
-      }, {
-        path: '/stock/cancel/detail',
-        component: () => import('@/xt_pages/stock/cancelStockDetail'),
-        name: 'cancelStockDetail',
-        hidden: true,
-        is_menu: false,
-        meta: { title: 'cancelStockDetail', noCache: true }
-      }
-
-    ]
-   },
-   {
-     path: '/qcd',
-     component: Layout,
-     redirect: '/qcd/dialysistotal',
-     name: 'qcd',
-     alwaysShow: true,
-     meta: { title: '科室质控', icon: 'table' },
-     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: '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' }, 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', noCache: true }
+  //     }, {
+  //       path: '/stock/out/detail',
+  //       component: () => import('@/xt_pages/stock/stockOutDetail'),
+  //       name: 'stockOutDetail',
+  //       hidden: true,
+  //       is_menu: false,
+  //       meta: { title: 'stockOutDetail', noCache: true }
+  //     }, {
+  //       path: '/stock/cancel/add',
+  //       component: () => import('@/xt_pages/stock/cancelStockOrderAdd'),
+  //       name: 'cancelStockOrderAdd',
+  //       hidden: true,
+  //       is_menu: false,
+  //       meta: { title: 'cancelStockOrderAdd', noCache: true }
+  //     }, {
+  //       path: '/stock/cancel/detail',
+  //       component: () => import('@/xt_pages/stock/cancelStockDetail'),
+  //       name: 'cancelStockDetail',
+  //       hidden: true,
+  //       is_menu: false,
+  //       meta: { title: 'cancelStockDetail', noCache: true }
+  //     }
+  //   ]
+  //  },
+  //  {
+  //    path: '/qcd',
+  //    component: Layout,
+  //    redirect: '/qcd/dialysistotal',
+  //    name: 'qcd',
+  //    alwaysShow: true,
+  //    meta: { title: '科室质控', icon: 'table' },
+  //    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' }}
+  //   ]
+  // },
   // /////////////////////////////////////线在end
   {
     path: '/role',

src/styles/index.scss

@@ -276,7 +276,7 @@ code {
 }
 
 .el-dialog__body {
-  max-height: calc(100vh - 350px) !important;
+  max-height: calc(100vh - 290px) !important;
   overflow-y: scroll !important;
   margin-right: 8px;
   /* 针对缺省样式 (必须的) */

src/views/layout/Layout.vue

@@ -54,13 +54,13 @@ export default {
   @import "src/styles/mixin.scss";
   .app-wrapper {
     @include clearfix;
-    position: relative;
+    // position: relative;
     height: 100%;
     width: 100%;
-    &.mobile.openSidebar{
-      position: fixed;
-      top: 0;
-    }
+    // &.mobile.openSidebar{
+    //   position: fixed;
+    //   top: 0;
+    // }
   }
   .drawer-bg {
     background: #000;

src/views/layout/components/Navbar.vue

@@ -126,14 +126,13 @@
 </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: 1000;
   .nav-logo {
     width: 162px;
     display: flex;

src/views/layout/components/TagsView.vue

@@ -130,9 +130,45 @@ export default {
     border-bottom: 1px solid #d8dce5;
     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
     position: fixed;
-    z-index: 2004;
+    z-index: 1000;
     top: 60px;
     overflow-x: scroll;
+    /* 针对缺省样式 (必须的) */
+      &::-webkit-scrollbar {
+        width: 6px;
+        height: 2px;
+      }
+      /* 滚动条的滑轨背景颜色 */
+      &::-webkit-scrollbar-track {
+        background-color: #fff;
+        border-radius: 3px;
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+      }
+      /* 滑块颜色 */
+      &::-webkit-scrollbar-thumb {
+        background: #fff;
+        border-radius: 3px;
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+      }
+      /*内层轨道的颜色*/
+      &::-webkit-scrollbar-track-piece {
+        background-color: #fff;
+        border-radius: 3px;
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+      }
+      /* 滑轨两头的监听按钮颜色 */
+      &::-webkit-scrollbar-button {
+        background-color: #fff;
+        width: 0;
+        height: 0;
+      }
+      /* 横向滚动条和纵向滚动条相交处尖角的颜色 */
+      &::-webkit-scrollbar-corner {
+        background-color: #fff;
+      }
     .tags-view-item {
       display: inline-block;
       position: relative;

src/xt_pages/data/components/tableson.vue

@@ -1,9 +1,8 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button style="float: right;margin-right: 40px" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button style="float: right;" class="filter-item" size="small" :disabled="addState"  @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
-
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row
       style="width: 100%;">
       <el-table-column  align="center" label="名称">

src/xt_pages/data/components/templateTable.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="">
     <div class="filter-container">
-      <el-button size="small" class="filter-item" style="float:right;margin-right: 30px" @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
+      <el-button size="small" class="filter-item" style="float:right;" @click="handleCreate" type="primary" icon="el-icon-circle-plus-outline">{{$t('table.add')}}</el-button>
     </div>
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :key='tableKey' :data="list" v-loading="listLoading" border fit highlight-current-row style="width: 100%;min-height:500px;">
       <!-- <el-table-column align="center" :label="$t('table.id')" width="65" @click="handleUpdate(scope.row)">

src/xt_pages/data/druguseTemplate.vue

@@ -28,6 +28,7 @@
             :row-class-name="tableRowClassNames"
             :span-method="merge"
             style="width: 100%;min-height:500px;"
+            :cell-class-name="adviceNameShow"
           >
             <el-table-column
               prop="id"
@@ -1151,7 +1152,13 @@ export default {
       this.unitsOption = getDataConfig('hemodialysis', 'units')
   },
     methods: {
-
+      adviceNameShow({row, column, rowIndex, columnIndex}){
+        if(columnIndex==1) {
+          return 'templateadvicenamedisplay';
+        }else {
+          return '';
+        }
+      },
       showCreatedTimes() {
         this.createdTimes = this.createdTimes + 1
       },
@@ -2172,3 +2179,11 @@ export default {
     }
   }
 </script>
+<style>
+
+  .templateadvicenamedisplay .cell {
+    float: left;
+    text-align: left;
+  }
+</style>
+

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

@@ -4,6 +4,7 @@
             title="透后评估"
             :visible.sync="isVisibility"
             width="1010px"
+            modal-append-to-body=“false”
            >
             <el-form ref="form" :model="form" label-width="130px" >
               <!-- <el-row :gutter="20"> -->

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

@@ -5,6 +5,7 @@
       :visible.sync="isVisibility"
       width="1010px"
       @close="resetDialog"
+      :modal-append-to-body="false"
     >
       <div class="txsj" v-show="showAdvicePanel">
         <el-button  round @click="openGroupFrom" :loading="deleLoading">新增医嘱</el-button>
@@ -28,7 +29,7 @@
       <!--&lt;!&ndash;:header-cell-style="{ backgroundColor: 'rgb(64, 158, 255)', color: 'white'}"&ndash;&gt;@current-change="selectRow"-->
       <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" :data="doctor_advices" border style="width: 100%" v-show="showAdvicePanel"
                 ref="advices_list" :row-class-name="tableRowClassName" :span-method="mergeSpan"
-                @row-click="cellMouseEnter"
+                @row-click="cellMouseEnter" :cell-class-name="adviceNameShow" :modal-append-to-body="false"
       >
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
@@ -191,6 +192,7 @@
       :show-close="isClose"
       :close-on-click-modal="isClose"
       :close-on-press-escape="isClose"
+      :modal-append-to-body="false"
       >
       <el-date-picker
         v-model="execTime"
@@ -366,6 +368,13 @@ export default {
     },
     methods: {
 
+      adviceNameShow({row, column, rowIndex, columnIndex}){
+        if(columnIndex==2) {
+          return 'dialysisadvicenamedisplay';
+        }else {
+          return '';
+        }
+      },
       submitEditAdvice() {
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
@@ -1303,6 +1312,10 @@ export default {
     margin-bottom: 20px;
   }
 
+  .dialysisadvicenamedisplay .cell {
+    float: left;
+    text-align: left;
+  }
 </style>
 
 

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

@@ -1,5 +1,6 @@
 <template>
   <el-dialog title="接诊评估"
+             modal-append-to-body=“false”
              :visible.sync="isVisibility"
             width="854px">
     <el-form :model="receiveTreatmentAsses" label-width="80px">

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

@@ -3,6 +3,7 @@
     title="透前评估"
     :visible.sync="isVisibility"
     width="1010px"
+    modal-append-to-body=“false”
   >
 
     <!--<check-box-dialog-->

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="透析上机" :visible.sync="visible" width="854px">
+        <el-dialog title="透析上机" :visible.sync="visible" width="854px" modal-append-to-body=“false”>
             <el-form :model="form" label-width="80px">
                 <el-form-item label="上机床位">
                     <el-select v-model="form.bed_id" placeholder="" :disabled="dialysis_order.id != 0">

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

@@ -3,6 +3,8 @@
     title="透析处方"
     :visible.sync="isVisibility"
     width="1010px"
+    modal-append-to-body=“false”
+    :append-to-body="true"
   >
     <el-form ref="dialysisPrescription"  :model="dialysisPrescription" label-width="146px">
       <!-- <el-row :gutter="20"> -->

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

@@ -1,6 +1,7 @@
 <template>
   <el-dialog title="双人核对"
              :visible.sync="isVisibility"
+             modal-append-to-body=“false”
              width="854px">
 
     <el-form :inline="true" class="demo-form-inline" :model="doubleReview" label-width="110px">

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

@@ -1,6 +1,6 @@
 <template>
     <div>
-        <el-dialog title="透析下机" :visible.sync="visible" width="854px">
+        <el-dialog title="透析下机" :visible.sync="visible" width="854px" modal-append-to-body=“false” >
             <div class="txsj">
             </div>
             <el-form :model="form" label-width="80px">

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

@@ -1,6 +1,6 @@
 <template>
   <div class="dialog_box">
-    <el-dialog title="透析监测" :visible.sync="visible" width="1100px" @close="reset">
+    <el-dialog title="透析监测" :visible.sync="visible" width="1100px" @close="reset" modal-append-to-body=“false”>
       <div v-show="edit == false">
         <div class="txsj">
           <el-button round @click="newRecordAction">新增监测</el-button>

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

@@ -3,7 +3,7 @@
     title="治疗小结"
     width="854px"
     :visible.sync="isVisibility"
-
+    modal-append-to-body=“false”
   >
     <el-form :model="treatmentSummary">
       <el-row :gutter="20">

src/xt_pages/role/components/AdminInfoForm.vue

@@ -1,15 +1,15 @@
 <template>
     <el-dialog :title="formTitle" :visible.sync="dialogFormVisible">
-        <el-form :model="form" ref="form" :rules="rules" label-width="100px">
-                <el-form-item label="账号" prop="mobile">
+        <el-form :model="form" ref="form" :rules="rules" label-width="60px">
+                <el-form-item label="账号 : " prop="mobile">
                     <el-input v-model="form.mobile" placeholder="用户手机号" :disabled="form.id !==  0"></el-input>
                 </el-form-item>
 
-                <el-form-item label="姓名" prop="name">
+                <el-form-item label="姓名 : " prop="name">
                     <el-input v-model="form.name" placeholder="用户姓名"></el-input>
                 </el-form-item>
 
-                <el-form-item label="职称">
+                <el-form-item label="职称 : ">
                     <el-select v-model="form.user_type" placeholder="用户类型">
                         <el-option v-for="item in user_types" :label="item.name" :value="item.index" :key="item.index"></el-option>
                     </el-select>
@@ -19,13 +19,13 @@
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="角色">
+                <el-form-item label="角色 : ">
                     <el-select v-model="form.role" placeholder="角色">
                         <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"></el-option>
                     </el-select>
                 </el-form-item>
 
-                <el-form-item label="介绍">
+                <el-form-item label="介绍 : ">
                     <Tinymce :height=400 menubar='' ref="editor" v-model="form.intro" :show_upload_img="false" />
                 </el-form-item>
 

src/xt_pages/role/components/EditRole.vue

@@ -1,10 +1,10 @@
 <template>
     <el-dialog title='新增角色' width="600px" :visible.sync="visible" :before-close="_close">
-        <el-form :model="form" :rules="rules" ref="form" label-width="80px">
-            <el-form-item label="角色名称" prop="name">
+        <el-form :model="form" :rules="rules" ref="form" label-width="90px">
+            <el-form-item label="角色名称 : " prop="name">
                 <el-input v-model="form.name" placeholder="" maxlength="30" ></el-input>
             </el-form-item>
-            <el-form-item label="角色描述" prop="intro">
+            <el-form-item label="角色描述 : " prop="intro">
                 <el-input type="textarea" v-model="form.intro" placeholder="" resize="none" rows="4" ></el-input>
             </el-form-item>
         </el-form>

src/xt_pages/sign/index.vue

@@ -10,7 +10,7 @@
                 <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>&nbsp;
-                    <el-button type="primary" @change="changeSearch">搜索</el-button>
+                    <el-button type="primary" @change="changeSearch" icon="el-icon-search">搜索</el-button>
                     <el-select v-model="queryParams.schedule_type" style="width: 100px;" @change="changeSearch">
                     <el-option v-for="item in shiftOptions" :label="item.label" :value="item.value" :key="item.value"></el-option>
                     </el-select>
@@ -39,7 +39,7 @@
                     <el-table-column prop="sign" label="签到" min-width="30" align="center" ></el-table-column>
                     <el-table-column prop="weight" label="称重(透前/透后)" min-width="50" align="center">
                         <template slot-scope="scope">
-                            {{scope.row.before}} / {{scope.row.after}}
+                           {{scope.row.before}} / {{scope.row.after}}
                         </template>
                     </el-table-column>
                 </el-table>
@@ -59,9 +59,9 @@
                     </div>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
                      体温(℃):&nbsp;<el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                     脉搏(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                     呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                     血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
+                     <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
+                     血压(mmHg):&nbsp;<el-input v-model="weigh_list.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input><span> / </span> <el-input v-model="weigh_list.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;
+                     脉率(次/分):&nbsp;<el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
                     </div>
                     <div class="border"></div>
                     <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
@@ -70,9 +70,9 @@
                     </div>
                     <div style="margin-bottom:12px;color:rgb(96,96,96);font-size:14px">
                       体温(℃):&nbsp;<el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                      脉搏(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                      呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp;
-                      血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>
+                      <!-- 呼吸(次/分):&nbsp;<el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>&nbsp;&nbsp;&nbsp; -->
+                      血压(mmHg):&nbsp;<el-input v-model="weigh_infor.systolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input> <span> / </span><el-input v-model="weigh_infor.diastolic_blood_pressure" style="width: 70px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;
+                      脉率(次/分):&nbsp;<el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
                     </div>
 
                     <div class="border"></div>
@@ -198,20 +198,13 @@ export default {
         this.patients = []
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
-          console.log('病人信息', this.patients[0].schedule)
+          // console.log('病人信息', this.patients[0].schedule)
           // 将没有排班的信息排除
           for (let i = this.patients.length - 1; i >= 0; i--) {
             if (this.patients[i].schedule.id == 0) {
               this.patients.splice(i, 1)
             }
           }
-
-          for (let i = this.patients.length - 1; ; i--) {
-            if (this.patients[i].schedule.id == 0) {
-              this.patients.splice(i, 1)
-            }
-          }
-
           this.queryParams.schedule_type = response.data.data.schedule_type
           this.querySignParams.date_time = response.data.data.today
 

src/xt_pages/stock/stockOutOrder.vue

@@ -469,75 +469,3 @@ export default {
   }
 }
 </style>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<<<<<<< .mine
-
-
-
-
-
-
-
-
-
-
-
-
-
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs

src/xt_pages/user/components/PatientDetail.vue

@@ -1214,4 +1214,7 @@ export default {
 .print_footnote_panel .proj .proj_title {
     font-weight: 500;
 }
+.el-select-dropdown{
+  z-index: 998!important;
+}
 </style>

src/xt_pages/user/components/PatientForm.vue

@@ -3,22 +3,19 @@
     <div v-if="!isEdit" class="position">
       <bread-crumb :crumbs='crumbs'></bread-crumb>
       <div class="" style="float:right;color: white">
-        <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
         <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
-        <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
-        <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
       </div>
     </div>
 
     <div v-if="isEdit" class="" style="float:right;margin-right: 35px;margin-top: 10px">
-      <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
+      <!-- <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" type="primary" v-if="this.isEdit==false" @click="resetForm('form')"  icon="el-icon-circle-plus-outline" size="small">新增</el-button>
       <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="success" icon="el-icon-setting" >保存</el-button>
-      <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button>
+      <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="warning" >保存并继续新增</el-button> -->
     </div>
 
     <div class="app-container " v-loading="pageLoad">
-      <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" >
+      <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" popper-append-to-body="false" >
         <div class="dataTitle">一般资料</div>
         <el-row >
           <el-col :span="20" class="form-table" >
@@ -369,14 +366,17 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="24" align="center">
+          <el-col :span="24" align="right" >
             <el-form-item>
-
+                <el-button @click="$router.back(-1)" icon="el-icon-refresh" size="small">取消</el-button>
+                <el-button :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" @click="onSubmit('form')"  size="small" type="primary" icon="el-icon-setting" >保存</el-button>
+                <el-button v-if="isEdit==false" @click="onReSubmit('form')" :disabled="$store.getters.xt_user.subscibe.state==3||!subscibeFlag?true:false" icon="el-icon-document-add" size="small" type="success" >保存并继续新增</el-button>
             </el-form-item>
           </el-col>
         </el-row>
 
       </el-form>
+
     </div>
   </div>
 
@@ -1026,9 +1026,8 @@
   }
   }
   }
-  .el-select-dropdown,
-  .el-popper{
-    z-index: 2000!important;
-  }
+  .el-select-dropdown{
+  z-index: 998!important;
+}
 </style>
 

src/xt_pages/user/doctorAdvice.vue

@@ -2,11 +2,13 @@
     <div class="patient-container">
         <patient-sidebar :id="patientID" defaultActive="1-4" v-on:tran-patient="onTranPatient"></patient-sidebar>
         <div class="patient-app-container advice-container app-container">
-            <div class="filter-container">
+            <div class="cellButton" style="float:right;">
+              <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" size="small"   @click="openNew" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
+                <el-button size="small"  @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印</el-button>            
+            </div>
+            <div class="cell clearfix">
                 <el-input   style="width: 400px;" v-model="listQuery.keywords" class="filter-item" size="small" />
-                <el-button  class="filter-item" size="small" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
-                <el-button  class="filter-item" size="small" style="float:right;" @click="printThisInfo()" :type="adviceType==1 || adviceType == 3?'primary':'warning'" icon="el-icon-printer" >打印</el-button>
-                <el-button :disabled="$store.getters.xt_user.subscibe.state==3?true:false" size="small" class="filter-item" style="float:right;" @click="openNew" type="primary" icon="el-icon-circle-plus-outline" >新增</el-button>
+                <el-button   size="small" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
             </div>
             <div class="cell clearfix">
                 <label class="title"><span class="name">医嘱类型</span> : </label>
@@ -30,7 +32,7 @@
                 <span class="cellLine"> - </span>
                 <el-date-picker size="small" v-model="listQuery.end_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" :picker-options="pickerOptions"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
             </div>
-            <el-table @cell-click="clickuseradvicecell" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" >
+            <el-table @cell-click="clickuseradvicecell" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"  row-class-name="user-advice-table-row" :span-method="mergeSpan" ref="multipleTable" :data="adviceTableData" border fit highlight-current-row @select="selectAdvice" @selection-change="changeAdvice" style="width: 100%;margin-top: 10px;" :cell-class-name="adviceNameShow" >
 
                 <el-table-column align="center" label="全选" width="60px" type="selection" fixed></el-table-column>
                 <!--<el-table-column type="index" :index="indexMethod"  label="序号" width="60px" align="center"></el-table-column>-->
@@ -47,7 +49,7 @@
                     <span v-else></span>
                 </template>
                 </el-table-column>
-                <el-table-column  label="医嘱内容" property="advice_name" width="180"  style="word-break: keep-all;white-space:nowrap;">
+                <el-table-column  label="医嘱内容" property="advice_name" width="180" align="center" style="word-break: keep-all;white-space:nowrap;">
                     <template slot-scope="scope">
                     <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
                         <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
@@ -1176,6 +1178,13 @@ export default {
     onTranPatient: function(tranPatient) {
       this.currentPatient = tranPatient;
     },
+    adviceNameShow({row, column, rowIndex, columnIndex}){
+      if(columnIndex==3) {
+        return 'advicenamedisplay';
+      }else {
+        return '';
+      }
+    },
     submitEditAdvice(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -3022,6 +3031,7 @@ export default {
 
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+
 .printForm {
   width: 960px;
 }
@@ -3195,5 +3205,9 @@ export default {
   -webkit-transform: rotate(90deg) !important;
   transform: rotate(90deg) !important;
 }
+.advicenamedisplay .cell {
+    float: left;
+    text-align: left;
+}
 </style>
 

src/xt_pages/user/registration.vue

@@ -608,6 +608,9 @@ export default {
     height: 59px!important;
 }
 }
+.el-select-dropdown{
+  z-index: 998!important;
+}
 
 </style>