From 1b52ecdf3696746a1b33c66f243bcd2b3b87a531 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期四, 31 八月 2023 09:48:43 +0800 Subject: [PATCH] #物料档案 --- src/main/webapp/static/js/pakStore/stockOut.js | 61 ++++++++++++++---------------- 1 files changed, 29 insertions(+), 32 deletions(-) diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js index e129b84..d9b2580 100644 --- a/src/main/webapp/static/js/pakStore/stockOut.js +++ b/src/main/webapp/static/js/pakStore/stockOut.js @@ -1,4 +1,4 @@ -var admin; +var locDetlLayerIdx; var locDetlData = []; function getCol() { var cols = [ @@ -14,12 +14,12 @@ layui.config({ base: baseUrl + "/static/layui/lay/modules/" -}).use(['admin', 'table','laydate', 'form'], function() { +}).use(['table','laydate', 'form', 'admin'], function() { var table = layui.table; var $ = layui.jquery; var layer = layui.layer; var form = layui.form; - admin = layui.admin; + var admin = layui.admin; tableIns = table.render({ elem: '#chooseData', @@ -28,6 +28,7 @@ even: true, toolbar: '#toolbar', cellMinWidth: 50, + limit: 500, cols: [getCol()], done: function(res, curr, count) { limit(); @@ -64,24 +65,19 @@ // 鐩戝惉澶村伐鍏锋爮浜嬩欢 table.on('toolbar(chooseData)', function (obj) { - var data = locDetlData; switch (obj.event) { case 'outbound': - if (data.length === 0){ - layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡'); + if (locDetlData.length === 0){ + layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2}); } else { var staNo = $("#staNoSelect").val(); if (staNo === "" || staNo === null){ - layer.msg("璇烽�夋嫨鍑哄簱鍙�"); + layer.msg("璇烽�夋嫨鍑哄簱鍙�", {icon: 2}); return; } - var locDetls = []; - data.forEach(function(elem) { - locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count}); - }); let param = { outSite: staNo, - locDetls: locDetls + locDetls: locDetlData } $.ajax({ url: baseUrl+"/plate/out/start", @@ -93,11 +89,11 @@ if (res.code === 200){ locDetlData = []; tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}}); - layer.msg(res.msg); + layer.msg(res.msg, {icon: 1}); } else if (res.code === 403){ top.location.href = baseUrl+"/"; } else { - layer.msg(res.msg) + layer.msg(res.msg, {icon: 2}) } } }); @@ -139,30 +135,32 @@ } }) } -}) -// 鎻愬彇鐗╂枡 -var locDetlLayerIdx; -function getLocDetl() { - locDetlLayerIdx = layer.open({ - type: 2, - title: false, - closeBtn: false, - maxmin: false, - area: ['90%', '85%'], - shadeClose: true, - content: 'locDetlQuery.html', - success: function(layero, index){ - } - }); -} + + $(document).on('click','#mat-query', function () { + let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false}); + locDetlLayerIdx = layer.open({ + type: 2, + title: false, + closeBtn: false, + maxmin: false, + area: ['90%', '85%'], + shadeClose: true, + content: 'locDetlQuery.html', + success: function(layero, index){ + layer.close(loadIndex); + } + }); + }) + +}) // 娣诲姞琛ㄦ牸鏁版嵁 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$) { + if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) { pass = true; break; } @@ -172,7 +170,6 @@ } else { data[i]["count"] = data[i]["anfme"]; } - } locDetlData.push.apply(locDetlData, data); tableIns.reload({data: locDetlData}); -- Gitblit v1.9.1