From 0d549f0bb889983d2c6ab569a1304ac0c3fba6f6 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 05 十二月 2022 14:50:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hylyasrs' into hylyasrs
---
src/main/webapp/views/pakStore/locDetlQuery.html | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 35b9f09..6f46989 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -72,6 +72,11 @@
<input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="batch" placeholder="鍚堝悓鍙�" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
@@ -126,6 +131,7 @@
var form = layui.form;
var admin = layui.admin;
var tableMerge = layui.tableMerge;
+ var dataSource = []
// 鏁版嵁娓叉煋
locDetlTableIns = table.render({
@@ -144,6 +150,7 @@
pageSize: 'limit'
},
parseData: function (res) {
+ dataSource = res.data.records
return {
'code': res.code,
'msg': res.msg,
@@ -164,15 +171,27 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
table.on('toolbar(stockOut)', function (obj) {
+
var checkStatus = table.checkStatus(obj.config.id);
var data = checkStatus.data;
+ var dataList = []
+ for (var j = 0; j < data.length; j++) {
+ var locno = data[j].locNo
+ for(var i = 0;i < dataSource.length; i++) {
+ if (dataSource[i].locNo === locno) {
+ dataList.push(dataSource[i])
+ }
+ }
+ }
+ console.log(dataList)
+
switch(obj.event) {
case 'confirm':
if (data.length === 0){
layer.msg("璇烽�夋嫨鏁版嵁");
return;
}
- parent.addTableData(data);
+ parent.addTableData(dataList);
break;
}
});
--
Gitblit v1.9.1