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

src/icons/svg/dashboard.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1509611822979" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10379" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M219.428571 658.285714q0-30.285714-21.428571-51.714285T146.285714 585.142857t-51.714285 21.428572T73.142857 658.285714t21.428572 51.714286T146.285714 731.428571t51.714286-21.428571T219.428571 658.285714z m109.714286-256q0-30.285714-21.428571-51.714285T256 329.142857t-51.714286 21.428572T182.857143 402.285714t21.428571 51.714286T256 475.428571t51.714286-21.428571T329.142857 402.285714z m244.571429 274.857143l57.714285-218.285714q3.428571-14.857143-4.285714-27.714286T605.142857 414.285714t-27.428571 3.714286-17.142857 22.571429l-57.714286 218.285714q-34.285714 2.857143-61.142857 24.857143t-36 56.285714q-11.428571 44 11.428571 83.428571t66.857143 50.857143 83.428571-11.428571 50.857143-66.857143q9.142857-34.285714-3.428571-66.857143t-41.142857-52z m377.142857-18.857143q0-30.285714-21.428572-51.714285T877.714286 585.142857t-51.714286 21.428572-21.428571 51.714285 21.428571 51.714286 51.714286 21.428571 51.714285-21.428571 21.428572-51.714286z m-365.714286-365.714285q0-30.285714-21.428571-51.714286T512 219.428571t-51.714286 21.428572T438.857143 292.571429t21.428571 51.714285T512 365.714286t51.714286-21.428572T585.142857 292.571429z m256 109.714285q0-30.285714-21.428571-51.714285T768 329.142857t-51.714286 21.428572T694.857143 402.285714t21.428571 51.714286T768 475.428571t51.714286-21.428571T841.142857 402.285714z m182.857143 256q0 149.142857-80.571429 276-10.857143 16.571429-30.857142 16.571429H111.428571q-20 0-30.857142-16.571429Q0 808 0 658.285714q0-104 40.571429-198.857143t109.142857-163.428571 163.428571-109.142857 198.857143-40.571429 198.857143 40.571429 163.428571 109.142857 109.142857 163.428571 40.571429 198.857143z" p-id="10380"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1559126278025" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4738" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M553.86203002 156.61769104a59.43740844 59.43740844 0 0 0-79.86785887 0L151.037323 463.27838135a29.79286192 29.79286192 0 0 0 39.89685059 44.25361632l5.13542175-4.87586974V822.72082519a59.58572388 59.58572388 0 0 0 59.58572388 59.6598816h173.39927672v-179.3875122a41.95472718 41.95472718 0 0 1 41.97326661-42.01034547h81.59202576a41.95472718 41.95472718 0 0 1 41.97326659 42.01034547v179.3875122h177.51502992a59.58572388 59.58572388 0 0 0 59.6042633-59.6598816V506.56794739c13.2371521 11.97647094 32.01759338 11.06803894 43.03001403-1.20506286a29.79286192 29.79286192 0 0 0-2.15057372-42.08450318L553.86203002 156.63623047z" fill="#333333" p-id="4739"></path></svg>

src/icons/svg/sign.svg

