Browse Source

12月12 自动生成

yq1 4 weeks ago
parent
commit
88d6be69fb
2 changed files with 78 additions and 41 deletions
  1. 5 5
      src/xt_pages/outpatientCharges/invoicePrint.vue
  2. 73 36
      src/xt_pages/sign/lineUp.vue

+ 5 - 5
src/xt_pages/outpatientCharges/invoicePrint.vue View File

17
     </template>
17
     </template>
18
     <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 10633"><!--&& org_id != 10188 && org_id != 0-->
18
     <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 10633"><!--&& org_id != 10188 && org_id != 0-->
19
         <div class='dialysisPage'>
19
         <div class='dialysisPage'>
20
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
20
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0" >
21
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
21
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
22
             <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams" :show="showclick"></printThree>
22
             <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams" :show="showclick"></printThree>
23
-            <printfifteen v-if="org_id == 10510 || org_id == 0 " :paramsObj="invoiceParams"></printfifteen>
23
+            <printfifteen v-if="org_id == 10510 " :paramsObj="invoiceParams"></printfifteen>
24
           </div>
24
           </div>
25
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
25
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
26
           <printFour v-if="org_id == 10215 " :paramsObj="invoiceParams"></printFour>
26
           <printFour v-if="org_id == 10215 " :paramsObj="invoiceParams"></printFour>
30
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
30
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
31
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
31
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
32
           <!-- <PrintTen v-if="org_id == 10375 ||org_id == 0 " :paramsObj="invoiceParams"></PrintTen> -->
32
           <!-- <PrintTen v-if="org_id == 10375 ||org_id == 0 " :paramsObj="invoiceParams"></PrintTen> -->
33
-          <printtwelve :paramsObj="invoiceParams"  v-if="org_id == 10480 "></printtwelve>
33
+          <printtwelve :paramsObj="invoiceParams"  v-if="org_id == 10480 || org_id == 0 "></printtwelve>
34
         </div>
34
         </div>
35
     </div>
35
     </div>
36
 
36
 
40
       </div>
40
       </div>
41
     </div>
41
     </div>
42
 
42
 
43
-    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 10633">
43
+    <div class="app-container" style="" v-if=" org_id == 10633">
44
       <div class='dialysisPage'>
44
       <div class='dialysisPage'>
45
         <printSix :paramsObj="invoiceParams"></printSix>
45
         <printSix :paramsObj="invoiceParams"></printSix>
46
       </div>
46
       </div>
57
       </div>
57
       </div>
58
     </div>
58
     </div>
59
 
59
 
60
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188  ">
60
+    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id == 10217">
61
       <div class='dialysisPage'>
61
       <div class='dialysisPage'>
62
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
62
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
63
       </div>
63
       </div>

+ 73 - 36
src/xt_pages/sign/lineUp.vue View File

74
                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
74
                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
75
                             </div>
75
                             </div>
76
                         </div>
76
                         </div>
77
-                    </div> 
77
+                    </div>
78
                     <div class="callingBox">
78
                     <div class="callingBox">
79
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
79
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
80
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
80
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
123
                             </div>
123
                             </div>
124
                         </div>
124
                         </div>
125
                     </div>
125
                     </div>
126
-                </div> 
127
-                
126
+                </div>
127
+
128
              </div>
128
              </div>
129
-        
129
+
130
             <!-- <div class="page_lineUp">
130
             <!-- <div class="page_lineUp">
131
                 <div class="lineUpTitle">
131
                 <div class="lineUpTitle">
132
                     <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示:请注意排队叫号,依次叫号就诊上机,谢谢配合</span></div>
132
                     <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示:请注意排队叫号,依次叫号就诊上机,谢谢配合</span></div>
159
                                 <p style="width:16%">07:38:00</p>
159
                                 <p style="width:16%">07:38:00</p>
160
                             </div>
160
                             </div>
161
                         </div>
161
                         </div>
162
-                    </div> 
162
+                    </div>
163
                     <div class="callingBox">
163
                     <div class="callingBox">
164
                         <div class="callingBoxLeft">
164
                         <div class="callingBoxLeft">
165
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
165
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
209
                         </div>
209
                         </div>
210
                     </div>
210
                     </div>
211
                 </div>
211
                 </div>
212
-                
212
+
213
             </div> -->
213
             </div> -->
214
         </div>
214
         </div>
215
         <div class="app-container">
215
         <div class="app-container">
251
                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
251
                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
252
                             </div>
252
                             </div>
253
                         </div>
253
                         </div>
254
-                    </div> 
254
+                    </div>
255
                     <div class="callingBox">
255
                     <div class="callingBox">
256
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
256
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
257
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
257
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
301
                         </div>
301
                         </div>
302
                     </div>
302
                     </div>
303
                 </div>
303
                 </div>
304
-                
304
+
305
             </div>
305
             </div>
306
-        
306
+
307
             <!-- <div class="page_lineUp">
307
             <!-- <div class="page_lineUp">
308
                 <div class="lineUpTitle">
308
                 <div class="lineUpTitle">
