From 6b91a33faa2d485e94eb7c498bd25b83eefb798d Mon Sep 17 00:00:00 2001 From: whycq <10027870+whycq@user.noreply.gitee.com> Date: 星期二, 13 八月 2024 08:02:25 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/pakStore/pakStore.js | 192 ++++++++++++++++++++++++----------------------- 1 files changed, 99 insertions(+), 93 deletions(-) diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js index 1510b4a..dd0f6cb 100644 --- a/src/main/webapp/static/js/pakStore/pakStore.js +++ b/src/main/webapp/static/js/pakStore/pakStore.js @@ -1,13 +1,24 @@ - +var matCodeLayerIdx; var initCountVal = 0; var matCodeData = []; +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: block;font-weight: bold'} + ]; + cols.push.apply(cols, matCols); + cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80}) + return cols; +} -layui.use(['table','laydate', 'form'], function() { +layui.config({ + base: baseUrl + "/static/layui/lay/modules/" +}).use(['admin', 'table','laydate', 'form'], function() { var table = layui.table; var $ = layui.jquery; var layer = layui.layer; - var layDate = layui.laydate; var form = layui.form; + var admin = layui.admin; tableIns = table.render({ elem: '#chooseData', @@ -16,18 +27,8 @@ 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: '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) { - $('td[data-field=count] div').html(initCountVal); - setMatCodeData(res.data); limit(); getInBound(); } @@ -35,7 +36,25 @@ // 椤甸潰淇敼 table.on('edit(chooseData)', function (obj) { - updateMatCodeData(obj.data.matNo, Number(obj.value)); + let index = obj.tr.attr("data-index"); + let data = matCodeData[index]; + let modify = true; + if (obj.field === 'anfme'){ + 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}); }); // 鐩戝惉澶村伐鍏锋爮浜嬩欢 @@ -46,25 +65,30 @@ case 'comb': // 鍒ゆ柇鏄惁瀛樺湪鐗╂枡 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("璇疯緭鍏ユ暟瀛�"); + if (isNaN(matCodeData[i].anfme)) { + layer.msg("璇疯緭鍏ユ暟瀛�", {icon: 2}); return; } - if (matCodeData[i].count === 0){ - layer.msg("鏁伴噺涓嶈兘涓洪浂"); + if (matCodeData[i].anfme <= 0){ + layer.msg("鏁伴噺蹇呴』澶т簬闆�", {icon: 2}); return; } + } + let devpNo = $('#putSiteSelect').val(); + if (isEmpty(devpNo)) { + layer.msg("璇烽�夋嫨鍏ュ簱绔�", {icon: 2}); + return; } $.ajax({ url: baseUrl+"/full/store/put/start", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify({ - devpNo: Number($('#putSiteSelect').val()), + devpNo: Number(devpNo), list: matCodeData }), contentType:'application/json;charset=UTF-8', @@ -72,67 +96,33 @@ async: false, success: function (res) { if (res.code === 200){ - layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data); + layer.msg("鍏ュ簱鍚姩鎴愬姛锛岀洰鏍囧簱浣嶏細" + res.data, {icon: 1}); matCodeData = []; + $('#focusMatByMat').val(""); tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}}); } else if (res.code === 403){ top.location.href = baseUrl+"/"; }else { - layer.msg(res.msg) + layer.msg(res.msg, {icon: 2}) } } }) + break; + default: break; } }); // 鐩戝惉琛屽伐鍏蜂簨浠� table.on('tool(chooseData)', function(obj){ - var data = obj.data; switch (obj.event) { case 'remove': - for (var i = matCodeData.length - 1; i >= 0; i--) { - if (matCodeData[i].matNo === data.matNo) { - matCodeData.splice(i, 1); - } - } - tableIns.reload({data: matCodeData,done:function (res) { - limit(); - getInBound(); - // 瑕嗙洊render鏂规硶鐨刣one - }}); + let index = obj.tr.attr("data-index"); + matCodeData.splice(index, 1); + tableIns.reload({data: matCodeData}); break; } }); - - function setMatCodeData(data) { - matCodeData = data; - for (var i=0;i<matCodeData.length;i++){ - matCodeData[i]["count"] = initCountVal; - } - } - - function updateMatCodeData(matNo, count) { - if (isNaN(count)) { - layer.msg("璇疯緭鍏ユ暟瀛�"); - } else { - if (count > 0) { - for (var i=0;i<matCodeData.length;i++){ - if (matCodeData[i]["matNo"] === matNo){ - matCodeData[i]["count"] = count; - } - } - } else { - layer.msg("鏁伴噺蹇呴』澶т簬闆�"); - } - } - - tableIns.reload({data: matCodeData,done:function (res) { - limit(); - getInBound(); - // 瑕嗙洊render鏂规硶鐨刣one - }}); - } // 鑾峰彇鍙敤鍏ュ簱绔欑偣 function getInBound() { @@ -150,47 +140,63 @@ } else if (res.code === 403) { top.location.href = baseUrl + "/"; } else { - layer.msg(res.msg) + layer.msg(res.msg, {icon: 2}) } } }) } + // 鎻愬彇鐗╂枡 + $(document).on('click','#mat-query', function () { + let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false}); + matCodeLayerIdx = admin.open({ + type: 2, + title: false, + closeBtn: false, + maxmin: false, + area: ['90%', '85%'], + shadeClose: true, + content: 'matQuery.html', + success: function(layero, index){ + layer.close(loadIndex); + } + }); + }) }); -// 鎻愬彇鐗╂枡 -var matCodeLayerIdx; -function getMat() { - matCodeLayerIdx = layer.open({ - type: 2, - title: '鎻愬彇鐗╂枡', - maxmin: true, - area: [top.detailWidth, top.detailHeight], - shadeClose: true, - content: 'matQuery.html', - success: function(layero, index){ + + +// 鎵爜 +function focusMat(el) { + if (isEmpty(el.value)) { + return + } + $.ajax({ + url: baseUrl + "/mat/" + el.value + "/auth", + headers: {'token': localStorage.getItem('token')}, + method: 'GET', + success: function (res) { + if (res.code === 200) { + matCodeData = []; + var param = new Array(); + param[0] = res.data; + addTableData(param); + } else if (res.code === 403) { + top.location.href = baseUrl + "/"; + } else { + layer.msg(res.msg, {icon: 2}) + } } - }); + }) } // 娣诲姞琛ㄦ牸鏁版嵁 -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); -} \ No newline at end of file +} -- Gitblit v1.9.1