@@ -1 +1 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1558939526756" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9518" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M 879.646 245.609 v 599.999 h -728.57 V 245.609 h 728.57 m 0 -85.714 h -728.57 c -47.338 0 -85.716 38.377 -85.716 85.715 v 599.999 c 0 47.338 38.378 85.715 85.716 85.715 h 728.57 c 47.338 0 85.715 -38.377 85.715 -85.715 v -600 c -0.001 -47.338 -38.378 -85.714 -85.715 -85.714 Z" p-id="9519"></path><path d="M 482.506 755.331 h -0.021 c -16.541 0 -32.059 -6.495 -43.695 -18.276 L 306.62 603.377 c -16.637 -16.835 -16.479 -43.967 0.348 -60.613 c 16.822 -16.625 43.954 -16.479 60.609 0.343 l 114.93 116.248 l 220.668 -223.211 c 16.646 -16.813 43.778 -16.972 60.614 -0.348 c 16.826 16.646 16.98 43.778 0.347 60.614 L 526.2 737.076 c -11.644 11.778 -27.161 18.255 -43.694 18.255 Z M 707.145 318.818 c -23.669 0 -42.86 -19.187 -42.86 -42.855 V 104.532 c 0 -23.665 19.191 -42.855 42.86 -42.855 c 23.664 0 42.855 19.19 42.855 42.855 v 171.431 c 0 23.669 -19.191 42.855 -42.855 42.855 Z M 318.211 318.818 c -23.67 0 -42.855 -19.187 -42.855 -42.855 V 104.532 c 0 -23.665 19.186 -42.855 42.855 -42.855 c 23.668 0 42.855 19.19 42.855 42.855 v 171.431 c 0 23.669 -19.187 42.855 -42.855 42.855 Z" p-id="9520"></path></svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1509611822979" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10379" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><defs><style type="text/css"></style></defs><path d="M219.428571 658.285714q0-30.285714-21.428571-51.714285T146.285714 585.142857t-51.714285 21.428572T73.142857 658.285714t21.428572 51.714286T146.285714 731.428571t51.714286-21.428571T219.428571 658.285714z m109.714286-256q0-30.285714-21.428571-51.714285T256 329.142857t-51.714286 21.428572T182.857143 402.285714t21.428571 51.714286T256 475.428571t51.714286-21.428571T329.142857 402.285714z m244.571429 274.857143l57.714285-218.285714q3.428571-14.857143-4.285714-27.714286T605.142857 414.285714t-27.428571 3.714286-17.142857 22.571429l-57.714286 218.285714q-34.285714 2.857143-61.142857 24.857143t-36 56.285714q-11.428571 44 11.428571 83.428571t66.857143 50.857143 83.428571-11.428571 50.857143-66.857143q9.142857-34.285714-3.428571-66.857143t-41.142857-52z m377.142857-18.857143q0-30.285714-21.428572-51.714285T877.714286 585.142857t-51.714286 21.428572-21.428571 51.714285 21.428571 51.714286 51.714286 21.428571 51.714285-21.428571 21.428572-51.714286z m-365.714286-365.714285q0-30.285714-21.428571-51.714286T512 219.428571t-51.714286 21.428572T438.857143 292.571429t21.428571 51.714285T512 365.714286t51.714286-21.428572T585.142857 292.571429z m256 109.714285q0-30.285714-21.428571-51.714285T768 329.142857t-51.714286 21.428572T694.857143 402.285714t21.428571 51.714286T768 475.428571t51.714286-21.428571T841.142857 402.285714z m182.857143 256q0 149.142857-80.571429 276-10.857143 16.571429-30.857142 16.571429H111.428571q-20 0-30.857142-16.571429Q0 808 0 658.285714q0-104 40.571429-198.857143t109.142857-163.428571 163.428571-109.142857 198.857143-40.571429 198.857143 40.571429 163.428571 109.142857 109.142857 163.428571 40.571429 198.857143z" p-id="10380"></path></svg>

src/router/index.js

@@ -334,7 +334,7 @@ export const xt_constantRouterMap = [
         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: '数据看板' }}
     ]
@@ -762,7 +762,7 @@ export const xt_asyncRouterMap = [
   //       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

@@ -481,7 +481,6 @@ code {
   border-bottom: 1px #E4E7ED solid;
   margin: 0 18px;
   flex: 1;
-  
 }
 .el-button+.el-button{
   // margin-left: 0;
@@ -495,4 +494,8 @@ code {
 .Total{
  margin:0 0 10px 0;
  float: right;
+}
+.cellLine{
+  color: #C0C4CC;
+  padding: 0 3px;
 }

src/views/layout/components/Navbar.vue

@@ -255,4 +255,10 @@ export default {
     left: 0;
   }
 }
+.el-dropdown-menu{
+  z-index: 9999!important;
+}
+.v-modal{
+  z-index: 9999!important;  
+}
 </style>

src/xt_pages/dialysis/bulletinBoard.vue

@@ -158,8 +158,8 @@
       }
     },
     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();
     },
@@ -210,7 +210,6 @@
                   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

