From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
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