From 3e3d19682673ce2d92162d1758816348a333e4ff Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 24 二月 2021 14:36:41 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/comb.html | 8 ++++----
src/main/webapp/views/pda/matQuery.html | 20 ++++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index f83699a..db7ffa7 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -55,8 +55,8 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {field: 'matnr', align: 'center', title: '鐗╂枡缂栫爜'},
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
}
@@ -93,13 +93,13 @@
// 娣诲姞琛ㄦ牸鏁版嵁
var matData = [];
function addTableData(data) {
- if (isEmpty(data.matName)){
+ if (isEmpty(data.maktx)){
tips("鎻愬彇澶辫触", true);
return;
}
let toPush = true;
for (var j=0;j<matData.length;j++){
- if (data.matNo === matData[j].matNo) {
+ if (data.matnr === matData[j].matnr) {
matData[j].count = Number(matData[j].count) + Number(data.count);
toPush = false;
}
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 0fc7734..0ed5255 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -77,19 +77,19 @@
<div class="form-box">
<div class="form-item">
<span>鐗╂枡缂栫爜</span>
- <input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
+ <input id="matnr" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
</div>
<div class="form-item">
<span>鐗╂枡鍚嶇О</span>
- <input id="matName" type="text" disabled="disabled">
+ <input id="maktx" type="text" disabled="disabled">
</div>
<div class="form-item">
<span>鐗╂枡瑙勬牸</span>
- <input id="str2" type="text" disabled="disabled">
+ <input id="specs" type="text" disabled="disabled">
</div>
<div class="form-item">
<span>鍗曚綅</span>
- <input id="str1" type="text" disabled="disabled">
+ <input id="unit" type="text" disabled="disabled">
</div>
<div class="form-item">
<span style="vertical-align: middle">鏁伴噺</span>
@@ -123,9 +123,9 @@
success: function (res) {
if (res.code === 200) {
if (res.data != null) {
- $('#matName').val(res.data.matName);
- $('#str1').val(res.data.str1);
- $('#str2').val(res.data.str2);
+ $('#maktx').val(res.data.maktx);
+ $('#specs').val(res.data.specs);
+ $('#unit').val(res.data.unit);
countDom.val(initMatCount);
$('#count').focus().select();
}
@@ -143,15 +143,15 @@
*/
function confirm(){
var data = {
- matNo: $('#matNo').val(),
- matName: $('#matName').val(),
+ matnr: $('#matnr').val(),
+ maktx: $('#maktx').val(),
count: countDom.val()
};
parent.addTableData(data);
parent.layer.close(parent.matCodeLayerIdx);
}
- window.onload = function(){document.getElementById("matNo").focus();}
+ window.onload = function(){document.getElementById("matnr").focus();}
$(document).on('click','#confirm', function () {
})
--
Gitblit v1.9.1