撤销回复功能

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

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

@@ -725,22 +725,24 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			return new Date();
 		};
 		
-		$scope.onReplyClick = function(item) {
+		$scope.onReplyClick = function(item, inverse) {
 			if(item.reply) {
-				if(!item.reply.qty) {
-					toaster.pop('warning', '提示', '请填写回复数量！');
+				if(!item.reply.qty || item.reply.qty < 0 || item.reply.qty > item.qty) {
+					toaster.pop('warning', '提示', '请填写有效的回复数量！');
 					return;
 				}
 				var reply = angular.copy(item.reply);
 				if(reply.delivery) {
 					if(typeof reply.delivery == 'object')
 						reply.delivery = reply.delivery.getTime();
-				} else
+				} else {
 					reply.delivery = item.delivery;
+				}
+				if(inverse && inverse == -1) reply.qty = -1 * reply.qty;// 取相反
 				$scope.loading = true;
 				PurcOrderItem.reply({orderItemId: item.id}, reply, function(){
 					$scope.loading = false;
-					toaster.pop('info', '提示', '回复成功');
+					toaster.pop('info', '提示', (inverse == -1 ? '撤销成功':'回复成功'));
 					$scope.tableParams.reload();
 				}, function(response){
 					$scope.loading = false;
@@ -859,6 +861,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				if($scope.order.display == 1) {//未查看的设为已查看
 					$scope.setDisplay('setRead', $scope.order.id);
 				}
+				$scope.loading = false;
 			});
 		};
 		loadData();
@@ -874,22 +877,28 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		    $event.stopPropagation();
 		    item[openParam] = !item[openParam];
 		};
-		$scope.onReplyClick = function(item) {
+		
+		$scope.onReplyClick = function(item, inverse) {
 			if(item.reply) {
-				if(!item.reply.qty) {
-					toaster.pop('warning', '提示', '请填写回复数量！');
+				if(!item.reply.qty || item.reply.qty < 0 || item.reply.qty > item.qty) {
+					toaster.pop('warning', '提示', '请填写有效的回复数量！');
 					return;
 				}
 				var reply = angular.copy(item.reply);
 				if(reply.delivery) {
 					if(typeof reply.delivery == 'object')
 						reply.delivery = reply.delivery.getTime();
-				} else
+				} else {
 					reply.delivery = item.delivery;
+				}
+				if(inverse && inverse == -1) reply.qty = -1 * reply.qty;// 取相反
+				$scope.loading = true;
 				PurcOrderItem.reply({orderItemId: item.id}, reply, function(){
-					toaster.pop('info', '提示', '回复成功');
+					$scope.loading = false;
+					toaster.pop('info', '提示', (inverse == -1 ? '撤销成功':'回复成功'));
 					loadData();
 				}, function(response){
+					$scope.loading = false;
 					toaster.pop('error', '回复失败', response.data);
 				});
 			}

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

@@ -198,7 +198,7 @@
 			<th width="100">数量</th>
 			<th width="120">交货日期</th>
 			<th width="180">单据状态</th>
-			<th width="60">操作</th>
+			<th width="80">操作</th>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
@@ -285,9 +285,9 @@
 				<div class="text-num" ng-bind="::item.qty"></div>
 				<div class="text-muted" ng-bind="::item.product.unit"></div>
 				<div style="margin: 0 auto" ng-if="item.$editing">
-					<input type="text" ng-model="item.reply.qty"
+					<input type="number" ng-model="item.reply.qty" min="0" max="{{item.qty-item.replyQty}}"
 						ng-init="item.reply.qty=item.qty-item.replyQty"
-						class="form-control input-xs" placeholder="回复数量">
+						class="form-control input-xs" placeholder="0~{{item.qty-item.replyQty}}">
 				</div>
 			</td>
 			<td class="text-center br-l">
@@ -333,7 +333,10 @@
 									<li ng-repeat="reply in ::item.replies">
 										<div class="row row-sm"
 											ng-class="{'text-inverse': $index==0}">
-											<div class="col-xs-6">数量{{::reply.qty}}</div>
+											<div class="col-xs-6">
+												<span ng-if="reply.qty < 0"> 撤销</span>
+												数量 {{::reply.qty}}
+											</div>
 											<div class="col-xs-6">交期{{::reply.delivery |
 												date:'yyyy-MM-dd'}}</div>
 										</div>
@@ -374,8 +377,13 @@
 							<a ng-click="item.$editing=false">取消</a>
 						</div>
 						<br>
-						<div>
-							<a ng-click="onReplyClick(item)" class="text-inverse">确认回复</a>
+						<div class="text-left">
+							<a ng-click="onReplyClick(item)" class="text-inverse">
+								<i class="fa fa-arrow-up"></i> 确认回复
+							</a>
+							<br>
+							<a ng-click="onReplyClick(item, -1)" class="text-muted" title="减去已回复数量">
+								<i class="fa fa-arrow-down"></i> 撤销回复</a>
 						</div>
 					</div>
 				</div>

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

@@ -1,3 +1,6 @@
+<div class="loading" ng-class="{'in': loading}">
+	<i></i>
+</div>
 <div class="pane base-info">
 	<div class="pane-header">
 		客户采购单<a ng-click="print(order)" class="pull-right text-simple"><i
@@ -79,7 +82,7 @@
 						<th width="100">数量</th>
 						<th width="120">交货日期</th>
 						<th width="180">回复状态</th>
-						<th width="60">操作</th>
+						<th width="100">操作</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -155,7 +158,10 @@
 												<li ng-repeat="reply in ::item.replies">
 													<div class="row row-sm"
 														ng-class="{'text-inverse': $index==0}">
-														<div class="col-xs-6">数量{{::reply.qty}}</div>
+														<div class="col-xs-6">
+															<span ng-if="reply.qty < 0"> 撤销</span>
+															数量 {{::reply.qty}}
+														</div>
 														<div class="col-xs-6">交期{{::reply.delivery |
 															date:'yyyy-MM-dd'}}</div>
 													</div>
@@ -196,9 +202,13 @@
 										<a ng-click="item.$editing=!item.$editing">取消</a>
 									</div>
 									<br>
-									<div>
-										<a ng-click="onReplyClick(item)" class="text-inverse">确认<br>回复
+									<div class="text-left">
+										<a ng-click="onReplyClick(item)" class="text-inverse">
+											<i class="fa fa-arrow-up"></i> 确认回复
 										</a>
+										<br>
+										<a ng-click="onReplyClick(item, -1)" class="text-muted" title="减去已回复数量">
+											<i class="fa fa-arrow-down"></i> 撤销回复</a>
 									</div>
 								</div>
 							</div>