فهرست منبع

新的合作伙伴状态布局改动,解决之前没有状态的时候空白一块情况。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8178 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 8 سال پیش
والد
کامیت
9297a0bcb7
1فایلهای تغییر یافته به همراه16 افزوده شده و 7 حذف شده
  1. 16 7
      src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

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

@@ -276,6 +276,9 @@
 .label-danger {
 .label-danger {
 	background: #327ebe;
 	background: #327ebe;
 }
 }
+.order-table .order-hd .text-center p{
+	margin: 0;
+}
 </style>
 </style>
 <div class="block" style="margin-left: -240px; width: 1170px;">
 <div class="block" style="margin-left: -240px; width: 1170px;">
 <div class="loading in" ng-class="{'in': loading}">
 <div class="loading in" ng-class="{'in': loading}">
@@ -330,10 +333,16 @@
 	<tbody ng-repeat="request in $data" class="company-list">
 	<tbody ng-repeat="request in $data" class="company-list">
 		<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="resources/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="resources/img/logo/youruanrenzheng.png" id="logo" ng-if="enterprise.status == 313"></td>
-			<td width="200" class="grey01" ng-if="request.statusCode==311 && request.method==1">等待处理</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==310 && request.method==1">未通过</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>
 			<td width="200" class="grey01" ng-if="request.statusCode==313">已通过</td>
 			<td width="200" class="grey01" ng-if="request.statusCode==313">已通过</td>
 			<td width="200" class="grey01"ng-if="request.statusCode==310 && request.method==1">未通过</td>
 			<td width="200" class="grey01"ng-if="request.statusCode==310 && request.method==1">未通过</td>
-			<td width="200" class="grey01"ng-if="request.statusCode==310 && request.method==0">已拒绝</td>
+			<td width="200" class="grey01"ng-if="request.statusCode==310 && request.method==0">已拒绝</td>-->
 		</tr>
 		</tr>
 		<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 class="first" colspan="4">
 			<td class="first" colspan="4">
@@ -342,14 +351,14 @@
 				<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">
+					<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">
-				<a class="btn label-success white" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313">添加供应商 </a><br/>
-				&nbsp;&nbsp;<a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313">添加客户</a>
-				<a  class="btn label-success white" ng-click="agree(request.id)" ng-if="request.statusCode==311 && request.method==0">通过 </a>
-				&nbsp;<a  class="btn  label-danger white" ng-click="refuse(request.id, request.reason)" ng-if="request.statusCode==311 && request.method==0">拒绝</a>
+				<p><a class="btn label-success white" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313">添加供应商 </a></p>
+				<p><a class="btn label-danger white" ng-click="addCust(request.vendUID)" ng-if="request.statusCode==313">添加客户</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>
 				<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="btn label-danger white" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>
 				<span class="btn label-danger white" ng-if="request.statusCode==310 && request.method==0">已拒绝对方</span>