From 9e735e0ee69c8874c1248c7fe16500db11e1086c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 10 七月 2020 09:54:16 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/pdaCe/index.html |   39 +++++++++++++++++++++++++++++----------
 1 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/views/pdaCe/index.html b/src/main/webapp/views/pdaCe/index.html
index 296d1b8..a253204 100644
--- a/src/main/webapp/views/pdaCe/index.html
+++ b/src/main/webapp/views/pdaCe/index.html
@@ -225,18 +225,17 @@
             tips("璇锋彁鍙栫墿鏂�", true);
             return;
         }
-        console.log(JSON.stringify({
-            barcode: barcode,
-            combMats: matData
-        }))
         httpRequest({
-            httpUrl: baseUrl+"/mobile/comb/form",
+            httpUrl: baseUrl+"/mobile/comb/auth",
             type: 'post',
-            headers: [{token: getCookie('token')}],
-            data: {
+            headers: [
+                {token: getCookie('token')}
+                ,{'Content-type':'application/json;charset=UTF-8',}
+                ],
+            data: JSON.stringify({
                 barcode: barcode,
                 combMats: matData
-            },
+            }) ,
         }, function (res) {
             if (res.code === 200) {
                 reset();
@@ -411,7 +410,7 @@
             requestData += name + '='+ paramData[name] + '&';
         }
         requestData = requestData === '' ? '' : requestData.substring(0,requestData.length - 1);
-
+        console.log(requestData)
         /*璇锋眰鎺ユ敹*/
         xmlhttp.onreadystatechange = function() {
             if(xmlhttp.readyState === 4 && xmlhttp.status === 200) {
@@ -442,8 +441,28 @@
             if (defaultContentType) {
                 xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
             }
-            xmlhttp.send(requestData);
+            xmlhttp.send(defaultContentType?requestData:paramData);
         }
     }
+
+    document.onkeyup = function (e) {
+        if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+            e = window.event;
+        var code = e.charCode || e.keyCode;
+        if (code === 13) {
+            comb()
+        }
+    }
+
+    // todo
+    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