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

src/router/modules/dialysis.js

@@ -316,6 +316,18 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/print/batch/thirty',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_thirty'),
+      hidden: true,
+      is_menu: false,
+      name: 'dialysis_batch_thirty',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/print/batch/twentyTwo_one',
       component: () =>

src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue

@@ -1301,7 +1301,7 @@
 
             this.records = this.records.concat(resp.data.schedules)
 
-              console.log('记录', this.records)
+              // console.log('记录', this.records)
 
             for (const recordIndex in this.records) {
               var dlegh = 0

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -199,6 +199,16 @@
           >
         </div>
       </template>
+      <template v-if="this.template_id == 30">
+        <el-button
+          size="small"
+          icon="el-icon-printer"
+          :disabled="selecting_schs.length == 0"
+          @click="batchPrintAction"
+          type="primary"
+          >批量打印</el-button
+        >
+      </template>
     </div>
     <div class="app-container">
       <!-- <div class="filter-container">
@@ -717,6 +727,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/twenty" });
       } else if (this.template_id == 22) {
         this.$router.push({ path: "/dialysis/print/batch/twentyTwo" });
+      }else if (this.template_id == 30) {
+        this.$router.push({ path: "/dialysis/print/batch/thirty" });
       }
     },
     batchPrintActionOne: function() {

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

@@ -314,10 +314,10 @@
               this.$set(this_order, key, resp_dialysis_order[key])
             }
             let orgId = parseInt(sessionStorage.getItem("org_id"));
-            axios.get('/api/index/uppatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id + '&up_time=' + (new Date(this.form.start_time).getTime() / 1000)).then((res) => {
-              console.log('res',res.data)
+            // axios.get('/api/index/uppatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id + '&up_time=' + (new Date(this.form.start_time).getTime() / 1000)).then((res) => {
+            //   console.log('res',res.data)
 
-            }) 
+            // }) 
             this.hide()
             this.$emit('monitor', resp.data.monitor)
             this.$message.success('上机成功')

src/xt_pages/dialysis/details/dialog/finish_dialog.vue

@@ -213,10 +213,10 @@
               this.$set(this_order, key, dialysis_order[key])
             }
             let orgId = parseInt(sessionStorage.getItem("org_id"));
-            axios.get('/api/index/downpatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id).then((res) => {
-              console.log('res',res.data)
+            // axios.get('/api/index/downpatient?org_id='+ orgId + '&admin_user_id='+ this.form.nurse_id + '&patient_id=' + this.patient_id).then((res) => {
+            //   console.log('res',res.data)
 
-            }) 
+            // }) 
             this.hide()
             this.$emit('assessmentAfterDislysis', resp.data.assessmentAfterDislysis)
 

src/xt_pages/dialysis/details/index.vue

