From 9887c97863d53f48bb39f73c366e86d5fcd0476e Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期五, 04 一月 2019 17:17:17 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index efa9644..3c203fa 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -582,15 +582,15 @@
var rs = JSON.parse(res.result);
var resData = [];
var isUpdateTbl = false;
+ //console.log(Page.all);
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];
var _tmp = formaterResData(_data);
-
- if(_data.apply_note != Page.all) {
+ if(_data.apply_note &&_data.apply_note != Page.all) {
resData.push(_tmp);
Page.setAll(_data.apply_note);
isUpdateTbl = true;
@@ -598,8 +598,9 @@
}
}else {
Page.setAll(0);
+ isUpdateTbl = true;
}
- // console.log(isUpdateTbl);
+ //console.log(isUpdateTbl);
if(isUpdateTbl) {
$('#applyNum').text(Page.all); // 璁剧疆寰界珷
tOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
--
Gitblit v1.9.1