From 8ec50944210dcbb93334ffb462c8f62a565f5748 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 10 七月 2020 11:19:07 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pdaCe/index.html |   76 +++++++++++++++++++++++++++-----------
 1 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/src/main/webapp/views/pdaCe/index.html b/src/main/webapp/views/pdaCe/index.html
index 0552383..ede925d 100644
--- a/src/main/webapp/views/pdaCe/index.html
+++ b/src/main/webapp/views/pdaCe/index.html
@@ -117,6 +117,7 @@
 <div>
     <span>鐗╂枡</span>
     <input type="text" id="matNo" onkeyup="find(this)" autocomplete="off">
+    <button onclick="find()">鏌ヨ</button>
 </div>
 
 <div class="mat-msg" id="mat-msg-id">
@@ -140,6 +141,10 @@
 
 <!-- 璇︽儏 -->
 <div class="form-box" id="mat-detail">
+    <div class="form-item form-count">
+        <span style="margin-right: 10px">鏁伴噺</span>
+        <button onclick="reduce()">-</button><input id="count" type="number" style="text-align: center"><button onclick="add()">+</button>
+    </div>
     <div class="form-item">
         <span>鍚嶇О</span>
         <input id="matName" type="text" disabled="disabled" style="background-color: #ececec;color: #000">
@@ -147,10 +152,6 @@
     <div class="form-item">
         <span>鍗曚綅</span>
         <input id="str1" type="text" disabled="disabled" style="background-color: #ececec;color: #000; text-align: center;">
-    </div>
-    <div class="form-item form-count">
-        <span style="margin-right: 10px">鏁伴噺</span>
-        <button onclick="reduce()">-</button><input id="count" type="number" style="text-align: center"><button onclick="add()">+</button>
     </div>
     <div class="form-item form-btn-con">
         <button id="confirm" onclick="confirm()">鎻愬彇</button>
@@ -161,6 +162,7 @@
 
 </body>
 <script>
+
     var matMsgTableBlankRows = 0;   // 绌虹櫧琛屾暟
     var matData = []; // 琛ㄦ牸鏁版嵁
     var code = document.getElementById("code")
@@ -181,6 +183,7 @@
 
     matDetail.style.display = 'none';
     var initMatCount = 1;
+    // window.onload = function(){code.focus();}
 
     // 鏌ヨ鐗╂祦
     function find(el) {
@@ -189,7 +192,7 @@
             type: 'post',
             headers: [{token: getCookie('token')}],
             data: {
-                id: el.value
+                id: matNo.value
             },
         }, function (res) {
             if (res.code === 200) {
@@ -201,8 +204,10 @@
                     // 濉厖鏁版嵁
                     matName.value = res.data.matName;
                     str1.value = res.data.str1;
+
+                    count.focus();
                     count.value = initMatCount;
-                    document.getElementById("confirm").focus();
+                    // confirmBtn.focus();
                 } else {
                     matMsg.style.display = 'block';
                     btnCon.style.display = 'block';
@@ -447,28 +452,55 @@
         }
     }
 
+    document.onkeyup = function (e) {
+        if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+            e = window.event;
+        var key = e.charCode || e.keyCode;
+        if (key === 112) {
+            code.focus();
+        } else if (key === 113) {
+            matNo.focus();
+        } else if (key === 114) {
+            combBtn.focus();
+        } else if (key === 13) {
+            confirmBtn.focus();
+        }
+
+        // if (code1 === 13) {
+        //     if (window.getComputedStyle(matDetail).display === 'block') {
+        //         confirm()
+        //     } else if (window.getComputedStyle(btnCon).display === 'block') {
+        //         comb()
+        //     }
+        // }
+    }
+
     document.onkeydown = function (e) {
         if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
             e = window.event;
-        var code1 = e.charCode || e.keyCode;
-        if (code1 === 13) {
-            if (window.getComputedStyle(matDetail).display === 'block') {
-                confirm()
-            } else if (window.getComputedStyle(btnCon).display === 'block') {
-                comb()
-            }
+        var key = e.charCode || e.keyCode;
+        if (key === 114) {
+            comb()
         }
+
+        // if (code1 === 13) {
+        //     if (window.getComputedStyle(matDetail).display === 'block') {
+        //         confirm()
+        //     } else if (window.getComputedStyle(btnCon).display === 'block') {
+        //         comb()
+        //     }
+        // }
     }
 
     // todo
-    setTimeout(function () {
-        code.value = "888"
-        addTableData({
-            matNo: "1902980-11/14",
-            matName: "閾濆甫|1100-O|0.33*475|",
-            str1: "浠�",
-            count: 1
-        })
-    }, 200)
+    // setTimeout(function () {
+    //     code.value = "888"
+    //     addTableData({
+    //         matNo: "1902980-11/14",
+    //         matName: "閾濆甫|1100-O|0.33*475|",
+    //         str1: "浠�",
+    //         count: 1
+    //     })
+    // }, 200)
 </script>
 </html>
\ No newline at end of file

--
Gitblit v1.9.1