From b41de83657e70a6b304d24a1f0fe58fa0eb4017c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 27 六月 2020 17:07:36 +0800
Subject: [PATCH] #
---
src/main/webapp/views/pda/comb.html | 18 +++++++++++++++++-
src/main/webapp/views/pda/matQuery.html | 11 +++++++++--
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 987c05f..1dceedd 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -106,11 +106,11 @@
</footer>
</body>
<script>
+ var tableIns;
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
- var layDate = layui.laydate;
var form = layui.form;
tableIns = table.render({
@@ -146,5 +146,21 @@
}
});
}
+
+ // 娣诲姞琛ㄦ牸鏁版嵁
+ var matData = [];
+ function addTableData(data) {
+ let toPush = true;
+ for (var j=0;j<matData.length;j++){
+ if (data.matNo === matData[j].matNo) {
+ matData[j].count = Number(matData[j].count) + Number(data.count);
+ toPush = false;
+ }
+ }
+ if (toPush) {
+ matData.push(data);
+ }
+ tableIns.reload({data: matData});
+ }
</script>
</html>
\ No newline at end of file
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 29d7a07..e857490 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -104,6 +104,7 @@
</body>
<script>
var countDom = $('#count');
+ var initMatCount = 1;
var pageCurr;
/**
@@ -126,7 +127,7 @@
$('#matName').val(res.data.matName);
$('#str1').val(res.data.str1);
$('#str2').val(res.data.str2);
- countDom.focus().val(1)
+ countDom.focus().val(initMatCount)
}
} else if (res.code === 403) {
top.location.href = baseUrl + "/pda";
@@ -141,6 +142,12 @@
* 鎻愬彇
*/
function confirm(){
+ var data = {
+ matNo: $('#matNo').val(),
+ matName: $('#matName').val(),
+ count: countDom.val()
+ };
+ parent.addTableData(data);
parent.layer.close(parent.matCodeLayerIdx);
}
@@ -158,7 +165,7 @@
countDom.val(Number(countDom.val()) + 1);
}
function reduce() {
- if (countDom.val() <= 1) {
+ if (countDom.val() <= initMatCount) {
return;
}
countDom.val(countDom.val() - 1);
--
Gitblit v1.9.1