From 6f39c0f9356f6c7e6fe80c4c99f1419b19be7e5e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 06 四月 2021 23:21:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud into master
---
src/main/webapp/views/pda/matQuery.html | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 0ed5255..9051ba1 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"/>
- <title>鐗╂枡鎻愬彇</title>
+ <title>鍟嗗搧鎻愬彇</title>
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -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,7 +37,20 @@
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
+ vertical-align: middle;
}
+ .form-box textarea {
+ width: 120px;
+ margin-left: 10px;
+ padding-left: 5px;
+ height: 30px;
+ border: 1px solid #777777;
+ }
+ #selectBtn {
+ vertical-align: middle;
+ padding: 3px 5px;
+ }
+
#confirm {
margin-top: 10px;
padding: 5px 20px;
@@ -75,17 +89,15 @@
<body>
<div class="form-box">
- <div class="form-item">
- <span>鐗╂枡缂栫爜</span>
+ <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>鐗╂枡鍚嶇О</span>
- <input id="maktx" type="text" disabled="disabled">
- </div>
- <div class="form-item">
- <span>鐗╂枡瑙勬牸</span>
- <input id="specs" type="text" disabled="disabled">
+ <span style="float: left;margin-left: 38px">鍟嗗搧鍚嶇О</span>
+ <textarea id="maktx" type="text" disabled="disabled" style="height: 60px;float: left;"></textarea>
+ <div style="clear: both"></div>
</div>
<div class="form-item">
<span>鍗曚綅</span>
@@ -107,7 +119,7 @@
var pageCurr;
/**
- * 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡璇︽儏
+ * 鏍规嵁鍟嗗搧缂栫爜鏌ヨ鍟嗗搧璇︽儏
*/
function find(el){
if (isEmpty(el.value)) {
@@ -152,7 +164,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 () {
@@ -182,4 +204,4 @@
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1