From 91f2cd5b0f832091f654cce926585d2f05cad114 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期四, 08 四月 2021 23:22:32 +0800
Subject: [PATCH] Merge branches 'dev' and 'master' of https://gitee.com/luxiaotao1123/xtywms into master
---
src/main/webapp/views/pda/matQuery.html | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 445781e..6292268 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -26,11 +26,9 @@
font-size: 16px;
display: inline-block;
text-align: right;
- width: 70px;
}
.form-box input {
- width: 120px;
- margin-left: 10px;
+ width: 160px;
padding-left: 5px;
height: 30px;
border: 1px solid #777777;
@@ -77,21 +75,57 @@
<div class="form-box">
<div class="form-item">
- <span>鐗╂枡缂栫爜</span>
- <input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">缂栫爜</span>
+ </td>
+ <td style="text-align: left">
+ <input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
+ </td>
+ </tr>
+ </table>
</div>
<div class="form-item">
- <span>鐗╂枡鍚嶇О</span>
- <input id="matName" type="text" disabled="disabled">
+ <table style="display: inline">
+ <tr>
+ <td style="vertical-align: top">
+ <span style="width: 35px; margin-right: 5px">鍚嶇О</span>
+ </td>
+ <td style="text-align: left">
+ <textarea rows="4" style="width: 165px; resize: none" id="matName" type="text" disabled="disabled" readonly="readonly"></textarea>
+ </td>
+ </tr>
+ </table>
</div>
<div class="form-item">
- <span>鐗╂枡瑙勬牸</span>
- <input id="str2" type="text" disabled="disabled">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">瑙勬牸</span>
+ </td>
+ <td style="text-align: left">
+ <input id="str2" type="text" disabled="disabled">
+ </td>
+ </tr>
+ </table>
</div>
<div class="form-item">
- <span>鍗曚綅</span>
- <input id="str1" type="text" disabled="disabled">
+ <table style="display: inline">
+ <tr>
+ <td>
+ <span style="width: 35px; margin-right: 5px">鍗曞彿</span>
+ </td>
+ <td style="text-align: left">
+ <input id="mnemonic" type="text" autocomplete="off">
+ </td>
+ </tr>
+ </table>
</div>
+ <!--<div class="form-item">-->
+ <!--<span>鍗曚綅</span>-->
+ <!--<input id="str1" type="text" disabled="disabled">-->
+ <!--</div>-->
<div class="form-item">
<span style="vertical-align: middle">鏁伴噺</span>
<div class="number-tool" style="vertical-align: middle">
@@ -146,7 +180,8 @@
var data = {
matNo: $('#matNo').val(),
matName: $('#matName').val(),
- count: countDom.val()
+ count: countDom.val(),
+ mnemonic: $("#mnemonic").val()
};
parent.addTableData(data);
parent.layer.close(parent.matCodeLayerIdx);
--
Gitblit v1.9.1