From 730b8f59c9d54ab30d343fce6f96fd1e96eefdd4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 13 七月 2020 11:08:55 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pdaCe/index.html | 167 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 109 insertions(+), 58 deletions(-)
diff --git a/src/main/webapp/views/pdaCe/index.html b/src/main/webapp/views/pdaCe/index.html
index fce94cf..ae2e4cb 100644
--- a/src/main/webapp/views/pdaCe/index.html
+++ b/src/main/webapp/views/pdaCe/index.html
@@ -3,12 +3,14 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, target-densitydpi=high-dpi, initial-scale=1.0, user-scalable=no"/>
- <title>涓壃鐗╂祦</title>
+ <title>娴欐睙涓壃鍌ㄥ瓨璁惧鏈夐檺鍏徃</title>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<style>
-
* {
font-size: 12px;
+ }
+ html {
+ background-color: #fff;
}
.mat-msg {
@@ -64,6 +66,7 @@
}
#tips {
font-size: 12px;
+ margin-top: 2px;
margin-left: 10px;
display: inline-block;
vertical-align: middle;
@@ -110,13 +113,15 @@
</style>
</head>
<body>
+<button onclick="help()" style="padding: 0 3px; position: absolute; top: 0%; right: 0%">?</button>
<div>
<span>鏉＄爜</span>
<input type="text" id="code">
</div>
<div>
<span>鐗╂枡</span>
- <input type="text" id="matnr" onkeyup="find(this)" autocomplete="off">
+ <input type="text" id="matNo" onkeyup="find(this)" autocomplete="off">
+ <button onclick="find()">鏌ヨ</button>
</div>
<div class="mat-msg" id="mat-msg-id">
@@ -134,12 +139,16 @@
<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>
<!-- 璇︽儏 -->
<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 +156,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,32 +166,37 @@
</body>
<script>
+
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;
+ window.onload = function(){matMsg.focus();}
// 鏌ヨ鐗╂祦
function find(el) {
httpRequest({
httpUrl: baseUrl + "/matCode/auth",
type: 'post',
+ headers: [{token: getCookie('token')}],
data: {
- id: el.value
+ id: matNo.value
},
}, function (res) {
if (res.code === 200) {
@@ -198,14 +208,19 @@
// 濉厖鏁版嵁
matName.value = res.data.matName;
str1.value = res.data.str1;
+
+ // count.focus();
count.value = initMatCount;
+ confirmBtn.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)
}
})
}
@@ -214,7 +229,12 @@
function comb() {
var barcode = code.value;
if (isEmpty(barcode)) {
- tips("鎵樼洏鏉＄爜涓虹┖", true);
+ tips("璇疯緭鍏ユ墭鐩樻潯鐮�", true);
+ // document.getElementById("code").focus();
+ return;
+ }
+ if (barcode.length !== 8) {
+ tips("鏉＄爜蹇呴』涓�8浣�", true);
// document.getElementById("code").focus();
return;
}
@@ -225,54 +245,27 @@
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)
}
})
}
- initCrnMsgTable();
+ // initCrnMsgTable();
function initCrnMsgTable(row) {
var line;
if (row === undefined){
@@ -305,7 +298,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 +309,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 +322,7 @@
// 閲嶇疆
function reset() {
code.value = "";
- matnr.value = "";
+ matNo.value = "";
cancel();
while(ttbody.hasChildNodes()) {
ttbody.removeChild(ttbody.firstChild);
@@ -357,7 +350,7 @@
// 鎻愬彇
function confirm() {
addTableData({
- matnr: matnr.value,
+ matNo: matNo.value,
matName: matName.value,
str1: str1.value,
count: count.value
@@ -367,7 +360,7 @@
}
// 鍙栨秷
function cancel() {
- matnr.value = "";
+ matNo.value = "";
matName.value = "";
str1.value = "";
count.value = initMatCount;
@@ -385,6 +378,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 +418,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 +427,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 +445,51 @@
}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.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();
+ }
+ }
+
+ document.onkeydown = function (e) {
+ if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+ e = window.event;
+ var key = e.charCode || e.keyCode;
+ if (key === 114) {
+ comb()
+ }
+ }
+
+ function help() {
+ window.alert("鈶� 鎸塅1杈撳叆鏉＄爜\n" +
+ "鈶� 鎸塅2杈撳叆鐗╂枡鍙凤紝鎸塃NTER鏌ヨ锛岄�夋嫨鏁伴噺鍚庢彁鍙朶n" +
+ "鈶� 鎸塅3寮�濮嬬粍鎵榎n" +
+ "鍏跺畠锛氭寜F5鍒锋柊椤甸潰");
+ }
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1