@@ -1008,11 +1008,11 @@
 </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

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

src/xt_pages/role/admin.vue

@@ -8,16 +8,16 @@
   </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>
@@ -27,7 +27,7 @@
           </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

@@ -6,9 +6,9 @@
   </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>
@@ -18,7 +18,7 @@
           </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/sign/index.vue

@@ -5,8 +5,8 @@
         <bread-crumb :crumbs='crumbs'></bread-crumb>
     </div>
     <div class="app-container sign-and-weigh-box">
-        <el-row :gutter="20">
-            <el-col :span="7">
+        <el-row :gutter="24">
+            <el-col :span="8">
                 <div class="dataTitle">患者列表</div>
                 <div style="margin-bottom: 10px;">
                     <el-input v-model="queryParams.keywords" placeholder="姓名/透析号" style="width: 180px;" @change="changeSearch"></el-input>
@@ -15,8 +15,8 @@
                     </el-select>
                 </div>
                 <el-table  :data="patients" :class="signAndWeighBoxPatients" style="width: 100%" border highlight-current-row :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)'}" max-height="300" @current-change="handleCurrentChange">  
-                    <el-table-column type="index" label="序号" min-width="30" align="center"></el-table-column>
-                   <el-table-column prop="name" label="姓名" min-width="30" align="center">
+                    <el-table-column type="index" label="序号" width="50px" align="center"></el-table-column>
+                    <el-table-column prop="name" label="姓名" min-width="20" align="center">
                        <template slot-scope="scope">
                             {{scope.row.name}}({{scope.row.dialysis_no}})
                         </template> 
@@ -43,89 +43,36 @@
                 </el-table>
             </el-col>
 
-            <el-col :span="17">
+            <el-col :span="16">
                 <div class="dataTitle">患者信息</div>
                 <el-form class="information" label-position="left">
-                   <div class="span"><span class="span">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span></div>
-                   <div class="patient-app-container">
-                      <span class="button"><el-button  @click="change()">修改</el-button></span>
-                    </div>
+                  <div class="inforTitle">
+                  <el-button  @click="change()" style="float:right;">修改</el-button>
+                   <span class="name">姓名:{{weigh_form.name}} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;透析号:{{weigh_form.dialysis_no}} &nbsp;&nbsp;</span>
+                   </div>   
                     <div class="border"></div>
-
-                    <el-row :gutter="20">
-                        <el-col :span="8">
-                            <el-form-item label="透前称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.weight_before" :disabled="disa" ></el-input>
-                            </el-form-item>
-                        </el-col> 
-                        <el-col :span="8">
-                            <el-form-item label="干体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.dry_weight" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="20">
-                        <el-col :span="4">
-                            <el-form-item label="体温(℃):" label-width="80px">
-                               <el-input v-model="weigh_list.temperature" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="脉搏(次/分):" label-width="90px">
-                                <el-input v-model="weigh_list.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="呼吸(次/分):" label-width="100px">
-                                <el-input v-model="weigh_list.breathing_rate" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="9">
-                            <el-form-item label="血压(mmHg):" label-width="100px">
-                                <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>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <div class="border"></div>                  
-                    <el-row :gutter="20">
-                        <el-col :span="8">
-                            <el-form-item label="透后称重(kg):" label-width="100px">
-                                <el-input v-model="weigh_infor.weight_after"  :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="干体重(kg):" label-width="100px">
-                                <el-input v-model="weigh_list.dry_weight" :disabled="disa"></el-input>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row :gutter="20">
-                        <el-col :span="4">
-                            <el-form-item label="体温(℃):" label-width="80px">
-                                <el-input v-model="weigh_infor.temperature" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="脉搏(次/分):" label-width="90px">
-                                <el-input v-model="weigh_infor.pulse_frequency" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="5">
-                            <el-form-item label="呼吸(次/分):" label-width="100px">
-                                <el-input v-model="weigh_infor.breathing_rate" :disabled="disa" style="width:70px"></el-input>
-                            </el-form-item>
-                        </el-col>
-                        <el-col :span="9">
-                            <el-form-item label="血压(mmHg):" label-width="100px">
-                                <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>
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    
+                    <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
+                    透前体重(kg):&nbsp;<el-input v-model="weigh_list.weight_before" :disabled="disa" style="width:200px"></el-input> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input><br>
+                    </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>
+                    </div>
+                    <div class="border"></div>  
+                    <div style="margin-bottom:20px;color:rgb(96,96,96);font-size:14px">
+                     透后称重(kg):&nbsp;<el-input v-model="weigh_infor.weight_after" style="width:200px" :disabled="disa"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                     干体重(kg):&nbsp;<el-input v-model="weigh_list.dry_weight" :disabled="disa" style="width:200px"></el-input>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    </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>
+                    </div>               
+                   
                     <div class="border"></div>
                     <div v-if="show">
                     <el-row :gutter="20">
