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

src/main.js

@@ -20,6 +20,7 @@ import "vant/lib/icon/local.css";
 import "@/styles/media.scss";
 import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
+// import "@/lib/flexible.js";
 
 // main.js
 // import 'lib-flexible'

src/pages/main/dialog/ComputerDialog.vue

@@ -26,7 +26,7 @@
           <h2 class="name">上机床位</h2>
           <div class="content">
             <span class="text" style="width: 100px">{{
-              device_number_map[bed_id].number
+              device_number_map[bed_id].number + "区"
             }}</span>
             <span class="iconfont">&#xe6f9;</span>
           </div>
@@ -311,7 +311,7 @@ export default {
         } else {
           Toast.success("上机成功");
           var monitor = response.data.data.monitor;
-          this.$emit('did_add_monitor', monitor)
+          this.$emit("did_add_monitor", monitor);
           this.$emit("did_start", response.data.data.dialysis_order);
           var record = this.record;
           for (const key in response.data.data.dialysis_order) {

src/pages/main/dialog/OrdersDialog.vue

@@ -17,10 +17,11 @@
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0)||(this.$store.getters.user.user.user_type == 2 && !isPremission) }"
         >执行</span>
         <span
+        id="fontSize"
           v-if="isShowMofifyExce"
           @click="modifyExecAdvice"
           :class="{ forbid: (current_advice&& current_advice.parent_id > 0) }"
-        >执行</span>
+        >修改执行</span>
         <span
           v-if="template_id != 6"
           @click="checkAdvice"

src/pages/main/dialog/PrescriptionDialog.vue

@@ -1079,7 +1079,6 @@
           if (treatment_mode[keys].id == val) {
             treatment_mode_name = treatment_mode[keys].name
           var treatment_mode_id = treatment_mode[keys].id
-          console.log("呵呵",treatment_mode_id)
             if(treatment_mode_id === 1 || treatment_mode_id === 3 || treatment_mode_id === 4 || treatment_mode_id === 5 || treatment_mode_id === 6 || treatment_mode_id === 7 || treatment_mode_id === 8 || treatment_mode_id === 9 || treatment_mode_id === 10 || treatment_mode_id === 11 || treatment_mode_id === 13 || treatment_mode_id === 14 || treatment_mode_id === 15 || treatment_mode_id === 16){
                  this.zhiShow = false
                  this.totalShow = false

src/pages/main/today/TodayTab.vue

@@ -73,7 +73,7 @@
 
 
     <accepts-assessment id="accepts_assessment" :record="receiver_treatment_access" title="接诊评估"></accepts-assessment>
-    </div>
+    
 
 
     <div class="blueBorder"></div>
@@ -123,7 +123,7 @@
     <div class="blueBorder"></div>
 
     <treatment-of id="treatment_of" ref="treatment_of" title="治疗小结" :record="treatment_summary"></treatment-of>
-
+</div>
     <van-popup title="透析处方" v-model="menuList[1].showPopup" :overlay="true" :close-on-click-overlay="false">
       <prescription-dialog :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
                            :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators"
@@ -1518,4 +1518,7 @@ import {parseTime} from '@/utils'
 .el-table::before {
   z-index: 0;
 }
+.el-loading-spinner{
+  top:10%;
+}
 </style>

src/styles/style.scss

@@ -409,9 +409,9 @@ body {
   .Dialog {
     font-size: 0.36rem;
     width: 11.8rem;
-    @media only screen and (min-width: 376px) and (max-width: 737px) {
-      width: 16.8rem !important;
-    }
+    // @media only screen and (min-width: 376px) and (max-width: 737px) {
+    //   width: 16.8rem !important;
+    // }
     @media only screen and (min-width: 376px) and (max-width: 415px) {
       width: 10.8rem !important;
     }
@@ -904,6 +904,6 @@ body {
     padding-top: 232px;
   }
 }
-#app {
-  -webkit-overflow-scrolling: touch;
-}
+// #app {
+//   -webkit-overflow-scrolling: touch;
+// }