Browse Source

修改华侨医院bug

csx 5 years ago
parent
commit
ca014687b8

+ 1 - 1
config/dev.env.js View File

@@ -4,7 +4,7 @@ const prodEnv = require('./prod.env')
4 4
 
5 5
 module.exports = merge(prodEnv, {
6 6
   NODE_ENV: '"development"',
7
-  BASE_API: '"http://api.xt.test.sgjyun.com"'
7
+  BASE_API: '"http://localhost:9529"'
8 8
    //http://api.xt.test.sgjyun.com http://localhost:9529
9 9
    // BASE_API: '"http://localhost:9529"'
10 10
 })

+ 1 - 1
config/prod.env.js View File

@@ -1,6 +1,6 @@
1 1
 'use strict'
2 2
 module.exports = {
3 3
   NODE_ENV: '"production"',
4
-  BASE_API: '"http://api.xt.kuyicloud.com"'
4
+  BASE_API: '"https://api.xt.kuyicloud.com"'
5 5
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
6 6
 }

+ 403 - 375
src/pages/advice/DialysisAdviceTable.vue View File

@@ -7,7 +7,9 @@
7 7
           <li slot="reference">{{patient_types[patient_selected].text}}<span class="iconfont">&#xe74a;</span></li>
8 8
           <div class="popover-demo-content">
9 9
             <ul>
10
-              <li v-for="type in patient_types" :key="type.value" @click="handlePaitentType(type.value)" :class="advice_type_selected == type.value ? 'tick' : ''" >{{type.text}}</li>
10
+              <li v-for="type in patient_types" :key="type.value" @click="handlePaitentType(type.value)"
11
+                  :class="advice_type_selected == type.value ? 'tick' : ''">{{type.text}}
12
+              </li>
11 13
             </ul>
12 14
           </div>
13 15
         </el-popover>
@@ -17,25 +19,31 @@
17 19
           <li slot="reference">{{zones[zone_selected].text}}<span class="iconfont">&#xe74a;</span></li>
18 20
           <div class="popover-demo-content">
19 21
             <ul>
20
-              <li v-for="(zone, index) in zones" :key="zone.value" @click="handleZoneChange(index)"  :class="zone_selected == index ? 'tick' : ''">{{zone.text}}</li>
22
+              <li v-for="(zone, index) in zones" :key="zone.value" @click="handleZoneChange(index)"
23
+                  :class="zone_selected == index ? 'tick' : ''">{{zone.text}}
24
+              </li>
21 25
             </ul>
22 26
           </div>
23 27
         </el-popover>
24 28
         <el-popover placement="bottom" trigger="click" v-model="show_sch_type_selector">
25
-          <li slot="reference">{{schedule_types[schedule_type_selected].text}}<span class="iconfont">&#xe74a;</span></li>
29
+          <li slot="reference">{{schedule_types[schedule_type_selected].text}}<span class="iconfont">&#xe74a;</span>
30
+          </li>
26 31
           <div class="popover-demo-content">
27 32
             <ul>
28
-              <li v-for="scheduleType in schedule_types" :key="scheduleType.value" @click="handletimeType(scheduleType.value)" :class="schedule_type_selected == scheduleType.value ? 'tick' : ''" >{{scheduleType.text}}</li>
33
+              <li v-for="scheduleType in schedule_types" :key="scheduleType.value"
34
+                  @click="handletimeType(scheduleType.value)"
35
+                  :class="schedule_type_selected == scheduleType.value ? 'tick' : ''">{{scheduleType.text}}
36
+              </li>
29 37
             </ul>
30 38
           </div>
31 39
         </el-popover>
32 40
         <!--<el-popover placement="bottom" trigger="click" v-model="show_advice_type_selector">-->
33
-          <!--<li slot="reference">{{advice_types[advice_type_selected].text}}<span class="iconfont">&#xe74a;</span></li>-->
34
-          <!--<div class="popover-demo-content">-->
35
-            <!--<ul>-->
36
-              <!--<li v-for="type in advice_types" :key="type.value" @click="handleAdviceType(type.value)" :class="advice_type_selected == type.value ? 'tick' : ''" >{{type.text}}</li>-->
37
-            <!--</ul>-->
38
-          <!--</div>-->
41
+        <!--<li slot="reference">{{advice_types[advice_type_selected].text}}<span class="iconfont">&#xe74a;</span></li>-->
42
+        <!--<div class="popover-demo-content">-->
43
+        <!--<ul>-->
44
+        <!--<li v-for="type in advice_types" :key="type.value" @click="handleAdviceType(type.value)" :class="advice_type_selected == type.value ? 'tick' : ''" >{{type.text}}</li>-->
45
+        <!--</ul>-->
46
+        <!--</div>-->
39 47
         <!--</el-popover>-->
40 48
 
41 49
         <li @click="openPicker()">
@@ -46,379 +54,399 @@
46 54
     </div>
47 55
 
48 56
     <div style="width:100%;overflow:hildden;overflow-x:auto;" class="DialysisAdvice">
49
-     <div class="blueBorder"></div>
50
-     <table class="table">
51
-      <tr>
52
-        <th width="50px">机号</th>
53
-        <th width="50px">姓名</th>
54
-        <th width="50px">透析号</th>
55
-        <th width="50px">期效</th>
56
-        <th width="100px">开始时间</th>
57
-        <th width="200px">医嘱内容</th>
58
-        <th width="50px">执行时间</th>
59
-        <th width="50px">执行护士</th>
60
-        <th width="50px">校对护士</th>
61
-        <th width="100px">校对时间</th>
62
-        <th width="50px">开嘱医生</th>
63
-        <th width="100px">开嘱时间</th>
64
-
65
-
66
-
67
-      </tr>
68
-      <template v-for="(schedules, zone_name, index) in filtedScheduals">
69
-        <tr :key="index">
70
-          <td>{{ zone_name }}</td>
71
-          <td></td>
72
-          <td></td>
73
-          <td></td>
74
-          <td></td>
75
-          <td></td>
76
-          <td></td>
77
-          <td></td>
78
-          <td></td>
79
-          <td></td>
80
-          <td></td>
81
-          <td></td>
82
-        </tr>
83
-        <template v-for="(schedule) in schedules">
84
-          <template v-for="(group, group_index) in schedule.new_advice">
85
-          <tr v-for="(advice, advice_index) in group.advices"  @click="clickfunction(schedule)">
86
-            <td  v-if="advice_index == 0"
87
-                 :rowspan="group.advices.length">{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
88
-            <td  v-if="advice_index == 0"
89
-                 :rowspan="group.advices.length" style="color:#409eff;">{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
90
-            <td  v-if="advice_index == 0"
91
-                 :rowspan="group.advices.length">{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
92
-            <td  v-if="advice_index == 0"
93
-                 :rowspan="group.advices.length">{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
94
-            <td  v-if="advice_index == 0"
95
-                 :rowspan="group.advices.length">{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}") : "" }}</td>
96
-            <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
97
-              <span >{{advice.advice_name }}</span>
98
-              <span >{{advice.advice_desc}}</span>
99
-              <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
100
-              <span v-if="advice.single_dose"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
101
-              <span >{{advice.delivery_way}}</span>
102
-              <span >{{advice.execution_frequency}}</span>
103
-              <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{advice.remark}})</span>
104
-
105
-            </td>
106
-            <td>{{  parseTime(advice.execution_time, "{m}-{d} {h}:{i}") }}</td>
107
-            <td>{{ getName(advice.execution_staff) }}</td>
108
-            <td>{{  getName(advice.checker)  }}</td>
109
-            <td>{{  parseTime(advice.check_time, "{m}-{d} {h}:{i}") }}</td>
110
-            <td>{{  getName(advice.advice_doctor) }}</td>
111
-            <td>{{ parseTime(advice.created_time, "{m}-{d} {h}:{i}")}}</td>
57
+      <div class="blueBorder"></div>
58
+      <table class="table">
59
+        <tr>
60
+          <!--<th width="50px">机号</th>-->
61
+          <th width="50px">姓名</th>
62
+          <th width="50px">透析号</th>
63
+          <th width="50px">期效</th>
64
+          <th width="100px">开始时间</th>
65
+          <th width="200px">医嘱内容</th>
66
+          <th width="50px">执行时间</th>
67
+          <th width="50px">执行护士</th>
68
+          <th width="50px">校对护士</th>
69
+          <th width="100px">校对时间</th>
70
+          <th width="50px">开嘱医生</th>
71
+          <th width="100px">开嘱时间</th>
112 72
 
113 73
 
74
+        </tr>
75
+        <template v-for="(schedules, zone_name, index) in filtedScheduals">
76
+          <tr :key="index">
77
+            <td>{{ zone_name }}</td>
78
+            <!--<td></td>-->
79
+            <td></td>
80
+            <td></td>
81
+            <td></td>
82
+            <td></td>
83
+            <td></td>
84
+            <td></td>
85
+            <td></td>
86
+            <td></td>
87
+            <td></td>
88
+            <td></td>
114 89
           </tr>
115
-          </template>
90
+          <template v-for="(schedule) in schedules">
91
+            <template v-for="(group, group_index) in schedule.new_advice">
92
+              <tr v-for="(advice, advice_index) in group.advices" @click="clickfunction(schedule)">
93
+                <!--<td  v-if="advice_index == 0"-->
94
+                <!--:rowspan="group.advices.length">{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>-->
95
+
96
+                <!--<td  v-if="advice_index == 0" :rowspan="group.advices.length">{{ advice.parent_id == 0 && advice.dialysis_order&&advice.dialysis_order.device_number&& advice.dialysis_order.device_number.number.length > 0 ? advice.dialysis_order.device_number.number : schedule.device_number.number }}</td>-->
97
+                <!--<td v-if="advice_index == 0" :rowspan="group.advices.length">-->
98
+                  <!--{{getNumber(advice,schedule)}}-->
99
+                <!--</td>-->
100
+
101
+                <td v-if="advice_index == 0"
102
+                    :rowspan="group.advices.length" style="color:#409eff;">{{ advice.parent_id == 0 ?
103
+                  schedule.patient.name : '' }}
104
+                </td>
105
+                <td v-if="advice_index == 0"
106
+                    :rowspan="group.advices.length">{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : '' }}
107
+                </td>
108
+                <td v-if="advice_index == 0"
109
+                    :rowspan="group.advices.length">{{ getAdaviceType(advice.advice_type,advice.parent_id)}}
110
+                </td>
111
+                <td v-if="advice_index == 0" :rowspan="group.advices.length">{{ advice.parent_id == 0 ? parseTime(advice.start_time, "{m}-{d} {h}:{i}"):''}}
112
+                </td>
113
+                <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
114
+                  <span>{{advice.advice_name }}</span>
115
+                  <span>{{advice.advice_desc}}</span>
116
+                  <span
117
+                    v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
118
+                  <span v-if="advice.single_dose"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
119
+                  <span>{{advice.delivery_way}}</span>
120
+                  <span>{{advice.execution_frequency}}</span>
121
+                  <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{advice.remark}})</span>
122
+
123
+                </td>
124
+                <td>{{ parseTime(advice.execution_time, '{m}-{d} {h}:{i}') }}</td>
125
+                <td>{{ getName(advice.execution_staff) }}</td>
126
+                <td>{{ getName(advice.checker) }}</td>
127
+                <td>{{ parseTime(advice.check_time, '{m}-{d} {h}:{i}') }}</td>
128
+                <td>{{ getName(advice.advice_doctor) }}</td>
129
+                <td>{{ parseTime(advice.created_time, '{m}-{d} {h}:{i}')}}</td>
130
+
131
+
132
+              </tr>
133
+            </template>
116 134
 
