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 | 64 ++++++++++++++++++--------------
1 files changed, 36 insertions(+), 28 deletions(-)
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index bfbe620..1366488 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -6,9 +6,9 @@
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
- <link rel="stylesheet" href="/static/layui/css/layui.css" media="all">
- <link rel="stylesheet" href="/static/css/cool.css" media="all">
- <link rel="stylesheet" href="/static/css/common.css" media="all">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../static/css/common.css" media="all">
<style>
.layui-table-body.layui-table-main{
overflow: auto; !important;
@@ -24,46 +24,54 @@
</div>
<table class="layui-hide" id="locDetlByMap" lay-filter="locDetlByMap"></table>
</body>
-<script type="text/javascript" src="/static/js/jquery/jquery-3.3.1.min.js"></script>
-<script type="text/javascript" src="/static/layui/layui.js" charset="utf-8"></script>
-<script type="text/javascript" src="/static/js/locMast/locMast.js" charset="utf-8"></script>
-<script type="text/javascript" src="/static/js/common.js" charset="utf-8"></script>
-<script type="text/javascript" src="/static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/locMast/locMast.js" charset="utf-8"></script>
<script type="text/javascript">
var pageCur;
+ function getCol() {
+ var cols = [
+ {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ if(parent.url != null){
+ cols = [
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
+ ];
+ }
+ cols.push.apply(cols, detlCols);
+ return cols;
+ }
layui.use(['table','laydate', 'form'], function() {
table = layui.table;
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);
+ }
+
+ 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: '/locDetl/list/auth',
+ url: baseUrl+url,
page: true,
- limit: 5,
+ limit: 20,
skin: 'line',
- where: {loc_no: parent.locNo},
+ where: {loc_no: $('#locNo').val()},
even: true,
cellMinWidth: 50,
- cols: [[
- // {type: 'checkbox'}
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
- ,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
- ,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
- // ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
- ,{field: 'werks', align: 'center',title: '宸ュ巶'}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'altme', align: 'center',title: '鍗曚綅'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
- ]],
+ cols: [getCol()],
request: {
pageName: 'curr',
pageSize: 'limit'
@@ -81,7 +89,7 @@
},
done: function(res, curr, count) {
if (res.code === 403) {
- top.location.href = "/";
+ top.location.href = baseUrl+"/";
}
pageCur=curr;
form.on('checkbox(tableCheckbox)', function (data) {
--
Gitblit v1.9.1