From d31f547c4d8556bb753b5d7f6e94b164c5037526 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:53:55 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/pakStore.js | 32 ++++++--------------------------
src/main/webapp/views/pakStore/matQuery.html | 13 -------------
2 files changed, 6 insertions(+), 39 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 3b3e666..c803685 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -4,7 +4,7 @@
function getCol() {
var cols = [
{fixed: 'left', field: 'anfme', title: '鏁伴噺锛堝繀濉級', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
- {field: 'batch', title: '鎵瑰彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: blue;font-weight: bold'}
+ {field: 'batch', title: '鎵瑰彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: block;font-weight: bold'}
];
cols.push.apply(cols, matCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80})
@@ -29,8 +29,6 @@
toolbar: '#toolbar',
cols: [getCol()],
done: function (res, curr, count) {
- $('td[data-field=anfme] div').html(initCountVal);
- setMatCodeData(res.data);
limit();
getInBound();
}
@@ -124,13 +122,6 @@
}
});
- function setMatCodeData(data) {
- matCodeData = data;
- for (var i=0;i<matCodeData.length;i++){
- matCodeData[i]["anfme"] = initCountVal;
- }
- }
-
// 鑾峰彇鍙敤鍏ュ簱绔欑偣
function getInBound() {
$.ajax({
@@ -197,22 +188,11 @@
}
// 娣诲姞琛ㄦ牸鏁版嵁
-function addTableData(data) {
- for (var i=0;i<data.length;i++){
- let pass = false;
- for (var j=0;j<matCodeData.length;j++){
- if (data[i].matNo === matCodeData[j].matNo) {
- pass = true;
- break;
- }
- }
- if (pass) {
- data.splice(i--, 1);
- } else {
- data[i]["count"] = initCountVal;
- }
- }
- matCodeData.push.apply(matCodeData, data);
+function addTableData(list) {
+ list.map(function (d) {
+ d['anfme'] = initCountVal;
+ })
+ matCodeData.push.apply(matCodeData, list);
tableIns.reload({data: matCodeData});
layer.close(matCodeLayerIdx);
}
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 69c9461..299d087 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -47,7 +47,6 @@
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
</div>
</div>
</fieldset>
@@ -147,12 +146,6 @@
tableReload();
});
- // 鎼滅储鏍忛噸缃簨浠�
- form.on('submit(reset)', function (data) {
- clearFormVal($('#search-box'));
- tableReload();
- });
-
layDate.render({
elem: '.layui-laydate-range'
,type: 'datetime'
@@ -170,12 +163,6 @@
});
}
- function clearFormVal(el) {
- $(':input', el)
- .val('')
- .removeAttr('checked')
- .removeAttr('selected');
- }
</script>
</html>
--
Gitblit v1.9.1