From b3460365bca5a645e3e37d69dd606ae8bea8cbb0 Mon Sep 17 00:00:00 2001
From: whyclj <1525436766@qq.com>
Date: 星期一, 07 一月 2019 16:11:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index b139164..a17b80b 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -180,7 +180,7 @@
// console.log(data.index); //寰楀埌褰撳墠Tab鐨勬墍鍦ㄤ笅鏍�
// console.log(data.elem); //寰楀埌褰撳墠鐨凾ab澶у鍣�
tabsIndex = data.index; // 鏍囪瘑鏄剧ず鐨勯�夐」鍗″唴瀹�
- console.log(tabsIndex);
+ //console.log(tabsIndex);
if(tabsIndex == 0) {
pagePage.init(Page, search); // 寰呭鏍�
}else if(tabsIndex == 1){
@@ -407,6 +407,21 @@
});
+ // 宸查獙鏀舵搷浣滄爮
+ table.on('tool(acceptedTbl)', function(obj) {
+ switch(obj.event) {
+ case 'accept':
+ acceptBattGroup(obj.data);
+ break;
+ case 'control':
+ controlPage(obj.data);
+ break;
+ case 'look':
+ lookHomeInfo(obj.data);
+ break;
+ }
+ });
+
// 鎵归噺鐢宠
$('#exBattGroups').click(function() {
var checkStatus = table.checkStatus('pageTbl'); //idTest 鍗充负鍩虹鍙傛暟 id 瀵瑰簲鐨勫��
@@ -626,12 +641,11 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(tOptions);
-
+ // 鍚姩鑷姩鍒锋柊
+ updateSearch();
}
,complete: function() {
layer.close(load);
- // 鍚姩鑷姩鍒锋柊
- updateSearch();
}
});
}
@@ -688,7 +702,7 @@
tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
table.render(tOptions);
}
-
+ // console.log(456);
// 瀹炴椂鍥炶皟
updateSearch.timer = setTimeout(updateSearch, 4000);
}
@@ -734,12 +748,12 @@
// 鐢熸垚琛ㄦ牸鏁版嵁
table.render(acceptOptions);
- // console.log(table);
+ // 鍚姩鑷姩鍒锋柊
+ updateAcceptSearch();
}
,complete: function() {
layer.close(load);
- // 鍚姩鑷姩鍒锋柊
- updateAcceptSearch();
+
}
});
}
@@ -748,7 +762,7 @@
function acceptSearchParam() {
var temp = {
apply_en: 1
- ,check_en: 0
+ ,check_en: 100
,binf: {
page: acceptPage.getPage()
}
@@ -803,7 +817,7 @@
apply_en: 1
,check_en: 1
,binf: {
- page: acceptPage.getPage()
+ page: acceptedPage.getPage()
}
};
return temp;
@@ -843,7 +857,7 @@
_resData.doThings = '';
layuiTbl.updateTr(i, _resData);
}
-
+ //console.log(123);
// 瀹炴椂鍥炶皟
updateAcceptSearch.timer = setTimeout(updateAcceptSearch, 4000);
}
--
Gitblit v1.9.1