Browse Source

搜索结果界面及审批出现两条横杆处理。

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

+ 5 - 0
src/main/webapp/resources/tpl/index/approvalFlow/home.html

@@ -9,6 +9,11 @@
     <link rel="stylesheet" href="static/css/base.css">
     <link rel="stylesheet" href="static/css/style.css">
 </head>
+<style>
+    .modal-content{
+        border: none !important;
+    }
+</style>
 <body>
 <div class="warp">
     <div class="content shenliu">

+ 58 - 19
src/main/webapp/resources/tpl/index/search/search_result.html

@@ -187,6 +187,14 @@
 .enterprise-table .text-muted{
 	text-align: center;
 }
+#resultTop a{
+	float: right;
+	color: #5078cb;
+	text-decoration: none;
+ }
+#resultTop a i{
+	margin-left: 5px;
+}
 </style>
 <div class="block" style="margin-left: -240px; width: 1100px;">
 	<div class="tip-body">
@@ -198,16 +206,18 @@
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
-	<div class="condition block" id="resultTop">
+	<div class="condition block open01" id="resultTop">
 		<strong>| 企业信息 (<span class="text-inverse" ng-bind="total"></span>)</strong>
+		<a href="javascript:void(0);" class="open">收起<i class="fa fa-angle-up"></i></a>
 	</div>
-	<table class="enterprise-table block" ng-table="tableParams">
-		<thead>
+	<div class="tab01">
+		<table class="enterprise-table block" ng-table="tableParams">
+			<thead>
 			<tr class="sep-row">
 				<td colspan="6"></td>
 			</tr>
-		</thead>
-		<tbody ng-if="tableParams.total() == 0">
+			</thead>
+			<tbody ng-if="tableParams.total() == 0">
 			<tr>
 				<td class="text-center" colspan="7">
 					<br>
@@ -215,8 +225,8 @@
 					<br>
 				</td>
 			</tr>
-		</tbody>
-		<tbody ng-repeat="enterprise in $data">
+			</tbody>
+			<tbody ng-repeat="enterprise in $data">
 			<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">
 				<td width="" class="" colspan=3>
 					<span  ng-bind-html="enterprise.name| getkey:tip"></span>
@@ -228,7 +238,7 @@
 					<span ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">当前企业还不是您的合作伙伴</span>
 					<span ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
 					<span ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</a>
-					<span ng-if="enterprise.requestStatus==313">合作伙伴</a>
+						<span ng-if="enterprise.requestStatus==313">合作伙伴</a>
 				</td>
 			</tr>
 			<tr class="enterprise-bd" ng-if="!enterprise.$collapsed ">
@@ -239,10 +249,10 @@
 					</div>
 					<div class="" >企业地址:<span ng-bind="::enterprise.address"></span></div>
 					<div class="" >联系人:<span ng-bind-html="enterprise.adminName| getkey:tip"></span>&nbsp;
-					电话:<span ng-bind="::enterprise.adminTel"></span></div>
+						电话:<span ng-bind="::enterprise.adminTel"></span></div>
 				</td>
 				<td class="text-center ">
-					
+
 				</td>
 				<td class="pull-right">
 					<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">立即添加</a>
@@ -251,18 +261,21 @@
 					<a class="btn btn-info" ng-if="enterprise.requestStatus==313" ng-click="PurcByEn(enterprise.businessCode)">立即购买</a>
 				</td>
 			</tr>
-		</tbody>
-	</table>
+			</tbody>
+		</table>
+	</div>
 	<div style="height: 30px; background-color: #f5f5f5">
 	</div>
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
-	<div class="condition block" id="resultTop">
+	<div class="condition block open02" id="resultTop">
 		<strong>| 产品信息 (<span class="text-inverse" ng-bind="prodtotal"></span>)</strong>
+		<a href="javascript:void(0);" class="open">收起<i class="fa fa-angle-up"></i></a>
 	</div>
-	<table class="enterprise-table block" ng-table="prodTableParams">
-		<tbody ng-if="prodTableParams.total() == 0">
+	<div class="tab02">
+		<table class="enterprise-table block" ng-table="prodTableParams">
+			<tbody ng-if="prodTableParams.total() == 0">
 			<tr>
 				<td class="text-center" colspan="7">
 					<br>
@@ -270,8 +283,8 @@
 					<br>
 				</td>
 			</tr>
-		</tbody>
-		<tbody ng-repeat="prod in $data">
+			</tbody>
+			<tbody ng-repeat="prod in $data">
 			<tr class="enterprise-hd" ng-dblclick="enterprise.$collapsed=!enterprise.$collapsed">
 				<td  colspan="3">
 					<span ng-bind-html="prod.enName| getkey:tip" ></span>
@@ -309,6 +322,32 @@
 					<a class="btn btn-info" ng-if="prod.isPartner==107" href="#/baseInfo/myRquest">立即查看</a>
 				</td>
 			</tr>
-		</tbody>
-	</table>
+			</tbody>
+		</table>
+	</div>
 </div>
+<script>
+	$(function() {
+		//展开收缩功能
+		$('.open01 .open').click(function () {
+			$(this).toggleClass("active");
+			if($(this).hasClass("active")){
+				$(this).html("展开<i class='fa fa-angle-down'></i>");
+				$(".tab01").hide();
+			}else{
+				$(this).html("收起<i class='fa fa-angle-up'></i>");
+				$(".tab01").show();
+			}
+		});
+		$('.open02 .open').click(function () {
+			$(this).toggleClass("active");
+			if($(this).hasClass("active")){
+				$(this).html("展开<i class='fa fa-angle-down'></i>");
+				$(".tab02").hide();
+			}else{
+				$(this).html("收起<i class='fa fa-angle-up'></i>");
+				$(".tab02").show();
+			}
+		});
+	})
+</script>