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

src/router/index.js

         hidden: true,
         is_menu: false,
         name: 'dialysis_batch_print',
-        meta: { title: 'dialysis_batch_print', noCache: true }
+        meta: { title: '批量打印', noCache: true }
       },
       { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }}
     ]
   //       hidden: true,
   //       is_menu: false,
   //       name: 'dialysis_batch_print',
-  //       meta: { title: 'dialysis_batch_print', noCache: true }
+  //       meta: { title: '批量打印', noCache: true }
   //     },
   //     { path: '/dialysis/board', component: () => import('@/xt_pages/dialysis/bulletinBoard'), name: '数据看板', meta: { title: '数据看板' }},
   //   ]

src/styles/index.scss

   border-bottom: 1px #E4E7ED solid;
   margin: 0 18px;
   flex: 1;
-  
 }
 .el-button+.el-button{
   // margin-left: 0;
 .Total{
  margin:0 0 10px 0;
  float: right;
+}
+.cellLine{
+  color: #C0C4CC;
+  padding: 0 3px;
 }

src/views/layout/components/Navbar.vue

     left: 0;
   }
 }
+.el-dropdown-menu{
+  z-index: 9999!important;
+}
+.v-modal{
+  z-index: 9999!important;  
+}
 </style>

src/xt_pages/dialysis/bulletinBoard.vue

       }
     },
     created() {
-        // this.orgname = xtuser.org.org_name;
-        this.orgname = "遂溪方济医院";
+        this.orgname = this.$store.getters.xt_user
+        // this.orgname = "遂溪方济医院";
         this.modeOptions = this.$store.getters.treatment_mode;
         this.initData();
     },
                   return false;
               } else {
                   if(r.data.boards.length==0) {
-                      console.log("getBoards this.currentPage", this.currentPage);
                       this.currentPage = 1;
                       this.getBoards();
                   }else {

src/xt_pages/dialysis/dialysisPrintOrder.vue

 </template>
 
 <script>
-  import { getDialysisRecord } from '@/api/dialysis'
+import { getDialysisRecord } from '@/api/dialysis'
 import { getDataConfig } from '@/utils/data'
 import { jsGetAge, uParseTime } from '@/utils/tools'
 import LabelBox from './printItem/LabelBox'
-  import print from 'print-js'
+import print from 'print-js'
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 
 export default {

src/xt_pages/qcd/dialysisTotal.vue

     return {
       crumbs:[
         {path:false, name:'科室质控'},
-        {path:'/qcd/dialysistotal', name:'透析总量'},
+        {path:false, name:'透析总量'},
       ],
       total: 0,
       totitle:'全部',

src/xt_pages/role/admin.vue

   </div>
   <div class="app-container">
     <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" style="width:100%;" ref="table" border :data="admins" v-loading="is_loading_admins">
-      <el-table-column label="用户名" prop="user_name" min-width="160"></el-table-column>
-      <el-table-column label="最后登录IP" prop="ip" min-width="150"></el-table-column>
-      <el-table-column label="最后登录时间" prop="last_login_time" min-width="170">
+      <el-table-column label="用户名" prop="user_name" min-width="160" align="center"></el-table-column>
+      <el-table-column label="最后登录IP" prop="ip" min-width="150" align="center"></el-table-column>
+      <el-table-column label="最后登录时间" prop="last_login_time" min-width="170" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.last_login_time == 0 ? '' : (_parseTime(scope.row.last_login_time, '{y}-{m}-{d} {h}:{i}'))}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="角色" prop="role_name" min-width="160"></el-table-column>
-      <el-table-column label="职称" prop="title_name" min-width="160"></el-table-column>
-      <el-table-column label="状态" min-width="100">
+      <el-table-column label="角色" prop="role_name" min-width="160" align="center"></el-table-column>
+      <el-table-column label="职称" prop="title_name" min-width="160" align="center"></el-table-column>
+      <el-table-column label="状态" min-width="100" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.status == 1" style="color: #67C23A; font-size:20px;">
             <li class="el-icon-success"></li>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="120">
+      <el-table-column label="操作" width="120" align="center">
         <template slot-scope="scope">
           <!-- <router-link :to="{ path:'/role/admin/edit', query:{ id:scope.row.user_id }}"> -->
             <el-tooltip class="item" effect="dark" content="编辑" placement="top">

src/xt_pages/role/role.vue

   </div>
   <div class="app-container">
     <el-table :data="roles" v-loading="loading_roles" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}">
-      <el-table-column label="角色名称" prop="name" min-width="20%"></el-table-column>
-      <el-table-column label="角色描述" prop="intro" min-width="25%"></el-table-column>
-      <el-table-column label="状态" min-width="15%">
+      <el-table-column label="角色名称" prop="name" min-width="20%" align="center"></el-table-column>
+      <el-table-column label="角色描述" prop="intro" min-width="25%" align="center"></el-table-column>
+      <el-table-column label="状态" min-width="15%" align="center">
         <template slot-scope="scope">
           <div v-if="scope.row.status == 1" style="color: #67C23A; font-size:20px;">
             <li class="el-icon-success"></li>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="180">
+      <el-table-column label="操作" width="180" align="center">
         <template slot-scope="scope">
           <router-link :to='{ path:"/role/perview", query:{ id:scope.row.id }}'>
             <el-tooltip class="item" effect="dark" content="权限设置" placement="top">

src/xt_pages/statistics/index.vue

   data() {
     return {
       crumbs: [
-        { path: 'statistics', name: '科室质控' },
-        { path: 'statistics', name: '统计分析' },
+        { path: false, name: '科室质控' },
+        { path: false, name: '统计分析' },
       ],
         pageLoad:true,
         patientCount:0,

src/xt_pages/stock/cancelStockOrder.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/detail/cancelStockDetail.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/detail/salesReturnDetail.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/detail/stockInDetail.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/detail/stockOutDetail.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/otherCancelStockOrder.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/otherSalesReturnOrder.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/otherStockInOrder.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/otherStockOutOrder.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/salesReturnOrder.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/stockDetail.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/stockInOrder.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/stock/stockOutOrder.vue

         <el-date-picker v-model="start_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="startTimeChange"></el-date-picker>
-        <span class="">-</span>
+        <span class="cellLine"> - </span>
         <el-date-picker v-model="end_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd" @change="endTimeChange"></el-date-picker>

src/xt_pages/user/components/PatientDetail.vue

 <template>
   <div class="app-container ">
     <el-form ref="form" :rules="rules" :model="form" label-width="134px" class="clearfix" id="patient-info" >
-    <div style="float:right;z-index:8;position: absolute;right: 30px;">
+    <div style="float:right;z-index:8;position: absolute;right: 16px;">
       <el-button size="small" type="primary" @click="printCard()" style="margin:0 6px 6px 0;z-index:1;">打印签到卡</el-button>
       <el-button size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" type="primary" @click="$router.push('/patients/patient/'+patientID+'/edit')" style="margin:0 0 6px 0;z-index:1;">修改</el-button>
       <el-button size="small" type="primary" @click="printThisInfo()" style="margin:0 6px 6px 0;z-index:1;">打印</el-button>
     </div>
       <div class="dataTitle">一般资料</div>
       <el-row >
-        <el-col :span="4" align="center">
-          <img width="100%" height="100%" v-if="form.avatar" :src="form.avatar" class="avatar">
-          <el-form-item prop="avatar">
-            <el-input v-model="form.avatar"  type="hidden" placeholder=""></el-input>
-          </el-form-item>
-        </el-col>
         <el-col :span="20" >
           <el-row :gutter="10">
             <el-col :span="8">
             </el-col>
           </el-row>
         </el-col>
+         <el-col :span="4" align="center">
+          <img width="146px" height="146px" v-if="form.avatar" :src="form.avatar" class="avatar">
+          <el-form-item prop="avatar">
+            <el-input v-model="form.avatar"  type="hidden" placeholder=""></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
 
       <div class="dataTitle">治疗信息</div>
-      <el-row :gutter="10">
-        <el-col :span="24">
+      <el-row :gutter="24">
+        <el-col :span="12">
           <el-form-item label="主诉 : " prop="patient_complains">
             <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder="" readonly></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="现病史 : " prop="present_history">
             <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder="" readonly></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="既往史 : " prop="past_history">
             <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder="" readonly></el-input>
           </el-form-item>

src/xt_pages/user/components/PatientForm.vue

 <template>
 <div class="main-contain">
-  <div class="position">
-
-    <div class="" style="float:right;">
-       <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="this.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 class="app-container " v-loading="pageLoad">
     <el-form ref="form" :rules="rules" :model="form" label-width="124px" class="clearfix" >
+        <div class="" style="z-index: 9999;position: absolute;right: 20px;">
+        <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="primary" icon="el-icon-setting" >保存</el-button>
+        <el-button v-if="this.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="dataTitle">一般资料</div>
       <el-row >
         <el-col :span="20" class="form-table" >
               </el-form-item>
             </el-col>
 
-            <el-col :span="8" >
+            <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="家庭住址 : " prop="homeAddress">
                 <el-input v-model="form.homeAddress"></el-input>
               </el-form-item>
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="工作单位 : " prop="work">
                 <el-input v-model="form.work"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8" >
+            <el-col :span="8" :style="isEdit?'width:360px':''">
               <el-form-item label="单位地址 : " prop="unit_address">
                 <el-input v-model="form.unit_address"></el-input>
               </el-form-item>
 
       <div class="dataTitle">治疗信息</div>
       <el-row :span="24">
-        <el-col :span="8">
+        <el-col :span="12">
           <el-form-item label="主诉 : " prop="patient_complains">
             <el-input type="textarea" :rows="3" v-model="form.patient_complains" resize="none" placeholder=""></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="12">
           <el-form-item label="现病史 : " prop="present_history">
             <el-input type="textarea" :rows="3" v-model="form.present_history" resize="none" placeholder=""></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="12">
           <el-form-item label="既往史 : " prop="past_history">
             <el-input type="textarea" :rows="3" v-model="form.past_history" resize="none" placeholder=""></el-input>
           </el-form-item>
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-
+.app-container{
+  margin: 0;
+}
 .uploadHeadBtn {
   width: 148px;
   margin-top: 10px;

src/xt_pages/user/components/PatientSidebar.1.vue

 <template>
   <div>
     <div class="patient-menu">
-
       <el-autocomplete
-        style="margin:13px 5px"
+        style="margin:16px 5px"
         popper-class="my-autocomplete"
         v-model="value"
         :fetch-suggestions="querySearchAsync"

src/xt_pages/user/components/PatientSidebar.vue

   <div>
     <div class="patient-menu">
       <el-autocomplete
-        style="margin:13px 5px"
+        style="margin:16px 5px"
         popper-class="my-autocomplete"
         v-model="value"
         :fetch-suggestions="querySearchAsync"
 </script>
 
 <style>
-.el-tree-node__content {
+.patient-menu .el-tree-node__content {
   font-size: 14px;
   height: 40px;
   font-weight: 400;
 }
-.el-tree-node__label:hover {
+.patient-menu .el-tree-node__label:hover {
   color:#409eff;
 }
-.el-tree-node:focus > .el-tree-node__content {
+.patient-menu .el-tree-node:focus > .el-tree-node__content {
   color:#409eff;
 }
-.el-tree-node .el-tree-node.is-current > .el-tree-node__content {
+.patient-menu .el-tree-node .el-tree-node.is-current > .el-tree-node__content {
   color:#409eff;
-  /* background-color: transparent; */
 }
-.el-tree {
+.patient-menu .el-tree {
   background: #f6f8f9;
 }
 .patient-menu {

src/xt_pages/user/dialysisRecord.vue

                     <!-- <el-col :span="11"> -->
                       <el-date-picker size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择开始时间" style="width:150px" v-model="queryParams.start_time" @change="changeSearch" ></el-date-picker>
                     <!-- </el-col> -->
-                    <span>-</span>
+                    <span class="cellLine">-</span>
                     <!-- <el-col :span="11"> -->
                       <el-date-picker size="small"   type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束时间" style="width:150px" v-model="queryParams.end_time" @change="changeSearch" ></el-date-picker>
                     <!-- </el-col> -->
         </div>
         <div>
           <el-table :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" min-width="60">
+              <el-table-column prop="dialysis_date" label="透析日期" align="center" width="110" fixed>
                 <template slot-scope="scope"><span>{{scope.row.dialysis_date | parseTime('{y}-{m}-{d}')}}</span></template>
               </el-table-column>
-              <el-table-column prop="schedule_type" label="班次" align="center" min-width="40">
+              <el-table-column prop="schedule_type" label="班次" align="center" width="80">
                 <template slot-scope="scope"><span>{{scheduleType(scope.row.schedule_type)}}</span></template>
               </el-table-column>
-              <el-table-column prop="partition" min-width="60" align="center" label="分区 - 机号">
+              <el-table-column prop="partition" width="100" align="center" label="分区 - 机号">
                 <template slot-scope="scope"><span>{{scope.row.partition_name}}-{{scope.row.device_number}}</span></template>
               </el-table-column>
-              <el-table-column prop="mode" min-width="60" align="center" label="透析模式">
+              <el-table-column prop="mode" width="90" align="center" label="透析模式">
                 <template slot-scope="scope">{{modeName(scope.row.prescription.mode_id)}}</template>
               </el-table-column>
-              <el-table-column prop="prescription.dialysis_duration" width="80" align="center" label="透析时长 h">
+              <el-table-column prop="prescription.dialysis_duration" width="100" align="center" label="透析时长(h)">
               </el-table-column>
-              <el-table-column prop="prescription.dry_weight" width="70" align="center" label="干体重 kg">
+              <el-table-column prop="prescription.dry_weight" width="96" align="center" label="干体重(kg)">
               </el-table-column>
-              <el-table-column prop="predialysis_evaluation.weight_before" width="80" align="center" label="透前体重 kg">
+              <el-table-column prop="predialysis_evaluation.weight_before" width="110" align="center" label="透前体重(kg)">
               </el-table-column>
-              <el-table-column prop="assessment_after_dislysis.weight_after" width="80" align="center" label="透后体重 kg">
+              <el-table-column prop="assessment_after_dislysis.weight_after" width="110" align="center" label="透后体重(kg)">
               </el-table-column>
-              <el-table-column prop="predialysis_evaluation" width="80" align="center" label="透前血压 mmhg">
+              <el-table-column prop="predialysis_evaluation" width="140" align="center" label="透前血压(mmhg)">
                 <template slot-scope="scope"><span>{{scope.row.predialysis_evaluation.systolic_blood_pressure}}/{{scope.row.predialysis_evaluation.diastolic_blood_pressure}}</span></template>
               </el-table-column>
-              <el-table-column prop="assessment_after_dislysis" width="80" align="center" label="透后血压 mmhg">
+              <el-table-column prop="assessment_after_dislysis" width="140" align="center" label="透后血压(mmhg)">
                 <template slot-scope="scope"><span>{{scope.row.assessment_after_dislysis.systolic_blood_pressure}}/{{scope.row.assessment_after_dislysis.diastolic_blood_pressure}}</span></template>
               </el-table-column>
-              <el-table-column prop="predialysis_evaluation.ultrafiltration_amount" width="80" align="center" label="超滤总量 L">
+              <el-table-column prop="predialysis_evaluation.ultrafiltration_amount" width="110" align="center" label="超滤总量(L)">
               </el-table-column>
-              <el-table-column  prop="access" min-width="60" align="center" label="血管通路">
+              <el-table-column  prop="access" width="100" align="center" label="血管通路">
                 <template slot-scope="scope"><span>{{setVascularAccess(scope.row.prescription)}}</span></template>
               </el-table-column>
-              <el-table-column prop="type" width="145" align="center" label="抗凝剂种类 首剂/维持/总量">
+              <el-table-column prop="type" width="200" align="center" label="抗凝剂种类 首剂/维持/总量">
               <template slot-scope="scope">
                 <span>{{setAnticoagulantsConfit(scope.row.prescription)}}</span>
               </template>
               </el-table-column>
-              <el-table-column prop="model" min-width="60" align="center" label="透析器型号">
+              <el-table-column prop="model" width="100" align="center" label="透析器型号">
                 <template slot-scope="scope"><span>{{setDialyzerModel(scope.row.prescription)}}</span></template>
               </el-table-column>
-              <el-table-column  prop="nurse" min-width="60" align="center" label="治疗护士">
+              <el-table-column  prop="nurse" width="90" align="center" label="治疗护士">
                 <template slot-scope="scope"><span>{{getNurseName(scope.row.treatment_summary)}}</span></template>
               </el-table-column>
-              <el-table-column prop="doctor" min-width="60" align="center" label="治疗医生">
+              <el-table-column prop="doctor" width="90" align="center" label="治疗医生">
                 <template slot-scope="scope"><span>{{getDoctorName(scope.row.treatment_summary)}}</span></template>
               </el-table-column>
           </el-table>
     justify-content: space-between;
     padding: 30px 2em;
 }
-</style>
-<style>
 .record-order .el-table__body{
     border: 1px solid #333;
 }
 .record-order th, .record-order td {
     padding: 5px 10px;
 }
+
 </style>

src/xt_pages/user/doctorAdvice.vue

             <div class="cell clearfix">
                 <label class="title"><span class="name">日期查询</span> : </label>
                 <el-date-picker size="small" v-model="listQuery.start_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>
-                <span class="">-</span>
+                <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;" >

src/xt_pages/user/editPatient.vue

 
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.app-container{
+  margin: 0;
+}
+</style>

src/xt_pages/user/patient.vue

     <div class="cell clearfix">
 	    <label class="title"><span class="name">日期查询</span> : </label>
        <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
-       <span class="">-</span>
+       <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"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
     </div>
     <div class="cell clearfix">

src/xt_pages/user/patients.vue

     <div class="cell clearfix">
       <label class="title"><span class="name">日期查询</span> : </label>
       <el-date-picker size="small" clearable v-model="listQuery.start_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
-      <span class="">-</span>
+      <span class="cellLine"> - </span>
       <el-date-picker size="small" clearable v-model="listQuery.end_time"   prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right"   format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
     </div>
     <div class="cell clearfix">

src/xt_pages/user/proeducation.vue

             <div class="cell clearfix">
                 <label class="title"><span class="name">日期查询</span> : </label>
                 <el-date-picker size="small" v-model="listQuery.start_time"  prefix-icon="el-icon-date" @change="changeTime" :editable="false" style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd" value-format="yyyy-MM-dd" > </el-date-picker>
-                <span class="">-</span>
+                <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"  format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>       
             </div>  
             <el-table :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="multipleTable" :data="edusTableData" border fit highlight-current-row  style="width: 100%;margin-top: 10px;" >

src/xt_pages/user/rescueRecord.vue

         border-bottom-width: 1px;
         border-bottom-style: solid;
         border-bottom-color: #ebeef5;
+        background-color: rgb(245, 247, 250);
     }
     .content {
         padding: 12px 15px;

src/xt_pages/workforce/appointment.vue

 </script>
 
 <style rel="stylesheet/css" lang="scss">
+
+.schedule-table-cell-disable {
+    background-color: #F5F5F5 !important;
+}
 </style>
 

src/xt_pages/workforce/components/setup_template_dialog.vue

             if (msg.length == 0) {
                 this.submit()
             } else {
-                this.$confirm(msg, '提示', {confirmButtonText: '是', cancelButtonText: '否', type: 'warning'})
+                this.$confirm(msg, '提示', {confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning'})
                 .then(() => {
                     this.submit()
                 })

src/xt_pages/workforce/components/tableData.vue

         <el-table-column prop="total" label="总数" width="60" align="center" fixed="right"></el-table-column>
       </el-table>
 
-
-
-
-
-
-
-
-
-
       <el-dialog title="排班" :visible.sync="dialogTableVisible" width="1000px;" :v-model="dialog" >
         <div>
            <div class="cell clearfix">
       <el-dialog
         title="调整排班"
         :visible.sync="tzDialogVisible"
-        width="365px"
-        center>
+        width="500px"
+        >
         <div style="width:100%;margin:0 auto">
           <el-radio-group v-model="tiaoZhengType" :class="tiaozhengclass" >
             <el-radio :label="1">取消排班</el-radio>
       <el-dialog
         title="调整模式"
         :visible.sync="msDialogVisible"
-        width="350px"
-        center>
-        <div style="width:100%;margin:0 auto">
+        width="500px"
+        >
+        <div>
           <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" >
             <el-form-item label="" prop="mode_id">
               <el-select v-model="changeSchedule.mode_id" placeholder="请选择" style="width:100%">
       <el-dialog
         title="调整机号"
         :visible.sync="jhDialogVisible"
-        width="400px"
-        center>
-        <div style="width:100%;margin:0 auto">
-          <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" label-width="90px" label-position="left">
-            <el-form-item label="排班日期">
+        width="500px"
+        >
+        <div >
+          <el-form :model="changeSchedule" ref="changeSchedule" :rules="changeRules" label-width="90px" >
+            <el-form-item label="排班日期: ">
               <el-input v-model="currentData.schedule_date" disabled></el-input>
             </el-form-item>
-            <el-form-item label="班次" prop="schedule_type">
+            <el-form-item label="班次: " prop="schedule_type">
               <el-select v-model="changeSchedule.schedule_type" placeholder="请选择" style="width:100%">
                 <el-option
                   v-for="item in scheduleType"
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="病房" prop="partition_id">
+            <el-form-item label="病房: " prop="partition_id">
               <el-select v-model="changeSchedule.partition_id" placeholder="请选择" style="width:100%" @change="changePartition">
                 <el-option
                   v-for="item in partitions"
                 </el-option>
               </el-select>
             </el-form-item>
-
-            <el-form-item label="透析机" prop="bed_id">
+            <el-form-item label="透析机: " prop="bed_id">
               <el-select v-model="changeSchedule.bed_id" placeholder="请选择" style="width:100%">
                 <el-option
                   v-for="item in jihaos"
                 }
               }
               if (!cflag) {
-                this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+                this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
                 .then(() => {
                   this.changeSchedule.change_action = "change_device";
                   this.changeScheduleActon(formName);
                 this.changeScheduleActon(formName);
               }
             }else if (this.changeSchedule.partition_type > 1) {
-              this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+              this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
                 .then(() => {
                   this.changeSchedule.change_action = "change_device";
                   this.changeScheduleActon(formName);
             }
           });
           if (!cflag) {
-            this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+            this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
             }).catch(() => {
             this.CreateSchedule(this.currentData.patient_id, this.currentData);
           }
         }else if (that.currentData.partition_type > 1) {
-          this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+          this.$confirm('此患者没有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
             }).catch(() => {
   white-space:nowrap !important;
 }
 .schedule-table-cell-disable {
-    background-color: rgb(245, 245, 245);
+    background-color: rgb(245, 245, 245)!important;
 }
 #table_data{
    min-height:calc(100vh - 350px);

src/xt_pages/workforce/components/template_table.vue

             // 此患者没有传染病，与此透析机不匹配，确定在此排班吗?
             // 此患者有传染病，与此透析机不匹配，确定在此排班吗?
             var msg = havePatientDisease ? '此患者有传染病，与此透析机不匹配，确定在此排班吗?' : '此患者没有传染病，与此透析机不匹配，确定在此排班吗?'
-            this.$confirm(msg, '提示', { confirmButtonText: '是', cancelButtonText: '否', type: 'warning' })
+            this.$confirm(msg, '提示', { confirmButtonText: '确 定', cancelButtonText: '取 消', type: 'warning' })
               .then(() => {
                 this.add_schedule(patient, device_number, treat_mode, weekday, time_type)
               })