309
                     <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示:请注意排队叫号,依次叫号就诊上机,谢谢配合</span></div>
309
                     <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示:请注意排队叫号,依次叫号就诊上机,谢谢配合</span></div>
336
                                 <p style="width:16%">07:38:00</p>
336
                                 <p style="width:16%">07:38:00</p>
337
                             </div>
337
                             </div>
338
                         </div>
338
                         </div>
339
-                    </div> 
339
+                    </div>
340
                     <div class="callingBox">
340
                     <div class="callingBox">
341
                         <div class="callingBoxLeft">
341
                         <div class="callingBoxLeft">
342
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
342
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
386
                         </div>
386
                         </div>
387
                     </div>
387
                     </div>
388
                 </div>
388
                 </div>
389
-                
389
+
390
             </div> -->
390
             </div> -->
391
         </div>
391
         </div>
392
     </div>
392
     </div>
410
             dialogTableVisible:false,
410
             dialogTableVisible:false,
411
             showSetting: false,
411
             showSetting: false,
412
             lineUpList:[],
412
             lineUpList:[],
413
-            count:0,
413
+            // count:0,
414
             page:1,
414
             page:1,
415
             timer:null,
415
             timer:null,
416
             queueConfig:{
416
             queueConfig:{
428
 
428
 
429
             voice:true,
429
             voice:true,
430
             a:1,
430
             a:1,
431
-            newTimes:null
432
-            
431
+            newTimes:null,
432
+
433
         }
433
         }
434
     },
434
     },
435
     computed: {
435
     computed: {
445
             sessionStorage.removeItem('lineUpKey')
445
             sessionStorage.removeItem('lineUpKey')
446
             sessionStorage.removeItem('signInKey')
446
             sessionStorage.removeItem('signInKey')
447
         }
447
         }
448
-        this.initData = {
449
-            cmd: "queue/join",
450
-            data: {type:2,page:1,size:6},
451
-        };
448
+        if(this.queueConfig.jzjhyc ==1&&this.queueConfig.sjjhyc ==1){
449
+          this.initData = {
450
+              cmd: "queue/join",
451
+              data: {type:2,page:1,size:6},
452
+          };
453
+        }else{
454
+          this.initData = {
455
+              cmd: "queue/join",
456
+              data: {type:2,page:1,size:10},
457
+          };
458
+        }
459
+        console.log('11111111222',this.initData);
460
+
452
         this.websocketSend(this.initData)
461
         this.websocketSend(this.initData)
453
         let newobj = {
462
         let newobj = {
454
             cmd: "queue/callreturn",
463
             cmd: "queue/callreturn",
483
         // this.websocketMess();
492
         // this.websocketMess();
484
     },
493
     },
