From bcb19e8c93c3cabf0d8eb3ee34ed819b3c5a10ef Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 25 十一月 2024 13:14:11 +0800
Subject: [PATCH] #优化地图
---
src/main/webapp/static/js/pakStore/stockAdjust.js | 158 +++++++++++++++++++++++++---------------------------
1 files changed, 76 insertions(+), 82 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index cb4e143..071cd46 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -2,23 +2,35 @@
var initAnfmeVal = "-";
var matCodeData = [];
var currLocNo;
+var matCodeLayerIdx;
function getCol() {
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'}
+ ,{field: 'threeCode', align: 'center',title: '閿�鍞鍗曞彿', edit: true, style: 'font-weight:bold'}
+ ,{field: 'deadTime', align: 'center',title: '閿�鍞鍗曡鍙�', edit: true, style: 'font-weight:bold'}
+ ,{field: 'suppCode', align: 'center',title: '璐ф灦鐮�', edit: false, style: 'font-weight:bold'}
];
- arrRemove(detlCols, "field", "anfme")
+ arrRemove(detlCols, "field", "zpallet");
+ arrRemove(detlCols, "field", "anfme");
+ arrRemove(detlCols, "field", "batch");
+ arrRemove(detlCols, "field", "threeCode");
+ arrRemove(detlCols, "field", "deadTime");
cols.push.apply(cols, detlCols);
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(['table','laydate', 'form', 'admin'], 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',
@@ -35,7 +47,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});
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
@@ -43,21 +73,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;
}
}
@@ -74,12 +104,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})
}
}
})
@@ -93,12 +123,9 @@
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);
- }
- }
- tableIns.reload({data: matCodeData,done:function (res) {limit();}});
+ let index = obj.tr.attr("data-index");
+ matCodeData.splice(index, 1);
+ tableIns.reload({data: matCodeData});
break;
}
});
@@ -122,11 +149,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();
@@ -142,9 +167,7 @@
// 閲嶈浇琛ㄦ牸
function tableReload() {
- tableIns.reload({data: matCodeData,done:function (res) {
- limit();
- }});
+ tableIns.reload({data: matCodeData});
}
// 搴撲綅鎻愮ず妗�
@@ -158,7 +181,7 @@
$('.not-retrieve').hide();
currLocNo = locNo;
} else {
- layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿");
+ layer.msg("璇疯緭鍏ユ湁鏁堝簱浣嶅彿", {icon: 2});
$('.not-retrieve').show();
$("#locMsg").html("");
$(".retrieve").hide();
@@ -174,45 +197,28 @@
}
}
- 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("鏁伴噺蹇呴』澶т簬闆�");
+ $(document).on('click','#mat-query', function () {
+ if (isEmpty(currLocNo)) {
+ layer.msg("璇峰厛妫�绱㈠簱浣�")
+ inputTip($("#searchLocNo"));
+ return;
+ }
+ 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);
}
- }
- tableIns.reload({data: matCodeData,done:function (res) {
- limit();
- }});
- }
-})
+ });
+ })
-// 鎻愬彇鐗╂枡
-var matCodeLayerIdx;
-function getMat() {
- if (isEmpty(currLocNo)) {
- layer.msg("璇峰厛妫�绱㈠簱浣�")
- inputTip($("#searchLocNo"));
- return;
- }
- matCodeLayerIdx = layer.open({
- type: 2,
- title: '鎻愬彇鐗╂枡',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: 'matQuery.html',
- success: function(layero, index){
- }
- });
-}
+})
// 鎼滅储妗嗙┖鍊兼彁绀�
function inputTip(el) {
@@ -224,30 +230,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].matNo === 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].matNo,
- maktx: data[i].matName,
- lgnum: data[i].str2,
- color: data[i].str3,
- bname: data[i].str4,
- altme: data[i].str1,
- })
- }
}
- matCodeData.push.apply(matCodeData,applyData);
+ matCodeData.push.apply(matCodeData, data);
tableIns.reload({data: matCodeData});
layer.close(matCodeLayerIdx);
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1