发要提醒F11全屏显示范围设置，打印标签自动叫号

src/main/java/cn/hnthyy/thmz/controller/mz/MzPharmacyController.java

@@ -850,6 +850,7 @@ public class MzPharmacyController {
                 mzSendMedicineVo.setComm(mzOrderFrequencyByCode.getComm());
             }
             dispensingSocketService.printSendToMedicine(mzChargeDetail.getPatientId());
+            dispensingSocketService.callNumberSendToMedicine(mzChargeDetail.getPatientId());
             resultMap.put("code", 0);
             resultMap.put("message", "打印成功");
             resultMap.put("data", cfxxList);

src/main/resources/static/js/mz/pharmacy-cell-number.js

@@ -13,6 +13,7 @@ var tempCurrentList = new Array();
 var tempPastList = new Array();
 /*//临时正在配药队列
 var tempDispenseList = new Array();*/
+var fullscreen = false;//浏览器全屏状态
 //药房编号
 var groupNo = null;
 var timeInterval;
@@ -23,15 +24,14 @@ $(function () {
     clearInterval(tableInterval);
     clearInterval(getTableDateInterval);
     openSocket("JH");
-    $("input").each(function (){
-        this.onkeydown = function (e) { // 监听键盘事件
-            let theEvent = window.event || e;
-            let code = theEvent.keyCode || theEvent.which;
-            if (code == 13) {//回车事件
-                $("#btn_init").click(); //触发搜索按钮点击事件
-            }
+    this.onkeydown = function (e) { // 监听键盘事件
+        let theEvent = window.event || e;
+        let code = theEvent.keyCode || theEvent.which;
+        if(code == 122){//捕捉F11键盘动作
+            e.preventDefault();  //阻止F11默认动作
+            fullScreen();
         }
-    });
+    }
     $(".selectpicker").selectpicker({
         dropuAuto: false
     });
@@ -59,8 +59,8 @@ $(function () {
 function setHeightForTable() {
     var height = $(window).height() - 320;
     var realHeigt = height / 7;
-    if (realHeigt < 65) {
-        realHeigt = 65;
+    if (realHeigt < 75) {
+        realHeigt = 75;
     }
     $("#tableList tr").css("height", realHeigt + "px");
 }
@@ -302,6 +302,36 @@ function currentListClear(data) {
     }
 }*/
 
+/**
+ * 指定区域全屏显示
+ * @param divStr 指定元素ID
+ */
+function fullScreen() {
+    let fullarea = document.getElementById('fulldiv');
+        if (fullscreen) {    // 退出全屏
+            if (document.exitFullscreen) {
+                document.exitFullscreen();
+            } else if (document.webkitCancelFullScreen) {
+                document.webkitCancelFullScreen();
+            } else if (document.mozCancelFullScreen) {
+                document.mozCancelFullScreen();
+            } else if (document.msExitFullscreen) {
+                document.msExitFullscreen();
+            }
+        } else {    // 进入全屏
+            if (fullarea.requestFullscreen) {
+                fullarea.requestFullscreen();
+            } else if (fullarea.webkitRequestFullScreen) {
+                fullarea.webkitRequestFullScreen();
+            } else if (fullarea.mozRequestFullScreen) {
+                fullarea.mozRequestFullScreen();
+            } else if (fullarea.msRequestFullscreen) {
+                // IE11
+                fullarea.msRequestFullscreen();
+            }
+        }
+        fullscreen = !fullscreen;
+}
 
 
 

src/main/resources/static/js/yf/yf_special_mark.js

@@ -37,6 +37,11 @@ function initTable() {
             jqXHR.setRequestHeader("Authorization", 'Bearer ' + localStorage.getItem("token"));
             jqXHR.setRequestHeader("Accept", 'application/json');
         },
+        ajaxCellOptions: {
+            beforeSend: function (XMLHttpRequest) {
+                XMLHttpRequest.setRequestHeader("Authorization", 'Bearer ' + localStorage.getItem("token"));
+            }
+        },
         styleUI: 'Bootstrap',
         viewrecords: true,
         autowidth: true,
@@ -125,13 +130,18 @@ function loadBatch(chargeCode) {
 function initBatch() {
     $.jgrid.gridUnload("tb_table_batch");
     $("#tb_table_batch").jqGrid({
-        datatype: 'local',
+        datatype: 'json',
         mtype: 'get',
         url: '/thmz/getYpZdYpbh',
         loadBeforeSend: function (jqXHR) {
             jqXHR.setRequestHeader("Authorization", 'Bearer ' + localStorage.getItem("token"));
             jqXHR.setRequestHeader("Accept", 'application/json');
         },
+        ajaxCellOptions: {
+            beforeSend: function (XMLHttpRequest) {
+                XMLHttpRequest.setRequestHeader("Authorization", 'Bearer ' + localStorage.getItem("token"));
+            }
+        },
         toolbar : [ true, "top" ],
         styleUI: 'Bootstrap',
         viewrecords: true,

src/main/resources/templates/mz/pharmacy-cell-number.html

@@ -10,7 +10,7 @@
 <style>
     tr{
         /*height: 100px;*/
-        font-size: 34px;
+        font-size: 40px;
         letter-spacing:8px;
         font-family: sans-serif;
     }
@@ -26,8 +26,14 @@
         height: 88px;
         max-height: 88px;
     }
+     #fulldiv {
+         background: #fff;
+         width: 100%;
+         text-align: center;
+         height: 100%;
+     }
 </style>
-<div class="row">
+<div class="row" id="fulldiv">
     <div class="col-md-12 col-sm-12 col-xs-12">
         <div class="x_panel">
             <div class="panel-body">
@@ -98,7 +104,7 @@
                         <img src="/thmz/images/wxts.png" style="height: 40px;opacity: 0.50;-moz-opacity:0.50;filter:alpha(opacity=50);"/>
                     </div>
                     <div class="col-md-10 col-sm-10 col-xs-12" style="margin-top: -5px;">
-                        <span style="color: red;line-height: 60px;font-size: 30px;">请在缴费收据上核对取药窗口，根据提示凭处方到对应窗口取药。</span>
+                        <span style="color: red;line-height: 60px;font-size: 30px;">请根据呼叫信息，到指定窗口进行取药，未叫号的患者请在等待区等候。</span>
                     </div>
                 </div>
             </div>