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

src/xt_pages/dialysis/dialysisPrintOrder.vue

         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:16px;border-color: #000;}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #000;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}.row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line {display: inline-block;border-bottom: 1px solid #000;text-align: center;white-space: nowrap; width: 50%;}';
       // const style3 =
       //   '@media print {.option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 50px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;}.inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;}.print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 5px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 16px;padding: 5px 5px;line-height: 18px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:950px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top:1050px;left: 50%;}.print-yema5{position: absolute;top:1370px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}';
-      //
       const style4 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:18px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:18px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:18px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:20px;height:20px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:23px;font-weight: 200;}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style5 =
           this.patient_id = response.data.data.patientInfo.DialysisSchedule.patient_id
           this.patient_name = response.data.data.patientInfo.name
 
-          // if(this.org_id !=10206 ){//&& this.org_id !=0
+          // if(this.org_id !=0){//&& this.org_id !=0
             this.org_template_info.template_id= response.data.data.org_template_info.template_id
             this.org_template_info = response.data.data.org_template_info;
           // }else{
           //   this.org_template_info = response.data.data.org_template_info;
-          //   this.org_template_info.template_id= 82
+          //   this.org_template_info.template_id= 68
           // }
 
 

src/xt_pages/outpatientCharges/invoicePrint.vue

     </template>
     <div class="app-container" style="padding-top:40px;" v-if="org_id != 10217 && org_id != 10485 && org_id != 10375 && org_id != 10567 && org_id != 10188 && org_id != 10633"><!--&& org_id != 10188 && org_id != 0-->
         <div class='dialysisPage'>
-          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 " >
+          <div v-if="org_id != 10106 && org_id != 10215 && org_id != 4 && org_id != 10188 && org_id != 10217 && org_id != 10387&& org_id != 10210 && org_id != 10387 && org_id != 10480 && org_id != 0" >
             <printOne v-if="org_id != 10088 && org_id != 10510 && org_id != 0" :paramsObj="invoiceParams"></printOne>
             <printThree v-if="org_id == 10088 " :paramsObj="invoiceParams" :show="showclick"></printThree>
-            <printfifteen v-if="org_id == 10510 || org_id == 0 " :paramsObj="invoiceParams"></printfifteen>
+            <printfifteen v-if="org_id == 10510 " :paramsObj="invoiceParams"></printfifteen>
           </div>
           <printTwo v-if="org_id == 10106" :paramsObj="invoiceParams"></printTwo>
           <printFour v-if="org_id == 10215 " :paramsObj="invoiceParams"></printFour>
           <print-eight v-if="org_id == 10387" :paramsObj="invoiceParams"></print-eight>
           <PrintNight v-if="org_id == 10210" :paramsObj="invoiceParams"></PrintNight>
           <!-- <PrintTen v-if="org_id == 10375 ||org_id == 0 " :paramsObj="invoiceParams"></PrintTen> -->
-          <printtwelve :paramsObj="invoiceParams"  v-if="org_id == 10480 "></printtwelve>
+          <printtwelve :paramsObj="invoiceParams"  v-if="org_id == 10480 || org_id == 0 "></printtwelve>
         </div>
     </div>
 
       </div>
     </div>
 
-    <div class="app-container" style="" v-if="org_id == 10217 || org_id == 10633">
+    <div class="app-container" style="" v-if=" org_id == 10633">
       <div class='dialysisPage'>
         <printSix :paramsObj="invoiceParams"></printSix>
       </div>
       </div>
     </div>
 
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188  ">
+    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id == 10217">
       <div class='dialysisPage'>
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
       </div>

src/xt_pages/sign/lineUp.vue

                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
                             </div>
                         </div>
-                    </div> 
+                    </div>
                     <div class="callingBox">
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
                             </div>
                         </div>
                     </div>
-                </div> 
-                
+                </div>
+
              </div>
-        
+
             <!-- <div class="page_lineUp">
                 <div class="lineUpTitle">
                     <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
                                 <p style="width:16%">07:38:00</p>
                             </div>
                         </div>
-                    </div> 
+                    </div>
                     <div class="callingBox">
                         <div class="callingBoxLeft">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
                         </div>
                     </div>
                 </div>
-                
+
             </div> -->
         </div>
         <div class="app-container">
                                 <p style="width:16%">{{ item.end_time && item.start_time ? getDates(item.end_time) : '--' }}</p>
                             </div>
                         </div>
-                    </div> 
+                    </div>
                     <div class="callingBox">
                         <div :class="(queueConfig.jzjhyc == 1 && queueConfig.sjjhyc == 0) ? 'callingBoxLeft1' : 'callingBoxLeft'" v-if="queueConfig.jzjhyc == 1">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
                         </div>
                     </div>
                 </div>
-                
+
             </div>
-        
+
             <!-- <div class="page_lineUp">
                 <div class="lineUpTitle">
                     <div>{{ this.$store.getters.xt_user.org.org_name }}<span>&nbsp;&nbsp;温馨提示：请注意排队叫号，依次叫号就诊上机，谢谢配合</span></div>
                                 <p style="width:16%">07:38:00</p>
                             </div>
                         </div>