485
     mounted(){
494
     mounted(){
486
-        
495
+      console.log('queueConfig.jzjhyc1111',this.queueConfig.jzjhyc,this.queueConfig.sjjhyc);
496
+
487
         this.timer = setInterval(() => {
497
         this.timer = setInterval(() => {
498
+
499
+          if(this.queueConfig.jzjhyc ==1&&this.queueConfig.sjjhyc ==1){
488
             if(this.page < Math.ceil(this.count / 6)){
500
             if(this.page < Math.ceil(this.count / 6)){
489
-                console.log('执行',Math.ceil(this.count / 6),this.page)
490
-                this.page++
491
-                let obj = {
501
+              console.log('执行',Math.ceil(this.count / 6),this.page)
502
+              this.page++
503
+              let obj = {
504
+                  cmd: "queue/queuelist",
505
+                  data: {page:this.page,size:6,sort:0}
506
+              };
507
+              this.websocketSend(obj)
508
+              setTimeout(() => {
509
+                  this.websocketMess();
510
+              }, 1000);
511
+            }else{
512
+                console.log('执行22223333')
513
+                this.page = 1
514
+                let a = {
492
                     cmd: "queue/queuelist",
515
                     cmd: "queue/queuelist",
493
                     data: {page:this.page,size:6,sort:0}
516
                     data: {page:this.page,size:6,sort:0}
494
                 };
517
                 };
495
-                this.websocketSend(obj)
518
+                this.websocketSend(a)
496
                 setTimeout(() => {
519
                 setTimeout(() => {
497
                     this.websocketMess();
520
                     this.websocketMess();
498
                 }, 1000);
521
                 }, 1000);
522
+
523
+            }
524
+          }else{
525
+            if(this.page < Math.ceil(this.count / 10)){
526
+              console.log('执行',Math.ceil(this.count / 10),this.page)
527
+              this.page++
528
+              let obj = {
529
+                  cmd: "queue/queuelist",
530
+                  data: {page:this.page,size:10,sort:0}
531
+              };
532
+              this.websocketSend(obj)
533
+              setTimeout(() => {
534
+                  this.websocketMess();
535
+              }, 1000);
499
             }else{
536
             }else{
500
-                console.log('执行22223333')
537
+                console.log('执行22223333444444')
501
                 this.page = 1
538
                 this.page = 1
502
                 let a = {
539
                 let a = {
503
                     cmd: "queue/queuelist",
540
                     cmd: "queue/queuelist",
504
-                    data: {page:this.page,size:6,sort:0}
541
+                    data: {page:this.page,size:10,sort:0}
505
                 };
542
                 };
506
                 this.websocketSend(a)
543
                 this.websocketSend(a)
507
                 setTimeout(() => {
544
                 setTimeout(() => {
508
                     this.websocketMess();
545
                     this.websocketMess();
509
                 }, 1000);
546
                 }, 1000);
510
-                
511
             }
547
             }
512
-            console.log('切换时间',this.queueConfig)
548
+          }
549
+          console.log('切换时间11',this.queueConfig)
513
         }, 1000 * parseInt(this.queueConfig.qhsj));
550
         }, 1000 * parseInt(this.queueConfig.qhsj));
514
         this.timerID = setInterval(() => {
551
         this.timerID = setInterval(() => {
515
             this.updateTime()
552
             this.updateTime()
543
         websocketSend(data) {
580
         websocketSend(data) {
544
             try {
581
             try {
545
                 this.websocket.send(JSON.stringify(data))
582
                 this.websocket.send(JSON.stringify(data))
546
-                
583
+
547
             } catch (error) {
584
             } catch (error) {
548
                 this.showError = true;
585
                 this.showError = true;
549
                 this.showIndex = 4;
586
                 this.showIndex = 4;
551
             }
588
             }
552
         },
589
         },
553
         websocketMess() {
590
         websocketMess() {
554
-            console.log('测试')
591
+            console.log('测试',this.websocket)
555
             this.websocket.onmessage = e => {
592
             this.websocket.onmessage = e => {
556
                 let res = JSON.parse(e.data);
593
                 let res = JSON.parse(e.data);
557
                 // let res = re.data;
594
                 // let res = re.data;
558
                 console.log('res',res)
595
                 console.log('res',res)
559
-                
596
+
560
                     if(res.channel == 'queue/join'){
597
                     if(res.channel == 'queue/join'){
561
                         if(res.data.type == 2){
598
                         if(res.data.type == 2){
562
                             this.queueConfig = res.data.queueConfig
599
                             this.queueConfig = res.data.queueConfig
587
                         console.log(999999999999,res.data)
624
                         console.log(999999999999,res.data)
588
                         let second = res.data.second
625
                         let second = res.data.second
589
                         let newType = res.data.type
626
                         let newType = res.data.type
590
-                    
627
+
591
                         console.log('执行几次',this.voiceNum)
628
                         console.log('执行几次',this.voiceNum)
592
                         if(this.voice == true){
629
                         if(this.voice == true){
593
                             this.patient_id = res.data.patientInfo.patient_id
630
                             this.patient_id = res.data.patientInfo.patient_id
606
                                     this.voicePrompt(res.data.callVolUrl)
643
                                     this.voicePrompt(res.data.callVolUrl)
607
                                 }else{
644
                                 }else{
608
                                     this.voiceNum = 1;
645
                                     this.voiceNum = 1;
609
-                                    this.voice = true 
646
+                                    this.voice = true
610
                                     let obj = {
647
                                     let obj = {
611
                                         cmd: "queue/callreturn",
648
                                         cmd: "queue/callreturn",
612
                                         data: {patient_id:this.patient_id,type:newType},
649
                                         data: {patient_id:this.patient_id,type:newType},
624
                         }
661
                         }
625
                     }else if(res.channel == 'updateCallList'){
662
                     }else if(res.channel == 'updateCallList'){
626
                         this.receivingPatient = res.data.queue_list
663
                         this.receivingPatient = res.data.queue_list
627
-                        
664
+
628
                     }else if(res.channel == 'updateWaitCallList'){
665
                     }else if(res.channel == 'updateWaitCallList'){
629
                         this.waitDoctorList = res.data.queue_list
666
                         this.waitDoctorList = res.data.queue_list
630
                     }else if(res.channel == 'updateUpCallList'){
667
                     }else if(res.channel == 'updateUpCallList'){
631
                         this.upPatientList = res.data.queue_list
668
                         this.upPatientList = res.data.queue_list
632
                     }
669
                     }
633
-                
670
+
634
                 // else if(res.channel == "patientQueueInfo"){
671
                 // else if(res.channel == "patientQueueInfo"){
635
                 //     this.queueInfo = res.data.queueInfo
672
                 //     this.queueInfo = res.data.queueInfo
636
                 //     let obj = {
673
                 //     let obj = {
638
                 //         data: {page:1,size:10}
675
                 //         data: {page:1,size:10}
639
                 //     };
676
                 //     };
640
                 //     this.websocketSend(obj)
677
                 //     this.websocketSend(obj)
641
-                    
678
+
642
                 // }
679
                 // }
643
             }
680
             }
644
         },
681
         },
719
         border-radius: 15px;
756
         border-radius: 15px;
720
         display: flex;
757
         display: flex;
721
         flex-direction: column;
758
         flex-direction: column;
722
-        
759
+
723
     }
760
     }
724
     .lineUpMainLeftTitle{
761
     .lineUpMainLeftTitle{
725
         display: flex;
762
         display: flex;