From 1aae6f4bd840a202ee9db3efa3f6776cd10b81f9 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 29 八月 2023 09:09:45 +0800
Subject: [PATCH] #bug修复
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 101 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 83 insertions(+), 18 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index aeef93f..60899cf 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -1,10 +1,14 @@
var locDetlLayerIdx;
var tableIns;
+var locDetlData = [];
+
+var admin;
function getCol() {
var cols = [
- {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'},
];
cols.push.apply(cols, detlCols);
+ cols.push({field: 'locNo',align: 'center', title: '鎿嶄綔',merge: true, toolbar: '#operate', width: 180})
return cols;
}
@@ -16,7 +20,7 @@
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
- var admin = layui.admin;
+ admin = layui.admin;
var tableMerge = layui.tableMerge;
tableIns = table.render({
@@ -31,30 +35,25 @@
tableMerge.render(this);
limit();
getOutBound();
+
}
});
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
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,16 +64,19 @@
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})
}
}
});
}
+ break;
+ case 'importExcel':
+ $("#importExcel").trigger("click");
break;
}
});
@@ -101,6 +103,24 @@
}
})
}
+ // 宸ュ叿鏉＄偣鍑讳簨浠�
+ table.on('tool(chooseData)', function (obj){
+ var data = obj.data;
+ var layEvent = obj.event;
+ if (layEvent === 'remove') {
+ layer.confirm('纭畾瑕佺Щ闄ゅ悧锛�',
+ function (i) {
+ layer.close(i);
+ var j = locDetlData.length;
+ while (j--) {
+ if (locDetlData[j].locNo === data.locNo) {
+ locDetlData.splice(j,1);
+ }
+ }
+ tableIns.reload({data: locDetlData});
+ })
+ }
+ })
$(document).on('click','#mat-query', function () {
let loadIndex = layer.msg('璇锋眰涓�...', {icon: 16, shade: 0.01, time: false});
@@ -120,12 +140,57 @@
})
+// 瀵煎叆鐩樼偣
+function upload(obj){
+ if(!obj.files) {
+ return;
+ }
+ var file = obj.files[0];
+ admin.confirm('纭瀵煎叆 [' + file.name +'] 鏂囦欢鍚楋紵', function (index) {
+ layer.load(1, {shade: [0.1,'#fff']});
+ var url = baseUrl + "/checkout/excel/import/auth";
+ var form = new FormData();
+ form.append("file", file);
+ let xhr = new XMLHttpRequest();
+ xhr.open("post", url, true);
+ xhr.setRequestHeader('token', localStorage.getItem('token'));
+ xhr.onload = uploadComplete;
+ xhr.onerror = uploadFailed;
+ xhr.onloadend = function () {
+ layer.closeAll('loading');
+ };
+ // xhr.upload.onprogress = progressFunction;
+ xhr.upload.onloadstart = function(){
+ ot = new Date().getTime();
+ oloaded = 0;
+ };
+ xhr.send(form);
+ }, function(index){
+ });
+}
+
+function uploadComplete(evt) {
+ let res = JSON.parse(evt.target.responseText);
+ if(res.code === 200) {
+ layer.msg(res.msg, {icon: 1});
+ insTb.reload({page: {curr: 1}});
+ } else {
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
+ }
+}
+function uploadFailed(evt) {
+ let res = JSON.parse(evt.target.responseText);
+ alert(res.msg);
+ // layer.msg(res.msg, {icon: 2});
+}
+
// 娣诲姞琛ㄦ牸鏁版嵁
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;
}
--
Gitblit v1.9.1