时间筛选

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1175 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/js/index/app.js

@@ -643,8 +643,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			condition.dateFrom = date;
 			condition.dateTo = null;
 		} else {
+			date.setMonth(date.getMonth() - 6)
 			condition.dateFrom = null;
-			condition.dateTo = null;
+			condition.dateTo = date;
 		}
 	};
 	
@@ -1572,6 +1573,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			$scope.condition.dateZone = zone;
 			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == 1 ? '一个月内' : '半年内');
 			$scope.condition.$dateZoneOpen = false;
+			getDateCondition(zone, $scope.condition);
+			$scope.tableParams.reload();
 		};
 		$scope.setActive = function(state) {
 			if($scope.active != state) {
@@ -1841,6 +1844,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			$scope.condition.dateZone = zone;
 			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == 1 ? '一个月内' : '半年内');
 			$scope.condition.$dateZoneOpen = false;
+			getDateCondition(zone, $scope.condition);
+			$scope.tableParams.reload();
 		};
 		$scope.setActive = function(state) {
 			if($scope.active != state) {
@@ -2556,6 +2561,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			$scope.condition.dateZone = zone;
 			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == 1 ? '一个月内' : '半年内');
 			$scope.condition.$dateZoneOpen = false;
+			getDateCondition(zone, $scope.condition);
+			$scope.tableParams.reload();
 		};
 		$scope.setActive = function(state) {
 			if($scope.active != state) {

src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -133,7 +133,7 @@
 			  <div class="form-group ">
 			    <label>发票日期：</label>
 			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
 				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 				  </button>
 				  <ul class="dropdown-menu">

src/main/webapp/resources/tpl/index/fa/left.html

@@ -9,7 +9,7 @@
 		<i></i>财务对账
 	</div>
 	<ul class="list-unstyled">
-		<li ng-class="{'active': active=='apBill'}"><a ui-sref="fa.apBill">客户应付发票</a></li>
+		<li ui-sref-active="active"><a ui-sref="fa.apBill">客户应付发票</a></li>
 	</ul>
 </div>
 <div class="left-nav">