From ff397a9336bb6676e88454540565d0e7451a2ef9 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139.mshome.net>
Date: 星期三, 09 一月 2019 17:40:41 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index 4eac20f..3f28b68 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -637,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];
@@ -714,7 +714,11 @@
if(isUpdateTbl) {
$('#applyNum').text(Page.all); // 璁剧疆寰界珷
tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
- table.render(tOptions);
+
+ // 褰撳墠閫夐」鍗℃病鏈夋樉绀�
+ if(tabsIndex != 0) {
+ table.render(tOptions);
+ }
}
// console.log(456);
// 瀹炴椂鍥炶皟
@@ -870,7 +874,10 @@
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);
// 瀹炴椂鍥炶皟
--
Gitblit v1.9.1