供应商、客户界面按钮UI调整，功能更新

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

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

@@ -30,6 +30,7 @@ import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.service.VendorService;
 import com.uas.platform.b2b.support.JxlsExcelView;
 import com.uas.platform.b2b.support.SystemSession;
+import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.model.PageInfo;
 import com.uas.platform.core.model.PageParams;
 import com.uas.search.b2b.model.MultiValue;
@@ -65,6 +66,8 @@ public class VendorController {
 	public SPage<Vendor> getVendors(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("ve_myenuu", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("ve_vendswitch", Constant.YES);
+		pageParams.getFilters().put("ve_custswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		sortList.add(new Sort("ve_id", false, Type.LONG, new Long(1)));
 		pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
@@ -91,6 +94,8 @@ public class VendorController {
 	public SPage<Vendor> getCustomers(PageParams params, String keyword) {
 		com.uas.search.b2b.model.PageParams pageParams = searchService.convertPageParams(params, null);
 		pageParams.getFilters().put("ve_vendenuu", SystemSession.getUser().getEnterprise().getUu());
+		pageParams.getFilters().put("ve_custswitch", Constant.YES);
+		pageParams.getFilters().put("ve_vendswitch", Constant.YES);
 		List<Sort> sortList = new ArrayList<>();
 		SearchFilter filter = userService.distribute();
 		if (filter != null && filter.getDistribute() == null) {

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

@@ -10665,8 +10665,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
 				}
-				$scope.tableParams.page(1);
-				$scope.tableParams.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -10678,8 +10676,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
 				}
-				$scope.tableParams.page(1);
-				$scope.tableParams.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -10691,8 +10687,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
 				}
-				$scope.tableParams.page(1);
-	  			$scope.tableParams.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});
@@ -10704,8 +10698,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				if(data.success) {
 					toaster.pop('success', '提示', data.success);
 				}
-				$scope.tableParams.page(1);
-	  			$scope.tableParams.reload();
 			}, function(response) {
 				toaster.pop('error', '提示', response.data);
 			});

src/main/webapp/resources/tpl/index/baseInfo/enMenu.html

@@ -5,7 +5,7 @@
 </style>
 <div class="tab-first" ng-controller="RequestAmountCtrl">
 	<div class="row">
-		<a type="button" ui-sref="baseInfo.vendorInfo" ng-class="{'active':status=='vendor' || 'customer' && status!='send' && status!='add'}" class="tab-btn">我的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
+		<a type="button" ui-sref="baseInfo.vendorInfo" ng-class="{'active':status=='vendor' || 'customer' || 'partner' && status!='send' && status!='add'}" class="tab-btn">全部合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a>
 		<!-- <a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='send'}" class="tab-btn">新的合作伙伴<b class="new-dot" ng-if="requestTodo.todo>0"></b></a> -->
 		<a type="button" ui-sref="baseInfo.partner_searchresult" class="tab-btn" ng-class="{'active':status=='add'}">添加合作伙伴</a>
 	</div>

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

@@ -134,7 +134,7 @@
 		<div class="enterprise-btn">
 			<img src="static/img/home/entLib.png" >
 			<div ng-controller="RequestAmountCtrl">
-				<a title="我的合作伙伴" ui-sref="baseInfo.myRequest">我的合作伙伴<em ng-if="requestTodo.todo>0"></em></a><br/>
+				<a title="我的合作伙伴" ui-sref="baseInfo.myRequest">全部合作伙伴<em ng-if="requestTodo.todo>0"></em></a><br/>
 				<a title="新的合作伙伴" ui-sref="baseInfo.partner_searchresult">添加合作伙伴</a>
 			</div>
 		</div>