|
@@ -23,53 +23,42 @@
|
23
|
23
|
</div>
|
24
|
24
|
|
25
|
25
|
<div class="adviceBox" v-show="showOne">
|
26
|
|
- <van-list
|
27
|
|
- v-model="loading"
|
28
|
|
- :finished="finished"
|
29
|
|
- finished-text="没有更多了"
|
30
|
|
- @load="onLoad"
|
31
|
|
- >
|
32
|
|
- <div
|
33
|
|
- class="adviceOne"
|
34
|
|
- v-for="(item, index) in doctorAdvice"
|
35
|
|
- :key="index"
|
36
|
|
- >
|
37
|
|
- <div class="adviceTitle">
|
38
|
|
- <p>{{ getTime(item.advice_date) }}</p>
|
39
|
|
- <van-icon
|
40
|
|
- class="ellipsis"
|
41
|
|
- name="ellipsis"
|
42
|
|
- @click="newShow = true"
|
43
|
|
- />
|
44
|
|
- </div>
|
45
|
|
- <div class="statOrder">
|
46
|
|
- <div class="statOrderTitle">
|
47
|
|
- <span>临时医嘱</span>
|
48
|
|
- <span style="margin-left:1rem">18:00</span>
|
49
|
|
- </div>
|
50
|
|
- <div class="orderContent">
|
51
|
|
- <p>那曲肝素钙注射液 单次用量 3075iu 静脉注射</p>
|
52
|
|
- <p>▲ 左卡尼汀注射液 单次用量 1g</p>
|
53
|
|
- </div>
|
54
|
|
- <div class="doctorBox">
|
55
|
|
- <p>开嘱医生:钱蛮子</p>
|
56
|
|
- <p>执行护士:欧巧漫</p>
|
57
|
|
- <p>核对护士:钱多多</p>
|
|
26
|
+ <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
|
|
27
|
+ <div class="adviceOne" v-for="(item, index) in doctorAdvice" :key="index">
|
|
28
|
+ <div v-for="(it, i) in item.child" :key="i">
|
|
29
|
+ <div class="adviceTitle" v-if="it.advice_date">
|
|
30
|
+ <p>{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>
|
|
31
|
+ <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
|
58
|
32
|
</div>
|
59
|
|
- </div>
|
60
|
|
- <div class="statOrder">
|
61
|
|
- <div class="longOrderTitle">
|
62
|
|
- <span>临时医嘱</span>
|
63
|
|
- <span style="margin-left:1rem">18:00</span>
|
64
|
|
- </div>
|
65
|
|
- <div class="orderContent">
|
66
|
|
- <p>那曲肝素钙注射液 单次用量 3075iu 静脉注射</p>
|
67
|
|
- <p>▲ 左卡尼汀注射液 单次用量 1g</p>
|
|
33
|
+ <div class="statOrder" v-if="it.advice_type == 1">
|
|
34
|
+ <div class="statOrderTitle">
|
|
35
|
+ <span>长期医嘱</span>
|
|
36
|
+ <span style="margin-left:1rem">{{getTimes(item.child[0].created_time)}}</span>
|
|
37
|
+ </div>
|
|
38
|
+ <div class="orderContent">
|
|
39
|
+ <p>那曲肝素钙注射液 单次用量 3075iu 静脉注射</p>
|
|
40
|
+ <p>▲ 左卡尼汀注射液 单次用量 1g</p>
|
|
41
|
+ </div>
|
|
42
|
+ <div class="doctorBox">
|
|
43
|
+ <p>开嘱医生:钱蛮子</p>
|
|
44
|
+ <p>执行护士:欧巧漫</p>
|
|
45
|
+ <p>核对护士:钱多多</p>
|
|
46
|
+ </div>
|
68
|
47
|
</div>
|
69
|
|
- <div class="doctorBox">
|
70
|
|
- <p>开嘱医生:效益</p>
|
71
|
|
- <p>执行护士:欧巧漫</p>
|
72
|
|
- <p>核对护士:钱多多</p>
|
|
48
|
+ <div class="statOrder" v-if="it.advice_type == 3">
|
|
49
|
+ <div class="longOrderTitle">
|
|
50
|
+ <span>临时医嘱</span>
|
|
51
|
+ <span style="margin-left:1rem">{{getTimes(item.child[0].created_time)}}</span>
|
|
52
|
+ </div>
|
|
53
|
+ <div class="orderContent">
|
|
54
|
+ <p>那曲肝素钙注射液 单次用量 3075iu 静脉注射</p>
|
|
55
|
+ <p>▲ 左卡尼汀注射液 单次用量 1g</p>
|
|
56
|
+ </div>
|
|
57
|
+ <div class="doctorBox">
|
|
58
|
+ <p>开嘱医生:效益</p>
|
|
59
|
+ <p>执行护士:欧巧漫</p>
|
|
60
|
+ <p>核对护士:钱多多</p>
|
|
61
|
+ </div>
|
73
|
62
|
</div>
|
74
|
63
|
</div>
|
75
|
64
|
<div class="all">全部</div>
|
|
@@ -89,24 +78,11 @@
|
89
|
78
|
|
90
|
79
|
<!-- 弹出层 -->
|
91
|
80
|
<div>
|
92
|
|
- <van-popup
|
93
|
|
- v-model="typeShow"
|
94
|
|
- position="bottom"
|
95
|
|
- :style="{ height: '40%' }"
|
96
|
|
- >
|
97
|
|
- <van-picker
|
98
|
|
- show-toolbar
|
99
|
|
- :columns="columns"
|
100
|
|
- @cancel="onCancel"
|
101
|
|
- @confirm="onConfirm"
|
102
|
|
- />
|
|
81
|
+ <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
|
|
82
|
+ <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
|
103
|
83
|
</van-popup>
|
104
|
84
|
|
105
|
|
- <van-popup
|
106
|
|
- v-model="startShow"
|
107
|
|
- position="bottom"
|
108
|
|
- :style="{ height: '40%' }"
|
109
|
|
- >
|
|
85
|
+ <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
|
110
|
86
|
<van-datetime-picker
|
111
|
87
|
v-model="currentDate"
|
112
|
88
|
type="date"
|
|
@@ -126,12 +102,7 @@
|
126
|
102
|
@cancel="endShow = false"
|
127
|
103
|
/>
|
128
|
104
|
</van-popup>
|
129
|
|
- <van-action-sheet
|
130
|
|
- v-model="newShow"
|
131
|
|
- :actions="actions"
|
132
|
|
- cancel-text="取消"
|
133
|
|
- @cancel="onCancel"
|
134
|
|
- />
|
|
105
|
+ <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
|
135
|
106
|
</div>
|
136
|
107
|
</div>
|
137
|
108
|
</template>
|
|
@@ -236,10 +207,39 @@ export default {
|
236
|
207
|
).then(response => {
|
237
|
208
|
if (response.data.state === 1) {
|
238
|
209
|
var advice = response.data.data.advice;
|
239
|
|
- this.doctorAdvice = advice;
|
|
210
|
+ // this.doctorAdvice = advice;
|
240
|
211
|
console.log("医嘱", advice);
|
241
|
212
|
var total = response.data.data.total;
|
242
|
|
- console.log("总计", total);
|
|
213
|
+ // console.log("总计", total);
|
|
214
|
+ let dataInfo = {};
|
|
215
|
+ advice.forEach((item, index) => {
|
|
216
|
+ let { groupno } = item;
|
|
217
|
+ if (!dataInfo[groupno]) {
|
|
218
|
+ dataInfo[groupno] = {
|
|
219
|
+ groupno,
|
|
220
|
+ child: []
|
|
221
|
+ };
|
|
222
|
+ }
|
|
223
|
+ dataInfo[groupno].child.push(item);
|
|
224
|
+ });
|
|
225
|
+ // console.log(dataInfo);
|
|
226
|
+ let list = Object.values(dataInfo); // list 转换成功的数据
|
|
227
|
+ // console.log(list);
|
|
228
|
+ let arr = [];
|
|
229
|
+ list.map(item => {
|
|
230
|
+ // console.log(item.child);
|
|
231
|
+ if (item.child.length > 1) {
|
|
232
|
+ item.child.map(it => {
|
|
233
|
+ // console.log(it);
|
|
234
|
+ if (arr.indexOf(it.advice_date) == -1) {
|
|
235
|
+ arr.push(it.advice_date);
|
|
236
|
+ } else {
|
|
237
|
+ delete it["advice_date"];
|
|
238
|
+ }
|
|
239
|
+ });
|
|
240
|
+ }
|
|
241
|
+ });
|
|
242
|
+ this.doctorAdvice = list;
|
243
|
243
|
}
|
244
|
244
|
});
|
245
|
245
|
},
|