From 4b4fd147ad9ca0ffaae202df9ecb093778cb82e3 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 22 六月 2020 08:45:35 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/pakStore/stockOut.js | 85 +++++++++++++++++++++++++++--------------- 1 files changed, 54 insertions(+), 31 deletions(-) diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js index 787beec..ea7f599 100644 --- a/src/main/webapp/static/js/pakStore/stockOut.js +++ b/src/main/webapp/static/js/pakStore/stockOut.js @@ -15,19 +15,19 @@ toolbar: '#toolbar', cellMinWidth: 50, cols: [[ - {type: 'checkbox'} - ,{field: 'anfme', align: 'center',title: '鏁伴噺锛堝彲璋冩暣锛�', edit:'text', width: 130, style:'color: blue;font-weight: bold'} + {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'} + ,{field: 'anfme', align: 'center',title: '鍘熸暟閲�'} ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'} ,{field: 'matnr', align: 'center',title: '鐗╂枡'} - ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80} - ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'} + // ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�', width:80} + // ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'} // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'} - ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200} - ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪', width:150} - ,{field: 'werks', align: 'center',title: '宸ュ巶'} - ,{field: 'altme', align: 'center',title: '鍗曚綅', width:80} + // ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID', width:200} + ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'} + // ,{field: 'werks', align: 'center',title: '宸ュ巶'} + ,{field: 'altme', align: 'center',title: '鍗曚綅'} ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'} - ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'} + // ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'} ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80} ]], done: function(res, curr, count) { @@ -38,20 +38,16 @@ // 椤甸潰淇敼 table.on('edit(chooseData)', function (obj) { - if (!isNaN(obj.value)) { - updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value)); - } else { - layer.msg("璇疯緭鍏ユ暟瀛�"); - } + updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value)); }); // 鐩戝惉澶村伐鍏锋爮浜嬩欢 table.on('toolbar(chooseData)', function (obj) { - var data = table.checkStatus(obj.config.id).data; + var data = locDetlData; switch (obj.event) { case 'outbound': if (data.length === 0){ - layer.msg('璇疯嚦灏戦�変腑涓�琛屾暟鎹�'); + layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡'); } else { var staNo = $("#staNoSelect").val(); if (staNo === "" || staNo === null){ @@ -60,7 +56,7 @@ } var locDetls = []; data.forEach(function(elem) { - locDetls.push({locNo: elem.locNo, matnr: elem.matnr}); + locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); }); let param = { outSite: staNo, @@ -72,10 +68,10 @@ data: JSON.stringify(param), contentType:'application/json;charset=UTF-8', method: 'POST', - traditional:true, success: function (res) { if (res.code === 200){ - getOutBound(); // 閲嶈浇鍑哄簱鍙� + locDetlData = []; + tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}}); layer.msg(res.msg); } else if (res.code === 403){ top.location.href = baseUrl+"/"; @@ -99,23 +95,28 @@ locDetlData.splice(i, 1); } } - tableIns.reload({data: locDetlData,done:function (res) { - limit(); - getOutBound(); - }}); + tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}}); break; } }); - function updateLocDetlData(locNo, matnr, anfme) { - for (var i=0;i<locDetlData.length;i++){ - if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){ - if (anfme > locDetlData[i]["anfme"]) { - layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�"); - } else { - locDetlData[i]["anfme"] = anfme; + function updateLocDetlData(locNo, matnr, count) { + if (isNaN(count)) { + layer.msg("璇疯緭鍏ユ暟瀛�"); + } else { + if (count > 0) { + for (var i=0;i<locDetlData.length;i++){ + if (locDetlData[i]["locNo"] === locNo && locDetlData[i]["matnr"] === matnr){ + if (count > locDetlData[i]["anfme"]) { + layer.msg("涓嶈兘瓒呰繃鍘熸暟閲�"); + } else { + locDetlData[i]["count"] = count; + } + break; + } } - break; + } else { + layer.msg("鏁伴噺蹇呴』澶т簬闆�"); } } tableIns.reload({data: locDetlData,done:function (res) {limit(); getOutBound();}}); @@ -159,3 +160,25 @@ } }); } + +// 娣诲姞琛ㄦ牸鏁版嵁 +function addTableData(data) { + for (var i=0;i<data.length;i++){ + let pass = false; + for (var j=0;j<locDetlData.length;j++){ + if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) { + pass = true; + break; + } + } + if (pass) { + data.splice(i--, 1); + } else { + data[i]["count"] = data[i]["anfme"]; + } + + } + locDetlData.push.apply(locDetlData, data); + tableIns.reload({data: locDetlData}); + layer.close(locDetlLayerIdx); +} \ No newline at end of file -- Gitblit v1.9.1