From 82c794aa1691821120ca4c6c8fda54a18cbb95f0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 16 七月 2020 11:01:32 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/zy-asrs into xtyasrs
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 90 +++++++++++++++++++++++++++++---------------
1 files changed, 59 insertions(+), 31 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index a25bf8a..0438e7a 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -1,8 +1,18 @@
var initCountVal = 0;
var initAnfmeVal = "-";
-var removeBtn = true;
var matCodeData = [];
var currLocNo;
+function getCol() {
+ var cols = [
+ {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ];
+ arrRemove(detlCols, "field", "anfme")
+ cols.push.apply(cols, detlCols);
+ cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ return cols;
+}
+
layui.use(['table','laydate', 'form'], function() {
var table = layui.table;
var $ = layui.jquery;
@@ -17,16 +27,7 @@
limit: 500,
cellMinWidth: 50,
toolbar: '#toolbar',
- cols: [[
- {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
- {field: 'anfme', align: 'center',title: '鏁伴噺'},
- {field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'barcode', align: 'center', title: '鏉＄爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'},
- {field: 'str1', align: 'center', title: '鐗╂枡鍗曚綅'},
- {field: 'str2', align: 'center', title: '鐗╂枡瑙勬牸'},
- {fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80}
- ]],
+ cols: [getCol()],
done: function (res, curr, count) {
limit();
}
@@ -34,7 +35,7 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matNo, Number(obj.value));
+ updateMatCodeData(obj.data.matnr, Number(obj.value));
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -74,7 +75,7 @@
success: function (res) {
if (res.code === 200){
layer.msg(currLocNo + res.msg);
- reset();
+ init(currLocNo)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
@@ -93,7 +94,7 @@
switch (obj.event) {
case 'remove':
for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matNo === data.matNo) {
+ if (matCodeData[i].matnr === data.matnr) {
matCodeData.splice(i, 1);
}
}
@@ -110,27 +111,27 @@
layer.msg("璇疯緭鍏ュ簱浣嶅彿");
return;
}
- http.post(baseUrl + "/locDetl/list/auth", {locNo: locNo,limit: 1000}, function (res) {
- matCodeData = [];
- let data = res.data.records;
- for (var i = 0; i<data.length; i++) {
- matCodeData.push({
- count: data[i].anfme,
- anfme: data[i].anfme,
- matNo: data[i].matnr,
- matName: data[i].maktx,
- removeBtn: false
- })
- }
- locTips(true, locNo);
- tableReload();
- })
+ init(locNo);
});
// 閲嶇疆浜嬩欢
form.on('submit(reset)', function (data) {
reset();
});
+
+ function init(locNo) {
+ http.post(baseUrl + "/locDetl/list/auth", {locNo: locNo,limit: 1000}, function (res) {
+ matCodeData = [];
+ let data = res.data.records;
+ for (var i = 0; i<data.length; i++) {
+ data[i]["count"] = data[i].anfme;
+ data[i]["removeBtn"] = false;
+ matCodeData.push(data[i]);
+ }
+ locTips(true, locNo);
+ tableReload();
+ })
+ }
function reset() {
clearFormVal($('#search-box'));
@@ -173,13 +174,13 @@
}
}
- function updateMatCodeData(matNo, count) {
+ function updateMatCodeData(matnr, count) {
if (isNaN(count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
} else {
if (count >= 0) {
for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matNo"] === matNo){
+ if (matCodeData[i]["matnr"] === matnr){
matCodeData[i]["count"] = count;
}
}
@@ -220,3 +221,30 @@
el.css("border-color", "#b8b8b8");
}, 1000);
}
+
+// 娣诲姞琛ㄦ牸鏁版嵁
+function addTableData(data) {
+ let applyData = [];
+ 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].matnr) {
+ pass = true;
+ break;
+ }
+ }
+ if (!pass) {
+ applyData.push({
+ count: initCountVal,
+ anfme: initAnfmeVal,
+ removeBtn: true,
+ matnr: data[i].matNo,
+ maktx: data[i].matName,
+ altme: data[i].str1,
+ })
+ }
+ }
+ matCodeData.push.apply(matCodeData,applyData);
+ tableIns.reload({data: matCodeData});
+ layer.close(matCodeLayerIdx);
+}
\ No newline at end of file
--
Gitblit v1.9.1