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

src/styles/index.scss

 .el-select-dropdown{
   // z-index: 2003!important;
 }
-
+// .patient-app-container {
+//   margin-bottom: 4px;
+//   height: 36px;
+//   line-height: 36px;
+// }
+.patient-app-container {
+  margin-left: 180px;
+  margin-right: 0;
+  background: #fff; 
+}
+.patient-name{
+  color: #606266;
+  font-size: 14px;
+  padding: 15px 0 15px 0;
+  display: block;
+  border-bottom: 1px #E4E7ED solid;
+  margin: 0 18px;
+  flex: 1;
+  
+}
+.el-button+.el-button{
+  // margin-left: 0;
+}
+// 病人管理-病程管理
+.filter_title {
+  font-size: 14px;
+  color: gray;
+  margin-right: 6px;
+}
+.Total{
+ margin:0 0 10px 0;
+ float: right;
+}

src/xt_pages/sign/index.vue

     background: #6fb5fa;
 }
 
- .patient-app-container {
-    margin-bottom: 4px;
-    height: 36px;
-    line-height: 36px;
-  }
+
 
   .button{
       float: right;

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

 <template>
   <div>
-
-
     <div class="patient-menu">
 
       <el-autocomplete
-        style="margin: 5px"
+        style="margin:13px 5px"
         popper-class="my-autocomplete"
         v-model="value"
         :fetch-suggestions="querySearchAsync"
         </template>
       </el-autocomplete>
 
-
-
-      <el-select v-model="selectID" style="margin-top:10px;text-align: center;" @change="changePatient"
+      <el-select v-model="selectID" style="margin:0 5px 0px 5px;text-align: center;" @change="changePatient"
                  placeholder="请选择">
         <el-option
           v-for="item in patientsList"
     content: '';
   }
 
-  .patient-app-container {
-    margin-left: 180px;
-    background: #fff; 
-  }
-   .patient-name{
-      color: #303133;
-      font-size: 15px;
-      padding-top: 15px;
-      padding-left: 15px;
-      display: inline-block;
-      
-    }
+ 
 </style>

src/xt_pages/user/components/PatientSidebar.vue

 <template>
   <div>
-
-
     <div class="patient-menu">
-
       <el-autocomplete
-        style="margin: 5px"
+        style="margin:13px 5px"
         popper-class="my-autocomplete"
         v-model="value"
         :fetch-suggestions="querySearchAsync"
         placeholder="病人名字或者透析号"
         @select="handleSelect"
        >
-        <i
-          class="el-icon-search el-input__icon"
-          slot="suffix"
-         >
-        </i>
+        <i class="el-icon-search el-input__icon" slot="suffix" > </i>
         <template slot-scope="{ item }">
           <div class="name">{{ item.name }}</div>
         </template>
       </el-autocomplete>
-
-
-
-      <el-select v-model="selectID" style="margin:10px 5px 0px 5px;text-align: center;" @change="changePatient" placeholder="请选择">
+      <el-select v-model="selectID" style="margin:0 5px 0px 5px;text-align: center;" @change="changePatient" placeholder="请选择">
         <el-option
           v-for="item in patientsList"
           :key="item.id"
 
 </template>
 <script>
+import { fetchAllList, PostSearch } from "@/api/patient";
+import { jsGetAge, uParseTime } from "@/utils/tools";
 
