diff --git a/topages/hourscount/hourscount.js b/topages/hourscount/hourscount.js index 6cf80c1..67efb06 100644 --- a/topages/hourscount/hourscount.js +++ b/topages/hourscount/hourscount.js @@ -48,7 +48,7 @@ var fun= { }); //项目查询 fn.getAsraProject("",function(data){ - var html=""; + var html=""; $.each(data,function(index,row){ html+=''; }); @@ -110,9 +110,14 @@ var fun= { var beginTime = $('#hourscount-daterange-btnsta').val(); //开始时间 var endTime = $('#hourscount-daterange-btnend').val(); //结束时间 var projectId = $('#hourscount-projectName').val();//项目id + if('ALL' ==projectId || projectId == null || projectId == '' || projectId==undefined){ + req.projectId = null; + }else{ + req.projectId = projectId; + } req.beginTime = beginTime; req.endTime = endTime; - req.projectId = projectId; + return req;