From 8976457876d817ae1e00b721fce595a376d34435 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 07 四月 2021 08:14:59 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud
---
src/main/webapp/views/pda/matQuery.html | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 18638fc..5dff49b 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -12,7 +12,7 @@
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<style>
.form-box {
- padding: 15px 5px 5px 5px;
+ padding: 15px 5px 5px 0px;
font-size: 16px;
text-align: center;
}
@@ -26,6 +26,7 @@
display: inline-block;
text-align: right;
width: 70px;
+ vertical-align: middle;
}
.form-box input {
width: 120px;
@@ -36,14 +37,22 @@
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
+ vertical-align: middle;
}
.form-box textarea {
+ height: 60px;
width: 120px;
margin-left: 10px;
padding-left: 5px;
- height: 30px;
border: 1px solid #777777;
+ display: inline-block;
+ vertical-align: middle;
}
+ #selectBtn {
+ vertical-align: middle;
+ padding: 3px 5px;
+ }
+
#confirm {
margin-top: 10px;
padding: 5px 20px;
@@ -82,13 +91,14 @@
<body>
<div class="form-box">
- <div class="form-item">
+ <div class="form-item" style="padding-left: 33px;">
<span>鍟嗗搧缂栫爜</span>
<input id="matnr" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
+ <button id="selectBtn">閫�</button>
</div>
<div class="form-item">
- <span style="float: left;margin-left: 38px">鍟嗗搧鍚嶇О</span>
- <textarea id="maktx" type="text" disabled="disabled" style="height: 60px;float: left;"></textarea>
+ <span>鍟嗗搧鍚嶇О</span>
+ <textarea id="maktx" type="text" disabled="disabled"></textarea>
<div style="clear: both"></div>
</div>
<div class="form-item">
@@ -156,7 +166,17 @@
}
window.onload = function(){document.getElementById("matnr").focus();}
- $(document).on('click','#confirm', function () {
+ $(document).on('click','#selectBtn', function () {
+ var matSelectIdx = parent.layer.open({
+ type: 2,
+ title: '閫夋嫨鍟嗗搧',
+ area: ['100%', '100%'],
+ content: 'selectMat.html',
+ success: function(layero, index){
+ // $('.layui-layer-title').css('font-size', '16px').css('background-color', '#fff');
+ }
+ });
+ parent.layer.full(matSelectIdx);
})
// $('body').keydown(function () {
@@ -186,4 +206,4 @@
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1