From f816765db6908f61a260e7da4fb15d22d1a89b0f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 10 七月 2020 16:47:08 +0800
Subject: [PATCH] #拣料
---
src/main/webapp/views/pdaCe/index.html | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/src/main/webapp/views/pdaCe/index.html b/src/main/webapp/views/pdaCe/index.html
index ede925d..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,6 +113,7 @@
</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">
@@ -183,7 +187,7 @@
matDetail.style.display = 'none';
var initMatCount = 1;
- // window.onload = function(){code.focus();}
+ window.onload = function(){matMsg.focus();}
// 鏌ヨ鐗╂祦
function find(el) {
@@ -205,9 +209,9 @@
matName.value = res.data.matName;
str1.value = res.data.str1;
- count.focus();
+ // count.focus();
count.value = initMatCount;
- // confirmBtn.focus();
+ confirmBtn.focus();
} else {
matMsg.style.display = 'block';
btnCon.style.display = 'block';
@@ -225,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;
}
@@ -256,7 +265,7 @@
})
}
- initCrnMsgTable();
+ // initCrnMsgTable();
function initCrnMsgTable(row) {
var line;
if (row === undefined){
@@ -465,14 +474,6 @@
} 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) {
@@ -482,25 +483,13 @@
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)
+ function help() {
+ window.alert("鈶� 鎸塅1杈撳叆鏉＄爜\n" +
+ "鈶� 鎸塅2杈撳叆鐗╂枡鍙凤紝鎸塃NTER鏌ヨ锛岄�夋嫨鏁伴噺鍚庢彁鍙朶n" +
+ "鈶� 鎸塅3寮�濮嬬粍鎵榎n" +
+ "鍏跺畠锛氭寜F5鍒锋柊椤甸潰");
+ }
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1