Browse Source

企业圈,添加合作伙伴上移,新的合作伙伴未处理状态文字及无需输入拒绝原因修改。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8274 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 years ago
parent
commit
ef37542f87

+ 1 - 0
src/main/webapp/resources/tpl/index/baseInfo/enMenu.html

@@ -2,6 +2,7 @@
 	<div class="row">
 	<div class="row">
 		<a type="button" ui-sref="baseInfo.vendorInfo" ng-class="{'active':status=='vendor' || 'customer' && status!='send'}" class="tab-btn">我的合作伙伴</a>
 		<a type="button" ui-sref="baseInfo.vendorInfo" ng-class="{'active':status=='vendor' || 'customer' && status!='send'}" class="tab-btn">我的合作伙伴</a>
 		<a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='send'}" class="tab-btn">新的合作伙伴<b class="new-dot"></b></a>
 		<a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='send'}" class="tab-btn">新的合作伙伴<b class="new-dot"></b></a>
+		<a type="button" href="#/baseInfo/partner" class="tab-btn">添加合作伙伴</a>
 	</div>
 	</div>
 </div>
 </div>
 <!--<div class="tab-active margin-bot group-container condition">
 <!--<div class="tab-active margin-bot group-container condition">

+ 6 - 6
src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -322,11 +322,11 @@
 			<div class="col-xs-4">
 			<div class="col-xs-4">
 				<p>搜索到<em>{{tableParams.total()}}</em>条</p>
 				<p>搜索到<em>{{tableParams.total()}}</em>条</p>
 			</div>
 			</div>
-			<div class="col-xs-3">
+			<!--<div class="col-xs-3">
 				<div class="btn-group btn-group-sm">
 				<div class="btn-group btn-group-sm">
 					<a href="#/baseInfo/partner" class="add"><img src="static/img/icon/add.png">添加合作伙伴</a>
 					<a href="#/baseInfo/partner" class="add"><img src="static/img/icon/add.png">添加合作伙伴</a>
 				</div>
 				</div>
-			</div>
+			</div>-->
 		</div>
 		</div>
 </div>
 </div>
 <table class="order-table block" ng-table="tableParams">
 <table class="order-table block" ng-table="tableParams">
@@ -334,7 +334,7 @@
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
 			<td colspan="4"><span ng-bind="request.vendName" class="margin-left20"></span><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
 			<td colspan="4"><span ng-bind="request.vendName" class="margin-left20"></span><img src="static/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
 			<td width="200" class="text-center">
 			<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==311 && request.method==1">等待处理</span>-->
 				<span class="grey01" ng-if="request.statusCode==313">已通过</span>
 				<span class="grey01" ng-if="request.statusCode==313">已通过</span>
 				<span class="grey01" ng-if="request.statusCode==310 && request.method==1">未通过</span>
 				<span class="grey01" ng-if="request.statusCode==310 && request.method==1">未通过</span>
 				<span class="grey01" ng-if="request.statusCode==310 && request.method==0">已拒绝</span>
 				<span class="grey01" ng-if="request.statusCode==310 && request.method==0">已拒绝</span>
@@ -351,7 +351,7 @@
 				<div>审核人:<span ng-bind="request.vendUserName"></span></div>
 				<div>审核人:<span ng-bind="request.vendUserName"></span></div>
 				<div>
 				<div>
 					原因:
 					原因:
-					<input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0" style="width: 90%; float: right;">
+					<!--<input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0" style="width: 90%; float: right;">-->
 					<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
 					<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>
 				</div>
 				</div>
 			<td width="200" class="text-center">
 			<td width="200" class="text-center">
@@ -359,9 +359,9 @@
 				<p><span class="btn01 btn label-danger white" ng-if="request.statusCode==313 && request.vendor == 1">供应商 </span></p>
 				<p><span class="btn01 btn label-danger white" ng-if="request.statusCode==313 && request.vendor == 1">供应商 </span></p>
 				<p><span class="btn01 btn label-danger white" ng-if="request.statusCode==313 && request.vendor == 1">客户</span></p>
 				<p><span class="btn01 btn label-danger white" ng-if="request.statusCode==313 && request.vendor == 1">客户</span></p>
 				<p><a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313 && request.vendor == 0">添加客户</a></p>
 				<p><a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313 && request.vendor == 0">添加客户</a></p>
-				<p><a  class="btn label-success white" ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">通过 </a></p>
+				<p><a  class="btn label-success white" ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">同意</a></p>
 				<p><a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a></p>
 				<p><a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a></p>
-				<span class="btn01 btn label-info white" ng-if="request.statusCode==311 && request.method==1">等待处理</span>
+				<span class="btn01 btn label-info white" ng-if="request.statusCode==311 && request.method==1">待回复</span>
 				<span class="btn01 btn label-danger white" ng-if="request.statusCode==310 && request.method==1">对方已拒绝</span>
 				<span class="btn01 btn label-danger white" ng-if="request.statusCode==310 && request.method==1">对方已拒绝</span>
 				<span class="btn01 btn label-danger white" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
 				<span class="btn01 btn label-danger white" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
 			</td>
 			</td>