Browse Source

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

administrator 11 years ago
parent
commit
13464c1053

+ 21 - 1
src/main/webapp/resources/js/index/app.js

@@ -262,7 +262,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/PurcOrder',
 			}
 		};
 	});
-	app.controller('SaleOrderCtrl', function($scope, $filter, PurcOrderItem, ngTableParams){
+	app.controller('SaleOrderCtrl', function($scope, $filter, PurcOrderItem, ngTableParams, $modal){
 		var isNumber = function(n) {
             return !isNaN(parseFloat(n)) && isFinite(n);
         };
@@ -316,6 +316,22 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/PurcOrder',
 			return sum;
 		};
 		
+		$scope.onReplyClick = function(order, orderItem) {
+			$modal.open({
+				templateUrl : 'sale/orders/items/reply.html',
+				controller : 'ReplyCtrl',
+				backdrop : "static",
+				resolve : {
+					order : function() {
+						return order;
+					},
+					orderItem: function() {
+						return orderItem;
+					}
+				}
+			});
+		};
+		
 		$scope.reply = function(item) {
 			if(item.reply) {
 				var reply = angular.copy(item.reply), 
@@ -330,5 +346,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/PurcOrder',
 			}
 		};
 	});
+	app.controller('ReplyCtrl', function($scope, $modalInstance, order, orderItem){
+		$scope.order = order;
+		$scope.orderItem = orderItem;
+	});
 	return app;
 });

+ 27 - 2
src/main/webapp/resources/tpl/index/sale/order.html

@@ -94,6 +94,10 @@
 	top: 0;
 	right: 100%;
 }
+
+.order-reply .modal-header span {
+	margin-right: 5px;
+}
 </style>
 <div ng-controller="SaleOrderCtrl" class="block">
 	<div class="loading in">
@@ -177,8 +181,29 @@
 				<td class="text-center text-num br-l" ng-bind="item.delivery"></td>
 				<td class="text-center br-l"><div>数量完成48%</div>
 					<div>交期未达标</div></td>
-				<td class="text-center br-l"><a href="#">回复</a></td>
+				<td class="text-center br-l"><a
+					ng-click="onReplyClick(order, orderItem)">回复</a></td>
 			</tr>
 		</tbody>
 	</table>
-</div>
+</div>
+<!-- modal window template -->
+<script type="text/ng-template" id="sale/orders/items/reply.html">
+<div class="order-reply">
+	<div class="modal-header">
+		<span class="text-num text-bold" title="{{order.date}}" ng-bind="order.date"></span> 
+		<span>订单号:<a class="text-num" ng-bind="order.code" href="#"></a></span>
+		<span class="pull-right" ng-bind="order.enterprise.enName"></span>
+	</div>
+	<div class="modal-body">
+		
+	</div>
+	<div class="modal-footer">
+		<div class="btn-group pull-right">
+			<a class="btn btn-default">取&nbsp;&nbsp;消</a>
+			<a class="btn btn-info" tooltip-placement="bottom" tooltip="回复成功后自动跳转下一条">回&nbsp;&nbsp;复</a>
+			<a class="btn btn-default">下一条</a>
+		</div>
+	</div>
+</div>
+</script>