Selaa lähdekoodia

转化bug修改

XMLWAN 4 vuotta sitten
vanhempi
commit
0b936c42a1

+ 2 - 2
config/prod.env.js Näytä tiedosto

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

+ 8 - 1
src/api/dialysis.js Näytä tiedosto

@@ -17,7 +17,6 @@ export function getWaitingScheduals(params) {
17 17
 }
18 18
 
19 19
 export function getDialysisRecord(params) {
20
-  console.log('params', params)
21 20
   return request({
22 21
     url: '/m/api/dialysis/record',
23 22
     method: 'get',
@@ -306,3 +305,11 @@ export function GetSchedualNumber(params) {
306 305
     params: params
307 306
   })
308 307
 }
308
+
309
+export function getPatientId(id, params) {
310
+  return request({
311
+    url: '/m/api/getPatientid?id=' + id,
312
+    method: 'get',
313
+    params: params
314
+  })
315
+}

+ 96 - 97
src/api/patient/patient.js Näytä tiedosto

@@ -1,6 +1,6 @@
1 1
 import request from '@/utils/request'
2 2
 
3
-export function getBloodDialysisPatient(page, limit) {
3
+export function getBloodDialysisPatient (page, limit) {
4 4
   const params = {
5 5
     page: page,
6 6
     limit: limit
@@ -12,7 +12,7 @@ export function getBloodDialysisPatient(page, limit) {
12 12
   })
13 13
 }
14 14
 
15
-export function getAllBloodDialysisPatient(page, limit, status, source) {
15
+export function getAllBloodDialysisPatient (page, limit, status, source) {
16 16
   const params = {
17 17
     page: page,
18 18
     limit: limit,
@@ -27,7 +27,7 @@ export function getAllBloodDialysisPatient(page, limit, status, source) {
27 27
   })
28 28
 }
29 29
 
30
-export function getAllSlowPatient(page, limit) {
30
+export function getAllSlowPatient (page, limit) {
31 31
   const params = {
32 32
     page: page,
33 33
     limit: limit
@@ -39,7 +39,7 @@ export function getAllSlowPatient(page, limit) {
39 39
   })
40 40
 }
41 41
 
42
-export function getAllMemberPatient(page, limit) {
42
+export function getAllMemberPatient (page, limit) {
43 43
   const params = {
44 44
     page: page,
45 45
     limit: limit
@@ -51,7 +51,7 @@ export function getAllMemberPatient(page, limit) {
51 51
   })
52 52
 }
53 53
 
54
-export function GenerateDialysisNo(params) {
54
+export function GenerateDialysisNo (params) {
55 55
   return request({
56 56
     url: '/m/api/patients/generatedialysisnotwo',
57 57
     method: 'get',
@@ -59,7 +59,7 @@ export function GenerateDialysisNo(params) {
59 59
   })
60 60
 }
61 61
 
62
-export function GetIllnessList(params) {
62
+export function GetIllnessList (params) {
63 63
   return request({
64 64
     url: 'm/api/patient/getillnesslist',
65 65
     method: 'get',
@@ -67,7 +67,7 @@ export function GetIllnessList(params) {
67 67
   })
68 68
 }
69 69
 
70
-export function GetPatientInfo(phone) {
70
+export function GetPatientInfo (phone) {
71 71
   const params = {
72 72
     phone: phone
73 73
   }
@@ -78,7 +78,7 @@ export function GetPatientInfo(phone) {
78 78
   })
79 79
 }
80 80
 
81
-export function savePatient(data) {
81
+export function savePatient (data) {
82 82
   return request({
83 83
     url: '/m/api/patient/savepatient',
84 84
     method: 'post',
@@ -86,7 +86,7 @@ export function savePatient(data) {
86 86
   })
87 87
 }
88 88
 
89
-export function getPatientDetail(id, params) {
89
+export function getPatientDetail (id, params) {
90 90
   return request({
91 91
     url: '/m/api/patient/getpatientdetail?id=' + id,
92 92
     method: 'get',
@@ -94,7 +94,7 @@ export function getPatientDetail(id, params) {
94 94
   })
95 95
 }
96 96
 
97
-export function getDoctorAdvices(id, type, startime, endtime, limit, page) {
97
+export function getDoctorAdvices (id, type, startime, endtime, limit, page) {
98 98
   const params = {
99 99
     id: id,
100 100
     type: type,
@@ -110,7 +110,7 @@ export function getDoctorAdvices(id, type, startime, endtime, limit, page) {
110 110
   })
111 111
 }
112 112
 
113
-export function getDryWeight(id, startime, endtime, limit, page) {
113
+export function getDryWeight (id, startime, endtime, limit, page) {
114 114
   const params = {
115 115
     id: id,
116 116
     startime: startime,
@@ -125,7 +125,7 @@ export function getDryWeight(id, startime, endtime, limit, page) {
125 125
   })
126 126
 }
127 127
 
128
-export function getBloodDialysisPatientTwo(page, limit) {
128
+export function getBloodDialysisPatientTwo (page, limit) {
129 129
   const params = {
130 130
     page: page,
131 131
     limit: limit
@@ -137,7 +137,7 @@ export function getBloodDialysisPatientTwo(page, limit) {
137 137
   })
138 138
 }
139 139
 
140
-export function ToSearch(name) {
140
+export function ToSearch (name) {
141 141
   const params = {
142 142
     name: name
143 143
   }
@@ -148,7 +148,7 @@ export function ToSearch(name) {
148 148
   })
149 149
 }
150 150
 
151
-export function getBloodPatientInfo(phone) {
151
+export function getBloodPatientInfo (phone) {
152 152
   const params = {
153 153
     phone: phone
154 154
   }
@@ -159,7 +159,7 @@ export function getBloodPatientInfo(phone) {
159 159
   })
160 160
 }
161 161
 
162
-export function getSlowPatientInfo(phone) {
162
+export function getSlowPatientInfo (phone) {
163 163
   const params = {
164 164
     phone: phone
165 165
   }
@@ -170,7 +170,7 @@ export function getSlowPatientInfo(phone) {
170 170
   })
171 171
 }
172 172
 
173
-export function getMemberPatientInfo(phone) {
173
+export function getMemberPatientInfo (phone) {
174 174
   const params = {
175 175
     phone: phone
176 176
   }
@@ -181,7 +181,7 @@ export function getMemberPatientInfo(phone) {
181 181
   })
182 182
 }
183 183
 
184
-export function getCourseManagement(id, limit, page, startime, endtime) {
184
+export function getCourseManagement (id, limit, page, startime, endtime) {
185 185
   const params = {
186 186
     id: id,
187 187
     limit: limit,
@@ -196,7 +196,7 @@ export function getCourseManagement(id, limit, page, startime, endtime) {
196 196
   })
197 197
 }
198 198
 
199
-export function DeleteCouseManage(id, params) {
199
+export function DeleteCouseManage (id, params) {
200 200
   return request({
201 201
     url: '/m/api/patient/delelecousemanage?id=' + id,
202 202
     method: 'delete',
@@ -204,7 +204,7 @@ export function DeleteCouseManage(id, params) {
204 204
   })
205 205
 }
206 206
 
207
-export function getCouseManagementDetail(id, params) {
207
+export function getCouseManagementDetail (id, params) {
208 208
   return request({
209 209
     url: '/m/api/patient/getcousemanagementdetail?id=' + id,
210 210
     method: 'get',
@@ -212,7 +212,7 @@ export function getCouseManagementDetail(id, params) {
212 212
   })
213 213
 }
214 214
 
215
-export function DeleteDryWeight(id, params) {
215
+export function DeleteDryWeight (id, params) {
216 216
   return request({
217 217
     url: '/m/api/patient/deletedryweight?id=' + id,
218 218
     method: 'delete',
@@ -220,7 +220,7 @@ export function DeleteDryWeight(id, params) {
220 220
   })
221 221
 }
222 222
 
223
-export function getDryWeightDetail(id, params) {
223
+export function getDryWeightDetail (id, params) {
224 224
   return request({
225 225
     url: '/m/api/patient/getdryweightdetail?id=' + id,
226 226
     method: 'get',
@@ -228,7 +228,7 @@ export function getDryWeightDetail(id, params) {
228 228
   })
229 229
 }
230 230
 
231
-export function GetLongDialysisRecord(id, limit, page, startime, endtime) {
231
+export function GetLongDialysisRecord (id, limit, page, startime, endtime) {
232 232
   const params = {
233 233
     id: id,
234 234
     limit: limit,
@@ -243,7 +243,7 @@ export function GetLongDialysisRecord(id, limit, page, startime, endtime) {
243 243
   })
244 244
 }
245 245
 
246
-export function GetPatientDetail(id, params) {
246
+export function GetPatientDetail (id, params) {
247 247
   return request({
248 248
     url: '/m/api/patient/getpatientdetail?id=' + id,
249 249
     method: 'get',
@@ -251,7 +251,7 @@ export function GetPatientDetail(id, params) {
251 251
   })
252 252
 }
253 253
 
254
-export function getRescueRecord(id, limit, page, startime, endtime) {
254
+export function getRescueRecord (id, limit, page, startime, endtime) {
255 255
   const params = {
256 256
     id: id,
257 257
     limit: limit,
@@ -266,7 +266,7 @@ export function getRescueRecord(id, limit, page, startime, endtime) {
266 266
   })
267 267
 }
268 268
 
269
-export function getScheduling(id, limit, page, startime, endtime, mode_types) {
269
+export function getScheduling (id, limit, page, startime, endtime, mode_types) {
270 270
   const params = {
271 271
     id: id,
272 272
     limit: limit,
@@ -282,7 +282,7 @@ export function getScheduling(id, limit, page, startime, endtime, mode_types) {
282 282
   })
283 283
 }
284 284
 
285
-export function getEducation(id, limit, page, startime, endtime) {
285
+export function getEducation (id, limit, page, startime, endtime) {
286 286
   const params = {
287 287
     id: id,
288 288
     limit: limit,
@@ -297,7 +297,7 @@ export function getEducation(id, limit, page, startime, endtime) {
297 297
   })
298 298
 }
299 299
 
300
-export function getSchedulingDetail(id, params) {
300
+export function getSchedulingDetail (id, params) {
301 301
   return request({
302 302
     url: '/m/api/patient/getschedulingdetail?id=' + id,
303 303
     method: 'get',
@@ -305,7 +305,7 @@ export function getSchedulingDetail(id, params) {
305 305
   })
306 306
 }
307 307
 
308
-export function DeleteScheduling(id, params) {
308
+export function DeleteScheduling (id, params) {
309 309
   return request({
310 310
     url: '/m/api/patient/deletescheduling?id=' + id,
311 311
     method: 'delete',
@@ -313,7 +313,7 @@ export function DeleteScheduling(id, params) {
313 313
   })
314 314
 }
315 315
 
316
-export function getEducationDetail(id, params) {
316
+export function getEducationDetail (id, params) {
317 317
   return request({
318 318
     url: '/m/api/patient/geteducationdetail?id=' + id,
319 319
     method: 'get',
@@ -321,7 +321,7 @@ export function getEducationDetail(id, params) {
321 321
   })
322 322
 }
323 323
 
324
-export function DeleteEducationOne(id, params) {
324
+export function DeleteEducationOne (id, params) {
325 325
   return request({
326 326
     url: '/m/api/patient/deleteeductionone?id=' + id,
327 327
     method: 'delete',
@@ -329,7 +329,7 @@ export function DeleteEducationOne(id, params) {
329 329
   })
330 330
 }
331 331
 
332
-export function getRescueRecordDetail(id, params) {
332
+export function getRescueRecordDetail (id, params) {
333 333
   return request({
334 334
     url: '/m/api/patient/getrescuerecorddetail?id=' + id,
335 335
     method: 'get',
@@ -337,7 +337,7 @@ export function getRescueRecordDetail(id, params) {
337 337
   })
338 338
 }
339 339
 
340
-export function DeleteRescueRecord(id, params) {
340
+export function DeleteRescueRecord (id, params) {
341 341
   return request({
342 342
     url: '/m/api/patient/deleterescuerecord?id=' + id,
343 343
     method: 'delete',
@@ -345,7 +345,7 @@ export function DeleteRescueRecord(id, params) {
345 345
   })
346 346
 }
347 347
 
348
-export function toSearchPatient(keyword) {
348
+export function toSearchPatient (keyword) {
349 349
   console.log('keyword', keyword)
350 350
   const params = {
351 351
     keyword: keyword
@@ -357,7 +357,7 @@ export function toSearchPatient(keyword) {
357 357
   })
358 358
 }
359 359
 
360
-export function SearchAllPatient(keyword) {
360
+export function SearchAllPatient (keyword) {
361 361
   const params = {
362 362
     keyword: keyword
363 363
   }
@@ -368,7 +368,7 @@ export function SearchAllPatient(keyword) {
368 368
   })
369 369
 }
370 370
 
371
-export function SearchAllBlood(keyword) {
371
+export function SearchAllBlood (keyword) {
372 372
   const params = {
373 373
     keyword: keyword
374 374
   }
@@ -379,7 +379,7 @@ export function SearchAllBlood(keyword) {
379 379
   })
380 380
 }
381 381
 
382
-export function getSlowSearchPatient(keyword) {
382
+export function getSlowSearchPatient (keyword) {
383 383
   const params = {
384 384
     keyword: keyword
385 385
   }
@@ -390,7 +390,7 @@ export function getSlowSearchPatient(keyword) {
390 390
   })
391 391
 }
392 392
 
393
-export function getMemberSearchPatient(keyword) {
393
+export function getMemberSearchPatient (keyword) {
394 394
   const params = {
395 395
     keyword: keyword
396 396
   }
@@ -401,7 +401,7 @@ export function getMemberSearchPatient(keyword) {
401 401
   })
402 402
 }
403 403
 
404
-export function getLongDialysisDetail(id, params) {
404
+export function getLongDialysisDetail (id, params) {
405 405
   return request({
406 406
     url: '/m/api/patient/getlongdialysisdetail?id=' + id,
407 407
     method: 'get',
@@ -409,7 +409,7 @@ export function getLongDialysisDetail(id, params) {
409 409
   })
410 410
 }
411 411
 
412
-export function DeleteLongDialysis(id, params) {
412
+export function DeleteLongDialysis (id, params) {
413 413
   return request({
414 414
     url: '/m/api/patient/deletelongdialysis?id=' + id,
415 415
     method: 'delete',
@@ -417,7 +417,7 @@ export function DeleteLongDialysis(id, params) {
417 417
   })
418 418
 }
419 419
 
420
-export function getDialysisRecord(id, limit, page, startime, endtime, dislysType) {
420
+export function getDialysisRecord (id, limit, page, startime, endtime, dislysType) {
421 421
   const params = {
422 422
     id: id,
423 423
     limit: limit,
@@ -433,7 +433,7 @@ export function getDialysisRecord(id, limit, page, startime, endtime, dislysType
433 433
   })
434 434
 }
435 435
 
436
-export function GetDoctorAdviceDetail(date, id) {
436
+export function GetDoctorAdviceDetail (date, id) {
437 437
   const params = {
438 438
     date: date,
439 439
     id: id
@@ -446,7 +446,7 @@ export function GetDoctorAdviceDetail(date, id) {
446 446
   })
447 447
 }
448 448
 
449
-export function DeleteManagement(id, params) {
449
+export function DeleteManagement (id, params) {
450 450
   return request({
451 451
     url: '/m/api/patient/deletemanagement?id=' + id,
452 452
     method: 'delete',
@@ -454,7 +454,7 @@ export function DeleteManagement(id, params) {
454 454
   })
455 455
 }
456 456
 
457
-export function DeleteChild(id, params) {
457
+export function DeleteChild (id, params) {
458 458
   return request({
459 459
     url: '/m/api/patient/deletechild?id=' + id,
460 460
     method: 'delete',
@@ -462,7 +462,7 @@ export function DeleteChild(id, params) {
462 462
   })
463 463
 }
464 464
 
465
-export function updatedPatient(data) {
465
+export function updatedPatient (data) {
466 466
   return request({
467 467
     url: '/m/api/patient/updatedpatient',
468 468
     method: 'post',
@@ -470,7 +470,7 @@ export function updatedPatient(data) {
470 470
   })
471 471
 }
472 472
 
473
-export function getAllDoctor(params) {
473
+export function getAllDoctor (params) {
474 474
   return request({
475 475
     url: '/m/api/patient/getalldoctor',
476 476
     method: 'get',
@@ -478,7 +478,7 @@ export function getAllDoctor(params) {
478 478
   })
479 479
 }
480 480
 
481
-export function GetAllProjectNameByDate(date, patientid) {
481
+export function GetAllProjectNameByDate (date, patientid) {
482 482
   const params = {
483 483
     date: date,
484 484
     patientid: patientid
@@ -491,7 +491,7 @@ export function GetAllProjectNameByDate(date, patientid) {
491 491
   })
492 492
 }
493 493
 
494
-export function getAllInspection(params) {
494
+export function getAllInspection (params) {
495 495
   return request({
496 496
     url: '/m/api/patient/getallinspection',
497 497
     method: 'get',
@@ -499,7 +499,7 @@ export function getAllInspection(params) {
499 499
   })
500 500
 }
501 501
 
502
-export function getInspection(id, limit, page, startime, endtime, projectid) {
502
+export function getInspection (id, limit, page, startime, endtime, projectid) {
503 503
   const params = {
504 504
     id: id,
505 505
     limit: limit,
@@ -515,7 +515,7 @@ export function getInspection(id, limit, page, startime, endtime, projectid) {
515 515
   })
516 516
 }
517 517
 
518
-export function getMyInformation(id, params) {
518
+export function getMyInformation (id, params) {
519 519
   return request({
520 520
     url: '/m/api/patient/getmyinformation?id=' + id,
521 521
     method: 'get',
@@ -523,7 +523,7 @@ export function getMyInformation(id, params) {
523 523
   })
524 524
 }
525 525
 
526
-export function getMyInformationThree(id, params) {
526
+export function getMyInformationThree (id, params) {
527 527
   return request({
528 528
     url: '/m/api/patient/getmyinformationThree?id=' + id,
529 529
     method: 'get',
@@ -531,7 +531,7 @@ export function getMyInformationThree(id, params) {
531 531
   })
532 532
 }
533 533
 
534
-export function getPatientName(id, params) {
534
+export function getPatientName (id, params) {
535 535
   return request({
536 536
     url: '/m/api/patient/getpatientname?id=' + id,
537 537
     method: 'get',
@@ -539,7 +539,7 @@ export function getPatientName(id, params) {
539 539
   })
540 540
 }
541 541
 
542
-export function getInspectionDetail(patientid, date, projectid) {
542
+export function getInspectionDetail (patientid, date, projectid) {
543 543
   const params = {
544 544
     patientid: patientid,
545 545
     date: date,
@@ -552,7 +552,7 @@ export function getInspectionDetail(patientid, date, projectid) {
552 552
   })
553 553
 }
554 554
 
555
-export function submitFeed(params) {
555
+export function submitFeed (params) {
556 556
   return request({
557 557
     url: '/m/api/patient/savefeed',
558 558
     method: 'get',
@@ -560,7 +560,7 @@ export function submitFeed(params) {
560 560
   })
561 561
 }
562 562
 
563
-export function DeleteInspection(date) {
563
+export function DeleteInspection (date) {
564 564
   const params = {
565 565
     date: date
566 566
   }
@@ -571,7 +571,7 @@ export function DeleteInspection(date) {
571 571
   })
572 572
 }
573 573
 
574
-export function DeleteChildInspection(name, date) {
574
+export function DeleteChildInspection (name, date) {
575 575
   const params = {
576 576
     name: name,
577 577
     date: date
@@ -583,7 +583,7 @@ export function DeleteChildInspection(name, date) {
583 583
   })
584 584
 }
585 585
 
586
-export function SaveMessage(params) {
586
+export function SaveMessage (params) {
587 587
   return request({
588 588
     url: '/m/api/patient/savemessage',
589 589
     method: 'get',
@@ -591,7 +591,7 @@ export function SaveMessage(params) {
591 591
   })
592 592
 }
593 593
 
594
-export function SaveSex(sex, id, orgid) {
594
+export function SaveSex (sex, id, orgid) {
595 595
   const params = {
596 596
     sex: sex,
597 597
     id: id,
@@ -604,7 +604,7 @@ export function SaveSex(sex, id, orgid) {
604 604
   })
605 605
 }
606 606
 
607
-export function SaveBirthday(data) {
607
+export function SaveBirthday (data) {
608 608
   return request({
609 609
     url: '/m/api/patient/savebirthday',
610 610
     method: 'post',
@@ -612,7 +612,7 @@ export function SaveBirthday(data) {
612 612
   })
613 613
 }
614 614
 
615
-export function getOrgName(id, params) {
615
+export function getOrgName (id, params) {
616 616
   return request({
617 617
     url: '/m/api/patient/getorgname?id=' + id,
618 618
     method: 'Get',
@@ -620,7 +620,7 @@ export function getOrgName(id, params) {
620 620
   })
621 621
 }
622 622
 
623
-export function getRoleName(id, orgid) {
623
+export function getRoleName (id, orgid) {
624 624
   const params = {
625 625
     id: id,
626 626
     orgid: orgid
@@ -633,7 +633,7 @@ export function getRoleName(id, orgid) {
633 633
   })
634 634
 }
635 635
 
636
-export function SavePartition(params) {
636
+export function SavePartition (params) {
637 637
   return request({
638 638
     url: '/m/api/patient/savepartition',
639 639
     method: 'get',
@@ -641,7 +641,7 @@ export function SavePartition(params) {
641 641
   })
642 642
 }
643 643
 
644
-export function GetAllZone(page, limit) {
644
+export function GetAllZone (page, limit) {
645 645
   const params = {
646 646
     page: page,
647 647
     limit: limit
@@ -653,7 +653,7 @@ export function GetAllZone(page, limit) {
653 653
   })
654 654
 }
655 655
 
656
-export function DeleteZone(id, params) {
656
+export function DeleteZone (id, params) {
657 657
   return request({
658 658
     url: '/m/api/patient/deletezone?id=' + id,
659 659
     method: 'delete',
@@ -661,7 +661,7 @@ export function DeleteZone(id, params) {
661 661
   })
662 662
 }
663 663
 
664
-export function saveGroup(params) {
664
+export function saveGroup (params) {
665 665
   return request({
666 666
     url: '/m/api/patient/savegroup',
667 667
     method: 'get',
@@ -669,7 +669,7 @@ export function saveGroup(params) {
669 669
   })
670 670
 }
671 671
 
672
-export function getAllGroup(page, limit) {
672
+export function getAllGroup (page, limit) {
673 673
   const params = {
674 674
     page: page,
675 675
     limit: limit
@@ -681,7 +681,7 @@ export function getAllGroup(page, limit) {
681 681
   })
682 682
 }
683 683
 
684
-export function DeleteGroup(id, params) {
684
+export function DeleteGroup (id, params) {
685 685
   return request({
686 686
     url: '/m/api/patient/deletegroup?id=' + id,
687 687
     method: 'delete',
@@ -689,7 +689,7 @@ export function DeleteGroup(id, params) {
689 689
   })
690 690
 }
691 691
 
692
-export function getAllGroupOne(params) {
692
+export function getAllGroupOne (params) {
693 693
   return request({
694 694
     url: '/m/api/patient/getallgroupone',
695 695
     method: 'get',
@@ -697,7 +697,7 @@ export function getAllGroupOne(params) {
697 697
   })
698 698
 }
699 699
 
700
-export function SaveBed(params) {
700
+export function SaveBed (params) {
701 701
   return request({
702 702
     url: '/m/api/patient/savebed',
703 703
     method: 'get',
@@ -705,7 +705,7 @@ export function SaveBed(params) {
705 705
   })
706 706
 }
707 707
 
708
-export function GetAllNumber(page, limit) {
708
+export function GetAllNumber (page, limit) {
709 709
   const params = {
710 710
     page: page,
711 711
     limit: limit
@@ -717,7 +717,7 @@ export function GetAllNumber(page, limit) {
717 717
   })
718 718
 }
719 719
 
720
-export function DeleteBed(id, params) {
720
+export function DeleteBed (id, params) {
721 721
   return request({
722 722
     url: '/m/api/patient/deletebed?id=' + id,
723 723
     method: 'delete',
@@ -725,7 +725,7 @@ export function DeleteBed(id, params) {
725 725
   })
726 726
 }
727 727
 
728
-export function LoginOut(id, params) {
728
+export function LoginOut (id, params) {
729 729
   return request({
730 730
     url: '/m/api/patient/loginout?id=' + id,
731 731
     method: 'get',
@@ -733,7 +733,7 @@ export function LoginOut(id, params) {
733 733
   })
734 734
 }
735 735
 
736
-export function getMemberPatient(params) {
736
+export function getMemberPatient (params) {
737 737
   return request({
738 738
     url: '/m/api/patient/getmemberpatient',
739 739
     method: 'get',
@@ -741,7 +741,7 @@ export function getMemberPatient(params) {
741 741
   })
742 742
 }
743 743
 
744
-export function getSlowPatient(params) {
744
+export function getSlowPatient (params) {
745 745
   return request({
746 746
     url: '/m/api/patient/getslowpatient',
747 747
     method: 'get',
@@ -749,7 +749,7 @@ export function getSlowPatient(params) {
749 749
   })
750 750
 }
751 751
 
752
-export function getBloodPatient(params) {
752
+export function getBloodPatient (params) {
753 753
   return request({
754 754
     url: '/m/api/patient/getbloodpatient',
755 755
     method: 'get',
@@ -757,7 +757,7 @@ export function getBloodPatient(params) {
757 757
   })
758 758
 }
759 759
 
760
-export function DeletePatient(id, params) {
760
+export function DeletePatient (id, params) {
761 761
   return request({
762 762
     url: '/m/api/patient/deletePatient?id=' + id,
763 763
     method: 'delete',
@@ -765,7 +765,7 @@ export function DeletePatient(id, params) {
765 765
   })
766 766
 }
767 767
 
768
-export function saveName(id, name) {
768
+export function saveName (id, name) {
769 769
   const params = {
770 770
     id: id,
771 771
     name: name
@@ -777,7 +777,7 @@ export function saveName(id, name) {
777 777
   })
778 778
 }
779 779
 
780
-export function saveNameTwo(id, name, orgid) {
780
+export function saveNameTwo (id, name, orgid) {
781 781
   const params = {
782 782
     id: id,
783 783
     name: name,
@@ -790,7 +790,7 @@ export function saveNameTwo(id, name, orgid) {
790 790
   })
791 791
 }
792 792
 
793
-export function getAllOrganization(id, params) {
793
+export function getAllOrganization (id, params) {
794 794
   return request({
795 795
     url: '/m/api/patient/getallorganization?id=' + id,
796 796
     method: 'get',
@@ -798,7 +798,7 @@ export function getAllOrganization(id, params) {
798 798
   })
799 799
 }
800 800
 
801
-export function getMyOrganazition(id, params) {
801
+export function getMyOrganazition (id, params) {
802 802
   return request({
803 803
     url: '/m/api/patient/getmyorganazition?id=' + id,
804 804
     method: 'get',
@@ -806,7 +806,7 @@ export function getMyOrganazition(id, params) {
806 806
   })
807 807
 }
808 808
 
809
-export function getOrgInformation(id, params) {
809
+export function getOrgInformation (id, params) {
810 810
   return request({
811 811
     url: '/m/api/org/getorginformation?id=' + id,
812 812
     method: 'get',
@@ -814,7 +814,7 @@ export function getOrgInformation(id, params) {
814 814
   })
815 815
 }
816 816
 
817
-export function getAllOrgType(params) {
817
+export function getAllOrgType (params) {
818 818
   return request({
819 819
     url: '/m/api/patient/getallorgtype',
820 820
     method: 'get',
@@ -822,7 +822,7 @@ export function getAllOrgType(params) {
822 822
   })
823 823
 }
824 824
 
825
-export function updateOrg(params, id) {
825
+export function updateOrg (params, id) {
826 826
   return request({
827 827
     url: '/m/api/patient/editorg?id=' + id,
828 828
     method: 'get',
@@ -830,7 +830,7 @@ export function updateOrg(params, id) {
830 830
   })
831 831
 }
832 832
 
833
-export function getMyInforName(id, orgid) {
833
+export function getMyInforName (id, orgid) {
834 834
   const params = {
835 835
     id: id,
836 836
     orgid: orgid
@@ -843,7 +843,7 @@ export function getMyInforName(id, orgid) {
843 843
   })
844 844
 }
845 845
 
846
-export function getPartionDetail(id, params) {
846
+export function getPartionDetail (id, params) {
847 847
   return request({
848 848
     url: '/m/api/patient/getpartiondetail?id=' + id,
849 849
     method: 'get',
@@ -851,7 +851,7 @@ export function getPartionDetail(id, params) {
851 851
   })
852 852
 }
853 853
 
854
-export function UpdatePartition(params) {
854
+export function UpdatePartition (params) {
855 855
   return request({
856 856
     url: '/m/api/patient/updatepartition',
857 857
     method: 'get',
@@ -859,7 +859,7 @@ export function UpdatePartition(params) {
859 859
   })
860 860
 }
861 861
 
862
-export function getGroupDetail(id, params) {
862
+export function getGroupDetail (id, params) {
863 863
   return request({
864 864
     url: '/m/api/patient/getgroupdetail?id=' + id,
865 865
     method: 'get',
@@ -867,7 +867,7 @@ export function getGroupDetail(id, params) {
867 867
   })
868 868
 }
869 869
 
870
-export function updateGroup(params) {
870
+export function updateGroup (params) {
871 871
   return request({
872 872
     url: '/m/api/patient/updategroup',
873 873
     method: 'get',
@@ -875,7 +875,7 @@ export function updateGroup(params) {
875 875
   })
876 876
 }
877 877
 
878
-export function getBedDetail(id, params) {
878
+export function getBedDetail (id, params) {
879 879
   return request({
880 880
     url: '/m/api/patient/getbeddetail?id=' + id,
881 881
     method: 'get',
@@ -883,8 +883,7 @@ export function getBedDetail(id, params) {
883 883
   })
884 884
 }
885 885
 
886
-export function updateBed(params) {
887
-  console.log('params', params)
886
+export function updateBed (params) {
888 887
   return request({
889 888
     url: '/m/api/patient/updatebed',
890 889
     method: 'get',
@@ -892,7 +891,7 @@ export function updateBed(params) {
892 891
   })
893 892
 }
894 893
 
895
-export function getMyOrgInformation(creator, params) {
894
+export function getMyOrgInformation (creator, params) {
896 895
   return request({
897 896
     url: '/m/api/patient/getmyorginformation?creator=' + creator,
898 897
     method: 'get',
@@ -900,7 +899,7 @@ export function getMyOrgInformation(creator, params) {
900 899
   })
901 900
 }
902 901
 
903
-export function getCurrentOrg(params) {
902
+export function getCurrentOrg (params) {
904 903
   return request({
905 904
     url: '/m/api/patient/getcurrentorg',
906 905
     method: 'get',
@@ -908,7 +907,7 @@ export function getCurrentOrg(params) {
908 907
   })
909 908
 }
910 909
 
911
-export function getMyInformationFour(params) {
910
+export function getMyInformationFour (params) {
912 911
   return request({
913 912
     url: '/m/api/patient/getmyinformationfour',
914 913
     method: 'get',
@@ -916,7 +915,7 @@ export function getMyInformationFour(params) {
916 915
   })
917 916
 }
918 917
 
919
-export function submitForm(params) {
918
+export function submitForm (params) {
920 919
   return request({
921 920
     url: '/m/api/patient/sumitform',
922 921
     method: 'Get',
@@ -924,7 +923,7 @@ export function submitForm(params) {
924 923
   })
925 924
 }
926 925
 
927
-export function getRolePosition(params) {
926
+export function getRolePosition (params) {
928 927
   return request({
929 928
     url: '/m/api/patient/getroleposition',
930 929
     method: 'get',
@@ -932,7 +931,7 @@ export function getRolePosition(params) {
932 931
   })
933 932
 }
934 933
 
935
-export function getMobile(params) {
934
+export function getMobile (params) {
936 935
   console.log('params', params)
937 936
   return request({
938 937
     url: '/m/api/patient/getmobile',
@@ -941,7 +940,7 @@ export function getMobile(params) {
941 940
   })
942 941
 }
943 942
 
944
-export function getOrgs(params) {
943
+export function getOrgs (params) {
945 944
   return request({
946 945
     url: '/m/api/patient/getorgs',
947 946
     method: 'get',

+ 0 - 3
src/pages/allDoctorAdvice/indexs.vue Näytä tiedosto

@@ -425,15 +425,12 @@ export default {
425 425
     setRem();
426 426
     setHeight();
427 427
     var id = this.$route.query.id;
428
-    window.console.log("id是--------", id);
429
-
430 428
     var patientid = this.$route.query.patientid;
431 429
     this.id = patientid;
432 430
     this.GetDoctorAdviceDetail(id, patientid);
433 431
     this.active = parseInt(this.$route.query.active);
434 432
     this.getAllDoctor();
435 433
     var docActive = localStorage.getItem("docActive", this.active);
436
-    console.log("docActive", docActive);
437 434
   }
438 435
 };
439 436
 </script>

+ 3 - 0
src/pages/configureCenter/editBed.vue Näytä tiedosto

@@ -206,6 +206,9 @@ export default {
206 206
           this.$toast("保存成功");
207 207
           this.$router.push("/configurecenter?active=" + this.active);
208 208
         }
209
+        if (response.data.state === undefined) {
210
+          this.$toast("床位号已存在!");
211
+        }
209 212
       });
210 213
     }
211 214
   },

+ 3 - 0
src/pages/configureCenter/editGrouping.vue Näytä tiedosto

@@ -56,6 +56,9 @@ export default {
56 56
           this.$toast("保存成功");
57 57
           this.$router.push("/configurecenter?active=" + this.active);
58 58
         }
59
+        if (response.data.state === undefined) {
60
+          this.$toast("分组名称已存在!");
61
+        }
59 62
       });
60 63
     },
61 64
     toReturn() {

+ 2 - 0
src/pages/configureCenter/editPartion.vue Näytä tiedosto

@@ -155,6 +155,8 @@ export default {
155 155
           // console.log("zone", zone);
156 156
           this.$toast("保存成功");
157 157
           this.$router.push("/configurecenter");
158
+        } else {
159
+          this.$toast("分区名称已存在!");
158 160
         }
159 161
       });
160 162
     },

+ 3 - 0
src/pages/configureCenter/newBed.vue Näytä tiedosto

@@ -126,6 +126,9 @@ export default {
126 126
           this.$toast("保存成功");
127 127
           this.$router.push("/configurecenter?active=" + this.active);
128 128
         }
129
+        if (response.data.state === undefined) {
130
+          this.$toast("床位号已存在!");
131
+        }
129 132
       });
130 133
     }
131 134
   },

+ 3 - 0
src/pages/configureCenter/newGrouping.vue Näytä tiedosto

@@ -36,6 +36,9 @@ export default {
36 36
           this.$toast("保存成功");
37 37
           this.$router.push("/configurecenter?active=" + this.active);
38 38
         }
39
+        if (response.data.state === undefined) {
40
+          this.$toast("分组名称已存在!");
41
+        }
39 42
       });
40 43
     },
41 44
     toReturn() {

+ 2 - 0
src/pages/configureCenter/newPartition.vue Näytä tiedosto

@@ -102,6 +102,8 @@ export default {
102 102
           var zone = response.data.data.zone;
103 103
           this.$toast("保存成功");
104 104
           this.$router.push("/configurecenter?active=" + this.active);
105
+        } else {
106
+          this.$toast("分区名称已存在!");
105 107
         }
106 108
       });
107 109
     },

+ 4 - 3
src/pages/doctorAdvice/components/Inspection.vue Näytä tiedosto

@@ -177,8 +177,6 @@ export default {
177 177
       this.typeShow = false;
178 178
     },
179 179
     onConfirm(value) {
180
-      // console.log("value值", value);
181
-      // console.log("columns", this.checkdata);
182 180
       for (let i = 0; i < this.checkdata.length; i++) {
183 181
         if (value == this.checkdata[i].project_name) {
184 182
           this.project_id = this.checkdata[i].project_id;
@@ -246,6 +244,7 @@ export default {
246 244
       getPatientDetail(patientid).then(response => {
247 245
         if (response.data.state === 1) {
248 246
           var patientDetail = response.data.data.patientDetail;
247
+          // console.log("patientDetail", patientDetail);
249 248
           if (patientDetail.blood_patients == 0) {
250 249
             this.Inspection = [];
251 250
             this.showOne = false;
@@ -263,6 +262,7 @@ export default {
263 262
       getAllInspection().then(response => {
264 263
         if (response.data.state === 1) {
265 264
           var inspection = response.data.data.inspection;
265
+          console.log("inspection", inspection);
266 266
           this.checkdata = inspection;
267 267
           for (let i = 0; i < inspection.length; i++) {
268 268
             this.columns.push(inspection[i].project_name);
@@ -281,7 +281,7 @@ export default {
281 281
       ).then(response => {
282 282
         if (response.data.state == 1) {
283 283
           var inspection = response.data.data.inspection;
284
-          // console.log("为什么", inspection);
284
+          console.log("为什么", inspection);
285 285
           var total = response.data.data.total;
286 286
           // console.log("total", total);
287 287
           let dataInfo = {};
@@ -311,6 +311,7 @@ export default {
311 311
             item.child = arr;
312 312
           });
313 313
           this.Inspection = list.reverse();
314
+          console.log("this", this.Inspection);
314 315
         }
315 316
       });
316 317
       this.finished = true;

+ 25 - 4
src/pages/doctorAdvice/index.vue Näytä tiedosto

@@ -166,7 +166,8 @@ export default {
166 166
     signsRecord,
167 167
     recoverNotes,
168 168
     medicationPlan,
169
-    deviceManagement
169
+    deviceManagement,
170
+    restatus: 0
170 171
   },
171 172
   inject: ["reload"],
172 173
   data() {
@@ -266,7 +267,10 @@ export default {
266 267
       patient_id: "",
267 268
       patient_info: {
268 269
         patient_id: this.patient_id
269
-      }
270
+      },
271
+      id: 0,
272
+      name: 0,
273
+      nowdate: 0
270 274
     };
271 275
   },
272 276
   methods: {
@@ -373,6 +377,11 @@ export default {
373 377
       getPatientDetail(patientid).then(response => {
374 378
         if (response.data.state === 1) {
375 379
           var patientDetail = response.data.data.patientDetail;
380
+          var nowdate = response.data.data.nowdate;
381
+          this.nowdate = nowdate;
382
+          this.id = patientDetail.blood_id;
383
+          this.name = patientDetail.name;
384
+          console.log("patientDetail详情", patientDetail);
376 385
           this.patientName = patientDetail.name;
377 386
         }
378 387
       });
@@ -553,8 +562,18 @@ export default {
553 562
       this.$router.push("/editPatient?patientid=" + this.patient_id);
554 563
     },
555 564
     toReturn() {
556
-      console.log("aaaaa");
557
-      this.$router.push("/patients");
565
+      if (this.restatus == 1) {
566
+        this.$router.push(
567
+          "/details?patient_id=" +
568
+            this.id +
569
+            "&date=" +
570
+            this.nowdate +
571
+            "&patient_name=" +
572
+            this.name
573
+        );
574
+      } else {
575
+        this.$router.push("/patients");
576
+      }
558 577
     }
559 578
   },
560 579
   created() {
@@ -578,6 +597,8 @@ export default {
578 597
     if (seacherActive == 3) {
579 598
       this.getMemberPatient();
580 599
     }
600
+    var restatus = this.$route.query.restatus;
601
+    this.restatus = restatus;
581 602
   },
582 603
   watch: {
583 604
     $route(newVal) {

+ 40 - 40
src/pages/main/DetailsPage.vue Näytä tiedosto

@@ -72,7 +72,6 @@ import { Toast } from "vant";
72 72
 import CaseHistory from "./records/CaseHistory";
73 73
 import { mediaMatches } from "@/libs/functionPad";
74 74
 
75
-
76 75
 export default {
77 76
   name: "DetailsPage",
78 77
   components: {
@@ -93,7 +92,7 @@ export default {
93 92
       index: 2,
94 93
       patient: null,
95 94
       sqls: [
96
-        window.matchMedia("(max-width:418px)"), //和CSS一样,也要注意顺序!
95
+        window.matchMedia("(max-width:418px)"), // 和CSS一样,也要注意顺序!
97 96
         window.matchMedia("(max-width:768px)"),
98 97
         window.matchMedia("(max-width:992px)"),
99 98
         window.matchMedia("(max-width:1200px)")
@@ -114,21 +113,22 @@ export default {
114 113
     this.patient_name = patient_name;
115 114
     this.GetPatientInfoWithDiseases(this.patient_id);
116 115
   },
117
-  mounted(){
118
-    const that = this
116
+  mounted() {
117
+    const that = this;
119 118
     window.onresize = () => {
120
-        return (() => {
121
-            window.clientHeight = document.body.clientHeight
122
-            that.clientHeight = window.clientHeight
123
-        })()
124
-    }
119
+      return (() => {
120
+        window.clientHeight = document.body.clientHeight;
121
+        that.clientHeight = window.clientHeight;
122
+      })();
123
+    };
125 124
   },
126 125
   methods: {
127 126
     ClickTab: function(tabIndex) {
128 127
       this.index = tabIndex;
129 128
     },
130 129
     backAction() {
131
-      this.$router.back(-1);
130
+      // this.$router.back(-1);
131
+      this.$router.push("/main");
132 132
     },
133 133
     openPicker() {
134 134
       this.$refs.picker.open();
@@ -163,26 +163,26 @@ export default {
163 163
     toMyPatients() {
164 164
       var patient_id = this.$route.query.patient_id;
165 165
       this.$router.push("/mypatients/" + patient_id);
166
-    },
166
+    }
167 167
   },
168
-  watch:{
169
-    clientHeight(val){
168
+  watch: {
169
+    clientHeight(val) {
170 170
       // 为了避免频繁触发resize函数导致页面卡顿,使用定时器
171
-      if(!this.timer){
171
+      if (!this.timer) {
172 172
         // 一旦监听到的screenWidth值改变,就将其重新赋给data里的screenWidth
173
-        this.clientHeight = val
174
-        this.timer = true
175
-        let that = this
176
-        setTimeout(function(){
177
-            // 打印screenWidth变化的值
178
-            console.log(that.clientHeight)
179
-            that.timer = false
180
-            that.mediaMatches();
181
-        },400)
173
+        this.clientHeight = val;
174
+        this.timer = true;
175
+        let that = this;
176
+        setTimeout(function() {
177
+          // 打印screenWidth变化的值
178
+          console.log(that.clientHeight);
179
+          that.timer = false;
180
+          that.mediaMatches();
181
+        }, 400);
182 182
       }
183 183
     }
184 184
   }
185
-}
185
+};
186 186
 </script>
187 187
 
188 188
 <style style="stylesheet/scss" lang="scss" scoped>
@@ -300,18 +300,18 @@ export default {
300 300
     }
301 301
   }
302 302
 }
303
-.printBox{
303
+.printBox {
304 304
   position: fixed;
305 305
   right: 0.6rem;
306 306
   bottom: 1rem;
307
-  img{
307
+  img {
308 308
     width: 1.875rem;
309 309
     height: 1.875rem;
310 310
   }
311 311
 }
312 312
 </style>
313 313
 <style lang="scss">
314
-.van-toast{
314
+.van-toast {
315 315
   position: fixed;
316 316
   top: 50%;
317 317
   left: 50%;
@@ -339,10 +339,10 @@ export default {
339 339
   white-space: pre-wrap;
340 340
   text-align: center;
341 341
   word-wrap: break-word;
342
-  background-color: rgba(50,50,51,.88);
342
+  background-color: rgba(50, 50, 51, 0.88);
343 343
   border-radius: 4px;
344
-  -webkit-transform: translate3d(-50%,-50%,0);
345
-  transform: translate3d(-50%,-50%,0);
344
+  -webkit-transform: translate3d(-50%, -50%, 0);
345
+  transform: translate3d(-50%, -50%, 0);
346 346
 }
347 347
 
348 348
 .van-dialog {
@@ -354,16 +354,16 @@ export default {
354 354
   font-size: 16px;
355 355
   background-color: #fff;
356 356
   border-radius: 16px;
357
-  -webkit-transform: translate3d(-50%,-50%,0);
358
-  transform: translate3d(-50%,-50%,0);
357
+  -webkit-transform: translate3d(-50%, -50%, 0);
358
+  transform: translate3d(-50%, -50%, 0);
359 359
   -webkit-backface-visibility: hidden;
360 360
   backface-visibility: hidden;
361
-  -webkit-transition: .3s;
362
-  transition: .3s;
363
-  -webkit-transition-property: opacity,-webkit-transform;
364
-  transition-property: opacity,-webkit-transform;
365
-  transition-property: transform,opacity;
366
-  transition-property: transform,opacity,-webkit-transform;
361
+  -webkit-transition: 0.3s;
362
+  transition: 0.3s;
363
+  -webkit-transition-property: opacity, -webkit-transform;
364
+  transition-property: opacity, -webkit-transform;
365
+  transition-property: transform, opacity;
366
+  transition-property: transform, opacity, -webkit-transform;
367 367
 }
368 368
 
369 369
 .van-dialog__message {
@@ -390,8 +390,8 @@ export default {
390 390
   text-align: center;
391 391
   border-radius: 2px;
392 392
   cursor: pointer;
393
-  -webkit-transition: opacity .2s;
394
-  transition: opacity .2s;
393
+  -webkit-transition: opacity 0.2s;
394
+  transition: opacity 0.2s;
395 395
   -webkit-appearance: none;
396 396
   -webkit-text-size-adjust: 100%;
397 397
 }

+ 1 - 5
src/pages/main/PatientBox.vue Näytä tiedosto

@@ -80,10 +80,6 @@ export default {
80 80
   data() {
81 81
     return {};
82 82
   },
83
-  created() {
84
-    console.log("11111");
85
-    console.log(this.patients);
86
-  },
87 83
   methods: {
88 84
     getUnReadNum: function(schedual) {
89 85
       if (schedual.doctor_advice != null) {
@@ -240,7 +236,7 @@ export default {
240 236
           "-"
241 237
         );
242 238
       } else {
243
-        return ''
239
+        return "";
244 240
       }
245 241
 
246 242
       // var now = new Date();

+ 5 - 3
src/pages/main/RecordPage.vue Näytä tiedosto

@@ -14,7 +14,7 @@
14 14
           </router-link>-->
15 15
           <i
16 16
             class="iconfont icon-zuojiantou jiantou"
17
-            @click="$router.go(-1)"
17
+            @click="toReturn"
18 18
           ></i>
19 19
           <span class="titleName">透析记录</span>
20 20
           <router-link to="/add_urgent_schedule">
@@ -239,6 +239,9 @@ export default {
239 239
     },
240 240
     goAdvice() {
241 241
       this.$router.push("/advice");
242
+    },
243
+    toReturn() {
244
+      this.$router.push("/homeIndex");
242 245
     }
243 246
   },
244 247
   created() {
@@ -472,7 +475,7 @@ export default {
472 475
       font-size: 24px;
473 476
       width: 0;
474 477
     }
475
-     @media only screen and (min-width: 416px) and (max-width: 767px) {
478
+    @media only screen and (min-width: 416px) and (max-width: 767px) {
476 479
       margin-top: 1px;
477 480
       font-size: 24px;
478 481
       width: 0;
@@ -482,7 +485,6 @@ export default {
482 485
     // left:1px;
483 486
     @media only screen and (min-width: 768px) {
484 487
       // left: 10px;
485
-      
486 488
     }
487 489
   }
488 490
 }

+ 193 - 194
src/pages/main/WaitingArea.vue Näytä tiedosto

@@ -101,11 +101,11 @@
101 101
 </template>
102 102
 
103 103
 <script>
104
-import PatientBox from './PatientBox'
105
-import { getWaitingScheduals } from '@/api/dialysis'
106
-import { parseTime } from '@/utils'
107
-import { Popover } from 'vux'
108
-import { Toast } from 'vant'
104
+import PatientBox from "./PatientBox";
105
+import { getWaitingScheduals } from "@/api/dialysis";
106
+import { parseTime } from "@/utils";
107
+import { Popover } from "vux";
108
+import { Toast } from "vant";
109 109
 
110 110
 import {
111 111
   getSelectedAreaDataConfigList,
@@ -114,22 +114,22 @@ import {
114 114
   setSelectedTimesDataConfigList,
115 115
   setWaitTypeSelectedConfig,
116 116
   getWaitTypeSelectedConfig
117
-} from '@/utils/data_config'
117
+} from "@/utils/data_config";
118 118
 
119 119
 export default {
120
-  name: 'WaitingArea',
120
+  name: "WaitingArea",
121 121
   components: {
122 122
     PatientBox,
123 123
     Popover
124 124
   },
125
-  inject: ['reload'],
126
-  data () {
125
+  inject: ["reload"],
126
+  data() {
127 127
     return {
128 128
       loading: false,
129 129
       menuList: [
130
-        { value: '1', label: '全部', count: 0 },
131
-        { value: '3', label: '待开处方', count: 0 },
132
-        { value: '2', label: '待称重', count: 0 }
130
+        { value: "1", label: "全部", count: 0 },
131
+        { value: "3", label: "待开处方", count: 0 },
132
+        { value: "2", label: "待称重", count: 0 }
133 133
       ],
134 134
 
135 135
       select_index: 0,
@@ -138,20 +138,20 @@ export default {
138 138
       cur_zone_selected: 0,
139 139
       networkStates: true,
140 140
       scheduals: [],
141
-      timer:null,
142
-      zone_options: [{ value: 0, text: '全部分区' }],
141
+      timer: null,
142
+      zone_options: [{ value: 0, text: "全部分区" }],
143 143
       zone_scheduals: [],
144 144
 
145 145
       time_options: [
146
-        { value: 0, text: '全部班' },
147
-        { value: 1, text: '上午' },
148
-        { value: 2, text: '下午' },
149
-        { value: 3, text: '晚上' }
146
+        { value: 0, text: "全部班" },
147
+        { value: 1, text: "上午" },
148
+        { value: 2, text: "下午" },
149
+        { value: 3, text: "晚上" }
150 150
       ],
151 151
 
152 152
       zone_options_visible: false,
153 153
       time_options_visible: false
154
-    }
154
+    };
155 155
   },
156 156
   props: {
157 157
     search_keyword: {
@@ -159,17 +159,17 @@ export default {
159 159
     }
160 160
   },
161 161
   computed: {
162
-    filtedScheduals: function () {
163
-      var search_keyword = this.search_keyword
162
+    filtedScheduals: function() {
163
+      var search_keyword = this.search_keyword;
164 164
       if (this.search_keyword.length > 0) {
165
-        var scheduals = []
165
+        var scheduals = [];
166 166
         for (let index = 0; index < this.scheduals.length; index++) {
167
-          const schedual = this.scheduals[index]
168
-          if ( schedual.patient.name.indexOf(search_keyword) != -1) {
169
-            scheduals.push(schedual)
167
+          const schedual = this.scheduals[index];
168
+          if (schedual.patient.name.indexOf(search_keyword) != -1) {
169
+            scheduals.push(schedual);
170 170
           }
171 171
         }
172
-        return this.processScheduals(scheduals)
172
+        return this.processScheduals(scheduals);
173 173
       }
174 174
       //
175 175
       if (this.zone_selected != 0) {
@@ -180,21 +180,21 @@ export default {
180 180
         //     return [zone_scheduals]
181 181
         //   }
182 182
         // }
183
-        var zone_name = this.zone_options[this.zone_selected].text
184
-        var schedules = []
185
-        var filtedSchedules = []
183
+        var zone_name = this.zone_options[this.zone_selected].text;
184
+        var schedules = [];
185
+        var filtedSchedules = [];
186 186
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
187
-          const scheduleInfo = this.zone_scheduals[o_i]
188
-          var originSchedules = scheduleInfo.scheduals
187
+          const scheduleInfo = this.zone_scheduals[o_i];
188
+          var originSchedules = scheduleInfo.scheduals;
189 189
 
190 190
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
191
-            const schedule = originSchedules[s_i]
191
+            const schedule = originSchedules[s_i];
192 192
             if (this.zone_selected == 0) {
193 193
               if (
194 194
                 this.time_selected == 0 ||
195 195
                 schedule.schedule_type == this.time_selected
196 196
               ) {
197
-                filtedSchedules.push(schedule)
197
+                filtedSchedules.push(schedule);
198 198
               }
199 199
             } else {
200 200
               if (
@@ -205,7 +205,7 @@ export default {
205 205
                   this.time_selected == 0 ||
206 206
                   schedule.schedule_type == this.time_selected
207 207
                 ) {
208
-                  filtedSchedules.push(schedule)
208
+                  filtedSchedules.push(schedule);
209 209
                 }
210 210
               }
211 211
             }
@@ -217,26 +217,26 @@ export default {
217 217
           //   });
218 218
           // }
219 219
         }
220
-        console.log(filtedSchedules)
221
-        return this.processScheduals(filtedSchedules)
220
+        // console.log(filtedSchedules)
221
+        return this.processScheduals(filtedSchedules);
222 222
       }
223 223
 
224 224
       if (this.time_selected != 0) {
225
-        var zone_name = this.zone_options[this.zone_selected].text
226
-        var schedules = []
227
-        var filtedSchedules = []
225
+        var zone_name = this.zone_options[this.zone_selected].text;
226
+        var schedules = [];
227
+        var filtedSchedules = [];
228 228
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
229
-          const scheduleInfo = this.zone_scheduals[o_i]
230
-          var originSchedules = scheduleInfo.scheduals
229
+          const scheduleInfo = this.zone_scheduals[o_i];
230
+          var originSchedules = scheduleInfo.scheduals;
231 231
 
232 232
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
233
-            const schedule = originSchedules[s_i]
233
+            const schedule = originSchedules[s_i];
234 234
             if (this.zone_selected == 0) {
235 235
               if (
236 236
                 this.time_selected == 0 ||
237 237
                 schedule.schedule_type == this.time_selected
238 238
               ) {
239
-                filtedSchedules.push(schedule)
239
+                filtedSchedules.push(schedule);
240 240
               }
241 241
             } else {
242 242
               if (
@@ -247,7 +247,7 @@ export default {
247 247
                   this.time_selected == 0 ||
248 248
                   schedule.schedule_type == this.time_selected
249 249
                 ) {
250
-                  filtedSchedules.push(schedule)
250
+                  filtedSchedules.push(schedule);
251 251
                 }
252 252
               }
253 253
             }
@@ -259,25 +259,25 @@ export default {
259 259
           //   });
260 260
           // }
261 261
         }
262
-        console.log(filtedSchedules)
263
-        return this.processScheduals(filtedSchedules)
262
+        console.log(filtedSchedules);
263
+        return this.processScheduals(filtedSchedules);
264 264
       }
265 265
 
266
-      var zone_selected = this.zone_selected
267
-      var timetype_selected = this.time_selected
268
-      var assessment_before_dislysis_count = 0
269
-      var prescription_count = 0
266
+      var zone_selected = this.zone_selected;
267
+      var timetype_selected = this.time_selected;
268
+      var assessment_before_dislysis_count = 0;
269
+      var prescription_count = 0;
270 270
       if (zone_selected != 0 || timetype_selected != 0) {
271 271
         var zone_name =
272
-          zone_selected == 0 ? '' : this.zone_options[zone_selected].text
273
-        var schedules = []
274
-        var filtedSchedules = []
272
+          zone_selected == 0 ? "" : this.zone_options[zone_selected].text;
273
+        var schedules = [];
274
+        var filtedSchedules = [];
275 275
         for (let o_i = 0; o_i < this.zone_scheduals.length; o_i++) {
276
-          const scheduleInfo = this.zone_scheduals[o_i]
277
-          var originSchedules = scheduleInfo.scheduals
276
+          const scheduleInfo = this.zone_scheduals[o_i];
277
+          var originSchedules = scheduleInfo.scheduals;
278 278
 
279 279
           for (let s_i = 0; s_i < originSchedules.length; s_i++) {
280
-            const schedule = originSchedules[s_i]
280
+            const schedule = originSchedules[s_i];
281 281
             if (
282 282
               zone_name.length == 0 ||
283 283
               (zone_name.length > 0 &&
@@ -287,7 +287,7 @@ export default {
287 287
                 timetype_selected == 0 ||
288 288
                 schedule.schedule_type == timetype_selected
289 289
               ) {
290
-                filtedSchedules.push(schedule)
290
+                filtedSchedules.push(schedule);
291 291
               }
292 292
             }
293 293
           }
@@ -299,13 +299,13 @@ export default {
299 299
           // }
300 300
         }
301 301
 
302
-        console.log(filtedSchedules)
303
-        return this.processScheduals(filtedSchedules)
302
+        console.log(filtedSchedules);
303
+        return this.processScheduals(filtedSchedules);
304 304
         // eslint-disable-next-line no-unreachable
305 305
         if (this.select_index == 2) {
306
-          var scheduals = []
306
+          var scheduals = [];
307 307
           for (let index = 0; index < this.scheduals.length; index++) {
308
-            const schedual = this.scheduals[index]
308
+            const schedual = this.scheduals[index];
309 309
             if (
310 310
               schedual.assessment_before_dislysis == null ||
311 311
               schedual.assessment_before_dislysis.weight_before == 0
@@ -314,23 +314,23 @@ export default {
314 314
                 this.cur_zone_selected > 0 &&
315 315
                 schedual.device_number.zone.id != this.cur_zone_selected
316 316
               ) {
317
-                continue
317
+                continue;
318 318
               }
319 319
               if (
320 320
                 timetype_selected > 0 &&
321 321
                 schedual.schedule_type != timetype_selected
322 322
               ) {
323
-                continue
323
+                continue;
324 324
               }
325
-              scheduals.push(schedual)
325
+              scheduals.push(schedual);
326 326
             }
327 327
           }
328
-          return this.processScheduals(scheduals)
328
+          return this.processScheduals(scheduals);
329 329
           // return scheduals;
330 330
         } else if (this.select_index == 1) {
331
-          var scheduals = []
331
+          var scheduals = [];
332 332
           for (let index = 0; index < this.scheduals.length; index++) {
333
-            const schedual = this.scheduals[index]
333
+            const schedual = this.scheduals[index];
334 334
             if (
335 335
               schedual.prescription == null ||
336 336
               schedual.prescription.creater == 0
@@ -339,276 +339,275 @@ export default {
339 339
                 this.cur_zone_selected > 0 &&
340 340
                 schedual.device_number.zone.id != this.cur_zone_selected
341 341
               ) {
342
-                continue
342
+                continue;
343 343
               }
344 344
               if (
345 345
                 timetype_selected > 0 &&
346 346
                 schedual.schedule_type != timetype_selected
347 347
               ) {
348
-                continue
348
+                continue;
349 349
               }
350
-              scheduals.push(schedual)
350
+              scheduals.push(schedual);
351 351
             }
352 352
           }
353 353
           // return scheduals;
354
-          return this.processScheduals(scheduals)
354
+          return this.processScheduals(scheduals);
355 355
         } else {
356 356
           // return this.zone_scheduals;
357
-          var scheduals = []
357
+          var scheduals = [];
358 358
           for (let index = 0; index < this.scheduals.length; index++) {
359
-            const schedual = this.scheduals[index]
359
+            const schedual = this.scheduals[index];
360 360
             if (schedual.dialysis_order == null) {
361 361
               if (
362 362
                 this.cur_zone_selected > 0 &&
363 363
                 schedual.device_number.zone.id != this.cur_zone_selected
364 364
               ) {
365
-                continue
365
+                continue;
366 366
               }
367 367
               if (
368 368
                 timetype_selected > 0 &&
369 369
                 schedual.schedule_type != timetype_selected
370 370
               ) {
371
-                continue
371
+                continue;
372 372
               }
373
-              scheduals.push(schedual)
373
+              scheduals.push(schedual);
374 374
             }
375 375
           }
376 376
           // return scheduals;
377
-          return this.processScheduals(scheduals)
377
+          return this.processScheduals(scheduals);
378 378
         }
379 379
       }
380 380
 
381 381
       if (this.select_index == 2) {
382
-        var scheduals = []
382
+        var scheduals = [];
383 383
         for (let index = 0; index < this.scheduals.length; index++) {
384
-          const schedual = this.scheduals[index]
384
+          const schedual = this.scheduals[index];
385 385
           if (
386 386
             schedual.assessment_before_dislysis == null ||
387 387
             schedual.assessment_before_dislysis.weight_before == 0
388 388
           ) {
389
-            scheduals.push(schedual)
389
+            scheduals.push(schedual);
390 390
           }
391 391
         }
392
-        return this.processScheduals(scheduals)
392
+        return this.processScheduals(scheduals);
393 393
         // return scheduals;
394 394
       } else if (this.select_index == 1) {
395
-        var scheduals = []
395
+        var scheduals = [];
396 396
         for (let index = 0; index < this.scheduals.length; index++) {
397
-          const schedual = this.scheduals[index]
397
+          const schedual = this.scheduals[index];
398 398
           if (
399 399
             schedual.prescription == null ||
400 400
             schedual.prescription.creater == 0
401 401
           ) {
402
-            scheduals.push(schedual)
402
+            scheduals.push(schedual);
403 403
           }
404 404
         }
405 405
         // return scheduals;
406
-        return this.processScheduals(scheduals)
406
+        return this.processScheduals(scheduals);
407 407
       } else {
408 408
         // return this.zone_scheduals;
409
-        var scheduals = []
409
+        var scheduals = [];
410 410
         for (let index = 0; index < this.scheduals.length; index++) {
411
-          const schedual = this.scheduals[index]
411
+          const schedual = this.scheduals[index];
412 412
           if (schedual.dialysis_order == null) {
413
-            scheduals.push(schedual)
413
+            scheduals.push(schedual);
414 414
           }
415 415
         }
416 416
         // return scheduals;
417
-        return this.processScheduals(scheduals)
417
+        return this.processScheduals(scheduals);
418 418
       }
419 419
     }
420 420
   },
421
-  created () {
422
-    var area = getSelectedAreaDataConfigList()
423
-    var time = getSelectedTimesDataConfigList()
424
-    var type = getWaitTypeSelectedConfig()
421
+  created() {
422
+    var area = getSelectedAreaDataConfigList();
423
+    var time = getSelectedTimesDataConfigList();
424
+    var type = getWaitTypeSelectedConfig();
425 425
 
426 426
     if (area != null) {
427
-      this.zone_options_visible = false
428
-      this.zone_selected = parseInt(area)
429
-      this.select_index = -1
427
+      this.zone_options_visible = false;
428
+      this.zone_selected = parseInt(area);
429
+      this.select_index = -1;
430 430
     }
431 431
 
432 432
     if (time != null) {
433
-      this.time_selected = parseInt(time)
434
-      this.select_index = -1
435
-      this.time_options_visible = false
433
+      this.time_selected = parseInt(time);
434
+      this.select_index = -1;
435
+      this.time_options_visible = false;
436 436
     }
437 437
     if (type != null) {
438
-      this.select_index = parseInt(type)
438
+      this.select_index = parseInt(type);
439 439
     }
440 440
 
441
-    var storedata = this.$store.getters.waitscheduals
442
-    var scheduals = storedata.waitscheduals
441
+    var storedata = this.$store.getters.waitscheduals;
442
+    var scheduals = storedata.waitscheduals;
443 443
     if (Object.keys(storedata).length > 0) {
444
-      var totalCount = scheduals.length
445
-      var prescription_count = 0
446
-      var assessment_before_dislysis_count = 0
444
+      var totalCount = scheduals.length;
445
+      var prescription_count = 0;
446
+      var assessment_before_dislysis_count = 0;
447 447
       for (let index = 0; index < scheduals.length; index++) {
448
-        const schedual = scheduals[index]
448
+        const schedual = scheduals[index];
449 449
         if (schedual.assessment_before_dislysis == null) {
450
-          assessment_before_dislysis_count += 1
450
+          assessment_before_dislysis_count += 1;
451 451
         }
452 452
         if (schedual.prescription == null) {
453
-          prescription_count += 1
453
+          prescription_count += 1;
454 454
         }
455 455
       }
456
-      this.menuList[2].count = assessment_before_dislysis_count
457
-      this.menuList[1].count = prescription_count
458
-      this.scheduals = scheduals
456
+      this.menuList[2].count = assessment_before_dislysis_count;
457
+      this.menuList[1].count = prescription_count;
458
+      this.scheduals = scheduals;
459 459
 
460
-      this.zone_options = this.makeZones(scheduals)
461
-      this.zone_scheduals = this.processScheduals(scheduals)
462
-    } 
460
+      this.zone_options = this.makeZones(scheduals);
461
+      this.zone_scheduals = this.processScheduals(scheduals);
462
+    }
463 463
     // else {
464 464
     //   this.requestScheduals()
465 465
     // }
466 466
   },
467
-  mounted () {
467
+  mounted() {
468 468
     // this.timer = window.setInterval(() => {
469 469
     //   setTimeout(this.requestScheduals(), 0)
470 470
     // }, 120000)
471 471
   },
472
-  beforeDestroy () {
473
-    clearInterval(this.timer)
474
-    this.timer = null
475
-    this.$once('hook:beforeDestroy', () => {
476
-      clearInterval(this.timer)
477
-    })
472
+  beforeDestroy() {
473
+    clearInterval(this.timer);
474
+    this.timer = null;
475
+    this.$once("hook:beforeDestroy", () => {
476
+      clearInterval(this.timer);
477
+    });
478 478
   },
479 479
   methods: {
480
-    processScheduals: function (scheduals) {
481
-      var zoneMap = {}
482
-      var schedualMap = {}
483
-      var assessment_before_dislysis_count = 0
484
-      var prescription_count = 0
480
+    processScheduals: function(scheduals) {
481
+      var zoneMap = {};
482
+      var schedualMap = {};
483
+      var assessment_before_dislysis_count = 0;
484
+      var prescription_count = 0;
485 485
       for (let index = 0; index < scheduals.length; index++) {
486
-        const schedual = scheduals[index]
486
+        const schedual = scheduals[index];
487 487
         if (schedualMap[schedual.device_number.zone.id] == null) {
488
-          schedualMap[schedual.device_number.zone.id] = []
488
+          schedualMap[schedual.device_number.zone.id] = [];
489 489
         }
490 490
         if (this.select_index == 1) {
491 491
           if (
492 492
             schedual.prescription == null ||
493 493
             schedual.prescription.creater == 0
494 494
           ) {
495
-            schedualMap[schedual.device_number.zone.id].push(schedual)
496
-            prescription_count++
495
+            schedualMap[schedual.device_number.zone.id].push(schedual);
496
+            prescription_count++;
497 497
           }
498 498
         } else if (this.select_index == 2) {
499 499
           if (
500 500
             schedual.assessment_before_dislysis == null ||
501 501
             schedual.assessment_before_dislysis.weight_before == 0
502 502
           ) {
503
-            schedualMap[schedual.device_number.zone.id].push(schedual)
504
-            assessment_before_dislysis_count++
503
+            schedualMap[schedual.device_number.zone.id].push(schedual);
504
+            assessment_before_dislysis_count++;
505 505
           }
506 506
         } else {
507 507
           if (schedual.dialysis_order == null) {
508
-            schedualMap[schedual.device_number.zone.id].push(schedual)
508
+            schedualMap[schedual.device_number.zone.id].push(schedual);
509 509
           }
510 510
         }
511 511
         if (zoneMap[schedual.device_number.zone.id] == null) {
512
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
512
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
513 513
         }
514 514
       }
515 515
 
516 516
       if (this.select_index == 1) {
517
-        this.menuList[1].count = prescription_count
517
+        this.menuList[1].count = prescription_count;
518 518
       }
519 519
       if (this.select_index == 2) {
520
-        this.menuList[2].count = assessment_before_dislysis_count
520
+        this.menuList[2].count = assessment_before_dislysis_count;
521 521
       }
522 522
 
523
-      var zones = []
523
+      var zones = [];
524 524
       // zones.push({ value: 0, text: "全部分区" })
525 525
       for (var zoneId in zoneMap) {
526
-        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name })
526
+        zones.push({ id: zoneMap[zoneId].id, name: zoneMap[zoneId].name });
527 527
       }
528 528
 
529
-      zones = zones.sort(function (a, b) {
530
-        return a.id > b.id
531
-      })
529
+      zones = zones.sort(function(a, b) {
530
+        return a.id > b.id;
531
+      });
532 532
       // this.zones = zones
533 533
 
534
-      var zone_scheduals = []
534
+      var zone_scheduals = [];
535 535
       for (let index = 0; index < zones.length; index++) {
536
-        const zone = zones[index]
537
-        var scheduals = schedualMap[zone.id]
536
+        const zone = zones[index];
537
+        var scheduals = schedualMap[zone.id];
538 538
         zone_scheduals.push({
539 539
           zone_id: zone.id,
540 540
           zone_name: zone.name,
541 541
 
542 542
           scheduals: scheduals
543
-        })
543
+        });
544 544
       }
545 545
       // this.zone_scheduals = zone_scheduals;
546
-      return zone_scheduals
546
+      return zone_scheduals;
547 547
     },
548
-    reloads: function () {
549
-      this.reload()
548
+    reloads: function() {
549
+      this.reload();
550 550
     },
551
-    handleAllChange: function (tabIndex) {
552
-      this.select_index = tabIndex
553
-      this.zone_selected = 0
554
-      this.time_selected = 0
551
+    handleAllChange: function(tabIndex) {
552
+      this.select_index = tabIndex;
553
+      this.zone_selected = 0;
554
+      this.time_selected = 0;
555 555
     },
556
-    menuTabClick: function (tabIndex) {
557
-      this.select_index = tabIndex
558
-      this.zone_selected = 0
559
-      this.time_selected = 0
560
-      setSelectedAreaDataConfigList(this.zone_selected)
561
-      setSelectedTimesDataConfigList(this.time_selected)
562
-      setWaitTypeSelectedConfig(tabIndex)
556
+    menuTabClick: function(tabIndex) {
557
+      this.select_index = tabIndex;
558
+      this.zone_selected = 0;
559
+      this.time_selected = 0;
560
+      setSelectedAreaDataConfigList(this.zone_selected);
561
+      setSelectedTimesDataConfigList(this.time_selected);
562
+      setWaitTypeSelectedConfig(tabIndex);
563 563
     },
564
-    handleZoneChange: function (index, zone) {
565
-      this.zone_options_visible = false
566
-      this.zone_selected = index
567
-      this.cur_zone_selected = zone.value
564
+    handleZoneChange: function(index, zone) {
565
+      this.zone_options_visible = false;
566
+      this.zone_selected = index;
567
+      this.cur_zone_selected = zone.value;
568 568
       // this.select_index = -1;
569
-      setSelectedAreaDataConfigList(index.toString())
569
+      setSelectedAreaDataConfigList(index.toString());
570 570
     },
571
-    handleTimeChange: function (index) {
572
-      this.time_selected = index
571
+    handleTimeChange: function(index) {
572
+      this.time_selected = index;
573 573
       // this.select_index = -1;
574
-      this.time_options_visible = false
575
-      setSelectedTimesDataConfigList(index.toString())
574
+      this.time_options_visible = false;
575
+      setSelectedTimesDataConfigList(index.toString());
576 576
     },
577 577
 
578
-    requestScheduals: function () {
578
+    requestScheduals: function() {
579 579
       // this.loading = true;
580 580
       // var date = parseTime(Date.parse(new Date()), '{y}-{m}-{d}')
581 581
       // getWaitingScheduals({ date: date }).then(rs => {
582 582
       // var resp = rs.data
583 583
       // if (resp.state == 1) {
584
-      
585
-      this.loading = false
586
-      var storedata = this.$store.getters.waitscheduals
587
-      var scheduals = storedata.waitscheduals
588
-  
584
+
585
+      this.loading = false;
586
+      var storedata = this.$store.getters.waitscheduals;
587
+      var scheduals = storedata.waitscheduals;
589 588
 
590 589
       // var scheduals = resp.data.scheduals
591 590
       // this.$store.dispatch('SetWaitScheduals', {
592 591
       //   waitscheduals: scheduals
593 592
       // })
594
-      var totalCount = scheduals.length
595
-      var prescription_count = 0
596
-      var assessment_before_dislysis_count = 0
593
+      var totalCount = scheduals.length;
594
+      var prescription_count = 0;
595
+      var assessment_before_dislysis_count = 0;
597 596
       for (let index = 0; index < scheduals.length; index++) {
598
-        const schedual = scheduals[index]
597
+        const schedual = scheduals[index];
599 598
         if (schedual.assessment_before_dislysis == null) {
600
-          assessment_before_dislysis_count += 1
599
+          assessment_before_dislysis_count += 1;
601 600
         }
602 601
         if (schedual.prescription == null) {
603
-          prescription_count += 1
602
+          prescription_count += 1;
604 603
         }
605 604
       }
606
-      this.menuList[2].count = assessment_before_dislysis_count
607
-      this.menuList[1].count = prescription_count
608
-      this.scheduals = scheduals
605
+      this.menuList[2].count = assessment_before_dislysis_count;
606
+      this.menuList[1].count = prescription_count;
607
+      this.scheduals = scheduals;
609 608
 
610
-      this.zone_options = this.makeZones(scheduals)
611
-      this.zone_scheduals = this.processScheduals(scheduals)
609
+      this.zone_options = this.makeZones(scheduals);
610
+      this.zone_scheduals = this.processScheduals(scheduals);
612 611
       // } else {
613 612
       //   this.loading = false
614 613
 
@@ -633,29 +632,29 @@ export default {
633 632
       //     }
634 633
       //   })
635 634
     },
636
-    makeZones: function (scheduals) {
637
-      var zoneMap = {}
635
+    makeZones: function(scheduals) {
636
+      var zoneMap = {};
638 637
       for (let index = 0; index < scheduals.length; index++) {
639
-        const schedual = scheduals[index]
638
+        const schedual = scheduals[index];
640 639
         if (zoneMap[schedual.device_number.zone.id] == null) {
641
-          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone
640
+          zoneMap[schedual.device_number.zone.id] = schedual.device_number.zone;
642 641
         }
643 642
       }
644 643
 
645
-      var zones = []
646
-      zones.push({ value: 0, text: '全部分区' })
644
+      var zones = [];
645
+      zones.push({ value: 0, text: "全部分区" });
647 646
 
648 647
       for (var zoneId in zoneMap) {
649
-        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name })
648
+        zones.push({ value: zoneMap[zoneId].id, text: zoneMap[zoneId].name });
650 649
       }
651 650
 
652 651
       // zones = zones.sort(function (a, b) {
653 652
       //   return a.value > b.value
654 653
       // })
655
-      return zones
654
+      return zones;
656 655
     }
657 656
   }
658
-}
657
+};
659 658
 </script>
660 659
 
661 660
 <style style="stylesheet/scss" lang="scss" scoped>

+ 0 - 1
src/pages/main/add_urgent_schedule.vue Näytä tiedosto

@@ -490,7 +490,6 @@ export default {
490 490
 };
491 491
 </script>
492 492
 
493
-
494 493
 <style style="stylesheet/scss" lang="scss" scoped>
495 494
 .mainContent {
496 495
   position: relative;

File diff suppressed because it is too large
+ 863 - 865
src/pages/main/template/DialysisPrintOrderEleven.vue


File diff suppressed because it is too large
+ 967 - 875
src/pages/main/today/TodayTab.vue


+ 5 - 4
src/pages/waitingRoom/components/dialog/dialysisDialog.vue Näytä tiedosto

@@ -330,7 +330,7 @@ export default {
330 330
         return false;
331 331
       }
332 332
       if (
333
-        typeof this.modeOptions[thismode] == "undefined" ||
333
+        typeof this.modeOptions[thismode] === "undefined" ||
334 334
         this.modeOptions[thismode] == null
335 335
       ) {
336 336
         return false;
@@ -363,7 +363,7 @@ export default {
363 363
         return false;
364 364
       }
365 365
       if (
366
-        typeof this.anticoagulantsConfit[thismode] == "undefined" ||
366
+        typeof this.anticoagulantsConfit[thismode] === "undefined" ||
367 367
         this.anticoagulantsConfit[thismode] == null
368 368
       ) {
369 369
         return false;
@@ -379,7 +379,7 @@ export default {
379 379
 
380 380
     this.patient = this.patient_prop;
381 381
     // this.dialysisPrescription = this.solution_prop;
382
-    if (this.solution_prop != null && typeof this.solution_prop.id != "") {
382
+    if (this.solution_prop != null && typeof this.solution_prop.id !== "") {
383 383
       for (const key in this.solution_prop) {
384 384
         this.dialysisPrescription[key] = this.solution_prop[key];
385 385
       }
@@ -407,4 +407,5 @@ export default {
407 407
 };
408 408
 </script>
409 409
 
410
-<style style="stylesheet/scss" lang="scss" scoped></style>
410
+<style style="stylesheet/scss" lang="scss" scoped>
411
+</style>