待发货、备料中分栏显示

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

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

@@ -594,6 +594,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			fn = 'getTodo';break;
 		case 'end':	
 			fn = 'getEnd';break;
+		case 'waiting':
+			fn = 'getWaiting';break;
 		}
 		return fn;
 	};
@@ -1191,10 +1193,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			}
 		};
 	});
-	app.controller('SaleNoticeCtrl', function($scope, $rootScope, $filter, PurcNotice, ngTableParams, toaster, BaseService, PurcNoticeHis, $modal, SaleTruck){
+	app.controller('SaleNoticeCtrl', 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.changeDateZone = function(zone) {
 			$scope.condition.dateZone = zone;
 			$scope.dateZoneText = typeof zone == 'undefined' ? '半年前' : (zone == 1 ? '一个月内' : '半年内');

src/main/webapp/resources/js/index/services/Purc.js

@@ -147,6 +147,11 @@ define([ 'ngResource'], function() {
 					_state: 'end'
 				}
 			},
+			getWaiting: {
+				params: {
+					_state: 'waiting'
+				}
+			},
 			getSends: {
 				url: 'sale/notice/:id/sendItems',
 				method: 'GET',

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

@@ -189,6 +189,10 @@
 						<button type="button" class="btn btn-default btn-line"
 							ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待发货</button>
 					</div>
+					<div class="btn-group btn-group-sm" title="暂时还未到可发货日期">
+						<button type="button" class="btn btn-default btn-line"
+							ng-class="{'btn-info':active=='waiting'}" ng-click="setActive('waiting')">备料中</button>
+					</div>
 					<div class="btn-group btn-group-sm">
 						<button type="button" class="btn btn-default btn-line"
 							ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已结案</button>
@@ -412,7 +416,7 @@
 					</div>
 				</div>
 			</td>
-			<td class="text-center br-l">{{::notice.orderItem.price | number:6}}</td>
+			<td class="text-center br-l text-num">{{::currency(notice.orderItem.order.currency)}}{{::notice.orderItem.price | number:6}}</td>
 			<td class="text-center br-l">
 				<div><span ng-bind="::notice.delivery | date : 'yyyy-MM-dd'"></span></div>
 				<div style="margin-top: 10px;" ng-if="notice.waiting" class="text-inverse">