135
+          </template>
117 136
         </template>
118
-      </template>
119
-     </table>
120
-     <div class="NoData" v-show="zones.length  <= 1"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
137
+      </table>
138
+      <div class="NoData" v-show="zones.length  <= 1"><img style="margin-top: 50px; margin-bottom: 50px"
139
+                                                           src="@/assets/login/data.jpg" alt=""></div>
121 140
 
122 141
     </div>
123 142
 
124
-  <mt-datetime-picker
125
-    v-model="selected_date"
126
-    type="date"
127
-    ref="picker"
128
-    year-format="{value} "
129
-    month-format="{value} "
130
-    date-format="{value} "
131
-    @confirm="requestSchedualDoctors">
132
-  </mt-datetime-picker>
143
+    <mt-datetime-picker
144
+      v-model="selected_date"
145
+      type="date"
146
+      ref="picker"
147
+      year-format="{value} "
148
+      month-format="{value} "
149
+      date-format="{value} "
150
+      @confirm="requestSchedualDoctors">
151
+    </mt-datetime-picker>
133 152
   </div>
134 153
 </template>
135 154
 
136 155
 <script>
137
-import SideBar from "@/pages/layout/SideBar";
138
-import { parseTime } from "@/utils";
139
-import { getSchedualDoctors } from "@/api/advice";
140
-
141
-export default {
142
-  name: "DialysisAdviceTable",
143
-  components: {
144
-    SideBar
145
-  },
146
-  data() {
147
-    return {
148
-      selected_date: new Date(),
149
-      admin_user: [],
150
-
151
-      show_sch_type_selector: false,
152
-      schedule_type_selected: 0,
153
-      schedule_types: [
154
-        { value: 0, text: "全部班次" },
155
-        { value: 1, text: "上午" },
156
-        { value: 2, text: "下午" },
157
-        { value: 3, text: "晚上" }
158
-      ],
159
-
160
-      show_zone_selector: false,
161
-      zone_selected: 0,
162
-      show_patient_type_selector: false,
163
-      zones: [{ value: 0, text: "全部分区", select: true }],
164
-
165
-      show_advice_type_selector: false,
166
-      advice_type_selected: 0,
167
-      advice_types: [
168
-        { value: 0, text: "全部医嘱" },
169
-        { value: 1, text: "长期医嘱" },
170
-        { value: 3, text: "临时医嘱" }
171
-      ],
172
-
173
-      patient_types: [
174
-        { value: 0, text: "全部病人" },
175
-        { value: 1, text: "我的病人" },
176
-        { value: 2, text: "未执行病人" }
177
-      ],
178
-      patient_selected: 0,
179
-
180
-      scheduleMap: {}
181
-    };
182
-  },
183
-  computed: {
184
-    selected_date_str: function() {
185
-      return parseTime(this.selected_date, "{y}-{m}-{d}");
156
+  import SideBar from '@/pages/layout/SideBar'
157
+  import {parseTime} from '@/utils'
158
+  import {getSchedualDoctors} from '@/api/advice'
159
+
160
+  export default {
161
+    name: 'DialysisAdviceTable',
162
+    components: {
163
+      SideBar
186 164
     },
187
-    filtedScheduals: function() {
188
-      var scheduleMap = new Object();
189
-      if (this.zone_selected == 0) {
190
-        for (const key in this.scheduleMap) {
191
-          scheduleMap[key] = this.scheduleMap[key];
192
-        }
193
-      } else {
194
-        var zone_name = this.zones[this.zone_selected].text;
195
-        scheduleMap[zone_name] = this.scheduleMap[zone_name];
165
+    data () {
166
+      return {
167
+        selected_date: new Date(),
168
+        admin_user: [],
169
+
170
+        show_sch_type_selector: false,
171
+        schedule_type_selected: 0,
172
+        schedule_types: [
173
+          {value: 0, text: '全部班次'},
174
+          {value: 1, text: '上午'},
175
+          {value: 2, text: '下午'},
176
+          {value: 3, text: '晚上'}
177
+        ],
178
+
179
+        show_zone_selector: false,
180
+        zone_selected: 0,
181
+        show_patient_type_selector: false,
182
+        zones: [{value: 0, text: '全部分区', select: true}],
183
+
184
+        show_advice_type_selector: false,
185
+        advice_type_selected: 0,
186
+        advice_types: [
187
+          {value: 0, text: '全部医嘱'},
188
+          {value: 1, text: '长期医嘱'},
189
+          {value: 3, text: '临时医嘱'}
190
+        ],
191
+
192
+        patient_types: [
193
+          {value: 0, text: '全部病人'},
194
+          {value: 1, text: '我的病人'},
195
+          {value: 2, text: '未执行病人'}
196
+        ],
197
+        patient_selected: 0,
198
+
199
+        scheduleMap: {}
196 200
       }
201
+    },
202
+    computed: {
203
+      selected_date_str: function () {
204
+        return parseTime(this.selected_date, '{y}-{m}-{d}')
205
+      },
206
+      filtedScheduals: function () {
207
+        var scheduleMap = new Object()
208
+        if (this.zone_selected == 0) {
209
+          for (const key in this.scheduleMap) {
210
+            scheduleMap[key] = this.scheduleMap[key]
211
+          }
212
+        } else {
213
+          var zone_name = this.zones[this.zone_selected].text
214
+          scheduleMap[zone_name] = this.scheduleMap[zone_name]
215
+        }
197 216
 
198
-      if (this.schedule_type_selected != 0) {
199
-        var _scheduleMap = {};
200
-        for (const key in scheduleMap) {
201
-          var origin_schedules = scheduleMap[key];
202
-          var schedules = [];
203
-          for (let index = 0; index < origin_schedules.length; index++) {
204
-            const schedule = origin_schedules[index];
205
-            if (schedule.schedule_type == this.schedule_type_selected) {
206
-              schedules.push(schedule);
217
+        if (this.schedule_type_selected != 0) {
218
+          var _scheduleMap = {}
219
+          for (const key in scheduleMap) {
220
+            var origin_schedules = scheduleMap[key]
221
+            var schedules = []
222
+            for (let index = 0; index < origin_schedules.length; index++) {
223
+              const schedule = origin_schedules[index]
224
+              if (schedule.schedule_type == this.schedule_type_selected) {
225
+                schedules.push(schedule)
226
+              }
227
+            }
228
+            if (schedules.length > 0) {
229
+              _scheduleMap[key] = schedules
207 230
             }
208 231
           }
209
-          if (schedules.length > 0) {
210
-            _scheduleMap[key] = schedules;
211
-          }
212
-        }
213 232
 
214
-        scheduleMap = _scheduleMap;
215
-      }
216
-      for(var key in scheduleMap) {
217
-        let mapArr =  scheduleMap[key]
218
-        for (let i = 0; i < mapArr.length; i++) {
219
-          mapArr[i]['new_advice'] = []
233
+          scheduleMap = _scheduleMap
234
+        }
235
+        for (var key in scheduleMap) {
236
+          let mapArr = scheduleMap[key]
237
+          for (let i = 0; i < mapArr.length; i++) {
238
+            mapArr[i]['new_advice'] = []
239
+          }
220 240
         }
221
-      }
222 241
 
223
-      for(var key in scheduleMap) {
224
-       let mapArr =  scheduleMap[key]
225
-        for (let i = 0; i < mapArr.length; i++) {
226
-         var  maps = mapArr[i]
227
-          var resp_advices = maps.doctor_advice
228
-          if (resp_advices.length > 0) {
229
-            var newGroupObject = function () {
230
-              return Object.assign({}, {
231
-                group_no: 0,
232
-                advices: [],
233
-              })
234
-            }
235
-            var initGroupBlock = function (group, advice) {
236
-              group.group_no = advice.groupno
237
-            }
242
+        for (var key in scheduleMap) {
243
+          let mapArr = scheduleMap[key]
244
+          for (let i = 0; i < mapArr.length; i++) {
245
+            var maps = mapArr[i]
246
+            var resp_advices = maps.doctor_advice
247
+            if (resp_advices.length > 0) {
248
+              var newGroupObject = function () {
249
+                return Object.assign({}, {
250
+                  group_no: 0,
251
+                  advices: [],
252
+                })
253
+              }
254
+              var initGroupBlock = function (group, advice) {
255
+                group.group_no = advice.groupno
256
+              }
238 257
 
239
-            var advice_groups = []
240
-            var group = newGroupObject()
241
-            for (let index = 0; index < resp_advices.length; index++) {
242
-              const advice = resp_advices[index];
243
-              if (advice.groupno == 0) { // 老版本的医嘱
244
-                if (advice.parent_id > 0) {
245
-                  if (advice_groups.length > 0) {
246
-                    var parent_group = advice_groups[advice_groups.length - 1]
247
-                    if (parent_group.advices.length > 0) {
248
-                      if (parent_group.advices[0].id == advice.parent_id) {
249
-                        parent_group.advices.push(advice)
258
+              var advice_groups = []
259
+              var group = newGroupObject()
260
+              for (let index = 0; index < resp_advices.length; index++) {
261
+                const advice = resp_advices[index]
262
+                if (advice.groupno == 0) { // 老版本的医嘱
263
+                  if (advice.parent_id > 0) {
264
+                    if (advice_groups.length > 0) {
265
+                      var parent_group = advice_groups[advice_groups.length - 1]
266
+                      if (parent_group.advices.length > 0) {
267
+                        if (parent_group.advices[0].id == advice.parent_id) {
268
+                          parent_group.advices.push(advice)
269
+                        }
250 270
                       }
251 271
                     }
272
+                    continue
273
+
274
+                  } else {
275
+                    if (group.group_no > 0) {
276
+                      advice_groups.push(group)
277
+                      group = newGroupObject()
278
+                    }
279
+
280
+                    initGroupBlock(group, advice)
281
+                    group.advices.push(advice)
282
+                    advice_groups.push(group)
283
+                    group = newGroupObject()
284
+                    continue
252 285
                   }
253
-                  continue
254 286
 
255 287
                 } else {
256
-                  if (group.group_no > 0) {
288
+                  if (group.group_no > 0 && group.group_no != advice.groupno) {
257 289
                     advice_groups.push(group)
258 290
                     group = newGroupObject()
259 291
                   }
260
-
261
-                  initGroupBlock(group, advice)
262
-                  group.advices.push(advice)
263
-                  advice_groups.push(group)
264
-                  group = newGroupObject()
265
-                  continue
266
-                }
267
-
268
-              } else {
269
-                if (group.group_no > 0 && group.group_no != advice.groupno) {
270
-                  advice_groups.push(group)
271
-                  group = newGroupObject()
272
-                }
273
-                if (group.group_no == 0) {
274
-                  initGroupBlock(group, advice)
275
-                }
276
-                if (group.group_no == advice.groupno) {
277
-                  group.advices.push(advice)
292
+                  if (group.group_no == 0) {
293
+                    initGroupBlock(group, advice)
294
+                  }
295
+                  if (group.group_no == advice.groupno) {
296
+                    group.advices.push(advice)
297
+                  }
278 298
                 }
279 299
               }
300
+              if (group.group_no > 0) { // 上述的算法会导致最后一组没有加到advice_groups,这里要手动加上
301
+                advice_groups.push(group)
302
+              }
303
+              advice_groups = advice_groups
304
+            } else {
305
+              advice_groups = []
280 306
             }
281
-            if (group.group_no > 0) { // 上述的算法会导致最后一组没有加到advice_groups,这里要手动加上
282
-              advice_groups.push(group)
283
-            }
284
-            advice_groups = advice_groups
285
-          } else {
286
-            advice_groups = []
307
+            maps.new_advice = advice_groups
287 308
           }
288
-          maps.new_advice = advice_groups
289 309
         }
290
-      }
291
-
292
-
293
-      console.log(scheduleMap)
294 310
 
311
+        console.log(scheduleMap)
295 312
 
296
-
297
-      return scheduleMap;
298
-    }
299
-  },
300
-  created() {
301
-    this.requestSchedualDoctors();
302
-  },
303
-  methods: {
304
-    clickfunction: function(val) {
305
-      // console.log(val);
306
-      this.$router.push({
307
-        path: "/details",
308
-        query: {
309
-          patient_id: val.patient.id,
310
-          date: this.selected_date.getTime() / 1000,
311
-          patient_name: val.patient.name
312
-        }
313
-      });
314
-    },
315
-    handlePaitentType: function(index) {
316
-      this.patient_selected = index;
317
-      this.show_patient_type_selector = false;
318
-      this.requestSchedualDoctors();
313
+        return scheduleMap
314
+      }
319 315
     },
320
-    openPicker() {
321
-      this.$refs.picker.open();
316
+    created () {
317
+      this.requestSchedualDoctors()
322 318
     },
323
-    getAdaviceType(type,parent_id) {
324
-      if(parent_id == 0) {
325
-        if (type == 1) {
326
-          return "长嘱";
327
-        } else if (type == 2) {
328
-          return "临嘱";
329
-        } else if (type == 3) {
330
-          return "临嘱";
319
+    methods: {
320
+      // getNumber: function (advice,schedule) {
321
+      //   console.log(advice)
322
+      //   if (advice.parent_id == 0 ) {
323
+      //     if(advice.dialysis_order && advice.dialysis_order.device_number && advice.dialysis_order.device_number.number.length > 0){
324
+      //       return advice.dialysis_order.device_number.number
325
+      //     }else{
326
+      //       return schedule.device_number.number
327
+      //     }
328
+      //   }
329
+      //
330
+      // },
331
+      clickfunction: function (val) {
332
+        // console.log(val);
333
+        this.$router.push({
334
+          path: '/details',
335
+          query: {
336
+            patient_id: val.patient.id,
337
+            date: this.selected_date.getTime() / 1000,
338
+            patient_name: val.patient.name
339
+          }
340
+        })
341
+      },
342
+      handlePaitentType: function (index) {
343
+        this.patient_selected = index
344
+        this.show_patient_type_selector = false
345
+        this.requestSchedualDoctors()
346
+      },
347
+      openPicker () {
348
+        this.$refs.picker.open()
349
+      },
350
+      getAdaviceType (type, parent_id) {
351
+        if (parent_id == 0) {
352
+          if (type == 1) {
353
+            return '长嘱'
354
+          } else if (type == 2) {
355
+            return '临嘱'
356
+          } else if (type == 3) {
357
+            return '临嘱'
358
+          }
331 359
         }
332
-      }
333
-    },
334
-    getName(val) {
335
-      console.log(this.admin_user)
360
+      },
361
+      getName (val) {
362
+        console.log(this.admin_user)
336 363
 
337
-      for (let i = 0; i < this.admin_user.length; i++) {
338
-        if (this.admin_user[i].id ==  val) {
339
-          return this.admin_user[i].name;
364
+        for (let i = 0; i < this.admin_user.length; i++) {
365
+          if (this.admin_user[i].id == val) {
366
+            return this.admin_user[i].name
367
+          }
340 368
         }
341
-      }
342
-    },
343
-    handletimeType: function(index) {
344
-      this.schedule_type_selected = index;
345
-      this.show_sch_type_selector = false;
346
-    },
347
-    handleAdviceType: function(index) {
348
-      this.advice_type_selected = index;
349
-      this.show_advice_type_selector = false;
350
-      this.requestSchedualDoctors();
351
-    },
352
-    handleZoneChange: function(index) {
353
-      this.zone_selected = index;
354
-      this.show_zone_selector = false;
355
-    },
356
-    parseTime: function(time, layout) {
357
-      // console.log(time);
358
-      if (time == 0) {
359
-        return "";
360
-      }
361
-      return parseTime(time, layout);
362
-    },
363
-    requestSchedualDoctors() {
364
-      getSchedualDoctors({
365
-        date: this.selected_date_str,
366
-        patient_type: this.patient_selected,
367
-        advice_type: 2
368
-      }).then(rs => {
369
-        var resp = rs.data;
370
-        if (resp.state == 1) {
371
-          this.admin_user = resp.data.adminUser;
372
-          var schedules = resp.data.scheduals;
373
-          var zoneMap = {};
374
-          var scheduleMap = {};
375
-          for (let index = 0; index < schedules.length; index++) {
376
-            const schedule = schedules[index];
377
-            if (schedule.doctor_advice.length == 0) {
378
-              continue;
379
-            }
380
-            if (scheduleMap[schedule.device_number.zone.name] == null) {
381
-              scheduleMap[schedule.device_number.zone.name] = [];
382
-            }
383
-            scheduleMap[schedule.device_number.zone.name].push(schedule);
384
-            if (zoneMap[schedule.device_number.zone.name] == null) {
385
-              zoneMap[schedule.device_number.zone.name] = schedule.device_number.zone;
369
+      },
370
+      handletimeType: function (index) {
371
+        this.schedule_type_selected = index
372
+        this.show_sch_type_selector = false
373
+      },
374
+      handleAdviceType: function (index) {
375
+        this.advice_type_selected = index
376
+        this.show_advice_type_selector = false
377
+        this.requestSchedualDoctors()
378
+      },
379
+      handleZoneChange: function (index) {
380
+        this.zone_selected = index
381
+        this.show_zone_selector = false
382
+      },
383
+      parseTime: function (time, layout) {
384
+        // console.log(time);
385
+        if (time == 0) {
386
+          return ''
387
+        }
388
+        return parseTime(time, layout)
389
+      },
390
+      requestSchedualDoctors () {
391
+        getSchedualDoctors({
392
+          date: this.selected_date_str,
393
+          patient_type: this.patient_selected,
394
+          advice_type: 2
395
+        }).then(rs => {
396
+          var resp = rs.data
397
+          if (resp.state == 1) {
398
+            this.admin_user = resp.data.adminUser
399
+            var schedules = resp.data.scheduals
400
+            var zoneMap = {}
401
+            var scheduleMap = {}
402
+            for (let index = 0; index < schedules.length; index++) {
403
+              const schedule = schedules[index]
404
+              if (schedule.doctor_advice.length == 0) {
405
+                continue
406
+              }
407
+              if (scheduleMap[schedule.device_number.zone.name] == null) {
408
+                scheduleMap[schedule.device_number.zone.name] = []
409
+              }
410
+              scheduleMap[schedule.device_number.zone.name].push(schedule)
411
+              if (zoneMap[schedule.device_number.zone.name] == null) {
412
+                zoneMap[schedule.device_number.zone.name] = schedule.device_number.zone
413
+              }
386 414
             }
387
-          }
388 415
 
389
-          var zones = [];
390
-          zones.push({ value: 0, text: "全部分区" });
391
-          for (var zoneName in zoneMap) {
392
-            zones.push({ value: zoneMap[zoneName].id, text: zoneName });
393
-          }
416
+            var zones = []
417
+            zones.push({value: 0, text: '全部分区'})
418
+            for (var zoneName in zoneMap) {
419
+              zones.push({value: zoneMap[zoneName].id, text: zoneName})
420
+            }
394 421
 
395
-          zones = zones.sort(function(a, b) {
396
-            return a.value > b.value;
397
-          });
398
-          this.zones = zones;
422
+            zones = zones.sort(function (a, b) {
423
+              return a.value > b.value
424
+            })
425
+            this.zones = zones
399 426
 
400
-          this.scheduleMap = scheduleMap;
401
-        } else {
402
-          this.$toast({
403
-            message: resp.msg
404
-          });
405
-        }
406
-      });
407
-    },
408
-    adviceDesc(advice) {}
427
+            this.scheduleMap = scheduleMap
428
+          } else {
429
+            this.$toast({
430
+              message: resp.msg
431
+            })
432
+          }
433
+        })
434
+      },
435
+      adviceDesc (advice) {
436
+      }
437
+    }
409 438
   }
410
-};
411 439
 </script>
412 440
 
413 441
 <style style="stylesheet/scss" lang="scss" scoped>
414
-.top {
442
+  .top {
415 443
   .hospital {
416
-    width: 2rem;
444
+  width: 2rem;
417 445
   }
418 446
   .TopTitle {
419
-    font-size: 0.36rem;
420
-    color: $title-color;
421
-    font-weight: normal;
447
+  font-size: 0.36rem;
448
+  color: $title-color;
449
+  font-weight: normal;
422 450
   }
423 451
   padding: 0.3rem 0.3rem;
424 452
   @include display-flex;
@@ -427,16 +455,16 @@ export default {
427 455
   @include justify-content-between;
428 456
   border-bottom: 1px #e5e5e5 solid;
429 457
   .title {
430
-    font-size: 0.3rem;
431
-    font-weight: bold;
432
-    color: $pgh-color;
458
+  font-size: 0.3rem;
459
+  font-weight: bold;
460
+  color: $pgh-color;
433 461
   }
434 462
   .iconfont {
435
-    font-size: 0.4rem;
436
-    color: #a8b3ba;
463
+  font-size: 0.4rem;
464
+  color: #a8b3ba;
465
+  }
437 466
   }
438
-}
439
-.search {
467
+  .search {
440 468
   background: #ebf1f7;
441 469
   border-radius: 30px;
442 470
   padding: 0 0.3rem;
@@ -445,17 +473,17 @@ export default {
445 473
   color: #a8b3ba;
446 474
 
447 475
   .iconfont {
448
-    color: #a8b3ba;
449
-    font-size: 0.28rem;
476
+  color: #a8b3ba;
477
+  font-size: 0.28rem;
450 478
   }
451 479
   .searchInput {
452
-    font-size: 0.28rem;
453
-    border: none;
454
-    outline: none;
455
-    background: #ebf1f7;
480
+  font-size: 0.28rem;
481
+  border: none;
482
+  outline: none;
483
+  background: #ebf1f7;
484
+  }
456 485
   }
457
-}
458
-.choice {
486
+  .choice {
459 487
   border-bottom: 1px #e5e5e5 solid;
460 488
   position: fixed;
461 489
   top: 63px;
@@ -464,39 +492,39 @@ export default {
464 492
   left: 1.58rem;
465 493
   background: #fff;
466 494
   ul {
467
-    @include display-flex;
468
-    @include align-items-center;
469
-    @include text-align;
470
-    @include justify-content-between;
471
-    width: 70%;
472
-    margin: 0 auto;
473
-    font-size: 0.32rem;
474
-    color: $pgh-color;
475
-    li {
476
-      @include display-flex;
477
-      @include align-items-center;
478
-      @include text-align;
479
-      @include justify-content-between;
480
-      padding: 0.3rem 0;
481
-      font-size: 0.32rem;
482
-      .iconfont {
483
-        margin: 0 0.1rem;
484
-      }
485
-      .line {
486
-        background: #a8b3ba;
487
-        width: 0.2rem;
488
-        height: 1px;
489
-        margin: 0 0.2rem;
490
-        display: inline-block;
491
-      }
492
-    }
495
+  @include display-flex;
496
+  @include align-items-center;
497
+  @include text-align;
498
+  @include justify-content-between;
499
+  width: 70%;
500
+  margin: 0 auto;
501
+  font-size: 0.32rem;
502
+  color: $pgh-color;
503
+  li {
504
+  @include display-flex;
505
+  @include align-items-center;
506
+  @include text-align;
507
+  @include justify-content-between;
508
+  padding: 0.3rem 0;
509
+  font-size: 0.32rem;
510
+  .iconfont {
511
+  margin: 0 0.1rem;
493 512
   }
494
-}
495
-.DialysisAdvice{
513
+  .line {
514
+  background: #a8b3ba;
515
+  width: 0.2rem;
516
+  height: 1px;
517
+  margin: 0 0.2rem;
518
+  display: inline-block;
519
+  }
520
+  }
521
+  }
522
+  }
523
+  .DialysisAdvice{
496 524
   padding-top:115px;
497 525
   background: #fff;
498 526
   min-height: calc(100vh - 2px);
499
-}
527
+  }
500 528
 
501 529
 
502 530
   .advice_content {

+ 13 - 3
src/pages/advice/NormalAdviceTable.vue View File

@@ -49,7 +49,7 @@
49 49
       <div class="blueBorder"></div>
50 50
       <table class="table">
51 51
         <tr>
52
-          <th width="50px">机号</th>
52
+          <!--<th width="50px">机号</th>-->
53 53
           <th width="50px">姓名</th>
54 54
           <th width="50px">透析号</th>
55 55
           <th width="50px">期效</th>
@@ -68,7 +68,7 @@
68 68
         <template v-for="(schedules, zone_name, index) in filtedScheduals">
69 69
           <tr :key="index">
70 70
             <td>{{ zone_name }}</td>
71
-            <td></td>
71
+            <!--<td></td>-->
72 72
             <td></td>
73 73
             <td></td>
74 74
             <td></td>
@@ -83,7 +83,8 @@
83 83
           </tr>
84 84
           <template v-for="(schedule) in schedules">
85 85
             <tr v-for="(advice, advice_index) in schedule.doctor_advice" :key="advice.id + '_' + advice_index + '_' + index"  @click="clickfunction(schedule)">
86
-              <td>{{ advice.parent_id == 0 ? schedule.device_number.number : "" }}</td>
86
+              <!--<td>{{ advice.parent_id == 0 && advice.dialysis_order&&advice.dialysis_order.device_number&& advice.dialysis_order.device_number.number.length > 0 ? advice.dialysis_order.device_number.number : schedule.device_number.number }}</td>-->
87
+              <!--<td>{{getNumber(advice)}}</td>-->
87 88
               <td>{{ advice.parent_id == 0 ? schedule.patient.name : "" }}</td>
88 89
               <td>{{ advice.parent_id == 0 ? schedule.patient.dialysis_no : "" }}</td>
89 90
               <td>{{ getAdaviceType(advice.advice_type,advice.parent_id)}}</td>
@@ -212,6 +213,15 @@
212 213
       this.requestSchedualDoctors();
213 214
     },
214 215
     methods: {
216
+      getNumber:function(advice){
217
+        if(advice.parent_id == 0 && advice.dialysis_order&&advice.dialysis_order.device_number&& advice.dialysis_order.device_number.number.length > 0){
218
+          console.log("111111")
219
+        }else{
220
+          console.log("222222")
221
+        }
222
+
223
+
224
+      },
215 225
       clickfunction: function(val) {
216 226
         // console.log(val);
217 227
         this.$router.push({

+ 1 - 1
src/pages/main/PatientBox.vue View File

@@ -26,7 +26,7 @@
26 26
       <div class="function" :class="functionColor(patient)">
27 27
         <ul>
28 28
           <li><span class="iconfont">&#xe6f7;</span>班次 : {{timeTypeText(patient)}}</li>
29
-          <li><span class="iconfont">&#xe6de;</span>床位号 : {{patient.device_number.number}}</li>
29
+          <li><span class="iconfont">&#xe6de;</span>床位号 : {{patient.dialysis_order&&patient.dialysis_order.device_number&&patient.dialysis_order.device_number.number.length > 0 ? patient.dialysis_order.device_number.number:patient.device_number.number}}</li>
30 30
           <li><span class="iconfont">&#xe6f6;</span>透析模式 : {{$store.getters.treatment_mode[patient.mode_id].name}}</li>
31 31
         </ul>
32 32
       </div>

+ 343 - 231
src/pages/main/WaitingArea.vue View File

@@ -2,6 +2,12 @@
2 2
   <div>
3 3
     <div class="screening">
4 4
       <ul>
5
+
6
+        <li v-for="(item,i) in menuList" :class="select_index == i ? 'active' : ''" @click="menuTabClick(i)"
7
+            :key="i">{{ item.label + (item.count > 0 ? '(' + item.count + ')' : '') }}
8
+        </li>
9
+
10
+
5 11
         <el-popover
6 12
           v-model="zone_options_visible"
7 13
           placement="bottom"
@@ -11,247 +17,353 @@
11 17
           </li>
12 18
           <div class="popover-demo-content">
13 19
             <ul>
14
-              <li v-for="(option, index) in zone_options" :key="index" @click="handleZoneChange(index)" :class="zone_selected == index ? 'tick' : ''">{{ option.text }}</li>
20
+              <li v-for="(option, index) in zone_options" :key="index" @click="handleZoneChange(index)"
21
+                  :class="zone_selected == index ? 'tick' : ''">{{ option.text }}
22
+              </li>
23
+            </ul>
24
+          </div>
25
+        </el-popover>
26
+
27
+        <el-popover
28
+          v-model="time_options_visible"
29
+          placement="bottom"
30
+          trigger="click">
31
+          <li slot="reference">
32
+            {{ time_options[time_selected].text }}<span class="iconfont">&#xe74a;</span>
33
+          </li>
34
+          <div class="popover-demo-content">
35
+            <ul>
36
+              <li v-for="(option, index) in time_options" :key="index" @click="handleTimeChange(index)"
37
+                  :class="time_selected == index ? 'tick' : ''">{{ option.text }}
38
+              </li>
15 39
             </ul>
16 40
           </div>
17 41
         </el-popover>
18 42
 
19
-         <li v-for="(item,i) in menuList" :class="select_index == i ? 'active' : ''" @click="menuTabClick(i)"
20
-        :key="i">{{ item.label + (item.count > 0 ? '(' + item.count + ')' : '') }}</li>
21 43
       </ul>
22 44
     </div>
23 45
     <div class="stateBox ">
24 46
       <!-- <patient-box class="clearfix" :patients="filtedScheduals "></patient-box> -->
25 47
       <div v-for="(item, index) in filtedScheduals" :key="index">
26
-        <h2 class="title" >{{item.zone_name}}</h2>
48
+        <h2 class="title">{{item.zone_name}}</h2>
27 49
         <patient-box class="clearfix" :patients="item.scheduals"></patient-box>
28 50
       </div>
29
-      <div class="NoData" v-show="filtedScheduals.length == 0"><img style="margin-top: 50px; margin-bottom: 50px" src="@/assets/login/data.jpg" alt=""></div>
51
+      <div class="NoData" v-show="filtedScheduals.length == 0"><img style="margin-top: 50px; margin-bottom: 50px"
52
+                                                                    src="@/assets/login/data.jpg" alt=""></div>
30 53
 
31 54
     </div>
32 55
   </div>
33 56
 </template>
34 57
 
35 58
 <script>
36
-import PatientBox from "./PatientBox";
37
-import { getWaitingScheduals } from "@/api/dialysis";
38
-import { parseTime } from "@/utils";
39
-import { Popover } from "vux";
40
-
41
-export default {
42
-  name: "WaitingArea",
43
-  components: {
44
-    PatientBox,
45
-    Popover
46
-  },
47
-  data() {
48
-    return {
49
-      menuList: [
50
-        { value: "2", label: "透前称量", count: 0 },
51
-        { value: "3", label: "制定处方", count: 0 }
52
-      ],
53
-
54
-      select_index: -1,
55
-      zone_selected: 0,
56
-
57
-      scheduals: [],
58
-
59
-      zone_options: [{ value: 0, text: "全部分区" }],
60
-      zone_scheduals: [],
61
-
62
-      zone_options_visible: false,
63
-    };
64
-  },
65
-  props: {
66
-    search_keyword: {
67
-      type: String
68
-    }
69
-  },
70
-  computed: {
71
-    filtedScheduals: function() {
72
-      var search_keyword = this.search_keyword;
73
-      if (this.search_keyword.length > 0) {
74
-        var scheduals = [];
75
-        for (let index = 0; index < this.scheduals.length; index++) {
76
-          const schedual = this.scheduals[index];
77
-          if (
78
-            schedual.patient.name.indexOf(search_keyword) != -1 ||
79
-            schedual.patient.dialysis_no.indexOf(search_keyword) != -1
80
-          ) {
81
-            scheduals.push(schedual);
82
-          }
83
-        }
84
-        return this.processScheduals(scheduals);
85
-      }
59
+  import PatientBox from './PatientBox'
60
+  import {getWaitingScheduals} from '@/api/dialysis'
61
+  import {parseTime} from '@/utils'
62
+  import {Popover} from 'vux'
63
+
64
+  export default {
65
+    name: 'WaitingArea',
66
+    components: {
67
+      PatientBox,
68
+      Popover
69
+    },
70
+    data () {
71
+      return {
72
+        menuList: [
73
+          {value: '1', label: '全部', count: 0},
74
+          {value: '3', label: '待开处方', count: 0},
75
+          {value: '2', label: '透前称量', count: 0}
76
+        ],
77
+
78
+        select_index: 0,
79
+        zone_selected: 0,
80
+        time_selected: 0,
81
+
82
+        scheduals: [],
83
+
84
+        zone_options: [{value: 0, text: '全部分区'}],
85
+        zone_scheduals: [],
86
+
87
+        time_options: [{value: 0, text: '全部班'}, {value: 1, text: '上午'}, {value: 2, text: '下午'}, {value: 3, text: '晚上'}],
88
+
89
+        zone_options_visible: false,
90
+        time_options_visible: false,
86 91
 
87
-      if (this.zone_selected != 0) {
88
-        var zone_name = this.zone_options[this.zone_selected].text;
89
-        for (let index = 0; index < this.zone_scheduals.length; index++) {
90
-          const zone_scheduals = this.zone_scheduals[index];
91
-          if (zone_scheduals.zone_name == zone_name) {
92
-            return [zone_scheduals];
93
-          }
94
-        }
95 92
       }
96 93
 
97
-      if (this.select_index == 0) {
98
-        // console.log("点击了第二个");
99
-        var scheduals = [];
100
-        for (let index = 0; index < this.scheduals.length; index++) {
101
-          const schedual = this.scheduals[index];
102
-          if (schedual.assessment_before_dislysis != null) {
103
-            scheduals.push(schedual);
94
+    },
95
+    props: {
96
+      search_keyword: {
97
+        type: String
98
+      }
99
+    },
100
+    computed: {
101
+      filtedScheduals: function () {
102
+        var search_keyword = this.search_keyword
103
+        if (this.search_keyword.length > 0) {
104
+          var scheduals = []
105
+          for (let index = 0; index < this.scheduals.length; index++) {
106
+            const schedual = this.scheduals[index]
107
+            if (
108
+              schedual.patient.name.indexOf(search_keyword) != -1 ||
109
+              schedual.patient.dialysis_no.indexOf(search_keyword) != -1
110
+            ) {
111
+              scheduals.push(schedual)
112
+            }
104 113
           }
114
+          return this.processScheduals(scheduals)
105 115
         }
106
-        return this.processScheduals(scheduals);
107
-        // return scheduals;
108
-      } else if (this.select_index == 1) {
109
-        // console.log("点击了第三个");
110
-        var scheduals = [];
111
-        for (let index = 0; index < this.scheduals.length; index++) {
112
-          const schedual = this.scheduals[index];
113
-          if (
114
-            schedual.assessment_before_dislysis == null &&
115
-            schedual.prescription != null
116
-          ) {
117
-            scheduals.push(schedual);
116
+        //
117
+        // if (this.zone_selected != 0) {
118
+        //   var zone_name = this.zone_options[this.zone_selected].text
119
+        //   for (let index = 0; index < this.zone_scheduals.length; index++) {
120
+        //     const zone_scheduals = this.zone_scheduals[index]
121
+        //     if (zone_scheduals.zone_name == zone_name) {
122
+        //       return [zone_scheduals]
123
+        //     }
124
+        //   }
125
+        // }
126
+
127
+        // if (this.time_selected != 0) {
128
+        //   var zone_name = this.zone_options[this.zone_selected].text
129
+        //   console.log(zone_name)
130
+        //   var schedules = [];
131
+        //   for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
132
+        //     const scheduleInfo = this.zone_scheduals[o_i];
133
+        //     var originSchedules = scheduleInfo.scheduals;
134
+        //     var filtedSchedules = [];
135
+        //     for (let s_i = 0; s_i < originSchedules.length; s_i++) {
136
+        //       const schedule = originSchedules[s_i];
137
+        //       if(this.zone_selected == 0){
138
+        //         if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
139
+        //           filtedSchedules.push(schedule);
140
+        //         }
141
+        //
142
+        //       }else{
143
+        //         console.log(zone_name)
144
+        //         console.log(schedule.device_number.zone.name)
145
+        //
146
+        //         if ((zone_name.length > 0 && zone_name == schedule.device_number.zone.name)) {
147
+        //           if (this.time_selected == 0 || schedule.schedule_type == this.time_selected) {
148
+        //             filtedSchedules.push(schedule);
149
+        //           }
150
+        //         }
151
+        //       }
152
+        //     }
153
+        //     if (filtedSchedules.length > 0) {
154
+        //       schedules.push({
155
+        //         zone_name: scheduleInfo.zone_name,
156
+        //         scheduals: filtedSchedules
157
+        //       });
158
+        //     }
159
+        //   }
160
+        //   return schedules
161
+        // }
162
+
163
+        var zone_selected = this.zone_selected
164
+        var timetype_selected = this.time_selected
165
+        if ((zone_selected != 0 || timetype_selected != 0)) {
166
+          var zone_name = zone_selected == 0 ? '' : this.zone_options[zone_selected].text
167
+          var schedules = []
168
+          for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
169
+            const scheduleInfo = this.zone_scheduals[o_i]
170
+            var originSchedules = scheduleInfo.scheduals
171
+            var filtedSchedules = []
172
+            for (let s_i = 0; s_i < originSchedules.length; s_i++) {
173
+              const schedule = originSchedules[s_i]
174
+              if (
175
+                zone_name.length == 0 ||
176
+                (zone_name.length > 0 &&
177
+                  zone_name == schedule.device_number.zone.name)
178
+              ) {
179
+                if (
180
+                  timetype_selected == 0 ||
181
+                  schedule.schedule_type == timetype_selected
182
+                ) {
183
+                  filtedSchedules.push(schedule)
184
+                }
185
+              }
186
+            }
187
+            if (filtedSchedules.length > 0) {
188
+              schedules.push({
189
+                zone_name: scheduleInfo.zone_name,
190
+                scheduals: filtedSchedules
191
+              })
192
+            }
118 193
           }
194
+          return schedules
119 195
         }
120
-        // return scheduals;
121
-        return this.processScheduals(scheduals);
122
-      } else {
123 196
 
197
+        if (this.select_index == 2) {
198
+          console.log('点击了第二个')
199
+          var scheduals = []
200
+          for (let index = 0; index < this.scheduals.length; index++) {
201
+            const schedual = this.scheduals[index]
202
+            if (schedual.assessment_before_dislysis == null) {
203
+              scheduals.push(schedual)
204
+            }
205
+          }
206
+          return this.processScheduals(scheduals)
207
+          // return scheduals;
208
+        } else if (this.select_index == 1) {
209
+          console.log('点击了第三个')
210
+          var scheduals = []
211
+          for (let index = 0; index < this.scheduals.length; index++) {
212
+            const schedual = this.scheduals[index]
213
+            if (
214
+              schedual.assessment_before_dislysis == null &&
215
+              schedual.prescription == null
216
+            ) {
217
+              scheduals.push(schedual)
218
+            }
219
+          }
220
+          // return scheduals;
221
+          return this.processScheduals(scheduals)
222
+        } else {
223
+          return this.zone_scheduals
124 224
 
125
-        return this.zone_scheduals;
225
+        }
126 226
 
127 227
       }
228
+    },
229
+    created () {
230
+      this.requestScheduals()
231
+    },
232
+    mounted () {
233
+      this.timer = window.setInterval(() => {
234
+        setTimeout(this.requestScheduals(), 0)
235
+      }, 30000)
128 236
 
129
-    }
130
-  },
131
-  created() {
132
-    this.requestScheduals();
133
-  },
134
-  mounted(){
135
-    this.timer =   window.setInterval(() => {
136
-      setTimeout(this.requestScheduals(), 0)
137
-    }, 30000)
138
-
139
-
140
-  },
141
-  beforeDestroy() {
142
-    clearInterval(this.timer);
143
-    this.timer = null;
144
-    // this.$once('hook:beforeDestroy', () => {
145
-    //   clearInterval(this.timer);
146
-    // })
147
-  },
148
-  methods: {
149
-    menuTabClick: function(tabIndex) {
150
-      this.select_index = tabIndex;
151
-      this.zone_selected = 0;
152 237
     },
153
-    handleZoneChange: function(index) {
154
-      this.zone_options_visible = false;
155
-      this.zone_selected = index;
156
-      this.select_index = -1;
238
+    beforeDestroy () {
239
+      clearInterval(this.timer)
240
+      this.timer = null
241
+      // this.$once('hook:beforeDestroy', () => {
242
+      //   clearInterval(this.timer);
243
+      // })
157 244
     },
245
+    methods: {
246
+      handleAllChange: function (tabIndex) {
247
+        this.select_index = tabIndex
248
+        this.zone_selected = 0
249
+        this.time_selected = 0
250
+
251
+      },
252
+      menuTabClick: function (tabIndex) {
253
+        this.select_index = tabIndex
254
+        this.zone_selected = 0
255
+        this.time_selected = 0
256
+
257
+      },
258
+      handleZoneChange: function (index) {
259
+        this.zone_options_visible = false
260
+        this.zone_selected = index
261
+        this.select_index = -1
262
+      }, handleTimeChange: function (index) {
263
+        this.time_selected = index
264
+        this.select_index = -1
265
+        this.time_options_visible = false
266
+
267
+      },
268
+
269
+      requestScheduals () {
158 270
 
159
-    requestScheduals() {
160
-
161
-      var date = parseTime(Date.parse(new Date()), "{y}-{m}-{d}");
162
-      getWaitingScheduals({ date: date }).then(rs => {
163
-        var resp = rs.data;
164
-        // console.log(resp);
165
-        if (resp.state == 1) {
166
-          var scheduals = resp.data.scheduals;
167
-          var totalCount = scheduals.length;
168
-          var prescription_count = 0;
169
-          var assessment_before_dislysis_count = 0;
170
-          for (let index = 0; index < scheduals.length; index++) {
171
-            const schedual = scheduals[index];
172
-            if (schedual.assessment_before_dislysis != null) {
173
-              assessment_before_dislysis_count += 1;
174
-            } else if (schedual.prescription != null) {
175
-              prescription_count += 1;
271
+        var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
272
+        getWaitingScheduals({date: date}).then(rs => {
273
+          var resp = rs.data
274
+          // console.log(resp);
275
+          if (resp.state == 1) {
276
+            var scheduals = resp.data.scheduals
277
+            var totalCount = scheduals.length
278
+            var prescription_count = 0
279
+            var assessment_before_dislysis_count = 0
280
+            for (let index = 0; index < scheduals.length; index++) {
281
+              const schedual = scheduals[index]
282
+              if (schedual.assessment_before_dislysis == null) {
283
+                assessment_before_dislysis_count += 1
284
+              }
285
+              if (schedual.prescription == null) {
286
+                prescription_count += 1
287
+              }
176 288
             }
177
-          }
178
-          this.menuList[0].count = assessment_before_dislysis_count;
179
-          this.menuList[1].count = prescription_count;
180
-          this.scheduals = scheduals;
289
+            this.menuList[2].count = assessment_before_dislysis_count
290
+            this.menuList[1].count = prescription_count
291
+            this.scheduals = scheduals
181 292
 
182
-          this.zone_options = this.makeZones(scheduals);
183
-          this.zone_scheduals = this.processScheduals(scheduals);
184
-        } else {
185
-          this.$toast({
186
-            message: resp.msg
187
-          });
188
-        }
189
-      });
190
-    },
191
-    makeZones: function(scheduals) {
192
-      var zoneMap = {};
193
-      for (let index = 0; index < scheduals.length; index++) {
194
-        const schedual = scheduals[index];
195
-        if (zoneMap[schedual.device_number.zone.id] == null) {
196
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
293
+            this.zone_options = this.makeZones(scheduals)
294
+            this.zone_scheduals = this.processScheduals(scheduals)
295
+          } else {
296
+            this.$toast({
297
+              message: resp.msg
298
+            })
299
+          }
300
+        })
301
+      },
302
+      makeZones: function (scheduals) {
303
+        var zoneMap = {}
304
+        for (let index = 0; index < scheduals.length; index++) {
305
+          const schedual = scheduals[index]
306
+          if (zoneMap[schedual.device_number.zone.id] == null) {
307
+            zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
308
+          }
197 309
         }
198
-      }
199 310
 
200
-      var zones = [];
201
-      zones.push({ value: 0, text: "全部分区" });
202
-      for (var zoneId in zoneMap) {
203
-        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name });
204
-      }
311
+        var zones = []
312
+        zones.push({value: 0, text: '全部分区'})
313
+        for (var zoneId in zoneMap) {
314
+          zones.push({value: zoneMap[zoneId].id, text: zoneMap[zoneId].name})
315
+        }
205 316
 
206
-      zones = zones.sort(function(a, b) {
207
-        return a.id > b.id;
208
-      });
209
-      return zones;
210
-    },
211
-    processScheduals: function(scheduals) {
212
-      var zoneMap = {};
213
-      var schedualMap = {};
214
-      for (let index = 0; index < scheduals.length; index++) {
215
-        const schedual = scheduals[index];
216
-        if (schedualMap[schedual.device_number.zone.id] == null) {
217
-          schedualMap[schedual.device_number.zone.id] = [];
317
+        zones = zones.sort(function (a, b) {
318
+          return a.id > b.id
319
+        })
320
+        return zones
321
+      },
322
+      processScheduals: function (scheduals) {
323
+        var zoneMap = {}
324
+        var schedualMap = {}
325
+        for (let index = 0; index < scheduals.length; index++) {
326
+          const schedual = scheduals[index]
327
+          if (schedualMap[schedual.device_number.zone.id] == null) {
328
+            schedualMap[schedual.device_number.zone.id] = []
329
+          }
330
+          schedualMap[schedual.device_number.zone.id].push(schedual)
331
+          if (zoneMap[schedual.device_number.zone.id] == null) {
332
+            zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
333
+          }
218 334
         }
219
-        schedualMap[schedual.device_number.zone.id].push(schedual);
220
-        if (zoneMap[schedual.device_number.zone.id] == null) {
221
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
335
+
336
+        var zones = []
337
+        // zones.push({ value: 0, text: "全部分区" })
338
+        for (var zoneId in zoneMap) {
339
+          zones.push({id: zoneMap[zoneId].id, name: zoneMap[zoneId].name})
222 340
         }
223
-      }
224 341
 
225
-      var zones = [];
226
-      // zones.push({ value: 0, text: "全部分区" })
227
-      for (var zoneId in zoneMap) {
228
-        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name });
229
-      }
342
+        zones = zones.sort(function (a, b) {
343
+          return a.id > b.id
344
+        })
345
+        // this.zones = zones
346
+
347
+        var zone_scheduals = []
348
+        for (let index = 0; index < zones.length; index++) {
349
+          const zone = zones[index]
350
+          var scheduals = schedualMap[zone.id]
351
+          zone_scheduals.push({
352
+            zone_id: zone.id,
353
+            zone_name: zone.name,
230 354
 
231
-      zones = zones.sort(function(a, b) {
232
-        return a.id > b.id;
233
-      });
234
-      // this.zones = zones
235
-
236
-      var zone_scheduals = [];
237
-      for (let index = 0; index < zones.length; index++) {
238
-        const zone = zones[index];
239
-        var scheduals = schedualMap[zone.id];
240
-        zone_scheduals.push({
241
-          zone_id: zone.id,
242
-          zone_name: zone.name,
243
-          scheduals: scheduals
244
-        });
355
+            scheduals: scheduals
356
+          })
357
+        }
358
+        // this.zone_scheduals = zone_scheduals;
359
+        return zone_scheduals
245 360
       }
246
-      // this.zone_scheduals = zone_scheduals;
247
-      return zone_scheduals;
248 361
     }
249 362
   }
250
-};
251 363
 </script>
252 364
 
253 365
 <style style="stylesheet/scss" lang="scss" scoped>
254
-.screening {
366
+  .screening {
255 367
   border-bottom: 1px #e5e5e5 solid;
256 368
   position: fixed;
257 369
   top: 63px;
@@ -260,46 +372,46 @@ export default {
260 372
   left: 1.58rem;
261 373
   background: #fff;
262 374
   ul {
263
-    @include display-flex;
264
-    @include align-items-center;
265
-    @include text-align;
266
-    @include justify-content-between;
267
-    width: 60%;
268
-    margin: 0 auto;
269
-    font-size: 0.32rem;
270
-    color:$title-color;
271
-    li {
272
-      padding: 0.3rem 0;
273
-      .iconfont {
274
-        font-size: 0.32rem;
275
-        margin-left: 0.1rem;
276
-      }
277
-    }
278
-    .active {
279
-      position: relative;
280
-      &::before {
281
-        position: absolute;
282
-        bottom: 0;
283
-        left: 0;
284
-        width: 100%;
285
-        height: 2px;
286
-        background: $main-color;
287
-        // border-bottom: 0.04rem $main-color solid;
288
-        content: "";
289
-      }
290
-    }
375
+  @include display-flex;
376
+  @include align-items-center;
377
+  @include text-align;
378
+  @include justify-content-between;
379
+  width: 60%;
380
+  margin: 0 auto;
381
+  font-size: 0.32rem;
382
+  color:$title-color;
383
+  li {
384
+  padding: 0.3rem 0;
385
+  .iconfont {
386
+  font-size: 0.32rem;
387
+  margin-left: 0.1rem;
388
+  }
389
+  }
390
+  .active {
391
+  position: relative;
392
+  &::before {
393
+  position: absolute;
394
+  bottom: 0;
395
+  left: 0;
396
+  width: 100%;
397
+  height: 2px;
398
+  background: $main-color;
399
+  // border-bottom: 0.04rem $main-color solid;
400
+  content: "";
291 401
   }
292
-}
293
-.stateBox {
402
+  }
403
+  }
404
+  }
405
+  .stateBox {
294 406
   // padding: 0.5rem 0 0 0.6rem;
295 407
   .title {
296
-    font-size: 0.34rem;
297
-    color: #34495e;
298
-    font-weight: 600;
299
-    height: 1rem;
300
-    line-height: 1rem;
301
-    display: inline-block;
408
+  font-size: 0.34rem;
409
+  color: #34495e;
410
+  font-weight: 600;
411
+  height: 1rem;
412
+  line-height: 1rem;
413
+  display: inline-block;
414
+  }
302 415
   }
303
-}
304 416
 </style>
305 417
 

+ 8 - 7
src/pages/main/add_urgent_schedule.vue View File

@@ -15,7 +15,8 @@
15 15
       <div class="form" v-loading="loading">
16 16
         <van-row class="row">
17 17
           <van-col :span="24" class="danger_hint">
18
-            本次临时排班会覆盖已有排班中的同班次、同床位的排班,请仔细检查后再提交
18
+            <!--本次临时排班会覆盖已有排班中的同班次、同床位的排班,请仔细检查后再提交-->
19
+            温馨提示:本次临时排班只能调整到空余的床位
19 20
           </van-col>
20 21
         </van-row>
21 22
         <van-row class="row">
@@ -309,12 +310,12 @@
309 310
               }
310 311
             }
311 312
 
312
-            if (this.patients.length > 0) {
313
-              this.patient_id = this.patients[0].id
314
-            }
315
-            if (this.modes.length > 0) {
316
-              this.mode_id = this.modes[0].id
317
-            }
313
+            // if (this.patients.length > 0) {
314
+            //   this.patient_id = this.patients[0].id
315
+            // }
316
+            // if (this.modes.length > 0) {
317
+            //   this.mode_id = this.modes[0].id
318
+            // }
318 319
 
319 320
             var zone_device_map = {}
320 321
             for (let index = 0; index < this.origin_device_numbers.length; index++) {

+ 2 - 0
src/pages/main/dialog/new_order/AddNewOrders.vue View File

@@ -465,6 +465,8 @@ export default {
465 465
           advice.single_dose_unit = order.single_dose_unit;
466 466
           advice.prescribing_number = order.prescribing_number;
467 467
           advice.prescribing_number_unit = order.prescribing_number_unit;
468
+          advice.remark = order.remark;
469
+
468 470
         } else {
469 471
           var subdrug = advice.subdrugs[this.selecting_subdrug_index];
470 472
           subdrug.title = order.title;

+ 1 - 0
src/pages/main/dialog/new_order/order_form.vue View File

@@ -328,6 +328,7 @@ export default {
328 328
         });
329 329
       } else if (this.mode == 2) {
330 330
         this.$emit("did-modify", {
331
+
331 332
           title: this.order.title,
332 333
           advice_desc: this.order.advice_desc,
333 334
           // drug_spec: this.order.drug_spec,

+ 4 - 2
src/pages/main/printItem/LabelBox/index.vue View File

@@ -58,8 +58,10 @@
58 58
     transition: border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46);
59 59
 }
60 60
 .is-checked-radio::after {
61
-    content: "√";
62
-    font-size: 15px;
61
+  content: "√";
62
+  font-size: 10px;
63
+  margin-left: 2px;
64
+  position: absolute;
63 65
 }
64 66
 .radio-no {
65 67
     opacity: 0;

+ 12 - 9
src/pages/main/template/DialysisPrintOrderTwo.vue View File

@@ -61,12 +61,14 @@
61 61
                     </div>
62 62
                     次/周
63 63
                   </div>
64
+
64 65
                   <div class="inline_block" style="margin-left: 30px;">
65 66
                     透析机编号:
66
-                    <div class="under_line" style="width: 100px;">{{''}}</div>
67
+                    <div class="under_line" style="width: 100px;">{{dialysisOrder&&dialysisOrder.DeviceNumber&&dialysisOrder.DeviceNumber.number.length > 0?dialysisOrder.DeviceNumber.number:patientInfo.DialysisSchedule.device_number.number}}</div>
67 68
                     型号
68
-                    <div class="under_line" style="width: 100px;">{{''}}</div>
69
+                    <div class="under_line" style="width: 100px;">{{predialysis&&predialysis.machine_type.length > 0 ?predialysis.machine_type:''}}</div>
69 70
                   </div>
71
+
70 72
                 </div>
71 73
                 <div class="row" style="padding: 2px 0;line-height:19px;">
72 74
                   <div class="inline_block" >
@@ -77,7 +79,7 @@
77 79
                   </div>
78 80
                   <div class="inline_block"  style="margin-left: 20px;">
79 81
                     出血:
80
-                    <check-box text="正常" :checked="predialysis.is_hemorrhage==2?true:false"></check-box>
82
+                    <check-box text="" :checked="predialysis.is_hemorrhage==2?true:false"></check-box>
81 83
                     <check-box text="异常" :checked="predialysis.is_hemorrhage==1?true:false"></check-box>
82 84
                     (&nbsp;
83 85
                     <check-box text="穿刺点渗血" :checked="predialysis.is_hemorrhage==1&&predialysis.hemorrhage.indexOf('穿刺点渗血')>-1?true:false"></check-box>
@@ -144,8 +146,9 @@
144 146
                     中心静脉导管:
145 147
                     <check-box text="正常" :checked="predialysis.ductus_arantii.indexOf('正常')>-1?true:false"></check-box>
146 148
                     <check-box text="不畅" :checked="predialysis.ductus_arantii.indexOf('不畅')>-1?true:false"></check-box>
147
-                    <check-box text="血流不足(正接)" :checked="predialysis.ductus_arantii.indexOf('血流不足(正接)')>-1?true:false"></check-box>
148
-                    <check-box text="血流不足(反接)" :checked="predialysis.ductus_arantii.indexOf('血流不足(反接)')>-1?true:false"></check-box>
149
+                    <check-box text="血流不足" :checked="predialysis.ductus_arantii.indexOf('血流不足')>-1?true:false"></check-box>
150
+                    (<check-box text="正接" :checked="predialysis.ductus_arantii.indexOf('正接')>-1?true:false"></check-box>/
151
+                    <check-box text="反接" :checked="predialysis.ductus_arantii.indexOf('反接')>-1?true:false"></check-box>)
149 152
                     <check-box text="血栓" :checked="predialysis.ductus_arantii.indexOf('血栓')>-1?true:false"></check-box>
150 153
                     <check-box text="缝线脱落" :checked="predialysis.ductus_arantii.indexOf('缝线脱落')>-1?true:false"></check-box>
151 154
                     <check-box text="导管脱落" :checked="predialysis.ductus_arantii.indexOf('导管脱落')>-1?true:false"></check-box>
@@ -675,26 +678,26 @@
675 678
                 </div>
676 679
                 <div class="row" style="padding: 2px 0;line-height:24px;">
677 680
                   <div class="inline_block">
678
-                    透析液(mol/l): &emsp;Ca<sup>2+</sup>:
681
+                    透析液(mmol/L): &emsp;Ca<sup>2+</sup>:
679 682
                     <div class="under_line" style="width: 70px;">
680 683
                         <span v-if="prescription.calcium">{{getFloat(prescription.calcium)?getFloat(prescription.calcium):'/'}}</span>
681 684
                       <span v-else>{{'/'}}</span>
682 685
 
683 686
                     </div>
684
-                    mol/l &emsp;Na<sup>+</sup>:
687
+                    mmol/L &emsp;Na<sup>+</sup>:
685 688
                     <div class="under_line" style="width: 70px;">
686 689
                       <span v-if="prescription.sodium">{{getFloat(prescription.sodium)?getFloat(prescription.sodium):'/'}}</span>
687 690
                       <span v-else>{{'/'}}</span>
688 691
 
689 692
                     </div>
690
-                    mol/l &emsp;K<sup>+</sup>:
693
+                    mmol/L &emsp;K<sup>+</sup>:
691 694
                     <div class="under_line" style="width: 70px;">
692 695
                       <span v-if="prescription.kalium">{{getFloat(prescription.kalium)?getFloat(prescription.kalium):'/'}}</span>
693 696
                       <span v-else>{{'/'}}</span>
694 697
 
695 698
 
696 699
                     </div>
697
-                    mol/l
700
+                    mmol/L
698 701
                   </div>
699 702
                   <div class="inline_block" v-if="prescription.displace_liqui_part == 0">
700 703
                     &emsp;置换液后/前稀释 总量:

+ 15 - 1
src/pages/main/today/TodayTab.vue View File

@@ -59,7 +59,7 @@
59 59
     </div>
60 60
     <div class="blueBorder"></div>
61 61
     <details-info title="基本信息" :patient="patient"
62
-                  :device_number="schedual.device_number == null || schedual.device_number == undefined ? '' : schedual.device_number.number"
62
+                  :device_number="getDeviceNumber()"
63 63
                   :step_data="stepData"></details-info>
64 64
 
65 65
     <div class="blueBorder"></div>
@@ -1021,6 +1021,20 @@ export default {
1021 1021
       return Object.keys(groups).map(function (group) {
1022 1022
         return groups[group]
1023 1023
       })
1024
+    },getDeviceNumber(){
1025
+      if(this.dialysis_order.id&&this.dialysis_order.DeviceNumber&&this.dialysis_order.DeviceNumber.number.length > 0){
1026
+        return this.dialysis_order.DeviceNumber.number
1027
+
1028
+      }else{
1029
+        if(this.schedual.device_number == null){
1030
+          return ''
1031
+        }else{
1032
+          return this.schedual.device_number.number
1033
+        }
1034
+
1035
+      }
1036
+
1037
+
1024 1038
     }
1025 1039
   }
1026 1040
 };

+ 4 - 4
src/pages/main/today/dialysisPrescription.vue View File

@@ -20,7 +20,7 @@
20 20
         <li v-if="isShow('钙')">
21 21
           <label>钙: </label>
22 22
           <span class="content">{{calcium != '0'?calcium:""}}</span>
23
-          <span class="unit">{{calcium != '0'?"mmol/l":""}}</span>
23
+          <span class="unit">{{calcium != '0'?"mmol/L":""}}</span>
24 24
         </li>
25 25
         <li  v-if="isShow('置换量')">
26 26
           <label>置换量 : </label>
@@ -31,7 +31,7 @@
31 31
         <li v-if="isShow('葡萄糖')">
32 32
           <label>葡萄糖 : </label>
33 33
           <span class="content">{{glucose != '0'?glucose:""}}</span>
34
-          <span class="unit">{{glucose != '0'?"mmol/l":""}}</span>
34
+          <span class="unit">{{glucose != '0'?"mmol/L":""}}</span>
35 35
         </li>
36 36
       <!-- </ul>
37 37
       <ul> -->
@@ -56,7 +56,7 @@
56 56
         <li v-if="isShow('碳酸氢盐')">
57 57
           <label>碳酸氢盐 : </label>
58 58
           <span class="content">{{bicarbonate != '0'?bicarbonate:""}}</span>
59
-          <span class="unit">{{bicarbonate != '0'?"mmol/l":""}}</span>
59
+          <span class="unit">{{bicarbonate != '0'?"mmol/L":""}}</span>
60 60
         </li>
61 61
         <!-- <li>
62 62
           <label>干体重 : </label>
@@ -87,7 +87,7 @@
87 87
         <li v-if="isShow('钠')">
88 88
           <label>钠 : </label>
89 89
           <span class="content">{{sodium != '0'?sodium:""}}</span>
90
-          <span class="unit">{{sodium != '0'?"mmol/l":""}}</span>
90
+          <span class="unit">{{sodium != '0'?"mmol/L":""}}</span>
91 91
         </li>
92 92
         <li v-if="isShow('透析液流量')">
93 93
           <label>透析液流量 : </label>

+ 1 - 1
src/pages/monitoring/index.vue View File

@@ -65,7 +65,7 @@
65 65
             <td width="27%"></td>
66 66
           </tr>
67 67
           <tr v-for="(item,index) in items.scheduals" :key="index" @click="clickfunction(item)">
68
-            <td width="8%">{{item.device_number.number}}</td>
68
+            <td width="8%">{{item.dialysis_order.device_number.number.length > 0 ? item.dialysis_order.device_number.number:item.device_number.number}}</td>
69 69
             <td width="10%" style="color:#409eff;">{{item.patient.name}}</td>
70 70
             <td width="9%">{{item.patient.dialysis_no}}</td>
71 71
             <td width="13%">{{parseTime(item.schedule_date, "{y}-{m}-{d}")}}</td>

+ 4 - 3
src/router/index.js View File

@@ -9,16 +9,16 @@ export default new Router({
9 9
       path: '/',
10 10
       name: 'Home',
11 11
       component: () => import('@/pages/home/login')
12
-    }, 
12
+    },
13 13
     {
14 14
       path: '/product',
15 15
       name: 'Product',
16 16
       component: () => import('@/pages/product/index')
17
-    }, 
17
+    },
18 18
     {
19 19
       path: '/main',
20 20
       name: 'main',
21
-      component: () => import('@/pages/main/index')
21
+      component: () => import('@/pages/main/index'),
22 22
     },
23 23
     {
24 24
       path: '/details',
@@ -29,6 +29,7 @@ export default new Router({
29 29
       path: "/monitoring",
30 30
       name: "monitorPage",
31 31
       component: () => import("@/pages/monitoring/index")
32
+
32 33
     },
33 34
     {
34 35
       path: "/my",

+ 4 - 2
src/store/modules/globalConfig.js View File

@@ -591,13 +591,15 @@ const global_config = {
591 591
     ductus_arantii:[
592 592
       {id: 1, name: "正常"},
593 593
       {id: 2, name: "不畅"},
594
-      {id: 3, name: "血流不足(正接)"},
595
-      {id: 4, name: "血流不足(反接)"},
594
+      {id: 3, name: "正接"},
595
+      {id: 4, name: "反接"},
596 596
       {id: 5, name: "血栓"},
597 597
       {id: 6, name: "缝线脱落"},
598 598
       {id: 7, name: "导管脱落"},
599 599
       {id: 8, name: "感染"},
600 600
       {id: 9, name: "破损"},
601
+      {id: 10, name: "血流不足"},
602
+
601 603
     ],
602 604
     dialysis_process:[
603 605
       {id: 1, name: "完成"},