From c01f7222dcd48a7263ee414287469c754e7de22c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 12 四月 2024 10:17:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
zy-asrs-wms/src/main/webapp/views/report/locDetl.html | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/webapp/views/report/locDetl.html b/zy-asrs-wms/src/main/webapp/views/report/locDetl.html
index 44296c0..1db1369 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/locDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/locDetl.html
@@ -33,7 +33,7 @@
var pageCur;
function getCol() {
var cols = [
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
return cols;
@@ -43,7 +43,12 @@
var $ = layui.jquery;
var form = layui.form;
- $('#locNo').val(parent.locNo);
+ var tmp = getQueryVariable("locNo")
+ if (tmp == false) {
+ $('#locNo').val(parent.locNo);
+ }else {
+ $('#locNo').val(tmp);
+ }
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -53,7 +58,7 @@
page: true,
limit: 20,
skin: 'line',
- where: {loc_no: parent.locNo},
+ where: {locNo: $('#locNo').val()},
even: true,
cellMinWidth: 50,
cols: [getCol()],
@@ -62,7 +67,6 @@
pageSize: 'limit'
},
parseData: function (res) {
- console.log(res)
return {
'code': res.code,
'msg': res.msg,
--
Gitblit v1.9.1