Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/advice/AdvicePage.vue

@@ -160,6 +160,7 @@ export default {
     text-align: center;
     font-size: 0.45rem;
     color: #258ffc;
+    vertical-align: middle;
   }
   .el-input {
     height: 100%;
@@ -173,6 +174,7 @@ export default {
     border-radius: 30px;
     border: none;
     font-size: 0.45rem;
+    vertical-align: middle;
     @media only screen and (min-width: 768px) {
       padding-left: 0.9rem;
     }

src/pages/main/DetailsPage.vue

@@ -1,42 +1,44 @@
 <template>
   <div class="mainBox">
     <div class="mainContent">
-      <div class="navigation">
-        <div class="goBack">
-          <span class="back" @click="backAction()">
-            <span class="iconfont">&#xe720;</span>返回
-          </span>
-          <el-popover placement="bottom" trigger="click" :disabled="true">
-            <li slot="reference" class="name">{{ patient_name }}</li>
-          </el-popover>
-        </div>
-        <div class="nav">
-          <ul>
-            <li
-              v-for="(item, i) in ['病历', '透析', '今日']"
-              :key="i"
-              :class="index == i ? 'active' : ''"
-              @click="ClickTab(i)"
-            >
-              {{ item }}
-            </li>
-          </ul>
-        </div>
+      <div class="newNavigation">
+        <div class="navigation">
+          <div class="goBack">
+            <span class="back" @click="backAction()">
+              <span class="iconfont">&#xe720;</span>返回
+            </span>
+            <el-popover placement="bottom" trigger="click" :disabled="true">
+              <li slot="reference" class="name">{{ patient_name }}</li>
+            </el-popover>
+          </div>
+          <div class="nav">
+            <ul>
+              <li
+                v-for="(item, i) in ['病历', '透析', '今日']"
+                :key="i"
+                :class="index == i ? 'active' : ''"
+                @click="ClickTab(i)"
+              >
+                {{ item }}
+              </li>
+            </ul>
+          </div>
 
-        <!-- <div @click="openPicker()" class="time">
+          <!-- <div @click="openPicker()" class="time">
                   {{pickerVisible}}<span class="iconfont">&#xe74a;</span>
         </div>-->
-        <!-- <div class="time" style="width:1.49rem;">
+          <!-- <div class="time" style="width:1.49rem;">
                   <span class="iconfont">2018-01-01&#xe74a;</span>
         </div>-->
-        <div class="print" style="float: right; display:none">
-          <el-button
-            size="mini"
-            type="primary"
-            @click="print"
-            icon="el-icon-printer"
-            >打印</el-button
-          >
+          <div class="print" style="float: right; display:none">
+            <el-button
+              size="mini"
+              type="primary"
+              @click="print"
+              icon="el-icon-printer"
+              >打印</el-button
+            >
+          </div>
         </div>
       </div>
       <div class="Tab">
@@ -165,6 +167,9 @@ export default {
 }
 .mainContent {
   position: relative;
+  .newNavigation {
+    overflow: hidden;
+  }
   .navigation {
     @include display-flex;
     @include align-items-center;

src/pages/main/RecordPage.vue

@@ -317,6 +317,7 @@ export default {
     text-align: center;
     font-size: 0.45rem;
     color: #258ffc;
+    vertical-align: middle;
   }
 }
 </style>
@@ -334,6 +335,7 @@ export default {
     font-size: 0.45rem;
     box-sizing: border-box;
     padding-bottom: 0.05rem;
+    vertical-align: middle;
     @media only screen and (min-width: 768px) {
       padding-left: 0.9rem !important;
     }

src/pages/main/dialog/OrdersDialog.vue

@@ -42,8 +42,8 @@
           :class="{ forbid: current_group_index < 0 || currentAdvices.length <= 0 || (this.$store.getters.user.user.user_type == 3 && !isPremission) }"
         >删除</span>
 
-        <span :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
-        <span :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
+        <span id="fontSize" :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="modifySubdviceAction">修改子医嘱</span>
+        <span id="fontSize" :class="{ forbid:(this.$store.getters.user.user.user_type == 3 && !isPremission) }" v-if="currentSubAdvices.length > 0" @click="deleteSubAdviceAction">删除子医嘱</span>
       </div>
       <div class="DialogContent choose" id="dialogTop" style="height:6.5rem;">
 

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1086,7 +1086,6 @@
               this.zhiShow = true
               this.totalShow = true
               this.huShow = true
-
             }
           }
         }

src/pages/main/dialog/modify_order/ModifyAdviceGroup.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="visibility" v-loading="loading">
-    <div class="Dialog" style="width: 16.8rem;" v-show="sub_dialog_key == 0">
+    <div class="Dialog" v-show="sub_dialog_key == 0">
       <div class="DialogTit">
         <div class="back" @click="backAction">
           <span class="iconfont">&#xe720;</span>返回
@@ -37,7 +37,9 @@
             </div>
             <div class="cell" style="margin-top: 0;">
               <label>开嘱医生</label>
-              <span>{{ $store.getters.user.user.user_name }}</span>
+              <span class="newdoctorName">{{
+                $store.getters.user.user.user_name
+              }}</span>
             </div>
           </div>
           <table class="table">
@@ -378,7 +380,10 @@ export default {
       height: 0.6rem;
       line-height: 0.6rem;
       color: $pgh-color;
-      font-size: 0.32rem;
+      font-size: 0.45rem;
+    }
+    .newdoctorName {
+      font-size: 0.45rem;
     }
     select {
       width: 100%;

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -396,7 +396,7 @@ export default {
   .cell {
     float: left;
     width: 4.5rem;
-    margin: 0.35rem 0.3rem 0.2rem 0.4rem;
+    margin: 0.35rem 0.3rem 0rem 0.4rem;
     overflow: hidden;
     label {
       display: block;
@@ -447,13 +447,13 @@ export default {
   .cell {
     .inputBox {
       @media only screen and (max-width: 767px) {
-        padding: 0.34rem 0 !important;
+        padding: 10.6px 0 !important;
         padding-left: 5px !important;
         font-size: 0.42rem !important;
       }
     }
     .el-input__inner {
-      font-size: 0.45rem;
+      font-size: 0.42rem;
     }
   }
 }

src/pages/main/dialog/new_order/order_form.vue

@@ -492,7 +492,7 @@ export default {
   .cell {
     .inputBox {
       @media only screen and (max-width: 767px) {
-        padding: 0.38rem 0 !important;
+        padding: 0.34rem 0 !important;
         padding-left: 5px !important;
         font-size: 0.42rem !important;
       }

src/pages/main/today/TodayTab.vue

@@ -1442,8 +1442,12 @@ import {parseTime} from '@/utils'
 
 
 <style style="stylesheet/scss" lang="scss" scoped>
+#today_panel{
+ overflow-x: hidden;
+}
   .today_panel {
   height: calc(100% - 63px);
+ 
   }
 
   .mainContent {

src/pages/monitoring/index.vue

@@ -609,6 +609,7 @@ export default {
     text-align: center;
     font-size: 0.45rem;
     color: #258ffc;
+    vertical-align: middle;
   }
   .el-input {
     height: 100%;
@@ -622,6 +623,7 @@ export default {
     border-radius: 30px;
     border: none;
     font-size: 0.45rem;
+    vertical-align: middle;
     @media only screen and (min-width: 768px) {
       padding-left: 0.9rem;
     }