Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/advice.js

@@ -498,6 +498,7 @@ export function GetLastOrNextDoctorAdvice(params) {
 }
 
 export function getSchedualDoctors (params) {
+  console.log("params-----",params)
   return request({
     url: '/api/schedule/advices',
     method: 'get',

src/views/layout/components/Navbar.vue

@@ -305,6 +305,12 @@ export default {
               this.showWsErr = true;
               this.wsErrMsg = "网络已断开，请检查网络后重新打开页面";
               console.log('navigator',navigator)
+              let http = 'wss://socket.sgjyun.com?token=' 
+              // let http = 'ws://socket.szjkhd.com?token=' //测试
+              let token = localStorage.getItem("token")
+              this.$store.state.user.websocket = new ReconnectingWebSocket(
+                http + token
+              );
             } else if (
               navigator.onLine == true &&
               this.websocket.readyState == 1
@@ -312,7 +318,7 @@ export default {
               this.showWsErr = false;
             }
             this.websocket.send("1");
-          }, 55000);
+          }, 30000);
         }
         
       }).catch(error => {

src/xt_pages/dialysis/details/index.vue

@@ -1696,13 +1696,36 @@ export default {
         // let res = re.data;
         // console.log('res3333333333',res)
         if(res.channel == 'queue/join'){
-          if(res.data.fisrtQueueInfo != null){
-            if(res.data.fisrtQueueInfo.create_time){
-              res.data.fisrtQueueInfo.create_time = moment(parseInt(res.data.fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+          let timeType = null
+          if(this.scheduleStateVal == 1){
+            timeType = 1
+          }else if(this.scheduleStateVal == 2){
+            timeType = 2
+          }else{
+            if(new Date().getHours() < 10){
+              timeType = 1
+            }else if(new Date().getHours() >= 10){
+              timeType = 2
             }
           }
+          let fisrtQueueInfo = []
+          this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+          if(res.data.fisrtQueueInfo != null){
+              if(timeType == 1){
+                  fisrtQueueInfo = res.data.fisrtQueueInfo.morning
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }else if(timeType == 2){
+                  fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }
+          }
+          this.fisrtQueueInfo = fisrtQueueInfo
           this.queueConfig = res.data.queueConfig
-          this.fisrtQueueInfo = res.data.fisrtQueueInfo
+          // this.fisrtQueueInfo = res.data.fisrtQueueInfo
           let arr = res.data.patientQueueList.data
           let waitingCalledArr = []
           let calledArr = []
@@ -1737,6 +1760,34 @@ export default {
         }else if(res.channel == 'patientCallInfo'){
           res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
           this.fisrtQueueInfo = res.data.patientInfo
+        }else if(res.channel == 'fisrtQueueInfo'){
+          if(this.scheduleStateVal == 1){
+            timeType = 1
+          }else if(this.scheduleStateVal == 2){
+            timeType = 2
+          }else{
+            if(new Date().getHours() < 10){
+              timeType = 1
+            }else if(new Date().getHours() >= 10){
+              timeType = 2
+            }
+          }
+          let fisrtQueueInfo = []
+          this.newFisrtQueueInfo = res.data.patientInfo
+          if(res.data.patientInfo != null){
+              if(timeType == 1){
+                  fisrtQueueInfo = res.data.patientInfo.morning
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }else if(timeType == 2){
+                  fisrtQueueInfo = res.data.patientInfo.afternoon
+                  if(fisrtQueueInfo.create_time){
+                      fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                  }
+              }
+          }
+          this.fisrtQueueInfo = fisrtQueueInfo
         }
       }
     },

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -64,7 +64,23 @@
           </ul>
         </div>
       </div>
-
+     
+     <div class="cell clearfix">
+        <label class="title"> <span class="name">给药途径</span> : </label>
+        <div class="time">
+          <ul class>
+            <li
+              :class="item.id == delivery_way ? 'active' : ''"
+              @click="selectDeliveryWay(item.id)"
+              v-for="item in deliveryWay"
+              :key="item.id"
+            >
+              {{ item.name }}
+            </li>
+          </ul>
+        </div>
+      </div>
+    
       <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
         @selection-change="handleSelectionChange"
         :row-class-name="tableRowClassName"
@@ -353,7 +369,7 @@ export default {
         schedul_type: 0,
         partition_type: 0,
         schedul_time: "",
-        keywords: ""
+        keywords: "",
       },
       selecting_schs: [],
       partitionArr: [],
@@ -361,6 +377,8 @@ export default {
       scheduleMap:[],
       show:true,
       showOne:false,
+      deliveryWay:[],
+      delivery_way:0,
     };
   },
   created() {
@@ -410,14 +428,20 @@ export default {
       // alert(scheduleType);/
       this.schedulType = scheduleType;
       this.listQuery.schedul_type = scheduleType;
-      this.requestSchedualDoctors();
+      this.requestSchedualDoctors(this.time);
     },
     selectPartitionType(partitionType) {
       this.partitionType = partitionType;
       this.listQuery.partition_type = partitionType;
-      this.requestSchedualDoctors();
+      this.requestSchedualDoctors(this.time);
+    },
+    
+    selectDeliveryWay(val){
+       this.delivery_way = val
+       this.requestSchedualDoctors(this.time)
     },
 
+
     changeTime() {
       this.listQuery.schedul_time = this.time;
       this.requestSchedualDoctors(this.time)
@@ -430,16 +454,31 @@ export default {
         } else {
           this.partitionArr = response.data.data.zone;
           this.partitionArr.unshift({ id: 0, name: "全部" });
+          var dics  =  response.data.data.dics
+          var obj = {id:0,name:"全部"}
+          this.deliveryWay.push(obj)
+          this.deliveryWay.push(...dics)
         }
       });
     },
     requestSchedualDoctors (time) {
+        
+        var name = ""
+        for(let i=0;i<this.deliveryWay.length;i++){
+            if(this.delivery_way == this.deliveryWay[i].id){
+              name = this.deliveryWay[i].name
+            }
+        }
+        if(name == '全部'){
+          name = ""
+        }
+
         let newTime =  moment(time).format('YYYY-MM-DD')
         getSchedualDoctors({
         date: newTime,
         patient_type: 0,
-        advice_type: 2
-        }).then(rs => {
+        advice_type: 2,
+        delivery_way:name}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
@@ -609,7 +648,16 @@ export default {
       }
     //   console.log("sch_ids",sch_ids)
       this.$store.dispatch("SetAdviceIDs", sch_ids);
-      this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime()} });
+       var name = ""
+        for(let i=0;i<this.deliveryWay.length;i++){
+            if(this.delivery_way == this.deliveryWay[i].id){
+              name = this.deliveryWay[i].name
+            }
+        }
+        if(name == '全部'){
+          name = ""
+       }
+      this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
 
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -258,6 +258,7 @@ export default {
             time:'',
             show:true,
             showOne:false,
+            delivery_way:""
         }
     },
     methods:{
@@ -277,7 +278,8 @@ export default {
             getSchedualDoctors({
             date: newTime,
             patient_type: 0,
-            advice_type: 2
+            advice_type: 2,
+            delivery_way:this.delivery_way,
             }).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
@@ -741,6 +743,9 @@ export default {
     },
     created(){
       var time = this.$route.query.time
+      var delivery_way = this.$route.query.delivery_way
+      console.log("delivery_Way",delivery_way)
+      this.delivery_way = delivery_way
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)

src/xt_pages/dialysis/schedualPatient.vue

@@ -279,6 +279,15 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
       }
     },
     created() {
+      if(sessionStorage.getItem('signIn') != null){
+        setTimeout(() => {    
+          if(sessionStorage.getItem('signIn') == 1){
+            this.$router.replace({ path: '/signIn' })
+          }else if(sessionStorage.getItem('signIn') == 2){
+            this.$router.replace({ path: '/lineUp' })
+          }
+        },1000)
+      }
       var schedule_type_selected = this.$store.getters.schedule_type_selected
       var zone_selected = this.$store.getters.zone_selected
       var patient_state_selected = this.$store.getters.patient_state_selected
@@ -379,10 +388,16 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           console.log('res3333333333',res)
           if(res.channel == 'queue/join'){
             let timeType = null
-            if(new Date().getHours() < 11){
+            if(this.schedule_type_selected == 1){
               timeType = 1
-            }else if(new Date().getHours() >= 11){
+            }else if(this.schedule_type_selected == 2){
               timeType = 2
+            }else{
+              if(new Date().getHours() < 10){
+                timeType = 1
+              }else if(new Date().getHours() >= 10){
+                timeType = 2
+              }
             }
             let fisrtQueueInfo = []
             this.newFisrtQueueInfo = res.data.fisrtQueueInfo
@@ -436,6 +451,34 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           }else if(res.channel == 'patientCallInfo'){
             res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
             this.fisrtQueueInfo = res.data.patientInfo
+          }else if(res.channel == 'fisrtQueueInfo'){
+            if(this.schedule_type_selected == 1){
+              timeType = 1
+            }else if(this.schedule_type_selected == 2){
+              timeType = 2
+            }else{
+              if(new Date().getHours() < 10){
+                timeType = 1
+              }else if(new Date().getHours() >= 10){
+                timeType = 2
+              }
+            }
+            let fisrtQueueInfo = []
+            this.newFisrtQueueInfo = res.data.patientInfo
+            if(res.data.patientInfo != null){
+                if(timeType == 1){
+                    fisrtQueueInfo = res.data.patientInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(timeType == 2){
+                    fisrtQueueInfo = res.data.patientInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
+            }
+            this.fisrtQueueInfo = fisrtQueueInfo
           }
         }
       },

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1458,6 +1458,7 @@ export default {
         }
 
         this.advices = response.data.data.advices
+        console.log("医嘱数据2222222222",this.advices)
         this.monitors = response.data.data.monitors
         this.summary = response.data.data.summary
         this.org_template_info = response.data.data.org_template_info

src/xt_pages/index/verify_token.vue

@@ -11,18 +11,19 @@ export default {
     this.$store.dispatch('VerifyToken', this.$route.query.token).then(() => {
       this.$store.dispatch('xt_GenerateRoutes', this.$store.getters.current_role_urls).then(() => {
         this.$store.dispatch('VerifyConfigList').then(() => {
-          // alert('token 验证成功')
-          // console.log(this.$store.getters.xt_permission.addRouters)
-          this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
-  //          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-          if(this.$store.getters.current_role_urls.includes('/dialysis/dialysisrecord')){
-            this.$router.replace({ path: '/dialysis/dialysisrecord' })
+          
+            // alert('token 验证成功')
+            // console.log(this.$store.getters.xt_permission.addRouters)
+            this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
+    //          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+            if(this.$store.getters.current_role_urls.includes('/dialysis/dialysisrecord')){
+              this.$router.replace({ path: '/dialysis/dialysisrecord' })
 
-          }else{
-            this.$router.replace({ path: '/home' })
+            }else{
+              this.$router.replace({ path: '/home' })
 
 
-          }
+            }
 
         })
       })

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -80,6 +80,7 @@
               :label="item.name"
               :name="item.name"
             >
+            <div class="RP">Rp
               <el-date-picker
                 v-model="item.pre_time"
                 type="datetime"
@@ -88,11 +89,6 @@
                 value-format="yyyy-MM-dd hh:mm"
                 placeholder="选择日期">
               </el-date-picker>
-
-            </el-tab-pane>
-            <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
-            </el-tab-pane>
-            <div class="RP">Rp
               <div style="float: right;margin-bottom:5px;margin-right:1%;">
                 <el-button
                   round
@@ -109,9 +105,12 @@
                 </el-button>
               </div>
             </div>
+              
 
-
-
+            </el-tab-pane>
+            <el-tab-pane name="more" closable><span slot="label"><i class="el-icon-plus" @click="addTab"></i></span>
+            </el-tab-pane>
+            
             <prescription-table ref="prescription_tables" :prescription="curPrescriptions" :preDrugs="preDrugs"
                                 :activeType="customTabIndex"></prescription-table>
           </el-tabs>

src/xt_pages/qcd/treatmentControlAnalysis/components/TimeAll.vue

@@ -233,8 +233,7 @@ export default {
 
     },
     changeEndTime(val) {
-      var time =
-        this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
+      var time = this.getTimestamp(val) - this.getTimestamp(this.listQuery.start_time);
       if (time < 0) {
         this.$message.error("结束时间不能小于开始时间");
         this.listQuery.end_time = "";
@@ -291,7 +290,9 @@ export default {
      })
    },
     geStatistics(){
+       console.log("this9999999",this.listQuery)
       geStatistics(this.listQuery).then(response=>{
+
         if(response.data.state === 1){
           var statistics =  response.data.data.statistics
           var treatinfo = response.data.data.treatinfo
@@ -330,12 +331,12 @@ export default {
               dd[dtd[index].date][dtd[index].mode_id] = dtd[index];
             }
           }
-          console.log("dd",dd)
+          
           for (const key in dd) {
             var total = 0;
             for (const mkey in this.modeOptions) {
               if (mkey in dd[key]) {
-                console.log("=====",mkey)
+               
                 console.log(this.modeOptions[mkey].name)
                 dd[key][mkey].mode = this.modeOptions[mkey].name;
                 var number = parseInt(dd[key][mkey].number);
@@ -352,6 +353,7 @@ export default {
                 };
               }
             }
+            this.tableData = []
             this.tableData.push({ date: key, data: dd[key], total: total });
           }
         }

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -22,6 +22,7 @@
                 <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>
                 <!-- <el-button style="margin: 0px 0 20px 0;" @click="pass(fisrtQueueInfo.patient_id)">&ensp;过号&ensp;</el-button> -->
                 <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '',fisrtQueueInfo && fisrtQueueInfo.schedule_type ? fisrtQueueInfo.schedule_type : '')">下一位</el-button>
+                <!-- <el-button style="margin:0 auto;" @click="nextFive(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '',fisrtQueueInfo && fisrtQueueInfo.schedule_type ? fisrtQueueInfo.schedule_type : '')">下五位</el-button> -->
             </div>
         </div>
     </div>
@@ -104,6 +105,12 @@ export default {
             data: {type:3},
         };
         this.websocketSend(unObj)
+
+        let unObj1 = {
+            cmd: "queue/unjoin",
+            data: {type:4},
+        };
+        this.websocketSend(unObj1)
     },
     methods:{
         websocketSend(data) {
@@ -130,13 +137,17 @@ export default {
                             if(res.data.fisrtQueueInfo != null){
                                 if(this.patientStateVal == 0){
                                     fisrtQueueInfo = res.data.fisrtQueueInfo.morning
-                                    if(fisrtQueueInfo.create_time){
-                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    if(fisrtQueueInfo != null){
+                                        if(fisrtQueueInfo.create_time){
+                                            fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                        }
                                     }
                                 }else if(this.patientStateVal == 1){
                                     fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
-                                    if(fisrtQueueInfo.create_time){
-                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    if(fisrtQueueInfo != null){
+                                        if(fisrtQueueInfo.create_time){
+                                            fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                        }
                                     }
                                 }
                             }
@@ -163,6 +174,17 @@ export default {
                             // this.waitingCalled = waitingCalledArr
                             this.waitingCalledAm = waitingCalledAm
                             this.waitingCalledPm = waitingCalledPm
+                            // this.called = calledArr
+                        }
+                        if(res.data.type == 4){
+                            let arr = res.data.patientQueueList.data
+                            let calledArr = []
+                            arr.map(item => {
+                                if(item.status == 2){
+                                    item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                    calledArr.push(item)
+                                }
+                            })
                             this.called = calledArr
                         }
                     }else if(res.channel == 'allQueueList'){
@@ -188,11 +210,32 @@ export default {
                         // this.waitingCalled = waitingCalledArr
                         this.waitingCalledAm = waitingCalledAm
                         this.waitingCalledPm = waitingCalledPm
-                        this.called = calledArr
+                        // this.called = calledArr
                     }else if(res.channel == 'patientCallInfo'){
                         res.data.patientInfo.create_time = moment(parseInt(res.data.patientInfo.create_time) * 1000).format('HH:mm')
                         this.fisrtQueueInfo = res.data.patientInfo
                         this.newFisrtQueueInfo = res.data.patientInfo
+                    }else if(res.channel == 'fisrtQueueInfo'){
+                        let fisrtQueueInfo = []
+                        this.newFisrtQueueInfo = res.data.patientInfo
+                        if(res.data.patientInfo != null){
+                            if(this.patientStateVal == 0){
+                                fisrtQueueInfo = res.data.patientInfo.morning
+                                if(fisrtQueueInfo != null){
+                                    if(fisrtQueueInfo.create_time){
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    }
+                                }
+                            }else if(this.patientStateVal == 1){
+                                fisrtQueueInfo = res.data.patientInfo.afternoon
+                                if(fisrtQueueInfo != null){
+                                    if(fisrtQueueInfo.create_time){
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    }
+                                }
+                            }
+                        }
+                        this.fisrtQueueInfo = fisrtQueueInfo
                     }
                 
             }
@@ -218,6 +261,13 @@ export default {
             //     }) 
             //     this.waitingCalledPm = newArr
             // }
+            if(index == 2){
+                let obj = {
+                    cmd: "queue/join",
+                    data: {type:4,page:0,size:0},
+                };
+                this.websocketSend(obj)
+            }
             let fisrtQueueInfo = []
             if(this.newFisrtQueueInfo != null){
                 if(this.patientStateVal == 0){
@@ -286,6 +336,37 @@ export default {
                 }
             })
         },
+        nextFive(patient_id){
+            if(patient_id == undefined || patient_id == ""){
+                this.$message.error('已经是最后一位了');
+                return
+            }
+            let schedule_type = null
+            if(this.patientStateVal == 0){
+                schedule_type = 1
+            }else if(this.patientStateVal == 1){
+                schedule_type = 2
+            }
+            console.log('patient_id',patient_id)
+            let org_id =  parseInt(sessionStorage.getItem("org_id"));
+            let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
+            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 => {
+                console.log(res)
+                // let patientArr = res.data.queue_list.data
+                // this.patientArr = patientArr
+                // this.$emit('child-event',this.patientArr)
+                if(res.data.data.patientInfo == null){
+                    this.$message.error('已经是最后一位了');
+                    return
+                }
+                if(res.data.code == 200){
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                }
+            })
+        },
         pass(patient_id){
             console.log('patient_id',patient_id)
             let org_id =  parseInt(sessionStorage.getItem("org_id"));
@@ -324,7 +405,7 @@ export default {
     height: 313px;
     border: 1px solid #e5e5ee;
     // flex: 1;
-    width: 12%;
+    width: 14%;
     text-align: center;
     .nowCallingTitle{
         font-size: 20px;

src/xt_pages/sign/components/called.vue

@@ -83,7 +83,7 @@ export default {
         padding: 9px 0;
         margin: 0 15px 15px 0;
         float: left;
-        width: 360px;
+        width: 400px;
         cursor: pointer;
         display: flex;
         justify-content: space-between;

src/xt_pages/sign/components/computerCalling.vue

@@ -21,6 +21,7 @@
                 <p class="nowCallingTime">签到时间：{{ fisrtQueueInfo ? fisrtQueueInfo.create_time : '' }}</p>
                 <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>
                 <el-button style="margin:0 auto;" @click="next(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')">下一位</el-button>
+                <el-button style="margin:0 auto;" @click="nextFive(fisrtQueueInfo && fisrtQueueInfo.patient_id ? fisrtQueueInfo.patient_id : '')">下五位</el-button>
             </div>
         </div>
     </div>
@@ -105,13 +106,17 @@ export default {
                         if(res.data.fisrtQueueInfo != null){
                             if(this.patientStateVal == 0){
                                 fisrtQueueInfo = res.data.fisrtQueueInfo.morning
-                                if(fisrtQueueInfo.create_time){
-                                    fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                if(fisrtQueueInfo != null){
+                                    if(fisrtQueueInfo.create_time){
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    }
                                 }
                             }else if(this.patientStateVal == 1){
                                 fisrtQueueInfo = res.data.fisrtQueueInfo.afternoon
-                                if(fisrtQueueInfo.create_time){
-                                    fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                if(fisrtQueueInfo != null){
+                                    if(fisrtQueueInfo.create_time){
+                                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                                    }
                                 }
                             }
                         }
@@ -138,6 +143,17 @@ export default {
                         // this.waitingCalled = waitingCalledArr
                         this.waitingCalledAm = waitingCalledAm
                         this.waitingCalledPm = waitingCalledPm
+                        // this.called = calledArr
+                    }
+                    if(res.data.type == 5){
+                        let arr = res.data.patientQueueList.data
+                        let calledArr = []
+                        arr.map(item => {
+                            if(item.status == 3){
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                calledArr.push(item)
+                            }
+                        })
                         this.called = calledArr
                     }
                 }else if(res.channel == 'allQueueList'){
@@ -163,7 +179,7 @@ export default {
                     // this.waitingCalled = waitingCalledArr
                     this.waitingCalledAm = waitingCalledAm
                     this.waitingCalledPm = waitingCalledPm
-                    this.called = calledArr
+                    // this.called = calledArr
                 }else if(res.channel == 'patientCallInfo'){
                     res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
                     this.fisrtQueueInfo = res.data.patientInfo
@@ -192,6 +208,13 @@ export default {
             //     }) 
             //     this.waitingCalledPm = newArr
             // }
+            if(index == 2){
+                let obj = {
+                    cmd: "queue/join",
+                    data: {type:5,page:0,size:0},
+                };
+                this.websocketSend(obj)
+            }
             let fisrtQueueInfo = []
             if(this.newFisrtQueueInfo != null){
                 if(this.patientStateVal == 0){
@@ -260,6 +283,37 @@ export default {
                 }
             })
         },
+        nextFive(patient_id){
+            if(patient_id == undefined || patient_id == ""){
+                this.$message.error('已经是最后一位了');
+                return
+            }
+            console.log('patient_id',patient_id)
+            let schedule_type = null
+            if(this.patientStateVal == 0){
+                schedule_type = 1
+            }else if(this.patientStateVal == 1){
+                schedule_type = 2
+            }
+            let org_id =  parseInt(sessionStorage.getItem("org_id"));
+            let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
+            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 => {
+                console.log(res)
+                // let patientArr = res.data.queue_list.data
+                // this.patientArr = patientArr
+                // this.$emit('child-event',this.patientArr)
+                if(res.data.data.patientInfo == null){
+                    this.$message.error('已经是最后一位了');
+                    return
+                }
+                if(res.data.code == 200){
+                    this.$message({
+                        message: res.data.msg,
+                        type: 'success'
+                    });
+                }
+            })
+        },
     }
 }
 </script>

src/xt_pages/sign/components/waitingCalled.vue

@@ -9,10 +9,13 @@
                 </div>
             </div>
             <div class="waitingOneRight">
-                <span v-if="item.schedule_type == 1">上午</span>
-                <span v-if="item.schedule_type == 2">下午</span>
-                <span v-if="item.schedule_type == 3">晚上</span>
-                <span>{{ item.queue_no }}号</span>
+                <div>
+                    <span v-if="item.schedule_type == 1">上午</span>
+                    <span v-if="item.schedule_type == 2">下午</span>
+                    <span v-if="item.schedule_type == 3">晚上</span>
+                    <span>{{ item.queue_no }}号</span>
+                </div>
+                <i class="el-icon-delete deleteIcon" @click="deletePatient(item.patient_id)"></i>
             </div>
             <!-- <div class="waitingOneRight" @click="call(item.patient_id)" style="display: none;">
                 <img src="../../../assets/img/volume.png" alt="">
@@ -56,8 +59,36 @@ export default {
                 }
                 
             })
+        },
+        deletePatient(patient_id){
+            this.$confirm('是否删除?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                let org_id =  parseInt(sessionStorage.getItem("org_id"));
+                let admin_user_id = parseInt(sessionStorage.getItem("admin_user_id"));
+                axios.get('/api/index/delpatient?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+                    console.log(res)
+                    // let patientArr = res.data.queue_list.data
+                    // this.patientArr = patientArr
+                    // this.$emit('child-event',this.patientArr)
+                    if(res.data.code == 200){
+                        this.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        });
+                    }
+                })
+                
+            }).catch(() => {
+                        
+            });
+
+
             
         }
+        
     }
     // watch:{
     //     waitingCalled:{
@@ -109,10 +140,16 @@ export default {
         }
         .waitingOneRight{
             color:#999;
+            text-align: center;
             img{
                 width: 30px;
                 margin-top: 6px;
             }
+            .deleteIcon{
+                font-size: 22px;
+                color:red;
+                margin-top: 10px;
+            }
         }
     }
 }

src/xt_pages/sign/lineUp.vue

@@ -251,10 +251,11 @@ export default {
         },
     },
     created(){
-        if(sessionStorage.getItem('lineUpKey') != null){
-            if(sessionStorage.getItem('lineUpKey') == 1){
+        if(sessionStorage.getItem('signIn') != null){
+            if(sessionStorage.getItem('signIn') == 2){
                 this.dialogTableVisible = true
             }
+            sessionStorage.removeItem('signIn')
         }
         this.initData = {
             cmd: "queue/join",
@@ -326,7 +327,9 @@ export default {
             this.updateTime()
         }, 1000);
         this.newTimes = setInterval(() => {
-            this.reload()
+            // this.reload()
+            sessionStorage.setItem('signIn',2);
+            window.location.reload()
         }, 1000 * 60 * 30);
     },
     beforeDestroy(){
@@ -334,8 +337,8 @@ export default {
         this.timer = null
         clearInterval(this.timerID);
         this.timerID = null;　　// 清除定时器
-        clearInterval(this.newTimes);　　// 清除定时器
-        this.newTimes = null
+        // clearInterval(this.newTimes);　　// 清除定时器
+        // this.newTimes = null
         let unObj = {
             cmd:'queue/unjoin',
             data:{type:2}
@@ -394,8 +397,8 @@ export default {
                         // })
                     }else if(res.channel == 'patientCallInfo'){
                         console.log(999999999999,res.data)
-                        
-                        
+                        let second = res.data.second
+                    
                         console.log('执行几次',this.voiceNum)
                         if(this.voice == true){
                             this.patient_id = res.data.patientInfo.patient_id
@@ -423,7 +426,7 @@ export default {
                                     clearInterval(this.voiceTime);
                                     this.voiceTime = null
                                 }
-                            },6000)
+                            },1000 * second)
                         }else {
                             // this.$message({
                             //     message: '警告哦，这是一条警告消息',

src/xt_pages/sign/signIn.vue

@@ -170,11 +170,17 @@ export default {
         },
     },
     created(){
-        if(sessionStorage.getItem('signInKey') != null){
-            if(sessionStorage.getItem('signInKey') == 1){
+        if(sessionStorage.getItem('signIn') != null){
+            if(sessionStorage.getItem('signIn') == 1){
                 this.dialogTableVisible = true
             }
+            sessionStorage.removeItem('signIn')
         }
+        // if(sessionStorage.getItem('signInKey') != null){
+        //     if(sessionStorage.getItem('signInKey') == 1){
+        //         this.dialogTableVisible = true
+        //     }
+        // }
         this.initData = {
             cmd: "queue/join",
             data: {type:1,page:1,size:10},
@@ -210,7 +216,9 @@ export default {
         }, 1000);
         // this.updateTime();
         this.newTimes = setInterval(() => {
-            this.reload()
+            // this.reload()
+            sessionStorage.setItem('signIn',1);
+            window.location.reload()
         }, 1000 * 60 * 30);
     },
     beforeDestroy(){

src/xt_pages/stock/detail/print.vue

@@ -31,7 +31,7 @@
 
               <td style="line-height: 50px" width="80">数量</td>
               <td style="line-height:50px" width="80" v-if="type == 1">进货价</td>
-             <td style="line-height:50px" width="80" v-if="type == 3">出货价</td>
+              <td style="line-height:50px" width="80" v-if="type == 3">出货价</td>
               <td style="line-height: 50px" width="80" v-if="type == 1 || type == 3">总价</td>
               <td style="line-height: 50px" width="">备 注</td>
             </tr>
@@ -40,10 +40,10 @@
               <td style="line-height: 50px">&nbsp;
                 {{index+1}}
               </td>
-               <td style="line-height: 50px">
+              <td style="line-height: 50px">
                 <span>{{stock.good_name}}</span>
               </td>
-               <td style="line-height: 50px">
+              <td style="line-height: 50px">
                 <span v-if="stock">{{stock.specification_name}}</span>
               </td>
               <td style="line-height: 50px">
@@ -287,9 +287,9 @@
       getUnit(id){
         var name = ""
         for(let i=0;i<this.goodUnit.length;i++){
-           if(this.goodUnit[i].id == id){
-              name = this.goodUnit[i].name
-           }
+          if(this.goodUnit[i].id == id){
+            name = this.goodUnit[i].name
+          }
         }
         return name
       }

src/xt_pages/stock/stockQuery.vue

@@ -310,11 +310,25 @@ export default {
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
     },
-    startTimeChange: function() {
-      this.GetAllStockQuery();
+    startTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+        this.GetAllStockQuery();
+      }
     },
-    endTimeChange: function() {
-      this.GetAllStockQuery();
+    endTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetAllStockQuery();
+      }
+     
     },
     stockInCount: function(row) {
       let total = 0;
@@ -331,6 +345,7 @@ export default {
       return total;
     },
     stockOutCount: function(row) {
+      console.log("row------",row)
       let total = 0;
       for (let i = 0; i < row.query_warehouseout_info.length; i++) {
         total = total + row.query_warehouseout_info[i].count;
@@ -386,7 +401,12 @@ export default {
            } 
         }
         return name
-      }
+      },
+
+      getTimestamp(time) {
+      // 把时间日期转成时间戳
+      return new Date(time).getTime() / 1000;
+    },
   }
 };
 </script>

src/xt_pages/workforce/next_remind_print.vue

@@ -145,7 +145,14 @@
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {
-          this.scheduleData = resp.data.schedule
+         var scheduleData = resp.data.schedule
+
+         for(let i=0;i<scheduleData.length;i++){
+             scheduleData[i].sort = scheduleData[i].number.sort
+          }
+          var arr = scheduleData.sort(this.compare('sort'))
+          console.log("打印数据",arr)
+          this.scheduleData = arr
         } else {
           this.$message.error(resp.msg)
         }
@@ -281,7 +288,15 @@
         }
         
         
+      },
+
+       compare(property) {
+       return function (a, b) {
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
       }
+     },
     }
   }
 </script>

src/xt_pages/workforce/remind_print.vue

@@ -134,7 +134,14 @@
         var resp = rs.data
         console.log(resp)
         if (resp.state == 1) {
-          this.scheduleData = resp.data.schdules
+           var scheduleData = resp.data.schdules
+           console.log("树",scheduleData)
+          for(let i=0;i<scheduleData.length;i++){
+             scheduleData[i].sort = scheduleData[i].number.sort
+          }
+          var arr = scheduleData.sort(this.compare('sort'))
+          console.log("打印数据",arr)
+          this.scheduleData = arr
         } else {
           this.$message.error(resp.msg)
         }
@@ -267,11 +274,17 @@
         }else{
           var str = year + "年" + month + "月" + day + "日  " + days;
           return str;
-        }
-        
-        
+        } 
+      },
+      compare(property) {
+       return function (a, b) {
+          var value1 = a[property];
+          var value2 = b[property];
+          return value1 - value2;
       }
+     },
     }
+   
   }
 </script>