From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1
---
src/main/webapp/views/report/locDetl.html | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index ed829a7..1366488 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -35,6 +35,11 @@
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
+ if(parent.url != null){
+ cols = [
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ }
cols.push.apply(cols, detlCols);
return cols;
}
@@ -50,11 +55,16 @@
$('#locNo').val(tmp);
}
+ var url = '/locDetl/list/auth';
+ if(parent.url != null){
+ var url = '/agv/locDetl/list/auth';
+ }
+
// 鏁版嵁娓叉煋
tableIns = table.render({
elem: '#locDetlByMap',
headers: {token: localStorage.getItem('token')},
- url: baseUrl+'/locDetl/list/auth',
+ url: baseUrl+url,
page: true,
limit: 20,
skin: 'line',
--
Gitblit v1.9.1