From 00833231bcb04021f4a69a1b9a7e4e45f7b20f40 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期一, 24 十二月 2018 11:15:00 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/ex-battinfo.jsp | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/gx_tieta/WebRoot/ex-battinfo.jsp b/gx_tieta/WebRoot/ex-battinfo.jsp
index 6c7f05f..e94e7b1 100644
--- a/gx_tieta/WebRoot/ex-battinfo.jsp
+++ b/gx_tieta/WebRoot/ex-battinfo.jsp
@@ -81,7 +81,11 @@
<a class="layui-btn layui-btn-xs" lay-event="adopt">瀹℃牳</a>
</script>
<script type="text/html" id="acceptBattGroupTools">
- <a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="accept">楠屾敹</a>
+ {{# if(d.check_en){ }}
+ <a class="layui-btn layui-btn-xs layui-btn-disabled" lay-event="accepted">楠屾敹</a>
+ {{# }else { }}
+ <a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="accept">楠屾敹</a>
+ {{# } }}
<a class="layui-btn layui-btn-xs layui-bg-blue" lay-event="control">瀹炴椂鏌ヨ</a>
</script>
<script type="text/html" id="applyEn">
@@ -266,6 +270,7 @@
,{field:'apply_name', title:'鐢宠浜�', align:'center', width: 120}
,{field:'apply_date', title:'鐢宠鏃ユ湡', align:'center', width: 260}
,{field:'confirm_name', title:'瀹℃牳浜�', align:'center', width: 120}
+ ,{field:'check_uname', title:'楠屾敹浜�', align:'center', width: 120}
,{fixed: 'right', title:'楠屾敹鎿嶄綔', align: 'center', toolbar: '#acceptBattGroupTools', width:180}
]]
,data:[]
@@ -301,9 +306,6 @@
break;
case 'control':
controlPage(obj.data);
- break;
- default:
- layer.msg('鍔熻兘寮�鍙戜腑...');
break;
}
});
@@ -481,7 +483,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];
@@ -489,6 +491,8 @@
resData.push(_tmp);
Page.setAll(_data.apply_note);
}
+ }else {
+ Page.setAll(0);
}
pagePage.setVal(); // 璁剧疆鍒嗛〉淇℃伅
$('#applyNum').text(Page.all); // 璁剧疆寰界珷
@@ -542,9 +546,12 @@
resData.push(_tmp);
acceptPage.setAll(_data.apply_note);
}
+ // console.log(resData);
+ }else {
+ acceptPage.setAll(0);
}
pagePage.setVal(); // 璁剧疆鍒嗛〉淇℃伅
- $('#acceptNum').text(acceptPage.all); // 璁剧疆寰界珷
+ $('#acceptNum').text(getAcceptHome(resData)); // 璁剧疆寰界珷
acceptOptions.data = resData; // 璁剧疆琛ㄦ牸鐨勬暟鎹�
// 鐢熸垚琛ㄦ牸鏁版嵁
@@ -586,6 +593,21 @@
return temp;
}
+
+ // 鑾峰彇寰呴獙鏀剁殑鏈烘埧
+ function getAcceptHome(data) {
+ // 閬嶅巻data
+ var num = 0;
+ for(var i=0; i<data.length; i++) {
+ var _data = data[i];
+ // 鍒ゆ柇鏄惁琚獙鏀�
+ if(!_data.check_en) {
+ num++;
+ }
+ }
+
+ return num;
+ }
});
</script>
</body>
--
Gitblit v1.9.1