From a0abdbc0b19c855fa53e47a9196dfa2cd41e8e9d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 23 十二月 2023 19:56:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskasrs-1' into tzskasrs-1
---
src/main/webapp/views/agvBasDevp/basDevpWaitPakinDetail.html | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/views/agvBasDevp/basDevpWaitPakinDetail.html b/src/main/webapp/views/agvBasDevp/basDevpWaitPakinDetail.html
index 86336b7..ae20a09 100644
--- a/src/main/webapp/views/agvBasDevp/basDevpWaitPakinDetail.html
+++ b/src/main/webapp/views/agvBasDevp/basDevpWaitPakinDetail.html
@@ -52,16 +52,16 @@
}else {
$('#zpallet').val(tmp);
}
-
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#locDetlByMap',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/agv/waitPakin/list/auth',
+ url: baseUrl+'/agv/basDevp/detail/list/auth',
page: true,
limit: 20,
skin: 'line',
- where: {zpallet: $('#zpallet').val()},
+ //where: {zpallet: $('#zpallet').val()},
+ where: {devNo: parent.devNo},
even: true,
cellMinWidth: 50,
cols: [getCol()],
@@ -70,6 +70,12 @@
pageSize: 'limit'
},
parseData: function (res) {
+ if(!res.data){
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ }
+ }
return {
'code': res.code,
'msg': res.msg,
--
Gitblit v1.9.1