企业列表和发出申请增加提示功能

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

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

@@ -184,7 +184,11 @@
 			</td>
 			<td width="300" class="text-center"><span ng-bind="enterprise.area"></span>
 			</td>
-			<td width="100" class="text-center"><a ng-click="addPartner(enterprise.name,enterprise.businessCode)"><i class="fa fa-user-plus">合作伙伴</i></a>
+			<td width="100" class="text-center">
+				<a class="label label-success" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310"><i class="fa fa-user-plus">合作伙伴</i></a>
+				<span class="label label-info" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
+				<span class="label label-info" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
+				<span class="label label-info" ng-if="enterprise.requestStatus==313">已添加</span>
 			</td>
 		</tr>
 		<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">

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

@@ -179,7 +179,7 @@
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th width="120" class="text-center">企业名称</th>
+			<th width="140" class="text-center">企业名称</th>
 			<th width="120" class="text-center">营业执照</th>
 			<th width="80" class="text-center">申请人</th>
 			<th width="80" class="text-center">审核人</th>
@@ -218,10 +218,13 @@
 				<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
 			</td>
 			<td colspan="1" class="text-center">
-				<a ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>供应商 </a>
-				<a ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>客户</a>
-				<a ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">通过 </a>
-				<a ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a>
+				<a class="label label-success" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>供应商 </a>
+				&nbsp;<a class="label label-danger" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313"><i class="fa fa-user-plus"></i>客户</a>
+				<a  class="label label-success" ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">通过 </a>
+				&nbsp;<a  class="label label-danger" ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a>
+				<span class="label label-info" ng-if="request.statusCode==311 && request.method==1">等待处理</span>
+				<span class="label label-danger" ng-if="request.statusCode==310 && request.method==1">对方已拒绝</span>
+				<span class="label label-danger" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
 			</td>
 		</tr>
 	</tbody>