Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
chenjinsong
2018-07-10 10:11:01 +08:00

View File

@@ -38,9 +38,9 @@
$("a[data-toggle='tab']").on("click",function(){ $("a[data-toggle='tab']").on("click",function(){
$("#reportBusinessType").val($(this).data("bussiness")); $("#reportBusinessType").val($(this).data("bussiness"));
if(!$(this).parent("li").hasClass("active")){ if(!$(this).parent("li").hasClass("active")){
var action=$('select[name="action"]').val(); //var action=$('select[name="action"]').val();
var reportBusinessType=$("#reportBusinessType").val(); //var reportBusinessType=$("#reportBusinessType").val();
var reportType=$('input[name="reportType"]:checked').val(); //var reportType=$('input[name="reportType"]:checked').val();
if($(this).data("bussiness")=="label_report"){ if($(this).data("bussiness")=="label_report"){
ajaxGetLabelReport(); ajaxGetLabelReport();
}else if($(this).data("bussiness")=="lwhh_report"){ }else if($(this).data("bussiness")=="lwhh_report"){
@@ -64,6 +64,7 @@
} }
var ajaxGetLabelReport=function(){ var ajaxGetLabelReport=function(){
loading('<spring:message code="onloading"/>');
$.ajax({ $.ajax({
type:'post', type:'post',
async:false, async:false,
@@ -75,10 +76,12 @@ var ajaxGetLabelReport=function(){
dataType:"html", dataType:"html",
success:function(data){ success:function(data){
$("#label").html(data); $("#label").html(data);
closeTip();
} }
}); });
} }
var ajaxGetLwhhReport=function(){ var ajaxGetLwhhReport=function(){
loading('<spring:message code="onloading"/>');
$.ajax({ $.ajax({
type:'post', type:'post',
async:false, async:false,
@@ -90,6 +93,7 @@ var ajaxGetLwhhReport=function(){
dataType:"html", dataType:"html",
success:function(data){ success:function(data){
$("#lwhh").html(data); $("#lwhh").html(data);
closeTip();
} }
}); });
} }
@@ -233,4 +237,4 @@ var ajaxGetLwhhReport=function(){
</div> </div>
</div> </div>
</body> </body>
</html> </html>