From 6c1a2ada4b09f07bfb5f1478bdee19e6df8ef30a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 28 七月 2020 08:39:50 +0800
Subject: [PATCH] #当前本版十分完美、冻结

---
 src/main/webapp/views/pda/comb.html |   32 +++++++++++++++++++++++---------
 1 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 2c12877..4f06e8f 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -23,7 +23,7 @@
         <input class="layui-input" type="text" id="code" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
     </div>
     <div style="margin: 5px 5px">
-        <button type="button" class="layui-btn layui-btn-normal  layui-btn-xs" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
+        <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
     </div>
 </header>
 
@@ -34,8 +34,8 @@
 <!-- 灏鹃儴 -->
 <footer>
     <div class="layui-btn-container">
-        <button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">閲嶇疆</button>
-        <button type="button" class="layui-btn layui-btn-normal  layui-btn-xs" onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+        <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
+        <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
         <span id="tips"></span>
     </div>
 </footer>
@@ -54,7 +54,7 @@
             limit: 500,
             cellMinWidth: 50,
             cols: [[
-                {fixed: 'left', align: 'center', field: 'count', title: '閲�', style:'color: blue', width:20},
+                {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
                 {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
                 {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
             ]],
@@ -70,13 +70,15 @@
     function getMat() {
         matCodeLayerIdx = layer.open({
             type: 2,
-            title: '鐗╂枡',
+            title: '鎻愬彇鐗╂枡',
             shade: [0.3,'#000'],
-            area: ['90%', '90%'],
+            area: ['90%', '80%'],
             content: 'matQuery.html',
             success: function(layero, index){
-                $('.layui-layer-title').css('height', '20px').css('line-height', '20px').css('font-size', '12px').css('padding-left', '10px')
-                $('.layui-layer-setwin').css("top", '2px').css('right', '3px')
+                $('.layui-layer-title').css('font-size', '16px');
+            },
+            end: function () {
+                $('#mat-btn').focus();
             }
         });
     }
@@ -115,7 +117,7 @@
         let barcode = $('#code').val();
         if (isEmpty(barcode)) {
             tips("鎵樼洏鏉$爜涓虹┖", true);
-            document.getElementById("code").focus();
+            // document.getElementById("code").focus();
             return;
         }
         if (barcode.length !== 8) {
@@ -159,5 +161,17 @@
         tips.html(msg);
         tips.css("color", warn?"red":'#666');
     }
+
+    document.onkeyup = function (e) {
+        if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+            e = window.event;
+        var key = e.charCode || e.keyCode;
+        if (key === 115) {
+            $("#comb-btn").focus();
+            comb();
+        } else if (key === 113) {
+            $("#code").focus();
+        }
+    }
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1