From a67ef1ea9215d52bbdef49061639f91cae5a972b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 10 七月 2020 10:26:19 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pdaCe/index.html | 128 ++++++++++++++++++++++++++----------------
1 files changed, 79 insertions(+), 49 deletions(-)
diff --git a/src/main/webapp/views/pdaCe/index.html b/src/main/webapp/views/pdaCe/index.html
index fce94cf..0552383 100644
--- a/src/main/webapp/views/pdaCe/index.html
+++ b/src/main/webapp/views/pdaCe/index.html
@@ -116,7 +116,7 @@
</div>
<div>
<span>鐗╂枡</span>
- <input type="text" id="matnr" onkeyup="find(this)" autocomplete="off">
+ <input type="text" id="matNo" onkeyup="find(this)" autocomplete="off">
</div>
<div class="mat-msg" id="mat-msg-id">
@@ -134,7 +134,7 @@
<div id="btn-con">
<button style="margin-right: 20px" onclick="reset()">閲嶇疆</button>
- <button onclick="comb()">缁勬墭</button>
+ <button id="comb" onclick="comb()">缁勬墭</button>
<span id="tips"></span>
</div>
@@ -164,18 +164,20 @@
var matMsgTableBlankRows = 0; // 绌虹櫧琛屾暟
var matData = []; // 琛ㄦ牸鏁版嵁
var code = document.getElementById("code")
- var matnr = document.getElementById("matnr")
+ var matNo = document.getElementById("matNo")
var matMsg = document.getElementById("mat-msg-id");
var matMsgTable = document.getElementById("mat-msg-table");
var tthead = document.getElementById("tthead");
var ttbody = document.getElementById("ttbody");
var btnCon = document.getElementById("btn-con");
var tipDom = document.getElementById("tips");
+ var combBtn = document.getElementById("comb");
var matDetail = document.getElementById("mat-detail");
var matName = document.getElementById("matName");
var str1 = document.getElementById("str1");
var count = document.getElementById("count");
+ var confirmBtn = document.getElementById("confirm");
matDetail.style.display = 'none';
var initMatCount = 1;
@@ -185,6 +187,7 @@
httpRequest({
httpUrl: baseUrl + "/matCode/auth",
type: 'post',
+ headers: [{token: getCookie('token')}],
data: {
id: el.value
},
@@ -199,13 +202,16 @@
matName.value = res.data.matName;
str1.value = res.data.str1;
count.value = initMatCount;
+ document.getElementById("confirm").focus();
} else {
matMsg.style.display = 'block';
btnCon.style.display = 'block';
matDetail.style.display = 'none';
}
+ } else if (res.code === 403) {
+ window.location.href = baseUrl + "/pda/ce";
} else {
- alert(res.msg);
+ tips(res.msg, true)
}
})
}
@@ -225,49 +231,22 @@
httpRequest({
httpUrl: baseUrl+"/mobile/comb/auth",
type: 'post',
+ headers: [
+ {token: getCookie('token')}
+ ,{'Content-type':'application/json;charset=UTF-8',}
+ ],
data: JSON.stringify({
barcode: barcode,
combMats: matData
- }),
+ }) ,
}, function (res) {
if (res.code === 200) {
- if (res.data != null) {
- // 鏍峰紡
- matMsg.style.display = 'none';
- btnCon.style.display = 'none';
- matDetail.style.display = 'block';
- // 濉厖鏁版嵁
- matName.value = res.data.matName;
- str1.value = res.data.str1;
- count.value = initMatCount;
- } else {
- matMsg.style.display = 'block';
- btnCon.style.display = 'block';
- matDetail.style.display = 'none';
- }
+ reset();
+ tips("缁勬墭鎴愬姛")
+ } else if (res.code === 403) {
+ window.location.href = baseUrl + "/pda/ce";
} else {
- alert(res.msg);
- }
- })
- $.ajax({
- url: baseUrl+"/mobile/comb/auth",
- headers: {'token': localStorage.getItem('token')},
- data: JSON.stringify({
- barcode: barcode,
- combMats: matData
- }),
- contentType:'application/json;charset=UTF-8',
- method: 'POST',
- async: false,
- success: function (res) {
- if (res.code === 200) {
- reset();
- tips("缁勬墭鎴愬姛")
- } else if (res.code === 403) {
- top.location.href = baseUrl + "/pda";
- } else {
- tips(res.msg, true)
- }
+ tips(res.msg, true)
}
})
}
@@ -305,7 +284,7 @@
}
var toPush = true;
for (var j=0;j<matData.length;j++){
- if (data.matnr === matData[j].matnr) {
+ if (data.matNo === matData[j].matNo) {
matData[j].count = Number(matData[j].count) + Number(data.count);
toPush = false;
}
@@ -316,7 +295,7 @@
var html = "";
for (var i=0;i<matData.length;i++) {
html += " <div class='table-data'>\n" +
- " <span>" + matData[i].matnr + "</span>\n" +
+ " <span>" + matData[i].matNo + "</span>\n" +
" <span>" + matData[i].matName + "</span>\n" +
" <span>" + matData[i].str1 + "</span>\n" +
" <span>" + matData[i].count + "</span>\n" +
@@ -329,7 +308,7 @@
// 閲嶇疆
function reset() {
code.value = "";
- matnr.value = "";
+ matNo.value = "";
cancel();
while(ttbody.hasChildNodes()) {
ttbody.removeChild(ttbody.firstChild);
@@ -357,7 +336,7 @@
// 鎻愬彇
function confirm() {
addTableData({
- matnr: matnr.value,
+ matNo: matNo.value,
matName: matName.value,
str1: str1.value,
count: count.value
@@ -367,7 +346,7 @@
}
// 鍙栨秷
function cancel() {
- matnr.value = "";
+ matNo.value = "";
matName.value = "";
str1.value = "";
count.value = initMatCount;
@@ -385,6 +364,21 @@
return;
}
count.value = count.value - 1;
+ }
+
+ //鑾峰彇 cookie
+ function getCookie(objName){//鑾峰彇鎸囧畾鍚嶇О鐨刢ookie鐨勫��
+ //澶氫釜cookie 淇濆瓨鐨勬椂鍊欐槸浠� ;绌烘牸 鍒嗗紑鐨�
+ var arrStr = document.cookie.split("; ");
+ for (var i = 0; i < arrStr.length; i++) {
+ var temp = arrStr[i].split("=");
+ if (temp[0] === objName){
+ return decodeURIComponent(temp[1]);
+ }else{
+ return "";
+ }
+
+ }
}
function httpRequest(paramObj,fun,errFun) {
@@ -410,6 +404,8 @@
var httpUrl = paramObj.httpUrl || '';
/*鏄惁寮傛璇锋眰*/
var async = paramObj.async || true;
+ /*璇锋眰澶村弬鏁�*/
+ var headerData = paramObj.headers || [];
/*璇锋眰鍙傛暟--post璇锋眰鍙傛暟鏍煎紡涓猴細foo=bar&lorem=ipsum*/
var paramData = paramObj.data || [];
var requestData = '';
@@ -417,7 +413,6 @@
requestData += name + '='+ paramData[name] + '&';
}
requestData = requestData === '' ? '' : requestData.substring(0,requestData.length - 1);
-
/*璇锋眰鎺ユ敹*/
xmlhttp.onreadystatechange = function() {
if(xmlhttp.readyState === 4 && xmlhttp.status === 200) {
@@ -436,9 +431,44 @@
}else if(httpType === 'POST'){
xmlhttp.open("POST",httpUrl,async);
//鍙戦�佸悎閫傜殑璇锋眰澶翠俊鎭�
- xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
- xmlhttp.send(requestData);
+ var defaultContentType = true;
+ for (var i=0;i<headerData.length;i++) {
+ for(var key in headerData[i]) {
+ if (key === "Content-type") {
+ defaultContentType = false;
+ }
+ xmlhttp.setRequestHeader(key, headerData[i][key]);
+ }
+ }
+ if (defaultContentType) {
+ xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+ }
+ xmlhttp.send(defaultContentType?requestData:paramData);
}
}
+
+ 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()
+ }
+ }
+ }
+
+ // 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