Browse Source

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

xiaoming_global 5 years ago
parent
commit
f9a9157360

+ 1 - 1
src/pages/advice/AdvicePage.vue View File

37
       <div class="newSearch">
37
       <div class="newSearch">
38
         <el-input
38
         <el-input
39
           prefix-icon="el-icon-search"
39
           prefix-icon="el-icon-search"
40
-          v-model="advice_keyword"
40
+          v-model="search_input"
41
           ref="search_field"
41
           ref="search_field"
42
           placeholder="透析号/姓名"
42
           placeholder="透析号/姓名"
43
         ></el-input>
43
         ></el-input>

+ 2 - 1
src/pages/main/DialysisArea.vue View File

154
       dialysis_scheduals: [],
154
       dialysis_scheduals: [],
155
 
155
 
156
       zone_options_visible: false,
156
       zone_options_visible: false,
157
-      sch_type_options_visible: false
157
+      sch_type_options_visible: false,
158
+      newMypatient: 0
158
     };
159
     };
159
   },
160
   },
160
   props: {
161
   props: {

+ 1 - 1
src/pages/main/dialog/ComputerDialog.vue View File

26
           <h2 class="name">上机床位</h2>
26
           <h2 class="name">上机床位</h2>
27
           <div class="content">
27
           <div class="content">
28
             <span class="text" style="width: 100px">{{
28
             <span class="text" style="width: 100px">{{
29
-              device_number_map[bed_id].number + ""
29
+              device_number_map[bed_id].number + ""
30
             }}</span>
30
             }}</span>
31
             <span class="iconfont">&#xe6f9;</span>
31
             <span class="iconfont">&#xe6f9;</span>
32
           </div>
32
           </div>