xiaoming_global 5 years ago
parent
commit
3fe956d53a
1 changed files with 7 additions and 94 deletions
  1. 7 94
      src/pages/main/today/statOrder.vue

+ 7 - 94
src/pages/main/today/statOrder.vue View File

@@ -61,16 +61,16 @@
61 61
 </template>
62 62
 
63 63
 <script>
64
-import { parseTime } from "@/utils";
64
+import { parseTime } from '@/utils';
65 65
 
66 66
 export default {
67
-  name: "statOrder",
68
-  data() {
67
+  name: 'statOrder',
68
+  data () {
69 69
     return {
70
-      title: "临时医嘱 ",
70
+      title: '临时医嘱 ',
71 71
       template_id: 0,
72 72
       tableDate: []
73
-    };
73
+    }
74 74
   },
75 75
   props: {
76 76
     doctor_map: {
@@ -79,14 +79,13 @@ export default {
79 79
     advice_groups: {
80 80
       type: Array,
81 81
       default: () => {
82
-        return [];
82
+        return []
83 83
       }
84 84
     }
85 85
   },
86
-<<<<<<< .mine
87 86
   created () {
88 87
     this.template_id = this.$store.getters.user.template_info.template_id
89
-    console.log("a")
88
+    console.log('a')
90 89
   },
91 90
   methods: {
92 91
     setAdvices (advices) {
@@ -168,92 +167,6 @@ export default {
168 167
 }
169 168
 </script>
170 169
 import { parseTime } from '@/utils'
171
-=======
172
-
173
-
174
-
175
-
176
-
177
-
178
-
179
-
180
-
181
-
182
-
183
-
184
-
185
-
186
-
187
-
188
-
189
-
190
-
191
-
192
-
193
-
194
-
195
-
196
-
197
-
198
-
199
-
200
-
201
-
202
-
203
-
204
-
205
-
206
-
207
-
208
-
209
-
210
-
211
-
212
-
213
-
214
-
215
-
216
-
217
-
218
-
219
-
220
-
221
-
222
-
223
-
224
-
225
-
226
-
227
-
228
-
229
-
230
-
231
-
232
-
233
-
234
-
235
-
236
-
237
-
238
-
239
-
240
-
241
-
242
-
243
-
244
-
245
-
246
-
247
-
248
-
249
-
250
-
251
-
252
-
253
-
254
-
255
-
256
->>>>>>> .theirs
257 170
 
258 171
   methods: {
259 172
     setAdvices(advices) {