See999 4 jaren geleden
bovenliggende
commit
f04d455ce6
1 gewijzigde bestanden met toevoegingen van 24 en 50 verwijderingen
  1. 24 50
      src/pages/doctorAdvice/components/DoctorManagement.vue

+ 24 - 50
src/pages/doctorAdvice/components/DoctorManagement.vue Bestand weergeven

@@ -23,40 +23,30 @@
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
-          >
26
+        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
27
+          <div class="adviceOne" v-for="(item, index) in doctorAdvice" :key="index">
37 28
             <div v-for="(it, i) in item.child" :key="i">
38 29
               <div class="adviceTitle" v-if="it.advice_date">
39 30
                 <p>{{ it.advice_date ? getTime(it.advice_date) : "" }}</p>
40
-                <van-icon
41
-                  class="ellipsis"
42
-                  name="ellipsis"
43
-                  @click="newShow = true"
44
-                />
31
+                <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
45 32
               </div>
46 33
 
47
-              <div class="statOrder" v-if="it.advice_type == 1">
34
+              <div class="statOrder" v-if="it.advice_type == 1 && it.parent_id == 0">
48 35
                 <div class="statOrderTitle">
49 36
                   <span>长期医嘱</span>
50
-                  <span style="margin-left:1rem">{{
37
+                  <span style="margin-left:1rem">
38
+                    {{
51 39
                     getTimes(it.created_time)
52
-                  }}</span>
40
+                    }}
41
+                  </span>
53 42
                 </div>
54 43
                 <div class="orderContent">
55
-                  <p>{{ it.advice_name }} 单次用量 3075iu 静脉注射</p>
56
-                  <div v-for="(b, c) in a" :key="c">
57
-                    <p v-if="b.parent_id == it.id">
58
-                      ▲ {{ b.advice_name }} 单次用量 1g
59
-                    </p>
44
+                  <p v-if="it.parent_id === 0">
45
+                    {{ it.advice_name }} 单次用量 {{ it.advice_desc
46
+                    }}{{ it.drug_spec_unit }} 静脉注射
47
+                  </p>
48
+                  <div v-for="(i,index) in childList" :key="index">
49
+                    <p v-if="i.parent_id == it.id">▲ {{ i.advice_name }} 单次用量 1g</p>
60 50
                   </div>
61 51
                 </div>
62 52
                 <div class="doctorBox">
@@ -69,9 +59,11 @@
69 59
               <div class="statOrder" v-if="it.advice_type == 3">
70 60
                 <div class="longOrderTitle">
71 61
                   <span>临时医嘱</span>
72
-                  <span style="margin-left:1rem">{{
62
+                  <span style="margin-left:1rem">
63
+                    {{
73 64
                     getTimes(item.child[0].created_time)
74
-                  }}</span>
65
+                    }}
66
+                  </span>
75 67
                 </div>
76 68
                 <div class="orderContent">
77 69
                   <p>那曲肝素钙注射液 单次用量 3075iu 静脉注射</p>
@@ -101,24 +93,11 @@
101 93
 
102 94
     <!-- 弹出层 -->
103 95
     <div>
104
-      <van-popup
105
-        v-model="typeShow"
106
-        position="bottom"
107
-        :style="{ height: '40%' }"
108
-      >
109
-        <van-picker
110
-          show-toolbar
111
-          :columns="columns"
112
-          @cancel="onCancel"
113
-          @confirm="onConfirm"
114
-        />
96
+      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
97
+        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
115 98
       </van-popup>
116 99
 
117
-      <van-popup
118
-        v-model="startShow"
119
-        position="bottom"
120
-        :style="{ height: '40%' }"
121
-      >
100
+      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
122 101
         <van-datetime-picker
123 102
           v-model="currentDate"
124 103
           type="date"
@@ -138,12 +117,7 @@
138 117
           @cancel="endShow = false"
139 118
         />
140 119
       </van-popup>
141
-      <van-action-sheet
142
-        v-model="newShow"
143
-        :actions="actions"
144
-        cancel-text="取消"
145
-        @cancel="onCancel"
146
-      />
120
+      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
147 121
     </div>
148 122
   </div>
149 123
 </template>
@@ -184,7 +158,7 @@ export default {
184 158
       showOne: true,
185 159
       showTwo: false,
186 160
       doctorAdvice: [],
187
-      a: []
161
+      childList: []
188 162
     };
189 163
   },
190 164
   methods: {
@@ -257,7 +231,7 @@ export default {
257 231
               objarr.push(advice[i]);
258 232
             }
259 233
           }
260
-          this.a = objarr;
234
+          this.childList = objarr;
261 235
           console.log("objaa", objarr);
262 236
           var total = response.data.data.total;
263 237
           // console.log("总计", total);