Merge branch 'test' of http://192.168.1.195:9998/web_developers/workreport into test

liuqimichale
2 parents 22d9fdfb ec90b68c
Showing 1 changed file with 7 additions and 2 deletions
topages/hourscount/hourscount.js
@@ -48,7 +48,7 @@ var fun= {
         });
         //项目查询
         fn.getAsraProject("",function(data){
-            var html="";
+            var html="<option value='ALL'>所有项目</option>";
             $.each(data,function(index,row){
                 html+='<option value="'+row.id+'">'+row.projecName+'</option>';
             });
@@ -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;