see999 пре 4 година
родитељ
комит
481d0af470

+ 41 - 5
src/xt_pages/sign/components/beforeDialysisCalling.vue Прегледај датотеку

@@ -22,6 +22,7 @@
22 22
                 <el-button type="primary" @click="call(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')" style="margin-left:0;margin: 30px 0 20px 0;">&ensp;叫号&ensp;</el-button>
23 23
                 <!-- <el-button style="margin: 0px 0 20px 0;" @click="pass(fisrtQueueInfo.patient_id)">&ensp;过号&ensp;</el-button> -->
24 24
                 <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '',fisrtQueueInfo && fisrtQueueInfo.schedule_type ? fisrtQueueInfo.schedule_type : '')">下一位</el-button>
25
+                <el-button style="margin:0 auto;" @click="nextFive(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '',fisrtQueueInfo && fisrtQueueInfo.schedule_type ? fisrtQueueInfo.schedule_type : '')">下五位</el-button>
25 26
             </div>
26 27
         </div>
27 28
     </div>
@@ -130,13 +131,17 @@ export default {
130 131
                             if(res.data.fisrtQueueInfo != null){
131 132
                                 if(this.patientStateVal == 0){
132 133
                                     fisrtQueueInfo = res.data.fisrtQueueInfo.morning
133
-                                    if(fisrtQueueInfo.create_time){
134
-                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
134
+                                    if(fisrtQueueInfo != null){
135
+                                        if(fisrtQueueInfo.create_time){
136
+                                            fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
137
+                                        }
135 138
                                     }
136 139
                                 }else if(this.patientStateVal == 1){
137 140
                                     fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
138
-                                    if(fisrtQueueInfo.create_time){
139
-                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
141
+                                    if(fisrtQueueInfo != null){
142
+                                        if(fisrtQueueInfo.create_time){
143
+                                            fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
144
+                                        }
140 145
                                     }
141 146
                                 }
142 147
                             }
@@ -286,6 +291,37 @@ export default {
286 291
                 }
287 292
             })
288 293
         },
294
+        nextFive(patient_id){
295
+            if(patient_id == undefined || patient_id == ""){
296
+                this.$message.error('已经是最后一位了');
297
+                return
298
+            }
299
+            let schedule_type = null
300
+            if(this.patientStateVal == 0){
301
+                schedule_type = 1
302
+            }else if(this.patientStateVal == 1){
303
+                schedule_type = 2
304
+            }
305
+            console.log('patient_id',patient_id)
306
+            let org_id =  parseInt(sessionStorage.getItem("org_id"));
307
+            let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
308
+            axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type + '&num=5').then(res => {
309
+                console.log(res)
310
+                // let patientArr = res.data.queue_list.data
311
+                // this.patientArr = patientArr
312
+                // this.$emit('child-event',this.patientArr)
313
+                if(res.data.data.patientInfo == null){
314
+                    this.$message.error('已经是最后一位了');
315
+                    return
316
+                }
317
+                if(res.data.code == 200){
318
+                    this.$message({
319
+                        message: res.data.msg,
320
+                        type: 'success'
321
+                    });
322
+                }
323
+            })
324
+        },
289 325
         pass(patient_id){
290 326
             console.log('patient_id',patient_id)
291 327
             let org_id =  parseInt(sessionStorage.getItem("org_id"));
@@ -324,7 +360,7 @@ export default {
324 360
     height: 313px;
325 361
     border: 1px solid #e5e5ee;
326 362
     // flex: 1;
327
-    width: 12%;
363
+    width: 14%;
328 364
     text-align: center;
329 365
     .nowCallingTitle{
330 366
         font-size: 20px;

+ 40 - 4
src/xt_pages/sign/components/computerCalling.vue Прегледај датотеку

@@ -21,6 +21,7 @@
21 21
                 <p class="nowCallingTime">签到时间:{{ fisrtQueueInfo ? fisrtQueueInfo.create_time : '' }}</p>
22 22
                 <p><el-button type="primary" @click="call(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')" style="margin-left:0;margin: 30px 0 20px 0;">&ensp;叫号&ensp;</el-button></p>
23 23
                 <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')">下一位</el-button>
24
+                <el-button style="margin:0 auto;" @click="nextFive(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')">下五位</el-button>
24 25
             </div>
25 26
         </div>
26 27
     </div>
@@ -105,13 +106,17 @@ export default {
105 106
                         if(res.data.fisrtQueueInfo != null){
106 107
                             if(this.patientStateVal == 0){
107 108
                                 fisrtQueueInfo = res.data.fisrtQueueInfo.morning
108
-                                if(fisrtQueueInfo.create_time){
109
-                                    fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
109
+                                if(fisrtQueueInfo != null){
110
+                                    if(fisrtQueueInfo.create_time){
111
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
112
+                                    }
110 113
                                 }
111 114
                             }else if(this.patientStateVal == 1){
112 115
                                 fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
113
-                                if(fisrtQueueInfo.create_time){
114
-                                    fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
116
+                                if(fisrtQueueInfo != null){
117
+                                    if(fisrtQueueInfo.create_time){
118
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
119
+                                    }
115 120
                                 }
116 121
                             }
117 122
                         }
@@ -260,6 +265,37 @@ export default {
260 265
                 }
261 266
             })
262 267
         },
268
+        nextFive(patient_id){
269
+            if(patient_id == undefined || patient_id == ""){
270
+                this.$message.error('已经是最后一位了');
271
+                return
272
+            }
273
+            console.log('patient_id',patient_id)
274
+            let schedule_type = null
275
+            if(this.patientStateVal == 0){
276
+                schedule_type = 1
277
+            }else if(this.patientStateVal == 1){
278
+                schedule_type = 2
279
+            }
280
+            let org_id =  parseInt(sessionStorage.getItem("org_id"));
281
+            let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
282
+            axios.get('/api/index/nextupcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type + '&num=5').then(res => {
283
+                console.log(res)
284
+                // let patientArr = res.data.queue_list.data
285
+                // this.patientArr = patientArr
286
+                // this.$emit('child-event',this.patientArr)
287
+                if(res.data.data.patientInfo == null){
288
+                    this.$message.error('已经是最后一位了');
289
+                    return
290
+                }
291
+                if(res.data.code == 200){
292
+                    this.$message({
293
+                        message: res.data.msg,
294
+                        type: 'success'
295
+                    });
296
+                }
297
+            })
298
+        },
263 299
     }
264 300
 }
265 301
 </script>

+ 3 - 3
src/xt_pages/sign/lineUp.vue Прегледај датотеку

@@ -394,8 +394,8 @@ export default {
394 394
                         // })
395 395
                     }else if(res.channel == 'patientCallInfo'){
396 396
                         console.log(999999999999,res.data)
397
-                        
398
-                        
397
+                        let second = res.data.second
398
+                    
399 399
                         console.log('执行几次',this.voiceNum)
400 400
                         if(this.voice == true){
401 401
                             this.patient_id = res.data.patientInfo.patient_id
@@ -423,7 +423,7 @@ export default {
423 423
                                     clearInterval(this.voiceTime);
424 424
                                     this.voiceTime = null
425 425
                                 }
426
-                            },6000)
426
+                            },1000 * second)
427 427
                         }else {
428 428
                             // this.$message({
429 429
                             //     message: '警告哦,这是一条警告消息',