From fe588de6c86e62505bc40e9af153af19e494210c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 18 六月 2020 13:58:35 +0800 Subject: [PATCH] # --- src/main/webapp/static/js/basDevp/basDevp.js | 1 - src/main/webapp/static/js/pakStore/stockAdjust.js | 13 ++++++++++++- src/main/webapp/views/pakStore/matQuery.html | 6 +++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js index 956b112..45c56b5 100644 --- a/src/main/webapp/static/js/basDevp/basDevp.js +++ b/src/main/webapp/static/js/basDevp/basDevp.js @@ -136,7 +136,6 @@ tableReload(); return; } - console.log(obj); $.ajax({ url: baseUrl+"/basDevp/update/auth", headers: {'token': localStorage.getItem('token')}, diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js index 0ff2db5..47b6df3 100644 --- a/src/main/webapp/static/js/pakStore/stockAdjust.js +++ b/src/main/webapp/static/js/pakStore/stockAdjust.js @@ -1,5 +1,7 @@ var initCountVal = 0; +var initAnfmeVal = "-"; var matCodeData = []; +var currLocNo; layui.use(['table','laydate', 'form'], function() { var table = layui.table; var $ = layui.jquery; @@ -78,17 +80,21 @@ $(".retrieve").show(); $("#locMsg").html(locNo + " ,搴撲綅鐘舵�侊細" + data.locType$); $('.not-retrieve').hide(); + currLocNo = locNo; } else { layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿"); $('.not-retrieve').show(); $("#locMsg").html(""); $(".retrieve").hide(); + currLocNo = null; + inputTip($("#searchLocNo")); } }) } else { $('.not-retrieve').show(); $("#locMsg").html(""); $(".retrieve").hide(); + currLocNo = null; } } }) @@ -96,6 +102,11 @@ // 鎻愬彇鐗╂枡 var matCodeLayerIdx; function getMat() { + if (isEmpty(currLocNo)) { + layer.msg("璇峰厛妫�绱㈠簱浣�") + inputTip($("#searchLocNo")); + return; + } matCodeLayerIdx = layer.open({ type: 2, title: '鎻愬彇鐗╂枡', @@ -113,5 +124,5 @@ el.css("border-color", "red"); setTimeout(function () { el.css("border-color", "#b8b8b8"); - }, 2000); + }, 1000); } diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html index 5af04f7..44e1dcc 100644 --- a/src/main/webapp/views/pakStore/matQuery.html +++ b/src/main/webapp/views/pakStore/matQuery.html @@ -118,8 +118,12 @@ } for (var i=0;i<data.length;i++){ data[i]["count"] = parent.initCountVal; + if (!isEmpty(parent.initAnfmeVal)) { + data[i]["anfme"] = parent.initAnfmeVal; + } } - parent.matCodeData.push.apply(parent.matCodeData, data); + data.push.apply(data, parent.matCodeData); + parent.matCodeData = data; parent.tableIns.reload({data: parent.matCodeData}); parent.layer.close(parent.matCodeLayerIdx); break; -- Gitblit v1.9.1