From c58d9f94318d9c8c3c3dfdbcfd6b7d0d436de992 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 10 一月 2019 09:09:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index 5bd3409..3f28b68 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -139,6 +139,13 @@
<script type="text/javascript" src="pages/js/common.js"></script>
<script type="text/javascript" src="pages/js/pages/homeInfo.js"></script>
<script type="text/javascript">
+ var permits;
+ <% Object obj=session.getAttribute("permits");
+ if(obj!=null){
+ String permits =obj.toString(); %>
+ permits=<%=permits%>;
+ //console.info(json);
+ <% } %>
layui.use(['form', 'table', 'layer', 'element'], function() {
/* 椤甸潰瀵煎叆layui妯″潡 */
var table = layui.table; // 鑾峰彇琛ㄦ牸妯″潡
@@ -248,6 +255,9 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
+ // 妫�娴嬫槸鍚﹀彲浠ュ鏍告潈闄�
+ var apprPermit = isHasPermit('install_appr_permit', permits);
+ changeApprTbl(apprPermit, tOptions);
// 寰呴獙鏀剁殑琛ㄦ牸
var acceptOptions = {
@@ -310,6 +320,9 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
+ // 妫�娴嬮獙鏀剁殑鏉冮檺
+ var checkPermit = isHasPermit('install_check_permit', permits);
+ changeCheckTbl(checkPermit, acceptOptions);
// 寰呴獙鏀剁殑琛ㄦ牸
var acceptedOptions = {
@@ -624,7 +637,7 @@
var resData = [];
if(rs.code == 1) {
var data = rs.data;
- // console.log(data);
+ //console.log(data);
// 閬嶅巻鏁版嵁鐨勫��
for(var i=0; i<data.length; i++) {
var _data = data[i];
@@ -663,9 +676,10 @@
}
// 鏇存柊瀹℃煡琛ㄦ牸
+ var updateSearchTimer;
function updateSearch() {
var temp = createSearchParam();
- clearInterval(updateSearch.timer);
+ clearInterval(updateSearchTimer);
// 鏌ヨ鍚庡彴
$.ajax({
type: 'post'
@@ -686,8 +700,8 @@
for(var i=0; i<data.length; i++) {
var _data = data[i];
var _tmp = formaterResData(_data);
+ resData.push(_tmp);
if(_data.apply_note &&_data.apply_note != Page.all) {
- resData.push(_tmp);
Page.setAll(_data.apply_note);
isUpdateTbl = true;
}
@@ -700,11 +714,15 @@
if(isUpdateTbl) {
$('#applyNum').text(Page.all); // 璁剧疆寰界珷
tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
- table.render(tOptions);
+
+ // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
+ if(tabsIndex != 0) {
+ table.render(tOptions);
+ }
}
- console.log(456);
+ // console.log(456);
// 瀹炴椂鍥炶皟
- updateSearch.timer = setTimeout(updateSearch, 4000);
+ updateSearchTimer = setTimeout(updateSearch, 4000);
}
});
}
@@ -824,9 +842,10 @@
}
// 鏇存柊楠屾敹琛ㄦ牸
+ var updateAcceptSearchTimer;
function updateAcceptSearch() {
var temp = acceptSearchParam();
- clearInterval(updateAcceptSearch.timer);
+ clearInterval(updateAcceptSearchTimer);
// 鏌ヨ鍚庡彴
$.ajax({
type: 'post'
@@ -850,16 +869,19 @@
}else {
acceptPage.setAll(0);
}
-
+ layuiTbl.setCache(table.cache.acceptTbl);
// 閬嶅巻data鐨勫�兼洿鏂版暟鎹�
for(var i=0; i<resData.length; i++) {
var _resData = resData[i];
_resData.doThings = '';
- layuiTbl.updateTr(i, _resData);
+ // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
+ if(tabsIndex != 1) {
+ layuiTbl.updateTr(i, _resData);
+ }
}
- console.log(123);
+ //console.log(123);
// 瀹炴椂鍥炶皟
- updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);
+ updateAcceptSearchTimer = setTimeout(updateAcceptSearch, 4000);
}
});
}
@@ -898,6 +920,27 @@
return num;
}
+
+ // 淇敼瀹℃壒琛ㄦ牸鏍峰紡
+ function changeApprTbl(bool, opts) {
+ var col = opts.cols[0];
+ var doThings = col[col.length-1];
+ // 绉婚櫎瀹℃壒鎸夐挳
+ if(!bool) {
+ col.length = col.length-1;
+ }
+ }
+
+ // 淇敼楠屾敹琛ㄦ牸鏍峰紡
+ function changeCheckTbl(bool, opts) {
+ var col = opts.cols[0];
+ var doThings = col[col.length-1];
+ // 绉婚櫎瀹℃壒鎸夐挳
+ if(!bool) {
+ doThings.width = 200;
+ doThings.toolbar = '#acceptedBattGroupTools';
+ }
+ }
});
</script>
</body>
--
Gitblit v1.9.1