显示当前单据总数、时间筛选加【不限】

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

src/main/webapp/resources/css/index.css

@@ -1340,6 +1340,10 @@ ul>li.item-link>a {
 	background: #fff;
 	z-index: 2;
 }
+
+.total {
+	line-height: 30px;
+}
 /*account*/
 .user-role>.role-item{
 	float: left;

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

@@ -655,7 +655,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	
 	var getDateCondition = function(zone, condition) {
 		var date = new Date();
-		if(zone == 1) {
+		if(zone == -1) {
+			condition.dateFrom = null;
+			condition.dateTo = null;
+		} else if(zone == 1) {
 			date.setMonth(date.getMonth() - 1);
 			condition.dateFrom = date;
 			condition.dateTo = new Date();
@@ -673,11 +676,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	app.controller('SaleOrderCtrl', ['$scope', '$filter', 'PurcOrderItem', 'PurcOrder', 'ngTableParams', 'toaster', 'ReportService', 'BaseService', 'PurcOrderItemHis',
 	   function($scope, $filter, PurcOrderItem, PurcOrder, ngTableParams, toaster, ReportService, BaseService, PurcOrderItemHis){
 		$scope.active = 'todo';
-		$scope.dateZoneText = '一个月内';
-		$scope.condition = {dateZone: 1};
+		$scope.dateZoneText = '不限';
+		$scope.condition = {dateZone: -1};
 		$scope.changeDateZone = function(zone) {
 			$scope.condition.dateZone = zone;
-			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == 1 ? '一个月内' : '半年内');
+			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == -1 ? '不限' : (zone == 1 ? '一个月内' : '半年内'));
 			$scope.condition.$dateZoneOpen = false;
 			getDateCondition(zone, $scope.condition);
 			$scope.tableParams.reload();
@@ -1602,12 +1605,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	// 发货提醒
 	app.controller('SaleNoticeCtrl', ['$scope', '$rootScope', '$filter', 'PurcNotice', 'ngTableParams', 'toaster', 'BaseService', 'PurcNoticeHis', '$modal', 'SaleTruck', 'Symbol', function($scope, $rootScope, $filter, PurcNotice, ngTableParams, toaster, BaseService, PurcNoticeHis, $modal, SaleTruck, Symbol){
 		$scope.active = 'todo';
-		$scope.dateZoneText = '一个月内';
-		$scope.condition = {dateZone: 1};
 		$scope.currency = Symbol.currency;
+		$scope.dateZoneText = '不限';
+		$scope.condition = {dateZone: -1};
 		$scope.changeDateZone = function(zone) {
 			$scope.condition.dateZone = zone;
-			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == 1 ? '一个月内' : '半年内');
+			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == -1 ? '不限' : (zone == 1 ? '一个月内' : '半年内'));
 			$scope.condition.$dateZoneOpen = false;
 			getDateCondition(zone, $scope.condition);
 			$scope.tableParams.reload();
@@ -1868,19 +1871,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	 */
 	app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams', 'toaster', 'BaseService', 'Symbol', function($scope, $filter, SaleSend, ngTableParams, toaster, BaseService, Symbol){
 		$scope.active = 'all';
-		$scope.agreedText = '全部';
-		$scope.dateZoneText = '一个月内';
-		$scope.condition = {dateZone: 1};
 		$scope.currency = Symbol.currency;
-		
-		$scope.changeAgreed = function(agreed) {
-			$scope.condition.agreed = agreed;
-			$scope.agreedText = typeof agreed == 'undefined' ? '全部' : (agreed == 1 ? '已同意' : '不同意');
-			$scope.condition.$agreedOpen = false;
-		};
+		$scope.dateZoneText = '不限';
+		$scope.condition = {dateZone: -1};
 		$scope.changeDateZone = function(zone) {
 			$scope.condition.dateZone = zone;
-			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == 1 ? '一个月内' : '半年内');
+			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == -1 ? '不限' : (zone == 1 ? '一个月内' : '半年内'));
 			$scope.condition.$dateZoneOpen = false;
 			getDateCondition(zone, $scope.condition);
 			$scope.tableParams.reload();
@@ -2608,22 +2604,16 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	 */
 	app.controller('SaleApBillCtrl', ['$scope', '$filter', 'PurcApBill', 'ngTableParams', 'toaster', 'BaseService', 'Symbol', function($scope, $filter, PurcApBill, ngTableParams, toaster, BaseService, Symbol){
 		$scope.active = 'all';
-		$scope.agreedText = '全部';
-		$scope.dateZoneText = '一个月内';
-		$scope.condition = {dateZone: 1};
-		$scope.currency = Symbol.currency;//将币别转化为对应的符号
-		$scope.changeAgreed = function(agreed) {
-			$scope.condition.agreed = agreed;
-			$scope.agreedText = typeof agreed == 'undefined' ? '全部' : (agreed == 1 ? '已同意' : '不同意');
-			$scope.condition.$agreedOpen = false;
-		};
+		$scope.dateZoneText = '不限';
+		$scope.condition = {dateZone: -1};
 		$scope.changeDateZone = function(zone) {
 			$scope.condition.dateZone = zone;
-			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == 1 ? '一个月内' : '半年内');
+			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == -1 ? '不限' : (zone == 1 ? '一个月内' : '半年内'));
 			$scope.condition.$dateZoneOpen = false;
 			getDateCondition(zone, $scope.condition);
 			$scope.tableParams.reload();
 		};
+		$scope.currency = Symbol.currency;//将币别转化为对应的符号
 		$scope.setActive = function(state) {
 			if($scope.active != state) {
 				$scope.active = state;

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

@@ -112,7 +112,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -121,6 +121,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
@@ -137,6 +142,7 @@
 				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 				  </button>
 				  <ul class="dropdown-menu">
+				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
 					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
 				    <li><a ng-click="changeDateZone()">半年前</a></li>

src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -110,7 +110,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -119,6 +119,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -109,7 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -118,6 +118,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -109,7 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -118,6 +118,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>

src/main/webapp/resources/tpl/index/sale/accept.html

@@ -109,7 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -118,6 +118,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>

src/main/webapp/resources/tpl/index/sale/approval.html

@@ -131,7 +131,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称、认定单号、送样单号或认定结果搜索" /><span
@@ -140,6 +140,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
@@ -244,6 +249,7 @@
 			  </div>
 			</form>
 		</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
@@ -410,4 +416,3 @@
 		</tr>
 	</tbody>
 </table>
-</div>

src/main/webapp/resources/tpl/index/sale/change.html

@@ -115,7 +115,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-5">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -124,6 +124,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>

src/main/webapp/resources/tpl/index/sale/forecast.html

@@ -109,7 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -118,6 +118,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -131,7 +131,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="col-xs-6">
+				<div class="col-xs-5">
 					<div class="search">
 						<div class="form-group form-group-sm has-feedback">
 							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -140,6 +140,11 @@
 						</div>
 					</div>
 				</div>
+				<div class="col-xs-1">
+					<div class="text-default f14 total">
+						共 <span ng-bind="tableParams.total()" class="text-num"></span>
+					</div>
+				</div>
 				<div class="col-xs-2 toggle">
 					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 				</div>

src/main/webapp/resources/tpl/index/sale/notice.html

@@ -199,7 +199,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-5">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -208,6 +208,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
@@ -221,6 +226,7 @@
 				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 				  </button>
 				  <ul class="dropdown-menu">
+				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
 					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
 				    <li><a ng-click="changeDateZone()">半年前</a></li>

src/main/webapp/resources/tpl/index/sale/order.html

@@ -127,7 +127,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-5">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" />
@@ -140,6 +140,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
@@ -153,6 +158,7 @@
 				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 				  </button>
 				  <ul class="dropdown-menu">
+				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
 					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
 				    <li><a ng-click="changeDateZone()">半年前</a></li>

src/main/webapp/resources/tpl/index/sale/quotation_list.html

@@ -25,7 +25,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="col-xs-6">
+		<div class="col-xs-5">
 			<div class="search">
 				<div class="form-group form-group-sm has-feedback">
 					<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -34,6 +34,11 @@
 				</div>
 			</div>
 		</div>
+		<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 		<div class="col-xs-2 toggle" ng-if="false">
 			<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 		</div>

src/main/webapp/resources/tpl/index/sale/returns.html

@@ -109,7 +109,7 @@
 </div>
 <div class="condition block">
 		<div class="row">
-			<div class="col-xs-10">
+			<div class="col-xs-9">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -118,6 +118,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>

src/main/webapp/resources/tpl/index/sale/sample.html

@@ -142,7 +142,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-5">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -151,6 +151,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>

src/main/webapp/resources/tpl/index/sale/send.html

@@ -130,7 +130,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-6">
+			<div class="col-xs-5">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -139,6 +139,11 @@
 					</div>
 				</div>
 			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple">
 					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
@@ -155,6 +160,7 @@
 				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 				  </button>
 				  <ul class="dropdown-menu">
+				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
 					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
 				    <li><a ng-click="changeDateZone()">半年前</a></li>