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

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

@@ -732,39 +732,11 @@ solid
 	color: #2a6496;
 }
 
-.todo
- 
-.todo-content
->
-ul
-:not
- 
-(
-:last-child
- 
-)
-{
-border-bottom
-:
- 
-1
-px
- 
-dashed
- 
-#e8e8e8
-;
-
-	
-margin-bottom
-:
- 
-20
-px
-;
-
-
+.todo .todo-content>ul:not(:last-child){
+	border-bottom: 1px dashed #e8e8e8;
+	margin-bottom: 20px;
 }
+
 .todo-content .icon {
 	margin-left: 20px;
 	float: left;
@@ -800,6 +772,7 @@ px
 	border-right: 1px solid #e8e8e8;
 	height: 50px;
 	width: 200px;
+	text-align: center;
 	margin-top: 12px;
 }
 
@@ -999,4 +972,9 @@ px
 	float: right;
 	width: 50%;
 	padding-left: 8px;
+}
+/*process*/
+.progress.progress-sm {
+	height: 14px;
+	margin-bottom: 8px;
 }

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

@@ -141,7 +141,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 			});
 		};
 	});
-	app.controller('DataCtrl', function($scope, MessageService) {
+	app.controller('OnhandCtrl', function($scope, MessageService){
+		MessageService.getOnhand(function(data){
+			$scope.onhand = data;
+		});
+	});
+	app.controller('DataCtrl', function($scope) {
 		$scope.charts = {
 			product : {
 				chartType : 'pie',
@@ -282,9 +287,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 				}
 			}
 		};
-		MessageService.getOnhand(function(data){
-			$scope.onhand = data;
-		});
 	});
 	var isNumber = function(n) {
         return !isNaN(parseFloat(n)) && isFinite(n);
@@ -373,6 +375,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 		$scope.print = function(order) {
 			ReportService.print(order.vendUU, 'purchase', '{purc_orders.pu_id}=' + order.id, '销售订单-' + order.code);
 		};
+		
+		$scope.getReply = function(item) {
+			if(!item.replies) {
+				PurcOrderItem.getReply({orderItemId: item.id}, function(replies){
+					item.replies = replies;
+				});
+			}
+		}
 	});
 	app.controller('SaleChangeCtrl', function($scope, $filter, PurcChange, ngTableParams, toaster){
 		$scope.tableParams = new ngTableParams({

src/main/webapp/resources/tpl/index/home/right.html

@@ -7,19 +7,19 @@
 			<li>交易中</li>
 			<li>交易后</li>
 		</ul>
-		<div class="todo-content">
+		<div class="todo-content" ng-controller="OnhandCtrl">
 			<ul class="list-unstyled list-inline">
 				<li class="icon">销售</li>
 				<li class="start">
 					<ul class="list-unstyled">
-						<li><a ui-sref="sale.inquiry">待报价(<span ng-class="{'text-inverse': onhand.inquiry>0}" ng-bind="onhand.inquiry"></span>)</a></li>
-						<li><a ui-sref="sale.order.reply">待回复(<span ng-class="{'text-inverse': onhand.order>0}" ng-bind="onhand.order"></span>)</a></li>
+						<li><a ui-sref="sale.inquiry">待报价(<span ng-class="{'text-default': onhand.inquiry>0}" ng-bind="onhand.inquiry"></span>)</a></li>
+						<li><a ui-sref="sale.order.reply">待回复(<span ng-class="{'text-default': onhand.order>0}" ng-bind="onhand.order"></span>)</a></li>
 					</ul>
 				</li>
 				<li class="doing">
 					<ul class="list-unstyled">
-						<li><a ui-sref="sale.notice">待发货(<span ng-class="{'text-inverse': onhand.notice>0}" ng-bind="onhand.notice"></span>)</a></li>
-						<li><a ui-sref="sale.change">变更中(<span ng-class="{'text-inverse': onhand.orderChange>0}" ng-bind="onhand.orderChange"></span>)</a></li>
+						<li><a ui-sref="sale.notice">待发货(<span ng-class="{'text-default': onhand.notice>0}" ng-bind="onhand.notice"></span>)</a></li>
+						<li><a ui-sref="sale.change">变更中(<span ng-class="{'text-default': onhand.orderChange>0}" ng-bind="onhand.orderChange"></span>)</a></li>
 					</ul>
 				</li>
 				<li class="end">
@@ -32,17 +32,18 @@
 				<li class="icon">委外</li>
 				<li class="start">
 					<ul class="list-unstyled">
+						<li><a href="#">待报价(0)</a></li>
 						<li><a href="#">待回复(0)</a></li>
 					</ul>
 				</li>
 				<li class="doing">
 					<ul class="list-unstyled">
 						<li><a href="#">待发货(0)</a></li>
+						<li><a href="#">变更中(0)</a></li>
 					</ul>
 				</li>
 				<li class="end">
 					<ul class="list-unstyled">
-						<li><a href="#">待确认收货(0)</a></li>
 						<li><a href="#">退货中(0)</a></li>
 					</ul>
 				</li>

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

@@ -96,8 +96,7 @@
 	border-radius: 3px;
 }
 
-.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not
-	 (:first-child ),.input-group-btn:last-child>.btn {
+.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
 	border-top-left-radius: 0;
 	border-bottom-left-radius: 0;
 }
@@ -112,15 +111,15 @@
 		<i></i>
 	</div>
 	<div class="condition block">
-		<div class="state-wrap">
+		<div class="state-wrap" ng-controller="OnhandCtrl">
 			<ul class="list-unstyled list-inline">
 				<li class="first"><a href="#"><span>所有订单</span></a></li>
-				<li><a ui-sref="sale.inquiry"><span>待报价</span><em class="tm-h">4</em></a></li>
+				<li><a ui-sref="sale.inquiry"><span>待报价</span><em class="tm-h" ng-bind="onhand.inquiry"></em></a></li>
 				<li><a ui-sref="sale.order.reply"><span>待回复</span><em
-						class="tm-h">6</em></a></li>
+						class="tm-h" ng-bind="onhand.order"></em></a></li>
 				<li class="active"><a ui-sref="sale.change"><span>变更中</span><em
-						class="tm-h">2</em></a></li>
-				<li><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h">0</em></a></li>
+						class="tm-h" ng-bind="onhand.orderChange"></em></a></li>
+				<li><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h" ng-bind="onhand.notice"></em></a></li>
 				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
 			</ul>
 		</div>

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

@@ -96,8 +96,7 @@
 	border-radius: 3px;
 }
 
-.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not
-	 (:first-child ),.input-group-btn:last-child>.btn {
+.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
 	border-top-left-radius: 0;
 	border-bottom-left-radius: 0;
 }
@@ -118,17 +117,17 @@
 		<i></i>
 	</div>
 	<div class="condition block">
-		<div class="state-wrap">
+		<div class="state-wrap" ng-controller="OnhandCtrl">
 			<ul class="list-unstyled list-inline">
 				<li class="first"><a href="#"><span>所有订单</span></a></li>
 				<li class="active"><a ui-sref="sale.inquiry"><span>待报价</span><em
-						class="tm-h">4</em></a></li>
+						class="tm-h" ng-bind="onhand.inquiry"></em></a></li>
 				<li><a ui-sref="sale.order.reply"><span>待回复</span><em
-						class="tm-h">6</em></a></li>
+						class="tm-h" ng-bind="onhand.order"></em></a></li>
 				<li><a ui-sref="sale.change"><span>变更中</span><em
-						class="tm-h">2</em></a></li>
+						class="tm-h" ng-bind="onhand.orderChange"></em></a></li>
 				<li><a ui-sref="sale.notice"><span>待发货</span><em
-						class="tm-h">0</em></a></li>
+						class="tm-h" ng-bind="onhand.notice"></em></a></li>
 				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
 			</ul>
 		</div>

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

@@ -146,17 +146,17 @@
 		<i></i>
 	</div>
 	<div class="condition block">
-		<div class="state-wrap">
+		<div class="state-wrap" ng-controller="OnhandCtrl">
 			<ul class="list-unstyled list-inline">
 				<li class="first"><a href="#"><span>所有订单</span></a></li>
 				<li><a ui-sref="sale.inquiry"><span>待报价</span><em
-						class="tm-h">4</em></a></li>
+						class="tm-h" ng-bind="onhand.inquiry"></em></a></li>
 				<li><a ui-sref="sale.order.reply"><span>待回复</span><em
-						class="tm-h">6</em></a></li>
+						class="tm-h" ng-bind="onhand.order"></em></a></li>
 				<li><a ui-sref="sale.change"><span>变更中</span><em
-						class="tm-h">2</em></a></li>
+						class="tm-h" ng-bind="onhand.orderChange"></em></a></li>
 				<li class="active"><a ui-sref="sale.notice"><span>待发货</span><em
-						class="tm-h">0</em></a></li>
+						class="tm-h" ng-bind="onhand.notice"></em></a></li>
 				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
 			</ul>
 		</div>

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

@@ -96,8 +96,7 @@
 	border-radius: 3px;
 }
 
-.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not
-	 (:first-child ),.input-group-btn:last-child>.btn {
+.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
 	border-top-left-radius: 0;
 	border-bottom-left-radius: 0;
 }
@@ -112,14 +111,14 @@
 		<i></i>
 	</div>
 	<div class="condition block">
-		<div class="state-wrap">
+		<div class="state-wrap" ng-controller="OnhandCtrl">
 			<ul class="list-unstyled list-inline">
 				<li class="first"><a href="#"><span>所有订单</span></a></li>
-				<li><a ui-sref="sale.inquiry"><span>待报价</span><em class="tm-h">4</em></a></li>
+				<li><a ui-sref="sale.inquiry"><span>待报价</span><em class="tm-h" ng-bind="onhand.inquiry"></em></a></li>
 				<li class="active"><a ui-sref="sale.order.reply"><span>待回复</span><em
-						class="tm-h">6</em></a></li>
-				<li><a ui-sref="sale.change"><span>变更中</span><em class="tm-h">2</em></a></li>
-				<li><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h">0</em></a></li>
+						class="tm-h" ng-bind="onhand.order"></em></a></li>
+				<li><a ui-sref="sale.change"><span>变更中</span><em class="tm-h" ng-bind="onhand.orderChange"></em></a></li>
+				<li><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h" ng-bind="onhand.notice"></em></a></li>
 				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
 			</ul>
 		</div>
@@ -216,12 +215,32 @@
 						</span>
 					</div>
 				</td>
-				<td class="text-center br-l">
-					<div>数量完成48%</div>
-					<div>交期未达标</div>
+				<td class="br-l">
+					<div ng-show="!item.$editing">
+						<div ng-show="!item.replyQty" class="text-muted text-center">未回复</div>
+						<div ng-show="item.replyQty > 0">
+							<div class="progress progress-sm">
+								<div class="progress-bar progress-bar-success" ng-style="{'width': 100*item.replyQty/item.qty + '%'}">
+									<span class="sr-only"></span>
+								</div>
+							</div>
+							已回复 <span class="text-default">{{item.replyQty}}</span> / {{item.qty}}
+							<div class="dropdown">
+								<a href="javascript:void(0);"
+									class="dropdown-toggle text-default">回复历史<i
+									class="fa fa-fw fa-angle-down"></i></a>
+								<div class="dropdown-menu">
+									<ul class="list-unstyled">
+										<li ng-repeat="reply in item.replies">{{reply.qty}}</li>
+									</ul>
+								</div>
+							</div>
+						</div>
+					</div>
 					<div style="margin: 0 auto" ng-show="item.$editing">
+						<br><br>
 						<input type="text" ng-model="item.reply.remark"
-							class="form-control input-xs" placeholder="回复备注">
+							class="form-control input-xs" placeholder="回复备注"/>
 					</div>
 				</td>
 				<td class="text-center br-l">