。

src/main/resources/static/app/storage/drug/drugStatement/controller/drugStatementCtrl.js

@@ -6,75 +6,43 @@ angular.module('app.storage').controller("drugStatementCtrl", function ($scope,$
 	$scope.endTime = null;
     // 获取列表数据.
     $scope.loadData = function (time) {
-    	if(time == null){
-    		startTime = $("#startDate").val(); // 时间控件获取值
-        	endTime = $("#endDate").val(); // 时间控件获取值
+    	/*if(time == null){
+    		$scope.startTime = $("#startDate").val(); // 时间控件获取值
+    		$scope.endTime = $("#endDate").val(); // 时间控件获取值
     	}else{
+    		var tYear = new Date().getFullYear();
+    		
+    		$scope.startDate = new Date(tYear,0,1);
+    		$scope.endDate = new date();
+    		$scope.startTime = null;
+    		$scope.endTime = null;
+    	}*/
+    	
+    	if(time == 1 ){ //清空
+    		$scope.startTime = null;
+    		$scope.endTime = null;
     		$scope.startDate = null;
-    		$scope.endDate = null;
-    		startTime = null;
-    		endTime = null;
+    		$scope.endDate = null
+    		
+    	}else{
+    		$scope.startTime = $("#startDate").val(); // 时间控件获取值
+    		$scope.endTime = $("#endDate").val(); // 时间控件获取值
+    		if($scope.startTime == null || $scope.startTime == ""){
+        		$scope.startDate = new Date().getFullYear()+"-"+"01"+"-"+"01";
+    		}
+    		if($scope.endTime == null || $scope.endTime == ""){
+    			$scope.endDate = new Date().getFullYear()+"-"+(new Date().getMonth()+1)+"-"+new Date().getDate();
+    		}
     	}
     	
-    	drugStatementService.getList(startTime,endTime).then(function (data) {
+    	
+    	drugStatementService.getList($scope.startTime, $scope.endTime).then(function (data) {
     		
             $scope.statementList = data.data;
             
         }, function (data) {
             console.log(data);
         });
-    	
-    	/*$scope.statementList = 
-    		
-    		
-    		[
-    	        {
-    	            "storagecount": 170,
-    	            "drugKindCount": 1,
-    	            "deliverycount": 170,
-    	            "amount": 170,
-    	            "drugkind": 3024,
-    	            "shelfamount": 170,
-    	            "drugNameCount": 1,
-    	            "drugname": 3032,
-    	            "openingInventory": 0
-    	        },
-    	        {
-    	            "storagecount": 56,
-    	            "drugKindCount": 3,
-    	            "deliverycount": 62,
-    	            "amount": 170,
-    	            "drugspecificationunit": 5507,
-    	            "drugkind": 3025,
-    	            "shelfamount": 170,
-    	            "drugNameCount": 2,
-    	            "drugname": 3041,
-    	            "openingInventory": 6
-    	        },
-    	        {
-    	            "storagecount": 18,
-    	            "drugKindCount": 0,
-    	            "deliverycount": 18,
-    	            "amount": 33,
-    	            "drugkind": 3025,
-    	            "shelfamount": 33,
-    	            "drugNameCount": 0,
-    	            "drugname": 3041,
-    	            "openingInventory": 0
-    	        },
-    	        {
-    	            "storagecount": 30,
-    	            "drugKindCount": 0,
-    	            "deliverycount": 30,
-    	            "amount": 71,
-    	            "drugspecificationunit": 5505,
-    	            "drugkind": 3025,
-    	            "shelfamount": 71,
-    	            "drugNameCount": 1,
-    	            "drugname": 3044,
-    	            "openingInventory": 0
-    	        }
-    	        ]*/
     };
     $scope.loadData();
 
@@ -87,17 +55,17 @@ angular.module('app.storage').controller("drugStatementCtrl", function ($scope,$
   //打印
     $scope.preview = function (oper) { 
     	if (oper < 10){ 
-	    	  bdhtml=window.document.body.innerHTML;//获取当前页的html代码 
-	    	  sprnstr="<!--startprint"+oper+"-->";//设置打印开始区域 
-	    	  eprnstr="<!--endprint"+oper+"-->";//设置打印结束区域 
-	    	  prnhtml=bdhtml.substring(bdhtml.indexOf(sprnstr)+18); //从开始代码向后取html 
+	    	  var bdhtml=window.document.body.innerHTML;//获取当前页的html代码 
+	    	  var sprnstr="<!--startprint"+oper+"-->";//设置打印开始区域 
+	    	  var eprnstr="<!--endprint"+oper+"-->";//设置打印结束区域 
+	    	  var prnhtml=bdhtml.substring(bdhtml.indexOf(sprnstr)+18); //从开始代码向后取html 
 	    	  
 	    	  prnhtml=prnhtml.substring(0,prnhtml.indexOf(eprnstr));//从结束代码向前取html 
 	    	  window.document.body.innerHTML=prnhtml; 
 	    	  window.print(); 
 	    	  window.document.body.innerHTML=bdhtml; 
     	 }else{
-    		 window.print(); 
+    		 window.print();
     	 }
     	 
     }