企业信息页面改动。

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

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -134,7 +134,9 @@
 	border-bottom: #e8e8e8 1px solid;
 	padding-bottom: 20px;
 }
-
+#company .com-list .row-sm:hover{
+	border: #d32526 2px solid;
+}
 .bule {
 	color: #327ebe;
 	font-size: 14px;
@@ -168,26 +170,28 @@
 	color: #3a89d1;
 }
 
-#address-list .row {
+.com-list .row {
 	position: relative;
 }
 
-#address-list .edit-icon {
+.com-list .edit-icon {
 	display: none;
 }
-
-#address-list .edit-icon .content {
+.com-list .row:hover .edit-icon{
+	display: inline-block;
+}
+.com-list .edit-icon {
 	position: absolute;
-	top: -100px;
+	top: 10px;
 	right: 0;
 	width: 100px !important;
 }
 
-#address-list .content span {
+.com-list .content span {
 	font-size: 14px;
 }
 
-#address-list .edit-icon a {
+.com-list .edit-icon a {
 	width: 42px;
 	height: 24px;
 	display: inline-block;
@@ -201,24 +205,25 @@
 	text-align: center;
 }
 
-#address-list .row:hover {
+.com-list .row:hover {
 	border: #d32526 1px solid;
 }
 
-#address-list .edit-icon a:hover {
+.com-list .edit-icon a:hover {
 	background: #3a89d1;
 }
 
 .com_title01 a {
 	color: #3a89d1;
 	font-size: 14px;
+	float: right;
 }
 
-.com_title01 a.open {
+.addrs-open a.open,.company-open a.open {
 	float: right;
 }
 
-.com_title01 a.open i {
+.addrs-open a.open i ,.company-open a.open i{
 	margin-left: 5px;
 }
 
@@ -226,7 +231,7 @@
 	border-top: none;
 }
 
-#address-list {
+.com-list {
 	height: 186px;
 	width: 100%;
 	overflow: hidden;
@@ -415,7 +420,7 @@
 			</div>
 		</form>
 	</div>
-	<div class="com_title01"><span>收货人信息</span>
+	<div class="addrs-open com_title01"><span>收货人信息</span>
 	<a href="javascript:void(0);" class="open" ng-if="ships.length>1">展开<i class="fa fa-angle-down"></i></a>
 	<a ng-show="!connectionEditings"  class="pull-right add-address" ng-click="">+新增收货人</a>
 	<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
@@ -424,7 +429,7 @@
 			class="fa fa-save fa-fw"></i>保存</a>
 	</div>
 	<!--收货人信息-->
-	<div class="pane-body" id="address-list">
+	<div class="com-list pane-body" id="address-list">
 		<form name="detailForm" ng-if="ships.length != 0">
 			<div class="row row-sm item" ng-repeat="ship in ships| orderBy: '-id'">
 				<div class="col-xs-12">
@@ -476,15 +481,11 @@
 							<span ng-bind="ship.addalias"></span>
 						</div>
 					</div>
-					<div class="edit-icon com-text col-xs-6">
-						<span class="title">&nbsp;</span>
-						<div class="content">
-							<a ng-click="editShip(ship)">编辑</a>
-							<a ng-click="removeShip(ship.id, $index)">删除</a>
-						</div>
-					</div>
 				</div>
-
+				<div class="edit-icon">
+					<a ng-click="editShip(ship)">编辑</a>
+					<a ng-click="removeShip(ship.id, $index)">删除</a>
+				</div>
 			</div>
 		</form>
 		<form ng-if="ships.length == 0" id="message">
@@ -494,7 +495,7 @@
 		</form>
 	</div>
 	<div ng-if="deputyEnter.deputyEnterprise">
-		<div class="com_title01"><span>付款企业信息</span>
+		<div class="compangy-open com_title01"><span>付款企业信息</span>
 			<a href="javascript:void(0);" class="open" ng-if="ships.length>1">展开<i class="fa fa-angle-down"></i></a>
 			<a ng-show="!connectionEditings"  class="pull-right add-paycompany" ng-click="">+新增付款企业</a>
 			<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
@@ -503,7 +504,7 @@
 					class="fa fa-save fa-fw"></i>保存</a>
 		</div>
 		<!--收货人信息-->
-		<div class="pane-body" id="address-list">
+		<div class="com-list pane-body" id="company-list" style="height: 116px;">
 			<form name="detailForm" ng-if="pays.length != 0">
 				<div class="row row-sm item" ng-repeat="pay in pays| orderBy: '-id'">
 					<div class="col-xs-12">
@@ -534,17 +535,10 @@
 							</div>
 						</div>
 					</div>
-					<div class="col-xs-12">
-						<div class="com-text col-xs-6"></div>
-						<div class="edit-icon com-text col-xs-6">
-							<span class="title">&nbsp;</span>
-							<div class="content">
-								<a ng-click="editPay(pay, enterprise.uu)">编辑</a>
-								<a ng-click="removePay(pay.id, $index)">删除</a>
-							</div>
-						</div>
+					<div class="edit-icon">
+						<a ng-click="editPay(pay, enterprise.uu)">编辑</a>
+						<a ng-click="removePay(pay.id, $index)">删除</a>
 					</div>
-	
 				</div>
 			</form>
 			<form ng-if="pays.length == 0" id="message">
@@ -689,12 +683,8 @@
          $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
             $(".bomb-box").hide();
         })
-		/*鼠标移动上去删除*/
-		$('#address-list .row').hover(function(){
-			$(this).find('.edit-icon').toggle();
-		});
 		/*展开收缩功能*/
-		$('.com_title01 .open').click(function () {
+		$('.addrs-open .open').click(function () {
 			$(this).toggleClass("active");
 			if($(this).hasClass("active")){
 				$(this).html("收起<i class='fa fa-angle-up'></i>");
@@ -705,7 +695,17 @@
 				$("#address-list").css("height","186px");
 			}
 		});
-		
+		$('.compangy-open .open').click(function () {
+			$(this).toggleClass("active");
+			if($(this).hasClass("active")){
+				$(this).html("收起<i class='fa fa-angle-up'></i>");
+				var size=$("#company-list .row").size();
+				$("#company-list").css("height","auto");
+			}else{
+				$(this).html("展开<i class='fa fa-angle-down'></i>");
+				$("#company-list").css("height","116px");
+			}
+		});
 		 //新增付款企业信息
         $(".com_title01 .add-paycompany").click(function(){
         	document.getElementById('payCompany').reset();