-  import {fetchAllList,PostSearch} from "@/api/patient";
-  import {jsGetAge, uParseTime} from "@/utils/tools";
-
-  export default {
-    name: "patientSidebar",
-    value:'',
-    searchArray:[],
-    props: {
-      id: 0,
-      defaultActive: {
-        type: String,
-        default: '1-1',
-      },
-
-    },
-    data() {
-      return {
-        thedefaultActive: 1,
-        patientsList: null,
-        currentPatient: {},
-        selectID: 0,
-        keyword:'',
-        value:'',
-        treeKey:'',
-        treeData:[
-          {
-            name:'1',
-            label: '电子病历',
-            children: [
-              {
-                name:'1-1',
-                label: '基本信息',
-              },
-              {
-                name:'1-4',
-                label: '医嘱管理',
-              },
-              {
-                name:'1-2',
-                label: '病程管理',
-              },
-              {
-                name:'1-3',
-                label: '检验检查',
-              },
-              {
-                name:'1-5',
-                label: '抢救记录',
-              }
-            ]
-          },
-          {
-            name:'2',
-            label: '透析管理',
-            children: [
-              {
-                name:'2-1',
-                label: '长期透析处方',
-              },
-              {
-                name:'2-2',
-                label: '透析记录',
-              },
-              {
-                name:'2-4',
-                label: '排班信息',
-              },
-              {
-                name:'2-5',
-                label: '宣教信息',
-              }
-            ]
-          }
-        ],
+export default {
+  name: "patientSidebar",
+  value: "",
+  searchArray: [],
+  props: {
+    id: 0,
+    defaultActive: {
+      type: String,
+      default: "1-1"
+    }
+  },
+  data() {
+    return {
+      thedefaultActive: 1,
+      patientsList: null,
+      currentPatient: {},
+      selectID: 0,
+      keyword: "",
+      value: "",
+      treeKey: "",
+      treeData: [
+        {
+          name: "1",
+          label: "电子病历",
+          children: [
+            {
+              name: "1-1",
+              label: "基本信息"
+            },
+            {
+              name: "1-4",
+              label: "医嘱管理"
+            },
+            {
+              name: "1-2",
+              label: "病程管理"
+            },
+            {
+              name: "1-3",
+              label: "检验检查"
+            },
+            {
+              name: "1-5",
+              label: "抢救记录"
+            }
+          ]
+        },
+        {
+          name: "2",
+          label: "透析管理",
+          children: [
+            {
+              name: "2-1",
+              label: "长期透析处方"
+            },
+            {
+              name: "2-2",
+              label: "透析记录"
+            },
+            {
+              name: "2-4",
+              label: "排班信息"
+            },
+            {
+              name: "2-5",
+              label: "宣教信息"
+            }
+          ]
+        }
+      ]
+    };
+  },
+  methods: {
+    handleNodeClick(data) {
+      var name = data.name;
+      if (name == "1-1") {
+        this.$router.push({ path: "/patients/patient/" + this.id });
+      } else if (name == "1-2") {
+        this.$router.push({ path: "/patients/course?id=" + this.id });
+      } else if (name == "1-3") {
+        this.$router.push({ path: "/patients/inspection?id=" + this.id });
+      } else if (name == "1-4") {
+        this.$router.push({
+          path: "/patients/patient/" + this.id + "/doctorAdvice"
+        });
+      } else if (name == "1-5") {
+        this.$router.push({ path: "/patients/rescue?id=" + this.id });
+      } else if (name == "2-1") {
+        this.$router.push({
+          path: "/patients/patient/" + this.id + "/dialysisSolution"
+        });
+      } else if (name == "2-2") {
+        this.$router.push({
+          path: "/patients/patient/" + this.id + "/dialysisRecord"
+        });
+      } else if (name == "2-4") {
+        this.$router.push({
+          path: "/patients/patient/" + this.id + "/scheduling"
+        });
+      } else if (name == "2-5") {
+        this.$router.push({
+          path: "/patients/patient/" + this.id + "/proeducation"
+        });
       }
     },
-    methods: {
-      
-      handleNodeClick(data) {
-        var name = data.name;
-        if (name=='1-1') {
-          this.$router.push({path:'/patients/patient/' + this.id});
-        } else if (name=='1-2') {
-          this.$router.push({path:'/patients/course?id='+this.id});
-        } else if (name=='1-3') {
-          this.$router.push({path:'/patients/inspection?id='+this.id});
-        } else if (name=='1-4') {
-          this.$router.push({path:'/patients/patient/'+this.id+'/doctorAdvice'});
-        } else if (name=='1-5') {
-          this.$router.push({path:'/patients/rescue?id='+this.id});
-        } else if (name=='2-1') {
-          this.$router.push({path:'/patients/patient/'+this.id+'/dialysisSolution'});
-        }else if (name=='2-2') {
-          this.$router.push({path:'/patients/patient/'+this.id+'/dialysisRecord'});
-        }else if (name=='2-4') {
-          this.$router.push({path:'/patients/patient/'+this.id+'/scheduling'});
-        }else if (name=='2-5') {
-          this.$router.push({path:'/patients/patient/'+this.id+'/proeducation'});
-        }
-      },
-      changePatient(value) {
-        console.log(value)
-        this.$router.push("/patients/patient/" + value);
-      },
-      getList() {
-        fetchAllList().then(response => {
-          if (response.data.state == 1) {
-            this.patientsList = response.data.data.patients;
-            var len = this.patientsList.length;
-            if (len > 0) {
-              for (let index = 0; index < len; index++) {
-                if (this.patientsList[index].id == this.id) {
-                  this.currentPatient = this.patientsList[index];
+    changePatient(value) {
+      console.log(value);
+      this.$router.push("/patients/patient/" + value);
+    },
+    getList() {
+      fetchAllList().then(response => {
+        if (response.data.state == 1) {
+          this.patientsList = response.data.data.patients;
+          var len = this.patientsList.length;
+          if (len > 0) {
+            for (let index = 0; index < len; index++) {
+              if (this.patientsList[index].id == this.id) {
+                this.currentPatient = this.patientsList[index];
 
-                  this.selectID = this.patientsList[index].id;
-                  this.$emit('tran-patient', this.currentPatient);
-                  break;
-                }
+                this.selectID = this.patientsList[index].id;
+                this.$emit("tran-patient", this.currentPatient);
+                break;
               }
             }
           }
-        });
-      },
-      tranAge(birthday) {
-        var birth = uParseTime(birthday, '{y}-{m}-{d}');
-        return jsGetAge(birth, '-');
-      },
-      tranSex(gender) {
-        var sex = "未知";
-        switch (gender) {
-          case 1:
-            sex = "男"
-            break;
-          case 2:
-            sex = "女"
-            break;
-          default:
-            break;
-        }
-        return sex;
-      },querySearchAsync(keyword,cb){
-        let key = ""
-        if(keyword != undefined){
-          key = keyword
         }
-        let searchArray = []
-        PostSearch(key).then(response => {
-          if (response.data.state == 1) {
-            searchArray =response.data.data.patient
-            cb(searchArray)
-          }else{
-            this.$message.error(response.data.msg);
-            cb([])
-
-          }
-
-        });
-
-      },handleSelect(val){
-        this.$router.push("/patients/patient/" + val.id);
-
-
+      });
+    },
+    tranAge(birthday) {
+      var birth = uParseTime(birthday, "{y}-{m}-{d}");
+      return jsGetAge(birth, "-");
+    },
+    tranSex(gender) {
+      var sex = "未知";
+      switch (gender) {
+        case 1:
+          sex = "男";
+          break;
+        case 2:
+          sex = "女";
+          break;
+        default:
+          break;
       }
-
+      return sex;
     },
-    created() {
-      this.treeKey = this.defaultActive;
-      this.getList();
+    querySearchAsync(keyword, cb) {
+      let key = "";
+      if (keyword != undefined) {
+        key = keyword;
+      }
+      let searchArray = [];
+      PostSearch(key).then(response => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.patient;
+          cb(searchArray);
+        } else {
+          this.$message.error(response.data.msg);
+          cb([]);
+        }
+      });
     },
-  };
-</script>
-
-<style>
-
-    .el-tree-node__content {
-        font-size: 14px;
-        height: 40px;
-        font-weight: 400;
-    }
-    .el-tree-node__label:hover {
-        color: #0593D3;
-    }
-    .el-tree-node:focus>.el-tree-node__content {
-        color: #0593D3;
-    }
-    .el-tree-node .el-tree-node.is-current>.el-tree-node__content{
-        color: #0593D3;
-        /* background-color: transparent; */
+    handleSelect(val) {
+      this.$router.push("/patients/patient/" + val.id);
     }
-    .el-tree {
-      background: #f6f8f9;
-    }
-  .patient-menu {
-    -webkit-transition: width 0.28s;
-    transition: width 0.28s;
-    width: 180px !important;
-    height: 100%;
-    position: relative;
-    font-size: 0px;
-    top: 0;
-    float: left;
-    bottom: 0;
-    left: 0;
-    /* z-index: 99; */
-    overflow: hidden;
+  },
+  created() {
+    this.treeKey = this.defaultActive;
+    this.getList();
   }
+};
+</script>
 
-  .patient-center-menu .el-icon-arrow-down:before {
-    content: '';
-  }
+<style>
+.el-tree-node__content {
+  font-size: 14px;
+  height: 40px;
+  font-weight: 400;
+}
+.el-tree-node__label:hover {
+  color:#409eff;
+}
+.el-tree-node:focus > .el-tree-node__content {
+  color:#409eff;
+}
+.el-tree-node .el-tree-node.is-current > .el-tree-node__content {
+  color:#409eff;
+  /* background-color: transparent; */
+}
+.el-tree {
+  background: #f6f8f9;
+}
+.patient-menu {
+  -webkit-transition: width 0.28s;
+  transition: width 0.28s;
+  width: 180px !important;
+  height: 100%;
+  position: relative;
+  font-size: 0px;
+  top: 0;
+  float: left;
+  bottom: 0;
+  left: 0;
+  /* z-index: 99; */
+  overflow: hidden;
+}
 
-  .patient-app-container {
-    margin-left: 180px;
-    background: #fff; 
-  }
-   .patient-name{
-      color: #303133;
-      font-size: 15px;
-      padding-top: 15px;
-      padding-left: 15px;
-      display: inline-block;
-      
-    }
+.patient-center-menu .el-icon-arrow-down:before {
+  content: "";
+}
 </style>

src/xt_pages/user/courseOfDisease.vue

     </div> -->
     <div class="patient-container ">
         <patient-sidebar :id="patient_id" defaultActive="1-2"></patient-sidebar>
-        <div class="container" v-loading="loading">
-            <div>
-                <span class="filter_title">日期查询</span>
-                <el-date-picker v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>
-                <span style="margin-left: 10px;">
-                    <el-button type="primary" @click="show_dialog = true">新增</el-button>
-                    <el-button v-show="selectingRows.length > 0" type="danger" @click="deleteAction">删除</el-button>
-                </span>
-            </div>
-            <div class="record">
-                <el-row :gutter="15">
-                    <el-col :span="10">
-                        <el-table  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="record_table" :data="records" border highlight-current-row @current-change="didChangeCurrentRecord" @selection-change="didSelectionChange">
-                            <el-table-column type="selection" width="40" align="center"></el-table-column>
-                            <el-table-column label="记录时间" align="center">
-                                <template slot-scope="scope">
-                                    {{ recordTime(scope.row.record_time) }}
-                                </template>
-                            </el-table-column>
-                            <el-table-column label="记录医生" align="center">
-                                <template slot-scope="scope">
-                                    {{ doctorName(scope.row.recorder) }}
-                                </template>
-                            </el-table-column>
-                        </el-table>
-                    </el-col>
-                    <el-col :span="14">
-                        <div class="record_content_panel">
-                            <div class="title">病程内容</div>
-                            <div class="content">
-                                {{ current_select_record == null ? "" : current_select_record.content }}
+        <!-- <div class="app-container"> -->
+            <div class="container" v-loading="loading">
+                <div>
+                    <span class="filter_title">日期查询</span>
+                    <el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestCourseRecords()"></el-date-picker>
+                    <span style="margin-left: 10px;">
+                        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="show_dialog = true">新增</el-button>
+                        <el-button  size="small" v-show="selectingRows.length > 0" type="danger" @click="deleteAction">删除</el-button>
+                    </span>
+                </div>
+                <div class="record">
+                    <el-row :gutter="15">
+                        <el-col :span="10">
+                            <el-table  :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}" ref="record_table" :data="records" border highlight-current-row @current-change="didChangeCurrentRecord" @selection-change="didSelectionChange">
+                                <el-table-column type="selection" width="40" align="center"></el-table-column>
+                                <el-table-column label="记录时间" align="center">
+                                    <template slot-scope="scope">
+                                        {{ recordTime(scope.row.record_time) }}
+                                    </template>
+                                </el-table-column>
+                                <el-table-column label="记录医生" align="center">
+                                    <template slot-scope="scope">
+                                        {{ doctorName(scope.row.recorder) }}
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                        </el-col>
+                        <el-col :span="14">
+                            <div class="record_content_panel">
+                                <div class="title">病程内容</div>
+                                <div class="content">
+                                    {{ current_select_record == null ? "" : current_select_record.content }}
+                                </div>
                             </div>
-                        </div>
-                    </el-col>
-                </el-row>
+                        </el-col>
+                    </el-row>
+                </div>
             </div>
-        </div>
-
+        <!-- </div> -->
         <el-dialog title="新增病程记录" width="40%" top="5vh" :visible.sync="show_dialog" :before-close="willCloseDialog">
             <div>
                 <div class="new_record_form">
 <style rel="stylesheet/css" lang="scss" scoped>
 .container {
     margin-left: 180px;
-    padding: 0 20px;
+    padding: 20px;
+    background: #fff;
+    min-height: calc(100vh - 173px);
+    margin-bottom: 15px;
 
     .record {
         padding-top: 20px;
     }
 }
-.filter_title {
-    font-size: 14px;
-    color: gray;
-    margin-right: 6px;
-}
 .record_content_panel {
     border-width: 1px;
     border-style: solid;

src/xt_pages/user/dialysisSolution.1.vue

   <el-dialog
     :title="isEdit?'编辑透析方案':'新增透析方案'"
     :visible.sync="dialogVisible"
-    width="700px">
+    width="1010px">
     <el-form ref="addPlan" :model="addPlan" :rules="addPlanRules" label-width="85px">
       <el-row :gutter="20"> 
         <el-col style="" :span="12"  >
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
-      <el-button type="warning" @click="submitEditChildSolution('childPlan')" v-if="isChildEdit">保 存</el-button>
+      <el-button type="primary" @click="submitEditChildSolution('childPlan')" v-if="isChildEdit">保 存</el-button>
       <el-button type="primary" @click="submitNewChildSolution('childPlan')" v-else>保 存</el-button>
       <el-button @click="dialogFormVisible = false">取 消</el-button>
     </div>
       margin: 0 20px 0 0;
     }
   }
-  .sum {
-    border: 1px #ebeef5 solid;
-    border-top: none;
-    border-bottom: none;
-    padding: 10px 0 10px 15px;
-    font-size: 15px;
-    color: #909399;
-  }
+
 }
 .form-table {
   border: 1px #ebeef5 solid;

src/xt_pages/user/dialysisSolution.vue

    <div class="patient-app-container app-container">
     <div class="Total">
       <!-- <div class="plan" >透析计划</div> -->
-      <table-title title="长期透析处方"></table-title>
+      <!-- <table-title title="长期透析处方"></table-title> -->
       <div class="sum">
         <!-- <span>透析总频率:<el-input :value="totalrate" disabled style="width:180px"></el-input></span> -->
-        <el-button type="primary" icon="el-icon-plus" size="medium" @click="openNew" :disabled="$store.getters.xt_user.subscibe.state==3?true:false">新增透析处方</el-button>
+        <el-button type="primary" size="small" icon="el-icon-plus"  @click="openNew" :disabled="$store.getters.xt_user.subscibe.state==3?true:false">新增透析处方</el-button>
       </div>
     </div>
     <el-table ref="solutionTable" :data="tableData" border fit highlight-current-row
   <el-dialog
     :title="isEdit?'编辑透析处方':'新增透析处方'"
     :visible.sync="dialogVisible"
-    width="850px">
+    width="1010px">
     <el-form ref="addPlan" :model="addPlan" :rules="addPlanRules" label-width="160px">
       <el-row :gutter="20">
-        <el-col style="width:380px" :span="12"  >
-            <el-form-item label="透析模式:" prop="mode">
+        <el-col  :span="8" style="height:59px;" >
+            <el-form-item label="透析模式:" prop="mode" >
               <el-select v-model="addPlan.mode" @change="addPlanModeChange" :disabled="isEdit?true:false" >
                 <el-option v-for="item in modeOptions"  :label="item.name" :key="item.id" :value="item.id"></el-option>
               </el-select>
             </el-form-item>
         </el-col>
 
-        <el-col style="width:380px" :span="12"  >
+        <el-col  :span="8"  >
           <el-form-item label="透析时长（h）:" prop="dialysis_duration">
             <!-- <el-input v-model="addPlan.dialysis_duration"></el-input> -->
              <el-time-picker
           </el-form-item>
         </el-col>
 
-        <!-- <el-col style="width:380px"  :span="12">
+        <!-- <el-col   :span="8">
           <el-form-item label="透析器:" prop="dialyzer">
               <el-select v-model="addPlan.dialyzer" placeholder="" >
                 <el-option v-for="item in deviceList"  :label="item.name" :key="item.id" :value="item.id"></el-option>
               </el-select>
           </el-form-item>
         </el-col> -->
-        <!-- <el-col style="width:380px"  :span="12">
+        <!-- <el-col   :span="8">
           <el-form-item label="透析器:" prop="hemodialysis_machine">
               <el-select v-model="addPlan.hemodialysis_machine" placeholder="" >
                 <el-option v-for="item in hemodialysis_machines"  :label="item.name" :key="item.id" :value="item.id"></el-option>
               </el-select>
           </el-form-item>
         </el-col> -->
-        <!-- <el-col style="width:380px"  :span="12">
+        <!-- <el-col   :span="8">
           <el-form-item label="灌流器:" prop="perfusion_apparatus">
               <el-select v-model="addPlan.perfusion_apparatus" placeholder="" >
                 <el-option v-for="item in perfusion_apparatus"  :label="item.name" :key="item.id" :value="item.id"></el-option>
               </el-select>
           </el-form-item>
         </el-col> -->
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="8">
           <el-form-item label="血流量(ml/min):" prop="blood_flow_volume">
             <el-input v-model="addPlan.blood_flow_volume" ></el-input>
           </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="8">
           <el-form-item label="目标超滤量(ml) : " prop="target_ultrafiltration">
             <el-input v-model="addPlan.target_ultrafiltration" type="number"></el-input>
           </el-form-item>
         </el-col>
 
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="8">
           <el-form-item label="透析液配方:" prop="dialysate_formulation" >
             <el-select v-model="addPlan.dialysate_formulation"  >
               <el-option v-for="item in dialysate_formulation"  :label="item.name" :key="item.id" :value="item.id"></el-option>
             </el-select>
          </el-form-item>
         </el-col>
-        <!-- <el-col style="width:380px" :span="12">
+        <!-- <el-col  :span="12">
           <el-form-item label="脱水量(L):" prop="dewater">
             <el-input v-model="addPlan.dewater" ></el-input>
           </el-form-item>
         </el-col> -->
-        <!-- <el-col style="width:380px" :span="12">
+        <!-- <el-col  :span="12">
           <el-form-item label="置换液(L):" prop="displace_liqui">
             <el-input v-model="addPlan.displace_liqui" ></el-input>
           </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="12">
           <el-form-item label="置换方式:" prop="replacement_way" >
             <el-select v-model="addPlan.replacement_way"  >
               <el-option v-for="item in replacementWays"  :label="item.name" :key="item.id" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-col> -->
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="8">
           <el-form-item label="抗凝剂:" prop="anticoagulant" >
             <el-select v-model="addPlan.anticoagulant" @change="changeThisAnticoagulant" >
               <el-option v-for="item in anticoagulantsConfit"  :label="item.name" :key="item.id" :value="item.id"></el-option>
             </el-select>
          </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12" v-if="anticoagulant.shouji != -1">
+        <el-col  :span="8" v-if="anticoagulant.shouji != -1">
             <el-form-item :label="'首剂（'+anticoagulant.shouji_unit+'）: '" prop="anticoagulant_shouji" >
              <el-input v-model="addPlan.anticoagulant_shouji" :disabled="anticoagulant.shouji==1?false:true"></el-input>
             </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12"  v-if="anticoagulant.weichi != -1">
+        <el-col  :span="8"  v-if="anticoagulant.weichi != -1">
             <el-form-item :label="'维持（'+anticoagulant.weichi_unit+'）: '" prop="anticoagulant_weichi" >
              <el-input v-model="addPlan.anticoagulant_weichi" :disabled="anticoagulant.weichi==1?false:true"></el-input>
             </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12" v-if="anticoagulant.zongliang != -1">
+        <el-col  :span="8" v-if="anticoagulant.zongliang != -1">
             <el-form-item :label="'总量（'+anticoagulant.zongliang_unit+'）: '" prop="anticoagulant_zongliang" >
              <el-input v-model="addPlan.anticoagulant_zongliang" :disabled="anticoagulant.zongliang==1?false:true" ></el-input>
             </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12" v-if="anticoagulant.gaimingcheng != -1">
+        <el-col  :span="8" v-if="anticoagulant.gaimingcheng != -1">
             <el-form-item :label="'钙（'+anticoagulant.gaimingcheng_unit+'）: '" prop="anticoagulant_gaimingcheng">
              <el-input v-model="addPlan.anticoagulant_gaimingcheng" :disabled="anticoagulant.gaimingcheng==1?false:true" placeholder="钙名称" ></el-input>
             </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12"  v-if="anticoagulant.gaijiliang != -1">
+        <el-col  :span="8"  v-if="anticoagulant.gaijiliang != -1">
             <el-form-item prop="anticoagulant_gaijiliang">
              <el-input v-model="addPlan.anticoagulant_gaijiliang" :disabled="anticoagulant.gaijiliang==1?false:true"  placeholder="钙剂量"></el-input>
             </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="8">
           <el-form-item label="置换量(L) : " prop="replacement_total">
             <el-input v-model="addPlan.replacement_total" type="number"></el-input>
           </el-form-item>
         </el-col>
 
         
-        <el-col style="width:380px" :span="12" >
+        <el-col  :span="8" >
           <el-form-item label="钾（mmol/L）: " prop="kalium">
             <el-input v-model="addPlan.kalium" ></el-input>
           </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12" >
+        <el-col  :span="8" >
           <el-form-item label="钠（mmol/L）: " prop="sodium">
             <el-input v-model="addPlan.sodium" ></el-input>
           </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12" >
+        <el-col  :span="8" >
           <el-form-item label="钙（mmol/L）: " prop="calcium">
             <el-input v-model="addPlan.calcium" ></el-input>
           </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12" >
+        <el-col  :span="8" >
            <el-form-item label="碳酸氢根（mmol/L）: " prop="bicarbonate">
              <el-input v-model="addPlan.bicarbonate" ></el-input>
            </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="8">
           <el-form-item label="葡萄糖（mmol/L）: "  prop="glucose">
               <el-input v-model="addPlan.glucose"></el-input>
           </el-form-item>
         </el-col>
 
-        <!-- <el-col style="width:380px" :span="12">
+        <!-- <el-col  :span="8">
           <el-form-item label="干体重（kg）: "   prop="dry_weight">
               <el-input v-model="addPlan.dry_weight"></el-input>
           </el-form-item>
         </el-col> -->
 
 
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="8">
           <el-form-item label="透析液流量（ml/min）: " prop="dialysate_flow">
               <el-input v-model="addPlan.dialysate_flow"></el-input>
           </el-form-item>
         </el-col>
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="8">
           <el-form-item label="透析液温度（℃）: "  prop="dialysate_temperature">
               <el-input v-model="addPlan.dialysate_temperature"></el-input>
           </el-form-item>
         </el-col>
 
-        <el-col style="width:380px" :span="12">
+        <el-col  :span="8">
           <el-form-item label="电导率（mS/cm）: " prop="conductivity">
               <el-input v-model="addPlan.conductivity"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
-        <el-col style="width:760px" :span="24">
+      <el-row :gutter="24">
+        <el-col  :span="24">
           <el-form-item label="备注: "  prop="remark">
               <el-input
               type="textarea"
      </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="warning" @click="submitEditSolution('addPlan')" v-if="isEdit" :disabled="$store.getters.xt_user.subscibe.state==3?true:false">保 存</el-button>
+        <el-button type="primary" @click="submitEditSolution('addPlan')" v-if="isEdit" :disabled="$store.getters.xt_user.subscibe.state==3?true:false">保 存</el-button>
         <el-button type="primary" @click="submitNewSolution('addPlan')" v-else :disabled="$store.getters.xt_user.subscibe.state==3?true:false">保 存</el-button>
       </span>
   </el-dialog>
       margin: 0 20px 0 0;
     }
   }
-  .sum {
-    border: 1px #ebeef5 solid;
-    border-top: none;
-    border-bottom: none;
-    padding: 10px 0 10px 15px;
-    font-size: 15px;
-    color: #909399;
-  }
+  
 }
 .form-table {
   border: 1px #ebeef5 solid;

src/xt_pages/user/doctorAdvice.vue

         <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">
-                <el-input   style="width: 400px;" v-model="listQuery.keywords" class="filter-item" />
-                <el-button  class="filter-item" type="primary" icon="el-icon-search" @click="changeKey" >搜索</el-button>
-                <el-button  class="filter-item" 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" class="filter-item" style="float:right;" @click="openNew" type="primary" icon="el-icon-plus" >新增医嘱</el-button>
+                <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>
             </div>
             <div class="cell clearfix">
                 <label class="title"><span class="name">医嘱类型</span> : </label>
             </div>
             <div class="cell clearfix">
                 <label class="title"><span class="name">日期查询</span> : </label>
-                <el-date-picker 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>
+                <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>
-                <el-date-picker 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>
+                <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;" >
 
                 </template> -->
                   <el-table-column  label="操作" width="180" align="center"  fixed="right">
                       <template slot-scope="scope">
-                        <el-button-group>
-                          <el-button type="primary" size="mini" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="scope.row.groupno>0?openEditGroupAdvice(scope.row.groupno):openEdit(scope.$index, scope.row)" v-if="isShowStartTime(scope.$index, scope.row)">编辑</el-button>
-                          <el-button type="danger" size="mini" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="scope.row.groupno>0?DeleteGroupAdvice(scope.row.groupno):openDelete(scope.$index, scope.row)" v-if="isShowStartTime(scope.$index, scope.row)">删除</el-button>
-                        </el-button-group>
+                        <!-- <el-button-group> -->
+                          <el-tooltip  class="item" effect="dark" content="编辑" placement="top">
+                            <el-button icon="el-icon-edit-outline" type="primary"  size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="scope.row.groupno>0?openEditGroupAdvice(scope.row.groupno):openEdit(scope.$index, scope.row)" v-if="isShowStartTime(scope.$index, scope.row)"></el-button>
+                          </el-tooltip>
+                          <el-tooltip class="item" effect="dark" content="删除" placement="top">
+                            <el-button icon="el-icon-delete" type="danger" size="small" :disabled="$store.getters.xt_user.subscibe.state==3?true:false" @click="scope.row.groupno>0?DeleteGroupAdvice(scope.row.groupno):openDelete(scope.$index, scope.row)" v-if="isShowStartTime(scope.$index, scope.row)"></el-button>
+                          </el-tooltip>
+                      <!-- </el-button-group> -->
                       </template>
                   </el-table-column>
             </el-table>

src/xt_pages/user/inspection.vue

         </el-col>
         <el-col :span="17" v-loading="itemLoading">
           <div class="filter-container" style="float:right">
-            <el-button class="filter-item" type="primary" @click="openNew()" icon="el-icon-plus" :disabled="project?false:true">新增</el-button>
-            <el-button class="filter-item" type="primary" icon="el-icon-edit" @click="openEdit()" :disabled="itemDate?false:true">修改</el-button>
-            <el-button class="filter-item" type="danger" icon="el-icon-delete" @click="deleteInspection()" :disabled="itemDate?false:true">删除</el-button>
+            <el-button size="small" class="filter-item" type="primary" @click="openNew()" icon="el-icon-circle-plus-outline" :disabled="project?false:true">新增</el-button>
+            <el-button size="small" class="filter-item" type="primary" icon="el-icon-edit-outline" @click="openEdit()" :disabled="itemDate?false:true">修改</el-button>
+            <el-button size="small" class="filter-item" type="danger" icon="el-icon-delete" @click="deleteInspection()" :disabled="itemDate?false:true">删除</el-button>
           </div>
           <div class="filter-container" >
             <el-button class="filter-item" type="text" style="color:#000">{{itemName}} <span v-if="itemDate">（检查日期：{{itemDate}}）</span></el-button>

src/xt_pages/user/patient.vue

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

src/xt_pages/user/patients.vue

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

src/xt_pages/user/proeducation.vue

         <div class="patient-app-container advice-container app-container">
             <div class="cell clearfix">
                 <label class="title"><span class="name">日期查询</span> : </label>
-                <el-date-picker 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>
+                <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>
-                <el-date-picker 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>       
+                <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;" >
                 <el-table-column type="index"  label="序号" width="60px" align="center"></el-table-column>

src/xt_pages/user/rescueRecord.vue

         <div class="container" v-loading="loading">
             <div>
                 <span class="filter_title">日期查询</span>
-                <el-date-picker v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestRescueRecords()"></el-date-picker>
+                <el-date-picker size="small" v-model="date" type="daterange" range-separator="至" start-placeholde="开始日期" end-placeholde="结束日期" value-format="timestamp" :clearable="false" @change="requestRescueRecords()"></el-date-picker>
                 <span style="margin-left: 10px;">
-                    <el-button type="primary" @click="show_dialog = true">新增</el-button>
-                    <el-button v-show="selectingRows.length > 0" type="danger" @click="deleteAction">删除</el-button>
+                    <el-button size="small" icon="el-icon-circle-plus-outline" type="primary" @click="show_dialog = true">新增</el-button>
+                    <el-button size="small" icon="el-icon-delete" v-show="selectingRows.length > 0" type="danger" @click="deleteAction">删除</el-button>
                 </span>
             </div>
             <div class="record">
 <style rel="stylesheet/css" lang="scss" scoped>
 .container {
     margin-left: 180px;
-    padding: 0 20px;
+    padding: 20px;
+    background: #fff;
+    min-height: calc(100vh - 173px);
+    margin-bottom: 15px;
 
     .record {
         padding-top: 20px;
     }
 }
-.filter_title {
-    font-size: 14px;
-    color: gray;
-    margin-right: 6px;
-}
+
 .record_content_panel {
     border-width: 1px;
     border-style: solid;

src/xt_pages/user/scheduling.vue

   <div class="patient-container">
     <patient-sidebar :id="patientID" defaultActive="2-4"></patient-sidebar>
     <div class="patient-app-container app-container ">
-      <table-title title="排班记录列表"></table-title>
+      <!-- <table-title title="排班记录列表"></table-title> -->
       <div class="sum">
           <!-- <span>治疗频率 : 两周5次 </span> -->
       </div> 
 </script>
 
 <style rel="stylesheet/css" lang="scss" scoped>
- .sum{
-    border: 1px #ebeef5 solid;
-    border-top: none;  
-    border-bottom: none;  
-    padding:10px 0 10px 15px;
-    font-size: 15px;
-    color: #909399;  
-  }
 
 </style>

src/xt_pages/user/weight.vue

 </script>
 <style rel="stylesheet/css" lang="scss" scoped>
 .sum{
-    border: 1px #ebeef5 solid;
-    border-top: none;  
-    border-bottom: none;  
-    padding:10px 0 10px 15px;
-    font-size: 15px;
-    color: #909399;
+
     .weight,
     .Adjust{
         margin: 0 0 0 4px;