@@ -209,7 +156,7 @@ export default {
         diastolic_blood_pressure: ''
       },
       shiftOptions: [
-        { value: 0, label: '班次' },
+        { value: 0, label: '全部' },
         { value: 1, label: '上午' },
         { value: 2, label: '下午' },
         { value: 3, label: '晚上' }
@@ -248,6 +195,8 @@ export default {
         this.patients = []
         if (response.data.state === 1) {
           this.patients = response.data.data.patients
+          console.log("排班数据是什么呢?")
+          console.log(this.patients)
           this.queryParams.schedule_type = response.data.data.schedule_type
           this.querySignParams.date_time = response.data.data.today
            
@@ -331,6 +280,7 @@ export default {
       //     dialysis_no:'',
       // };
       this.disa = true
+      this.show=false
       this.weigh_form.choose = true
       this.weigh_form.name = row.name
       this.weigh_form.dialysis_no = row.dialysis_no
@@ -540,10 +490,14 @@ export default {
                     var sl = this.schedules.length
                     for(let j = 0; j < sl; j++){
                          if(this.schedules[j].type === this.patients[index].schedule.schedule_type){
-                              if(this.weigh_form.id > 0){
-                                  this.schedules[j].sign++
+                              // if(this.weigh_form.id>= 0){
+                              //     this.schedules[j].sign++
+                              // }
+                              if((signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0)||(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0)){
+                                    this.schedules[j].sign++
                               }
                               if(signin.weigh_before_time === 0 && response.data.data.signs.weigh_before_time > 0){
+                                   
                                    this.schedules[j].before++
                               }
                               if(signin.weigh_time === 0 && response.data.data.signs.weigh_time > 0){
@@ -624,7 +578,7 @@ export default {
 
 <style rel="stylesheet/css" lang="scss" scoped>
 .information {
-    border: 1px #dcdfe6 solid;
+    border: 1px #EBEEF5 solid;
     padding: 30px 20px 30px 20px;
 
     .border {
@@ -652,7 +606,7 @@ export default {
 
 <style>
 .sign-and-weigh-box .sign-and-weigh-box-patients .cell{
-    font-size: 12px;
+    font-size: 14px;
 }
 
 .sign-and-weigh-box .sign-and-weigh-box-patients .current-row>td{
@@ -661,16 +615,15 @@ export default {
 
   .button{
       float: right;
-      margin-bottom:0px
+      margin-bottom:0px;
   }
 
-  .patient-app-container{
-
-    line-height: 20px;
+  .inforTitle{
+    line-height: 40px;
     height: 50px;
   }
 
-  .span{
-    height:1px;
+  .el-table th .cell, .el-table td .cell{
+    padding: 0!important;
   }
 </style>

src/xt_pages/statistics/index.vue

@@ -114,8 +114,8 @@ export default {
   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

@@ -21,7 +21,7 @@
         <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

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

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

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

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

@@ -21,7 +21,7 @@
         <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

@@ -21,7 +21,7 @@
         <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

@@ -20,7 +20,7 @@
         <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

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

@@ -20,7 +20,7 @@
         <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

@@ -21,7 +21,7 @@
         <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

@@ -18,7 +18,7 @@
         <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

@@ -16,7 +16,7 @@
         <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

@@ -1,19 +1,13 @@
 <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">
@@ -168,21 +162,27 @@
             </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

@@ -110,7 +110,7 @@
               </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>
@@ -182,12 +182,12 @@
                 </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>
@@ -238,17 +238,17 @@
 
       <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>
@@ -996,7 +996,9 @@ export default {
 </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

@@ -1,9 +1,8 @@
 <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

@@ -2,7 +2,7 @@
   <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"
@@ -219,22 +219,21 @@ export default {
 </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

@@ -16,7 +16,7 @@
                     <!-- <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> -->
@@ -33,49 +33,49 @@
         </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>
@@ -384,8 +384,6 @@ export default {
     justify-content: space-between;
     padding: 30px 2em;
 }
-</style>
-<style>
 .record-order .el-table__body{
     border: 1px solid #333;
 }
@@ -396,4 +394,5 @@ export default {
 .record-order th, .record-order td {
     padding: 5px 10px;
 }
+
 </style>

src/xt_pages/user/doctorAdvice.vue

@@ -27,7 +27,7 @@
             <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

@@ -37,3 +37,9 @@ export default {
 
 }
 </script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.app-container{
+  margin: 0;
+}
+</style>

src/xt_pages/user/patient.vue

@@ -14,7 +14,7 @@
     <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

@@ -14,7 +14,7 @@
     <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

@@ -5,7 +5,7 @@
             <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

@@ -286,25 +286,25 @@
     border-color: #ebeef5;
     min-height: 200px;
 
-  .title {
-    font-size: 14px;
-    font-weight: 500;
-    color: #909399;
-    line-height: 44px;
-    height: 44px;
-    text-align: center;
-    border-bottom-width: 1px;
-    border-bottom-style: solid;
-    border-bottom-color: #ebeef5;
-  }
-
-  .content {
-    padding: 12px 15px;
-    font-size: 15px;
-    color: gray;
-    line-height: 22px;
-  }
-  }
+    .title {
+        font-size: 14px;
+        font-weight: 500;
+        color: #909399;
+        line-height: 44px;
+        height: 44px;
+        text-align: center;
+        border-bottom-width: 1px;
+        border-bottom-style: solid;
+        border-bottom-color: #ebeef5;
+        background-color: rgb(245, 247, 250);
+    }
+    .content {
+        padding: 12px 15px;
+        font-size: 15px;
+        color: gray;
+        line-height: 22px;
+    }
+}
 
   .new_record_form {
   .textarea_panel {

src/xt_pages/workforce/appointment.vue

@@ -274,5 +274,9 @@ export default {
 </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

@@ -73,7 +73,7 @@ export default {
             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

@@ -96,15 +96,6 @@
         <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">
@@ -174,8 +165,8 @@
       <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>
@@ -191,9 +182,9 @@
       <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%">
@@ -216,14 +207,14 @@
       <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"
@@ -233,7 +224,7 @@
                 </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"
@@ -243,8 +234,7 @@
                 </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"
@@ -784,7 +774,7 @@ export default {
                 }
               }
               if (!cflag) {
-                this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+                this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
                 .then(() => {
                   this.changeSchedule.change_action = "change_device";
                   this.changeScheduleActon(formName);
@@ -795,7 +785,7 @@ export default {
                 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);
@@ -929,7 +919,7 @@ export default {
             }
           });
           if (!cflag) {
-            this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '是',cancelButtonText: '否',type: 'warning'})
+            this.$confirm('此患者有传染病，与此透析机不匹配，确定在此排班吗?', '提示', {confirmButtonText: '确 定',cancelButtonText: '取 消',type: 'warning'})
             .then(() => {
               this.CreateSchedule(this.currentData.patient_id, this.currentData);
             }).catch(() => {
@@ -938,7 +928,7 @@ export default {
             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(() => {
@@ -1124,7 +1114,7 @@ export default {
   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

@@ -466,7 +466,7 @@ export default {
             // 此患者没有传染病，与此透析机不匹配，确定在此排班吗?
             // 此患者有传染病，与此透析机不匹配，确定在此排班吗?
             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)
               })