Merge branch 'pudong' into pudong_jdk8

王通
2 parents 1a3f1987 6e47d285
Showing 3 changed files with 2 additions and 4 deletions
src/main/resources/static/pages/forms/calc/calcDetailMonthly.html
src/main/resources/static/pages/report/cardInsertion/cardInsertionList.html
src/main/resources/static/pages/report/cardInsertion/cardList.html
@@ -149,9 +149,10 @@
         };
         var d = new Date();
+        d.setTime(d.getTime() - 4*1000*60*60*24);//只能查4天以前的数据
         var year = d.getFullYear();
         var month = d.getMonth() + 1;
-        var day = d.getDate()-4;//只能查4天以前的数据
+        var day = d.getDate();
         if(month < 10)
             month = "0" + month;
         if(day < 10)
@@ -265,13 +265,11 @@
 		});
 		function showcalcSheetList(){
-			debugger;
 			var id = $(this).data('id');
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
 			$("#id").val(id);
 			$get('/CardSigning/calcListSheet',{line:id,date:date,endDate:endDate,type:'query'},function(result){
-				debugger;
 				var calcSheetList = template('calcSheetList_1',{list:result});
 				$('#forms_1 tbody').html(calcSheetList);
 				$('.btn-calcSheetList_1').on('click', opencalcSheetList);
@@ -65,7 +65,6 @@
             var i = layer.load(2);
             $get('/CardSigning/calcSheet',{line:no,date:dates,dir:dir,type:'query'},function(result){
                 layer.close(i);
-                debugger;
                 var calcSheetList_2 = template('calcSheetList_2',{list:result});
                 $('#forms_2 tbody').html(calcSheetList_2);
             });