-                    </div> 
+                    </div>
                     <div class="callingBox">
                         <div class="callingBoxLeft">
                             <div class="callingTitle"><span style="margin: 0 auto;">接<br />诊<br />叫<br />号</span></div>
                         </div>
                     </div>
                 </div>
-                
+
             </div> -->
         </div>
     </div>
             dialogTableVisible:false,
             showSetting: false,
             lineUpList:[],
-            count:0,
+            // count:0,
             page:1,
             timer:null,
             queueConfig:{
 
             voice:true,
             a:1,
-            newTimes:null
-            
+            newTimes:null,
+
         }
     },
     computed: {
             sessionStorage.removeItem('lineUpKey')
             sessionStorage.removeItem('signInKey')
         }
-        this.initData = {
-            cmd: "queue/join",
-            data: {type:2,page:1,size:6},
-        };
+        if(this.queueConfig.jzjhyc ==1&&this.queueConfig.sjjhyc ==1){
+          this.initData = {
+              cmd: "queue/join",
+              data: {type:2,page:1,size:6},
+          };
+        }else{
+          this.initData = {
+              cmd: "queue/join",
+              data: {type:2,page:1,size:10},
+          };
+        }
+        console.log('11111111222',this.initData);
+
         this.websocketSend(this.initData)
         let newobj = {
             cmd: "queue/callreturn",
         // this.websocketMess();
     },
     mounted(){
-        
+      console.log('queueConfig.jzjhyc1111',this.queueConfig.jzjhyc,this.queueConfig.sjjhyc);
+
         this.timer = setInterval(() => {
+
+          if(this.queueConfig.jzjhyc ==1&&this.queueConfig.sjjhyc ==1){
             if(this.page < Math.ceil(this.count / 6)){
-                console.log('执行',Math.ceil(this.count / 6),this.page)
-                this.page++
-                let obj = {
+              console.log('执行',Math.ceil(this.count / 6),this.page)
+              this.page++
+              let obj = {
+                  cmd: "queue/queuelist",
+                  data: {page:this.page,size:6,sort:0}
+              };
+              this.websocketSend(obj)
+              setTimeout(() => {
+                  this.websocketMess();
+              }, 1000);
+            }else{
+                console.log('执行22223333')
+                this.page = 1
+                let a = {
                     cmd: "queue/queuelist",
                     data: {page:this.page,size:6,sort:0}
                 };
-                this.websocketSend(obj)
+                this.websocketSend(a)
                 setTimeout(() => {
                     this.websocketMess();
                 }, 1000);
+
+            }
+          }else{
+            if(this.page < Math.ceil(this.count / 10)){
+              console.log('执行',Math.ceil(this.count / 10),this.page)
+              this.page++
+              let obj = {
+                  cmd: "queue/queuelist",
+                  data: {page:this.page,size:10,sort:0}
+              };
+              this.websocketSend(obj)
+              setTimeout(() => {
+                  this.websocketMess();
+              }, 1000);
             }else{
-                console.log('执行22223333')
+                console.log('执行22223333444444')
                 this.page = 1
                 let a = {
                     cmd: "queue/queuelist",
-                    data: {page:this.page,size:6,sort:0}
+                    data: {page:this.page,size:10,sort:0}
                 };
                 this.websocketSend(a)
                 setTimeout(() => {
                     this.websocketMess();
                 }, 1000);
-                
             }
-            console.log('切换时间',this.queueConfig)
+          }
+          console.log('切换时间11',this.queueConfig)
         }, 1000 * parseInt(this.queueConfig.qhsj));
         this.timerID = setInterval(() => {
             this.updateTime()
         websocketSend(data) {
             try {
                 this.websocket.send(JSON.stringify(data))
-                
+
             } catch (error) {
                 this.showError = true;
                 this.showIndex = 4;
             }
         },
         websocketMess() {
-            console.log('测试')
+            console.log('测试',this.websocket)
             this.websocket.onmessage = e => {
                 let res = JSON.parse(e.data);
                 // let res = re.data;
                 console.log('res',res)
-                
+
                     if(res.channel == 'queue/join'){
                         if(res.data.type == 2){
                             this.queueConfig = res.data.queueConfig
                         console.log(999999999999,res.data)
                         let second = res.data.second
                         let newType = res.data.type
-                    
+
                         console.log('执行几次',this.voiceNum)
                         if(this.voice == true){
                             this.patient_id = res.data.patientInfo.patient_id
                                     this.voicePrompt(res.data.callVolUrl)
                                 }else{
                                     this.voiceNum = 1;
-                                    this.voice = true 
+                                    this.voice = true
                                     let obj = {
                                         cmd: "queue/callreturn",
                                         data: {patient_id:this.patient_id,type:newType},
                         }
                     }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 = {
                 //         data: {page:1,size:10}
                 //     };
                 //     this.websocketSend(obj)
-                    
+
                 // }
             }
         },
         border-radius: 15px;
         display: flex;
         flex-direction: column;
-        
+
     }
     .lineUpMainLeftTitle{
         display: flex;