From 6c1a2ada4b09f07bfb5f1478bdee19e6df8ef30a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 28 七月 2020 08:39:50 +0800
Subject: [PATCH] #当前本版十分完美、冻结
---
src/main/webapp/views/pda/index.html | 9 ++--
src/main/webapp/static/css/pda.css | 17 +++++---
src/main/webapp/views/pda/comb.html | 32 +++++++++++----
src/main/webapp/views/pda/login.html | 6 +-
src/main/webapp/views/pda/matQuery.html | 43 +++++++++++++--------
5 files changed, 68 insertions(+), 39 deletions(-)
diff --git a/src/main/webapp/static/css/pda.css b/src/main/webapp/static/css/pda.css
index 8e5f71e..5a9609e 100644
--- a/src/main/webapp/static/css/pda.css
+++ b/src/main/webapp/static/css/pda.css
@@ -5,7 +5,7 @@
box-sizing: border-box;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
- font-size: 11px;
+ font-size: 16px;
}
html {
height: 100%;
@@ -28,15 +28,18 @@
.layui-form-label {
width: initial;
padding: 6px 10px;
+ line-height: 30px;
}
#code {
width: 75%;
- height: 30px;
+ height: 40px;
margin-right: 0;
}
header button {
height: 20px;
width: 70px;
+}
+#mat-btn:focus {
}
/* layer */
@@ -48,7 +51,7 @@
/* 涓讳綋 */
main {
- height: 170px;
+ height: 235px;
overflow: auto;
}
.layui-table, .layui-table-view {
@@ -58,8 +61,8 @@
padding: 0;
}
.layui-table-cell {
- height: 22px;
- line-height: 22px;
+ height: 32px;
+ line-height: 32px;
padding: 0;
}
.layui-table-grid-down {
@@ -70,8 +73,7 @@
}
/* 灏鹃儴 */
footer {
- position: absolute;
- bottom: 5px;
+ margin-top: 20px;
width: 100%;
}
.layui-btn-container .layui-btn {
@@ -88,6 +90,7 @@
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
+ font-size: 12px;
}
.layui-btn-primary:hover {
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 2c12877..4f06e8f 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -23,7 +23,7 @@
<input class="layui-input" type="text" id="code" placeholder="鎵爜 / 杈撳叆" autocomplete="off">
</div>
<div style="margin: 5px 5px">
- <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
+ <button id="mat-btn" type="button" class="layui-btn layui-btn-normal" onclick="getMat()"><i class="layui-icon">+</i>鎻愬彇</button>
</div>
</header>
@@ -34,8 +34,8 @@
<!-- 灏鹃儴 -->
<footer>
<div class="layui-btn-container">
- <button type="button" class="layui-btn layui-btn-xs layui-btn-primary" onclick="reset()">閲嶇疆</button>
- <button type="button" class="layui-btn layui-btn-normal layui-btn-xs" onclick="comb()" style="margin-left: 20px">缁勬墭</button>
+ <button type="button" id="reset-btn" class="layui-btn layui-btn-primary" onclick="reset()">閲嶇疆</button>
+ <button type="button" id="comb-btn" class="layui-btn layui-btn-normal " onclick="comb()" style="margin-left: 20px">缁勬墭</button>
<span id="tips"></span>
</div>
</footer>
@@ -54,7 +54,7 @@
limit: 500,
cellMinWidth: 50,
cols: [[
- {fixed: 'left', align: 'center', field: 'count', title: '閲�', style:'color: blue', width:20},
+ {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
{field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
@@ -70,13 +70,15 @@
function getMat() {
matCodeLayerIdx = layer.open({
type: 2,
- title: '鐗╂枡',
+ title: '鎻愬彇鐗╂枡',
shade: [0.3,'#000'],
- area: ['90%', '90%'],
+ area: ['90%', '80%'],
content: 'matQuery.html',
success: function(layero, index){
- $('.layui-layer-title').css('height', '20px').css('line-height', '20px').css('font-size', '12px').css('padding-left', '10px')
- $('.layui-layer-setwin').css("top", '2px').css('right', '3px')
+ $('.layui-layer-title').css('font-size', '16px');
+ },
+ end: function () {
+ $('#mat-btn').focus();
}
});
}
@@ -115,7 +117,7 @@
let barcode = $('#code').val();
if (isEmpty(barcode)) {
tips("鎵樼洏鏉＄爜涓虹┖", true);
- document.getElementById("code").focus();
+ // document.getElementById("code").focus();
return;
}
if (barcode.length !== 8) {
@@ -159,5 +161,17 @@
tips.html(msg);
tips.css("color", warn?"red":'#666');
}
+
+ document.onkeyup = function (e) {
+ if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+ e = window.event;
+ var key = e.charCode || e.keyCode;
+ if (key === 115) {
+ $("#comb-btn").focus();
+ comb();
+ } else if (key === 113) {
+ $("#code").focus();
+ }
+ }
</script>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pda/index.html b/src/main/webapp/views/pda/index.html
index 3876ad6..cd3c9db 100644
--- a/src/main/webapp/views/pda/index.html
+++ b/src/main/webapp/views/pda/index.html
@@ -19,6 +19,7 @@
}
body {
height: 100%;
+ /*overflow: hidden;*/
}
/* 瀵艰埅 */
@@ -36,7 +37,7 @@
border-right: 1px solid #f1f1f1; /*todo*/
}
.nav li a {
- font-size: 14px;
+ font-size: 20px;
letter-spacing: 1px;
display: block;
text-decoration: none;
@@ -59,7 +60,7 @@
/* 涓讳綋 */
#content {
- padding-top: 25px;
+ padding-top: 32px;
width: 100%;
height: 100%;
}
@@ -73,8 +74,8 @@
<!-- 瀵艰埅鏍� -->
<ul class="nav">
<li><a id="comb" onclick="nav(this.id)" class="nav-select" href="#">缁勬墭</a></li>
- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a></li>
- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>
+<!-- <li><a id="stockIn" onclick="nav(this.id)" class="nav-unselect" href="#">鍏ュ簱</a></li>-->
+<!-- <li><a id="stockOut" onclick="nav(this.id)" class="nav-unselect" href="#">鍑哄簱</a></li>-->
</ul>
<!-- 涓讳綋鍐呭 -->
diff --git a/src/main/webapp/views/pda/login.html b/src/main/webapp/views/pda/login.html
index a7878d6..678f030 100644
--- a/src/main/webapp/views/pda/login.html
+++ b/src/main/webapp/views/pda/login.html
@@ -28,7 +28,7 @@
box-sizing:border-box;
background: #fff;
height: 100%;
- padding: 60px 40px;
+ padding: 100px 60px;
text-align: center;
overflow: hidden;
}
@@ -45,9 +45,9 @@
position: relative;
}
.layui-form-item .layui-input {
- height: 30px;
+ height: 40px;
padding-left: 20px;
- font-size: 14px;
+ font-size: 16px;
border: 1px solid #767676;
color: inherit;
border-radius: 3px;
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 942ec78..4c84b09 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -14,7 +14,7 @@
.form-box {
padding: 15px 5px 5px 5px;
- font-size: 12px;
+ font-size: 16px;
text-align: center;
}
@@ -23,16 +23,16 @@
}
.form-box span {
- font-size: 12px;
+ font-size: 16px;
display: inline-block;
text-align: right;
- width: 50px;
+ width: 70px;
}
.form-box input {
width: 120px;
margin-left: 10px;
padding-left: 5px;
- height: 20px;
+ height: 30px;
border: 1px solid #777777;
overflow:hidden;
white-space:nowrap;
@@ -56,19 +56,19 @@
}
.number-tool button {
background-color: #fff;
- margin-top: 2px;
- font-size: 13px;
- height: 18px;
+ margin-top: 3px;
+ font-size: 16px;
+ height: 25px;
float: left;
- width: 20px;
+ width: 25px;
border: 1px solid #777777;
}
.number-tool input {
text-align: center;
- height: 20px;
+ height: 30px;
float: left;
margin: 0 5px;
- width: 30px;
+ width: 40px;
padding: 0;
}
</style>
@@ -127,7 +127,8 @@
$('#matName').val(res.data.matName);
$('#str1').val(res.data.str1);
$('#str2').val(res.data.str2);
- countDom.focus().val(initMatCount)
+ countDom.val(initMatCount);
+ $('#confirm').focus();
}
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
@@ -155,11 +156,11 @@
$(document).on('click','#confirm', function () {
})
- $('body').keydown(function () {
- if (event.keyCode === 13) {
- $("#confirm").click();
- }
- });
+ // $('body').keydown(function () {
+ // if (event.keyCode === 13) {
+ // $("#confirm").click();
+ // }
+ // });
function add() {
countDom.val(Number(countDom.val()) + 1);
@@ -171,5 +172,15 @@
countDom.val(countDom.val() - 1);
}
+
+ document.onkeyup = function (e) {
+ if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+ e = window.event;
+ var key = e.charCode || e.keyCode;
+ if (key === 115) {
+ confirm();
+ }
+ }
+
</script>
</html>
\ No newline at end of file
--
Gitblit v1.9.1