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

src/pages/advice/AdvicePage.vue

@@ -37,7 +37,7 @@
       <div class="newSearch">
         <el-input
           prefix-icon="el-icon-search"
-          v-model="advice_keyword"
+          v-model="search_input"
           ref="search_field"
           placeholder="透析号/姓名"
         ></el-input>

src/pages/main/DialysisArea.vue

@@ -154,7 +154,8 @@ export default {
       dialysis_scheduals: [],
 
       zone_options_visible: false,
-      sch_type_options_visible: false
+      sch_type_options_visible: false,
+      newMypatient: 0
     };
   },
   props: {

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>