From bf411aee332eba93ce827ced5b3aa4c8250d81cc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 29 十一月 2024 09:22:34 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 116 +++++++++++++++++++---------------------------------------
1 files changed, 38 insertions(+), 78 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index 895c536..8bbcf0d 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -1,19 +1,24 @@
-var pageCurr;
+var locDetlLayerIdx;
var tableIns;
+var locDetlData = [];
function getCol() {
var cols = [
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�', style: 'font-weight: bold'}
];
cols.push.apply(cols, detlCols);
return cols;
}
-layui.use(['table','laydate', 'form'], function() {
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin', 'tableMerge'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
+ var admin = layui.admin;
+ var tableMerge = layui.tableMerge;
tableIns = table.render({
elem: '#chooseData',
@@ -24,37 +29,27 @@
cellMinWidth: 50,
cols: [getCol()],
done: function(res, curr, count) {
+ tableMerge.render(this);
limit();
getOutBound();
}
});
- // 椤甸潰淇敼
- table.on('edit(chooseData)', function (obj) {
- updateLocDetlData(obj.data.locNo, obj.data.matnr, Number(obj.value));
- });
-
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
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}); // todo
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr});
- });
let param = {
outSite: staNo,
- locDetls: locDetls
+ locDetls: locDetlData
}
$.ajax({
url: baseUrl+"/locCheck/out/start",
@@ -65,12 +60,12 @@
success: function (res) {
if (res.code === 200){
locDetlData = [];
- tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
- layer.msg(res.msg);
+ tableIns.reload({data: locDetlData});
+ 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})
}
}
});
@@ -79,47 +74,10 @@
}
});
- // 鐩戝惉琛屽伐鍏蜂簨浠�
- table.on('tool(chooseData)', function(obj){
- var data = obj.data;
- switch (obj.event) {
- case 'remove':
- for (var i = locDetlData.length - 1; i >= 0; i--) {
- if (locDetlData[i].locNo === data.locNo && locDetlData[i].matnr === data.matnr) {
- locDetlData.splice(i, 1);
- }
- }
- tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
- break;
- }
- });
-
- 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;
- }
- }
- } else {
- layer.msg("鏁伴噺蹇呴』澶т簬闆�");
- }
- }
- tableIns.reload({data: locDetlData,done:function (res) {limit(); getOutBound();}});
- }
-
// 鑾峰彇鍑哄簱鍙�
function getOutBound(){
$.ajax({
- url: baseUrl+"/available/take/site",
+ url: baseUrl+"/available/take/check/site",
headers: {'token': localStorage.getItem('token')},
method: 'POST',
async: false,
@@ -138,29 +96,31 @@
}
})
}
-})
-// 鎻愬彇鐗╂枡
-var locDetlLayerIdx;
-function getLocDetl() {
- locDetlLayerIdx = layer.open({
- type: 2,
- title: '鎻愬彇鍑鸿揣鍐呭',
- maxmin: true,
- area: [top.detailWidth, top.detailHeight],
- shadeClose: true,
- content: 'locDetlCheckQuery.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: 'locDetlCheckQuery.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ })
+
+})
// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
- for (var i=0;i<data.length;i++){
+ for (let 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$) {
+ for (let j=0;j<locDetlData.length;j++){
+ if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -175,4 +135,4 @@
locDetlData.push.apply(locDetlData, data);
tableIns.reload({data: locDetlData});
layer.close(locDetlLayerIdx);
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1