From b1cbb59d39cea44d35110d95e54fbd86d4a12e13 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 01 八月 2025 12:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs
---
src/main/webapp/views/pakStore/locDetlQuery.html | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 68f73d3..6e7e5b1 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -64,17 +64,32 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="brand" placeholder="鍖呰缁勫彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+ <input class="layui-input" type="text" name="model" placeholder="鍗峰彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ <input class="layui-input" type="text" name="unit" placeholder="绠卞彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="matnr" 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">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="memo" placeholder="澶囨敞" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -131,6 +146,7 @@
var form = layui.form;
var admin = layui.admin;
var tableMerge = layui.tableMerge;
+ var dataSource = []
// 鏁版嵁娓叉煋
locDetlTableIns = table.render({
@@ -149,6 +165,7 @@
pageSize: 'limit'
},
parseData: function (res) {
+ dataSource = res.data.records
return {
'code': res.code,
'msg': res.msg,
@@ -169,15 +186,44 @@
// 鐩戝惉澶村伐鍏锋爮浜嬩欢
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])
+ }
+ }
+ }
+
switch(obj.event) {
case 'confirm':
if (data.length === 0){
layer.msg("璇烽�夋嫨鏁版嵁");
return;
}
- parent.addTableData(data);
+
+ const reqDate = [...new Set(dataList.map(obj => obj.brand))]
+ $.ajax({
+ url: baseUrl+"/getLocDateByLocNo",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(reqDate),
+ contentType:'application/json;charset=UTF-8',
+ dataType:'json',
+ method: 'POST',
+ success: function (res) {
+ if (res.code === 200){
+ parent.addTableData(res.data);
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
break;
}
});
--
Gitblit v1.9.1