@@ -1801,10 +1801,16 @@ export default {
       })
     },
     next(){
+      let schedule_type = null
+      if(new Date().getHours() < 11){
+        schedule_type = 1
+      }else {
+        schedule_type = 2
+      }
       console.log('patient_id',this.$route.query.date)
       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=' + this.patient_id + '&admin_user_id=' + admin_user_id).then(res => {
+      axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + this.patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
         console.log(res)
         if(res.data.data.patientInfo == null){
           this.$message.error('已经是最后一位了');

src/xt_pages/dialysis/schedualPatient.vue

@@ -378,13 +378,30 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           // let res = re.data;
           console.log('res3333333333',res)
           if(res.channel == 'queue/join'){
+            let timeType = null
+            if(new Date().getHours() < 11){
+              timeType = 1
+            }else if(new Date().getHours() >= 11){
+              timeType = 2
+            }
+            let fisrtQueueInfo = []
+            this.newFisrtQueueInfo = res.data.fisrtQueueInfo
             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')
-              }
+                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 = []
@@ -448,10 +465,23 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             this.$message.error('已经是最后一位了');
             return
           }
+          let schedule_type = null
+          if(this.schedule_type_selected == 0){
+            if(new Date().getHours() < 11){
+              schedule_type = 1
+            }else {
+              schedule_type = 2
+            }
+          }else if(this.schedule_type_selected == 1){
+            schedule_type = 1
+          }else if(this.schedule_type_selected == 2){
+            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).then(res => {
+          axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
               console.log(res)
               // let patientArr = res.data.queue_list.data
               // this.patientArr = patientArr

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -429,7 +429,7 @@
                     <td width="10">ml</td>
                     <td width="30"></td>
                     <td width='70'>透后体重:</td>
-                    <td width="50">
+                    <td width="70">
                       <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "未称重" }}</div>
                     </td>
                     <td width="10">Kg</td>

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -1028,6 +1028,7 @@
           isLoading = true
           console.log("prescriptions9999",this.prescriptions)
           console.log("params---",params)
+          console.log("data",data)
           createHisPrescription(data, params).then(response => {
             if (response.data.state == 1) {
               this.$emit("change")

src/xt_pages/sign/components/beforeDialysisCalling.vue

@@ -11,16 +11,17 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div class="callingArea">
-                <waiting-called v-if="patientStateVal == 0" :waitingCalled='waitingCalled' ></waiting-called>
-                <called v-if="patientStateVal == 1" :called="called"></called>
+                <waiting-called v-if="patientStateVal == 0" :waitingCalled='waitingCalledAm' ></waiting-called>
+                <waiting-called v-if="patientStateVal == 1" :waitingCalled='waitingCalledPm' ></waiting-called>
+                <called v-if="patientStateVal == 2" :called="called"></called>
             </div>
-            <div class="nowCalling" v-if="patientStateVal == 0">
+            <div class="nowCalling" v-if="patientStateVal == 0 || patientStateVal == 1">
                 <p class="nowCallingTitle">当前叫号</p>
                 <p class="nowCallingName">{{ fisrtQueueInfo ? fisrtQueueInfo.patient_name : '' }}</p>
                 <p class="nowCallingTime">签到时间：{{ fisrtQueueInfo ? fisrtQueueInfo.create_time : '' }}</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>
                 <!-- <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 : '')">下一位</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>
             </div>
         </div>
     </div>
@@ -40,8 +41,9 @@ export default {
     data(){
         return{
             patient_state:[
-                {value: 0,label: '待叫号'},
-                {value: 1,label: '已叫号'},
+                {value: 0,label: '上午待叫号'},
+                {value: 1,label: '下午待叫号'},
+                {value: 2,label: '已叫号'},
             ],
             patientStateVal: 0,
             waitingCalled:[],
@@ -49,6 +51,10 @@ export default {
             fisrtQueueInfo:{},
             timer:null,
 
+            waitingCalledAm:[],
+            waitingCalledPm:[],
+            newFisrtQueueInfo:{}
+
         }
     },
     computed: {
@@ -116,53 +122,116 @@ export default {
                 let res = JSON.parse(e.data);
                 // 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')
+                
+                    if(res.channel == 'queue/join'){
+                        if(res.data.type == 3){
+                            let fisrtQueueInfo = []
+                            this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+                            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')
+                                    }
+                                }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')
+                                    }
+                                }
+                            }
+                            this.fisrtQueueInfo = fisrtQueueInfo
+                            let arr = res.data.patientQueueList.data
+                            // let waitingCalledArr = []
+                            let waitingCalledAm = []
+                            let waitingCalledPm = []
+                            let calledArr = []
+                            arr.map(item => {
+                                if(item.status == 1){
+                                    item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                    // waitingCalledArr.push(item)
+                                    if(item.schedule_type == 1){
+                                        waitingCalledAm.push(item)
+                                    }else if(item.schedule_type == 2){
+                                        waitingCalledPm.push(item)
+                                    }
+                                }else if(item.status == 2){
+                                    item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                    calledArr.push(item)
+                                }
+                            })
+                            // this.waitingCalled = waitingCalledArr
+                            this.waitingCalledAm = waitingCalledAm
+                            this.waitingCalledPm = waitingCalledPm
+                            this.called = calledArr
                         }
-                        
+                    }else if(res.channel == 'allQueueList'){
+                        let arr = res.data.queue_list.data
+                        // let waitingCalledArr = []
+                        let waitingCalledAm = []
+                        let waitingCalledPm = []
+                        let calledArr = []
+                        arr.map(item => {
+                            if(item.status == 1){
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                // waitingCalledArr.push(item)
+                                if(item.schedule_type == 1){
+                                    waitingCalledAm.push(item)
+                                }else if(item.schedule_type == 2){
+                                    waitingCalledPm.push(item)
+                                }
+                            }else if(item.status == 2){
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                calledArr.push(item)
+                            }
+                        })
+                        // this.waitingCalled = waitingCalledArr
+                        this.waitingCalledAm = waitingCalledAm
+                        this.waitingCalledPm = waitingCalledPm
+                        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.fisrtQueueInfo = res.data.fisrtQueueInfo
-                    let arr = res.data.patientQueueList.data
-                    let waitingCalledArr = []
-                    let calledArr = []
-                    arr.map(item => {
-                        if(item.status == 1){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            waitingCalledArr.push(item)
-                        }else if(item.status == 2){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            calledArr.push(item)
-                        }
-                    })
-                    console.log('waitingCalledArr待叫号',waitingCalledArr)
-                    console.log('waitingCalledArr以较好',calledArr)
-                    this.waitingCalled = waitingCalledArr
-                    this.called = calledArr
-                }else if(res.channel == 'allQueueList'){
-                    let arr = res.data.queue_list.data
-                    let waitingCalledArr = []
-                    let calledArr = []
-                    arr.map(item => {
-                        if(item.status == 1){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            waitingCalledArr.push(item)
-                        }else if(item.status == 2){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            calledArr.push(item)
-                        }
-                    })
-                    this.waitingCalled = waitingCalledArr
-                    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
-                }
+                
             }
         },
         handleStateChange: function(index) {
             this.patientStateVal = index
+            // if(index == 0){
+            //     let arr = this.waitingCalledAm
+            //     let newArr = []
+            //     arr.map(item => {
+            //         if(item.schedule_type == 1){
+            //             newArr.push(item)
+            //         }
+            //     }) 
+            //     this.waitingCalledAm = newArr
+            // }else if(index == 1){
+            //     let arr = this.waitingCalledPm
+            //     let newArr = []
+            //     arr.map(item => {
+            //         if(item.schedule_type == 2){
+            //             newArr.push(item)
+            //         }
+            //     }) 
+            //     this.waitingCalledPm = newArr
+            // }
+            let fisrtQueueInfo = []
+            if(this.newFisrtQueueInfo != null){
+                if(this.patientStateVal == 0){
+                    fisrtQueueInfo = this.newFisrtQueueInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(this.patientStateVal == 1){
+                    fisrtQueueInfo = this.newFisrtQueueInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
+            }
+            this.fisrtQueueInfo = fisrtQueueInfo
         },
         call(patient_id){
             if(patient_id == undefined || patient_id == ""){
@@ -190,10 +259,16 @@ export default {
                 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).then(res => {
+            axios.get('/api/index/nextcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
                 console.log(res)
                 // let patientArr = res.data.queue_list.data
                 // this.patientArr = patientArr

src/xt_pages/sign/components/computerCalling.vue

@@ -11,8 +11,9 @@
         </div>
         <div style="display:flex;justify-content: space-between;">
             <div class="callingArea">
-                <called v-if="patientStateVal == 0" :index='1' :called='waitingCalled'></called>
-                <called v-if="patientStateVal == 1" :called="called"></called>
+                <called v-if="patientStateVal == 0" :index='1' :called='waitingCalledAm'></called>
+                <called v-if="patientStateVal == 1" :index='1' :called='waitingCalledPm'></called>
+                <called v-if="patientStateVal == 2" :called="called"></called>
             </div>
             <div class="nowCalling" v-if="patientStateVal == 0">
                 <p class="nowCallingTitle">当前叫号</p>
@@ -36,8 +37,9 @@ export default {
     data(){
         return{
             patient_state:[
-                {value: 0,label: '待叫号'},
-                {value: 1,label: '已叫号'},
+                {value: 0,label: '上午待叫号'},
+                {value: 1,label: '下午待叫号'},
+                {value: 2,label: '已叫号'},
             ],
             patientStateVal: 0,
             waitingCalled:[],
@@ -45,6 +47,10 @@ export default {
             fisrtQueueInfo:{},
             timer:null,
 
+            waitingCalledAm:[],
+            waitingCalledPm:[],
+            newFisrtQueueInfo:{}
+
         }
     },
     computed: {
@@ -93,42 +99,70 @@ export default {
                 // let res = re.data;
                 console.log('res',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')
+                    if(res.data.type == 4){
+                        let fisrtQueueInfo = []
+                        this.newFisrtQueueInfo = res.data.fisrtQueueInfo
+                        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')
+                                }
+                            }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')
+                                }
+                            }
                         }
+                        this.fisrtQueueInfo = fisrtQueueInfo
+                        let arr = res.data.patientQueueList.data
+                        // let waitingCalledArr = []
+                        let waitingCalledAm = []
+                        let waitingCalledPm = []
+                        let calledArr = []
+                        arr.map(item => {
+                            if(item.status == 2){
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                // waitingCalledArr.push(item)
+                                if(item.schedule_type == 1){
+                                    waitingCalledAm.push(item)
+                                }else if(item.schedule_type == 2){
+                                    waitingCalledPm.push(item)
+                                }
+                            }else if(item.status == 3){
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                                calledArr.push(item)
+                            }
+                        })
+                        // this.waitingCalled = waitingCalledArr
+                        this.waitingCalledAm = waitingCalledAm
+                        this.waitingCalledPm = waitingCalledPm
+                        this.called = calledArr
                     }
-                    this.fisrtQueueInfo = res.data.fisrtQueueInfo
-                    let arr = res.data.patientQueueList.data
-                    let waitingCalledArr = []
-                    let calledArr = []
-                    arr.map(item => {
-                        if(item.status == 2){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            waitingCalledArr.push(item)
-                        }else if(item.status == 3){
-                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            calledArr.push(item)
-                        }
-                    })
-                    console.log('waitingCalledArr',waitingCalledArr)
-                    console.log('waitingCalledArr',calledArr)
-                    this.waitingCalled = waitingCalledArr
-                    this.called = calledArr
                 }else if(res.channel == 'allQueueList'){
                     let arr = res.data.queue_list.data
-                    let waitingCalledArr = []
+                    // let waitingCalledArr = []
+                    let waitingCalledAm = []
+                    let waitingCalledPm = []
                     let calledArr = []
                     arr.map(item => {
                         if(item.status == 2){
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                            waitingCalledArr.push(item)
+                            // waitingCalledArr.push(item)
+                            if(item.schedule_type == 1){
+                                waitingCalledAm.push(item)
+                            }else if(item.schedule_type == 2){
+                                waitingCalledPm.push(item)
+                            }
                         }else if(item.status == 3){
                             item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
                             calledArr.push(item)
                         }
                     })
-                    this.waitingCalled = waitingCalledArr
+                    // this.waitingCalled = waitingCalledArr
+                    this.waitingCalledAm = waitingCalledAm
+                    this.waitingCalledPm = waitingCalledPm
                     this.called = calledArr
                 }else if(res.channel == 'patientCallInfo'){
                     res.data.patientInfo.create_time = moment(res.data.patientInfo.create_time * 1000).format('HH:mm')
@@ -138,6 +172,40 @@ export default {
         },
         handleStateChange: function(index) {
             this.patientStateVal = index
+            // if(index == 0){
+            //     let arr = this.waitingCalledAm
+            //     let newArr = []
+            //     arr.map(item => {
+            //         if(item.schedule_type == 1){
+            //             newArr.push(item)
+            //         }
+            //     }) 
+            //     this.waitingCalledAm = newArr
+            // }else if(index == 1){
+            //     let arr = this.waitingCalledPm
+            //     let newArr = []
+            //     arr.map(item => {
+            //         if(item.schedule_type == 2){
+            //             newArr.push(item)
+            //         }
+            //     }) 
+            //     this.waitingCalledPm = newArr
+            // }
+            let fisrtQueueInfo = []
+            if(this.newFisrtQueueInfo != null){
+                if(this.patientStateVal == 0){
+                    fisrtQueueInfo = this.newFisrtQueueInfo.morning
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }else if(this.patientStateVal == 1){
+                    fisrtQueueInfo = this.newFisrtQueueInfo.afternoon
+                    if(fisrtQueueInfo.create_time){
+                        fisrtQueueInfo.create_time = moment(parseInt(fisrtQueueInfo.create_time) * 1000).format('HH:mm')
+                    }
+                }
+            }
+            this.fisrtQueueInfo = fisrtQueueInfo
         },
         call(patient_id){
             if(patient_id == undefined || patient_id == ""){
@@ -166,9 +234,15 @@ export default {
                 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).then(res => {
+            axios.get('/api/index/nextupcall?org_id=' + org_id + '&patient_id=' + patient_id + '&admin_user_id=' + admin_user_id + '&schedule_type=' + schedule_type).then(res => {
                 console.log(res)
                 // let patientArr = res.data.queue_list.data
                 // this.patientArr = patientArr

src/xt_pages/sign/lineUp.vue

@@ -70,7 +70,7 @@
                                     <span v-if="item.status == 5">已下机</span>
                                 </p>
                                 <p style="width:14%">{{ item.start_time ? getDates(item.start_time) : '--' }}</p>
-                                <p style="width:16%">{{ item.end_time ? getDates(item.end_time) : '--' }}</p>
+                                <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
                             </div>
                         </div>
                     </div> 
@@ -154,7 +154,7 @@
                                     <span v-if="item.status == 5">已下机</span>
                                 </p>
                                 <p style="width:14%">{{ item.start_time ? getDates(item.start_time) : '--' }}</p>
-                                <p style="width:16%">{{ item.end_time ? getDates(item.end_time) : '--' }}</p>
+                                <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
                             </div>
                         </div>
                     </div> 
@@ -353,76 +353,80 @@ export default {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                if(res.channel == 'queue/join'){
-                    this.queueConfig = res.data.queueConfig
-                    this.lineUpList = res.data.patientQueueList.data
-                    this.receivingPatient = res.data.receivingPatient
-                    this.waitDoctorList = res.data.waitDoctorList
-                    this.upPatientList = res.data.upPatientList
-                    this.count = res.data.patientQueueList.count
-                    // this.lineUpList.map(item => {
-                    //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                    //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
-                    // })
-                }else if(res.channel == 'queue/queuelist'){
-                    this.lineUpList = res.data.patientQueueList.data
-                    this.count = res.data.patientQueueList.count
-                    // this.lineUpList.map(item => {
-                    //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                    //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
-                    //     if(item.start_time != null){
-                    //         item.start_time = moment(item.start_time * 1000).format('HH:mm:ss')
-                    //     }
-                    //     if(item.status == 5 || item.end_time){
-                    //         item.end_time = moment(item.end_time * 1000).format('HH:mm:ss')
-                    //     }
-                    // })
-                }else if(res.channel == 'patientCallInfo'){
-                    console.log(999999999999,res.data)
-                    
-                    
-                    console.log('执行几次',this.voiceNum)
-                    if(this.voice == true){
-                        this.patient_id = res.data.patientInfo.patient_id
-                        this.voice = false
-                        // let time1 = null
-                        this.voicePrompt(res.data.callVolUrl)
-                        this.voiceTime = setInterval(() => {
-                            let num = null
-                            if(res.data.patientInfo.status == 2){
-                                num = parseInt(this.queueConfig.jzdcbbcs)
-                            }else if(res.data.patientInfo.status == 3){
-                                num = parseInt(this.queueConfig.sjdcbbcs)
-                            }
-                            if(this.voiceNum < num){
-                                this.voiceNum++
-                                this.voicePrompt(res.data.callVolUrl)
-                            }else{
-                                this.voiceNum = 1;
-                                this.voice = true 
-                                let obj = {
-                                    cmd: "queue/callreturn",
-                                    data: {patient_id:this.patient_id},
-                                };
-                                this.websocketSend(obj)
-                                clearInterval(this.voiceTime);
-                                this.voiceTime = null
-                            }
-                        },6000)
-                    }else {
-                        // this.$message({
-                        //     message: '警告哦，这是一条警告消息',
-                        //     type: 'warning'
-                        // });
+                
+                    if(res.channel == 'queue/join'){
+                        if(res.data.type == 2){
+                            this.queueConfig = res.data.queueConfig
+                            this.lineUpList = res.data.patientQueueList.data
+                            this.receivingPatient = res.data.receivingPatient
+                            this.waitDoctorList = res.data.waitDoctorList
+                            this.upPatientList = res.data.upPatientList
+                            this.count = res.data.patientQueueList.count
+                            // this.lineUpList.map(item => {
+                            //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                            //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
+                            // })
+                        }
+                    }else if(res.channel == 'queue/queuelist'){
+                        this.lineUpList = res.data.patientQueueList.data
+                        this.count = res.data.patientQueueList.count
+                        // this.lineUpList.map(item => {
+                        //     item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                        //     // item.start_time = moment(item.start_time * 1000).format('HH:mm')
+                        //     if(item.start_time != null){
+                        //         item.start_time = moment(item.start_time * 1000).format('HH:mm:ss')
+                        //     }
+                        //     if(item.status == 5 || item.end_time){
+                        //         item.end_time = moment(item.end_time * 1000).format('HH:mm:ss')
+                        //     }
+                        // })
+                    }else if(res.channel == 'patientCallInfo'){
+                        console.log(999999999999,res.data)
+                        
+                        
+                        console.log('执行几次',this.voiceNum)
+                        if(this.voice == true){
+                            this.patient_id = res.data.patientInfo.patient_id
+                            this.voice = false
+                            // let time1 = null
+                            this.voicePrompt(res.data.callVolUrl)
+                            this.voiceTime = setInterval(() => {
+                                let num = null
+                                if(res.data.patientInfo.status == 2){
+                                    num = parseInt(this.queueConfig.jzdcbbcs)
+                                }else if(res.data.patientInfo.status == 3){
+                                    num = parseInt(this.queueConfig.sjdcbbcs)
+                                }
+                                if(this.voiceNum < num){
+                                    this.voiceNum++
+                                    this.voicePrompt(res.data.callVolUrl)
+                                }else{
+                                    this.voiceNum = 1;
+                                    this.voice = true 
+                                    let obj = {
+                                        cmd: "queue/callreturn",
+                                        data: {patient_id:this.patient_id},
+                                    };
+                                    this.websocketSend(obj)
+                                    clearInterval(this.voiceTime);
+                                    this.voiceTime = null
+                                }
+                            },6000)
+                        }else {
+                            // this.$message({
+                            //     message: '警告哦，这是一条警告消息',
+                            //     type: 'warning'
+                            // });
+                        }
+                    }else if(res.channel == 'updateCallList'){
+                        this.receivingPatient = res.data.queue_list
+                        
+                    }else if(res.channel == 'updateWaitCallList'){
+                        this.waitDoctorList = res.data.queue_list
+                    }else if(res.channel == 'updateUpCallList'){
+                        this.upPatientList = res.data.queue_list
                     }
-                }else if(res.channel == 'updateCallList'){
-                    this.receivingPatient = res.data.queue_list
-                    
-                }else if(res.channel == 'updateWaitCallList'){
-                    this.waitDoctorList = res.data.queue_list
-                }else if(res.channel == 'updateUpCallList'){
-                    this.upPatientList = res.data.queue_list
-                }
+                
                 // else if(res.channel == "patientQueueInfo"){
                 //     this.queueInfo = res.data.queueInfo
                 //     let obj = {

src/xt_pages/sign/signIn.vue

@@ -216,35 +216,39 @@ export default {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                if(res.channel == 'queue/join'){
-                    this.signInList = res.data.patientQueueList.data
-                    this.count = res.data.patientQueueList.count
-                    this.signInList.map(item => {
-                        item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                    })
-                }else if(res.channel == "patientQueueInfo"){
-                    clearTimeout(this.ds)
-                    this.ds = null
-                    this.queueInfo = res.data.queueInfo
-                    this.page = 1
-                    let obj = {
-                        cmd: "queue/queuelist",
-                        data: {page:1,size:10,sort:1}
-                    };
-                    this.websocketSend(obj)
-                    
-                    this.ds = setTimeout(() => { 
-                       this.queueInfo = {} 
-                    }, 60000);
-                    
-                }else if(res.channel == 'queue/queuelist'){
-                    console.log(11111111111,res.data)
-                    this.signInList = res.data.patientQueueList.data
-                    this.count = res.data.patientQueueList.count
-                    this.signInList.map(item => {
-                        item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
-                    })
-                }
+                
+                    if(res.channel == 'queue/join'){
+                        if(res.data.type == 1){
+                            this.signInList = res.data.patientQueueList.data
+                            this.count = res.data.patientQueueList.count
+                            this.signInList.map(item => {
+                                item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                            })
+                        }
+                    }else if(res.channel == "patientQueueInfo"){
+                        clearTimeout(this.ds)
+                        this.ds = null
+                        this.queueInfo = res.data.queueInfo
+                        this.page = 1
+                        let obj = {
+                            cmd: "queue/queuelist",
+                            data: {page:1,size:10,sort:1}
+                        };
+                        this.websocketSend(obj)
+                        
+                        this.ds = setTimeout(() => { 
+                        this.queueInfo = {} 
+                        }, 60000);
+                        
+                    }else if(res.channel == 'queue/queuelist'){
+                        console.log(11111111111,res.data)
+                        this.signInList = res.data.patientQueueList.data
+                        this.count = res.data.patientQueueList.count
+                        this.signInList.map(item => {
+                            item.create_time = moment(item.create_time * 1000).format('HH:mm:ss')
+                        })
+                    }
+                
                 // console.log("action", re.action);
                 // console.log("data", JSON.stringify(res));
             }

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -229,9 +229,19 @@ export default {
       }
      },
     getNextScheduleWeekDay() {
+        const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
+        const end = moment().weekday(7).format('YYYY-MM-DD')
+        // console.log("start",moment(start).unix())
+      
+        // const params = {
+        //   start_time:moment().week(moment().week() + 1).startOf('week').unix(),
+        //   end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+        //   week_type:this.week_type,
+        //   week_time:this.week_time,
+        // }
         const params = {
-          start_time:moment().week(moment().week() + 1).startOf('week').unix(),
-          end_time:moment().week(moment().week() + 1).endOf('week').unix(),
+          start_time:1609603200,
+          end_time:1610208000,
           week_type:this.week_type,
           week_time:this.week_time,
         }
@@ -293,9 +303,6 @@ export default {
     },
     selectWeekType(type) {
       this.week_type = type;
-      // let params = {
-      //   week_type: this.week_type
-      // };
       this.getNextScheduleWeekDay();
     },
     selectWeekTime(type){

src/xt_pages/workforce/components/tableWeeks.vue

@@ -240,8 +240,8 @@ export default {
            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)
+          var arr = scheduleData.sort(this.compare('sort'))
+          console.log("元旦快乐",arr)
           this.scheduleData = arr
         } else {
           this.$message.error("网络错误");

src/xt_pages/workforce/next_remind_print.vue

@@ -127,11 +127,18 @@
       this.week_type = this.$route.query.week_type
       this.week_time  = this.$route.query.week_time
       
-      const params = {
+      // const params = {
+      //     week_type:this.week_type,
+      //     week_time:this.week_time,
+      //     start_time:this.start_time,
+      //     end_time:this.end_time,
+      //   }
+
+         const params = {
           week_type:this.week_type,
           week_time:this.week_time,
-          start_time:this.start_time,
-          end_time:this.end_time,
+          start_time:1609603200,
+          end_time:1610208000,
         }
       console.log("打印下周",params)
       getNextScheduleWeekDay(params).then(rs => {