企业圈添加合作伙伴，非优软云用户可以邀请注册

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

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

@@ -340,8 +340,9 @@
             <td colspan="4" style="position: relative;"><span ng-bind="request.vendName" class="margin-left20"></span><b class="new-dot" ng-if="request.statusCode==311 && request.method==0"></b><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
             <td width="200" class="text-center">
                 <!--<span class="grey01" ng-if="request.statusCode==311 && request.method==1">等待处理</span>-->
-                <span class="grey01" ng-if="request.statusCode==313">已通过</span>
+                <span class="grey01" ng-if="request.statusCode==313 && request.method == 1">已通过</span>
                 <span class="grey01" ng-if="request.statusCode==310 && request.method==1">未通过</span>
+                <span class="grey01" ng-if="request.statusCode==313 && request.method == 0">已同意</span>
                 <span class="grey01" ng-if="request.statusCode==310 && request.method==0">已拒绝</span>
             </td>
             <!--<td width="200" class="grey01" ng-if="request.statusCode==311 && request.method==1">等待处理</td>
@@ -383,8 +384,8 @@
                 <p ng-if="request.statusCode==311 && request.method==0"><a  class="btn label-success white" ng-click="agree(request.id)">同意</a></p>
                 <p  ng-if="request.statusCode==311 && request.method==0"><a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)">拒绝</a></p>
                 <p ng-if="request.statusCode==311 && request.method==1"><span class="btn01 btn label-info white">待回复</span></p>
-                <p ng-if="request.statusCode==310 && request.method==1"><a class="btn label-danger white" ng-click="addAgain(request.vendName, request.vendUID)" >再次添加</a></p>
-                <p ng-if="request.statusCode==310 && request.method==0"><span class="btn01 btn label-danger white" >已拒绝对方</span></p>
+                <p ng-if="request.statusCode==310 && request.method==1">未通过<br><a class="btn label-danger white" ng-click="addAgain(request.vendName, request.vendUID)" >再次添加</a></p>
+                <p ng-if="request.statusCode==310 && request.method==0"><span class="btn01 btn label-danger white" >已拒绝</span></p>
             </td>
         </tr>
         </tbody>