From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/pda/matQuery.html | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 1c2b07b..38ba406 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -77,11 +77,11 @@
<div class="form-box">
<div class="form-item">
- <span>鍟嗗搧缂栧彿</span>
+ <span>鐗╂枡鍙�</span>
<input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
</div>
<div class="form-item">
- <span>鍟嗗搧鍚嶇О</span>
+ <span>鐗╂枡鍚嶇О</span>
<input id="matName" type="text" disabled="disabled">
</div>
<div class="form-item">
@@ -124,7 +124,8 @@
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- $('#matName').val(res.data.matName);
+ console.log(res.data)
+ $('#matName').val(res.data.maktx);
$('#str1').val(res.data.str1);
$('#str2').val(res.data.str2);
countDom.val(initMatCount);
@@ -144,10 +145,11 @@
*/
function confirm(){
var data = {
- matNo: $('#matNo').val(),
- matName: $('#matName').val(),
+ matnr: $('#matNo').val(),
+ maktx: $('#matName').val(),
count: countDom.val()
};
+ console.log(data)
parent.addTableData(data);
parent.layer.close(parent.matCodeLayerIdx);
}
@@ -183,4 +185,4 @@
}
</script>
-</html>
\ No newline at end of file
+</html>
--
Gitblit v1.9.1