From 24c47473e12e4b095c0087bc08d1d4f7171d1f98 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 16 十二月 2024 08:33:57 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 100 ++++++++++++++++++++-----------------------------
1 files changed, 41 insertions(+), 59 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index fc2db36..042a8b5 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -7,8 +7,10 @@
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿锛堢紪杈戯級', edit: true, style: 'font-weight:bold'}
];
- arrRemove(detlCols, "field", "anfme")
+ arrRemove(detlCols, "field", "anfme");
+ arrRemove(detlCols, "field", "batch");
cols.push.apply(cols, detlCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
@@ -39,7 +41,25 @@
// 椤甸潰淇敼
table.on('edit(chooseData)', function (obj) {
- updateMatCodeData(obj.data.matnr, Number(obj.value));
+ let index = obj.tr.attr("data-index");
+ let data = matCodeData[index];
+ let modify = true;
+ if (obj.field === 'count'){
+ let vle = Number(obj.value);
+ if (isNaN(vle)) {
+ layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
+ modify = false;
+ } else {
+ if (vle <= 0) {
+ layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2});
+ modify = false;
+ }
+ }
+ }
+ if (modify) {
+ data[obj.field] = obj.value;
+ }
+ tableIns.reload({data: matCodeData});
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -47,21 +67,21 @@
switch(obj.event) {
case 'adjust':
if (isEmpty(currLocNo)) {
- layer.msg("璇峰厛妫�绱㈠簱浣�")
+ layer.msg("璇峰厛妫�绱㈠簱浣�", {icon: 2})
inputTip($("#searchLocNo"));
return;
}
if (matCodeData.length === 0) {
- layer.msg("璇峰厛娣诲姞鏄庣粏");
+ layer.msg("璇峰厛娣诲姞鏄庣粏", {icon: 2});
return;
}
for (var i=0;i<matCodeData.length;i++){
if (isNaN(matCodeData[i].count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
+ layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2});
return;
}
if (matCodeData[i].count < 0){
- layer.msg("鏁伴噺涓嶈兘灏忎簬闆�");
+ layer.msg("鏁伴噺涓嶈兘灏忎簬闆�", {icon: 2});
return;
}
}
@@ -78,12 +98,12 @@
async: false,
success: function (res) {
if (res.code === 200){
- layer.msg(currLocNo + res.msg);
+ layer.msg(currLocNo + res.msg, {icon: 1});
init(currLocNo)
} else if (res.code === 403){
top.location.href = baseUrl+"/";
}else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
}
})
@@ -97,11 +117,8 @@
var data = obj.data;
switch (obj.event) {
case 'remove':
- for (var i = matCodeData.length - 1; i >= 0; i--) {
- if (matCodeData[i].matnr === data.matnr) {
- matCodeData.splice(i, 1);
- }
- }
+ let index = obj.tr.attr("data-index");
+ matCodeData.splice(index, 1);
tableIns.reload({data: matCodeData});
break;
}
@@ -126,11 +143,9 @@
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]);
+ matCodeData = res.data.records;
+ for (var i = 0; i<matCodeData.length; i++) {
+ matCodeData[i]["count"] = matCodeData[i]["anfme"];
}
locTips(true, locNo);
tableReload();
@@ -176,23 +191,6 @@
}
}
- function updateMatCodeData(matnr, count) {
- if (isNaN(count)) {
- layer.msg("璇疯緭鍏ユ暟瀛�");
- } else {
- if (count >= 0) {
- for (var i=0;i<matCodeData.length;i++){
- if (matCodeData[i]["matnr"] === matnr){
- matCodeData[i]["count"] = count;
- }
- }
- } else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�");
- }
- }
- tableIns.reload({data: matCodeData});
- }
-
$(document).on('click','#mat-query', function () {
if (isEmpty(currLocNo)) {
layer.msg("璇峰厛妫�绱㈠簱浣�")
@@ -226,34 +224,18 @@
// 娣诲姞琛ㄦ牸鏁版嵁
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].matnr === matCodeData[j].matnr) {
- pass = true;
+ for (let i=0;i<data.length;i++){
+ for (let j=0;j<matCodeData.length;j++){
+ if (data[i].matnr === matCodeData[j].matnr && data[i].batch === matCodeData[j].batch) {
+ data.splice(i, 1);
break;
+ } else {
+ data[i]['anfme'] = initAnfmeVal;
+ data[i]['count'] = initCountVal;
}
}
- if (!pass) {
- applyData.push({
- count: initCountVal,
- anfme: initAnfmeVal,
- removeBtn: true,
- matnr: data[i].matnr,
- maktx: data[i].matName,
- lgnum: data[i].str2,
- type: data[i].str5,
- color: data[i].barcode,
- supplier: data[i].str6,
- warehouse: data[i].str7,
- brand: data[i].str3,
- altme: data[i].str1,
- bname: data[i].str4,
- })
- }
}
- matCodeData.push.apply(matCodeData,applyData);
+ matCodeData.push.apply(matCodeData, data);
tableIns.reload({data: matCodeData});
layer.close(matCodeLayerIdx);
}
--
Gitblit v1.9.1