From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/static/js/pakStore/stockOut.js | 50 ++++++++++++++++++++++++--------------------------
1 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index f040a92..d9b2580 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -1,4 +1,4 @@
-var admin;
+var locDetlLayerIdx;
var locDetlData = [];
function getCol() {
var cols = [
@@ -14,12 +14,12 @@
layui.config({
base: baseUrl + "/static/layui/lay/modules/"
-}).use(['admin', 'table','laydate', 'form'], function() {
+}).use(['table','laydate', 'form', 'admin'], function() {
var table = layui.table;
var $ = layui.jquery;
var layer = layui.layer;
var form = layui.form;
- admin = layui.admin;
+ var admin = layui.admin;
tableIns = table.render({
elem: '#chooseData',
@@ -28,6 +28,7 @@
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
+ limit: 500,
cols: [getCol()],
done: function(res, curr, count) {
limit();
@@ -64,10 +65,9 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(chooseData)', function (obj) {
- var data = locDetlData;
switch (obj.event) {
case 'outbound':
- if (data.length === 0){
+ if (locDetlData.length === 0){
layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2});
} else {
var staNo = $("#staNoSelect").val();
@@ -75,13 +75,9 @@
layer.msg("璇烽�夋嫨鍑哄簱鍙�", {icon: 2});
return;
}
- var locDetls = [];
- data.forEach(function(elem) {
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr, batch: elem.batch, count: elem.count});
- });
let param = {
outSite: staNo,
- locDetls: locDetls
+ locDetls: locDetlData
}
$.ajax({
url: baseUrl+"/plate/out/start",
@@ -139,23 +135,25 @@
}
})
}
+
+
+ $(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: 'locDetlQuery.html',
+ success: function(layero, index){
+ layer.close(loadIndex);
+ }
+ });
+ })
+
})
-
-
-var locDetlLayerIdx;
-function getLocDetl() {
- locDetlLayerIdx = layer.open({
- type: 2,
- title: false,
- closeBtn: false,
- maxmin: false,
- area: ['90%', '85%'],
- shadeClose: true,
- content: 'locDetlQuery.html',
- success: function(layero, index){
- }
- });
-}
// 娣诲姞琛ㄦ牸鏁版嵁
function addTableData(data) {
--
Gitblit v1.9.1