模具询价已作废和已过期合并为已失效；采购单已回复过滤掉已结案的单据；企业圈添加合作伙伴提示和刷新方式修改。

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

src/main/java/com/uas/platform/b2b/controller/SaleOrderController.java

@@ -317,6 +317,7 @@ public class SaleOrderController {
 		pageParams.getFilters().put("pu_venduu", SystemSession.getUser().getEnterprise().getUu());
 		ModelMap map = new ModelMap();
 		map.put("pu_end", Constant.YES);
+		map.put("pu_end", 2); // 建索引时，将不处于已结案状态，但是货物全部交接完毕的单，end值设为了2
 		pageParams.setNotEqualFilters(map);
 		return searchService.searchPurchaseWaitingOrderIds(keyword, pageParams);
 	}

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

@@ -12172,9 +12172,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 同意申请
 		$scope.agree = function(id) {
 			AddPartner.agreeRequest({id: id}, {}, function(data) {
-				toaster.pop('success', '提示', '操作成功');
-                $scope.tableParams.reload();
-                // $window.location.reload();
+                if (data.success) {
+                    toaster.pop('success', '提示', '操作成功');
+                }
+                if (data.error) {
+                    toaster.pop('error', '提示', '操作失败');
+                }
+                // $scope.tableParams.reload();
+                $window.location.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -12183,9 +12188,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 拒绝申请
 		$scope.refuse = function(id, reason) {
 			AddPartner.refuseRequest({id: id, reason: reason}, {}, function(data) {
-				toaster.pop('success', '提示', '操作成功');
-                $scope.tableParams.reload();
-                // $window.location.reload();
+                if (data.success) {
+                    toaster.pop('success', '提示', '操作成功');
+                }
+                if (data.error) {
+                    toaster.pop('error', '提示', '操作失败');
+                }
+                // $scope.tableParams.reload();
+                $window.location.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -12366,9 +12376,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 同意申请
         $scope.agree = function(id) {
             AddPartner.agreeRequest({id: id}, {}, function(data) {
-                toaster.pop('success', '提示', '操作成功');
-                $scope.tableParams.reload();
-                // $window.location.reload();
+                if (data.success) {
+                    toaster.pop('success', '提示', '操作成功');
+                }
+                if (data.error) {
+                    toaster.pop('error', '提示', '操作失败');
+                }
+                // $scope.tableParams.reload();
+                $window.location.reload();
             }, function(response) {
                 toaster.pop('error', '提示', response.data);
             });
@@ -12381,9 +12396,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 拒绝申请
         $scope.refuse = function(id, reason) {
             AddPartner.refuseRequest({id: id, reason: reason}, {}, function(data) {
-                toaster.pop('success', '提示', '操作成功');
-                $scope.tableParams.reload();
-                // $window.location.reload();
+                if (data.success) {
+                    toaster.pop('success', '提示', '操作成功');
+                }
+                if (data.error) {
+                    toaster.pop('error', '提示', '操作失败');
+                }
+                // $scope.tableParams.reload();
+                $window.location.reload();
             }, function(response) {
                 toaster.pop('error', '提示', response.data);
             });
@@ -12506,10 +12526,16 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		
 		// 同意申请
 		$scope.agree = function(id) {
-			AddPartner.agreeRequest({id: id}, {}, function(data) {
-				toaster.pop('success', '提示', '操作成功');
-                $scope.tableParams.reload();
-                // $window.location.reload();
+			AddPartner.agreeReq
+            uest({id: id}, {}, function(data) {
+                if (data.success) {
+                    toaster.pop('success', '提示', '操作成功');
+                }
+                if (data.error) {
+                    toaster.pop('error', '提示', '操作失败');
+                }
+                // $scope.tableParams.reload();
+                $window.location.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -12518,9 +12544,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 拒绝申请
 		$scope.refuse = function(id, reason) {
 			AddPartner.refuseRequest({id: id, reason: reason}, {}, function(data) {
-				toaster.pop('success', '提示', '操作成功');
-                $scope.tableParams.reload();
-                // $window.location.reload();
+                if (data.success) {
+                    toaster.pop('success', '提示', '操作成功');
+                }
+                if (data.error) {
+                    toaster.pop('error', '提示', '操作失败');
+                }
+                // $scope.tableParams.reload();
+                $window.location.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});

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

@@ -187,13 +187,13 @@ tbody td div.text-mould {
 						<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">-->
+						<!--<button type="button" class="btn btn-default btn-line"-->
+							<!--ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已过期</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>
-					</div>
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='invalid'}" ng-click="setActive('invalid')">已作废</button>
+							ng-class="{'btn-info':active=='invalid'}" ng-click="setActive('invalid')">已失效</button>
 					</div>
 				</div>
 			</div>