浏览代码

企业信息功能用angularjs方式调整,供应商详情小调整。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8436 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
ouxianqin 9 年之前
父节点
当前提交
425f3d8f1e

+ 21 - 36
src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -239,6 +239,14 @@
 .input-group-xs>.input-group-addon{
 	border: #bfbfbf 1px solid;
 }
+.com_title01 a span{
+	font-weight: normal;
+	color: #5078cb;
+	margin-right: 3px;
+}
+.address.active,.company.active{
+	height: auto !important;
+}
 </style>
 <!--<div class="com_title">设置&gt;企业设置<font>&gt;企业信息</font></div>-->
 <div class="com_head"><span>企业信息</span></div>
@@ -420,16 +428,16 @@
 			</div>
 		</form>
 	</div>
-	<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" href="javascript:void(0);">+新增收货人</a>
-	<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
-			class="fa fa-reply-all fa-fw"></i>取消</a>
-	<a ng-show="connectionEditings" ng-click="updateDetailInfo()" class="pull-right text-simple color02"><i
-			class="fa fa-save fa-fw"></i>保存</a>
+	<div class="com_title01"><span>收货人信息</span>
+		<a ng-click="$open = !$open" ng-show="ships.length>1"><span ng-bind="$open ? '收起' : '展开'"></span><i class="fa fa-angle-down" ng-class="{'fa-angle-up':$open, 'fa-angle-down': !$open}"></i></a>
+		<a ng-show="!connectionEditings"  class="pull-right add-address" href="javascript:void(0);">+新增收货人</a>
+		<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
+				class="fa fa-reply-all fa-fw"></i>取消</a>
+		<a ng-show="connectionEditings" ng-click="updateDetailInfo()" class="pull-right text-simple color02"><i
+				class="fa fa-save fa-fw"></i>保存</a>
 	</div>
 	<!--收货人信息-->
-	<div class="com-list pane-body" id="address-list">
+	<div class="address com-list pane-body" id="address-list" ng-class="{'active':$open}">
 		<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">
@@ -489,14 +497,14 @@
 			</div>
 		</form>
 		<form ng-if="ships.length == 0">
-			<div class="row row-sm item" >
-				<span style="line-height: 186px;text-align: center;font-size: 16px;width: 100%;display: inline-block;color: #999;"><i class="fa fa-spinner"></i> 暂未设置收货人信息</span>
+			<div class="row row-sm item" style="padding-bottom: 0;">
+				<span style="line-height: 160px;text-align: center;font-size: 16px;width: 100%;display: inline-block;color: #999;"><i class="fa fa-spinner"></i> 暂未设置收货人信息</span>
 			</div>
 		</form>
 	</div>
 	<div ng-if="deputyEnter.deputyEnterprise">
-		<div class="compangy-open com_title01"><span>付款企业信息</span>
-			<a href="javascript:void(0);" class="open">展开<i class="fa fa-angle-down"></i></a>
+		<div class="com_title01"><span>付款企业信息</span>
+			<a ng-click="$open01 = !$open01" ng-show="pays.length>1"><span ng-bind="$open01 ? '收起' : '展开'"></span><i class="fa fa-angle-down" ng-class="{'fa-angle-up':$open01, 'fa-angle-down': !$open01}"></i></a>
 			<a ng-show="!connectionEditings"  class="pull-right add-paycompany" ng-click="addPayCompany()">+新增付款企业</a>
 			<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
 					class="fa fa-reply-all fa-fw"></i>取消</a>
@@ -504,7 +512,7 @@
 					class="fa fa-save fa-fw"></i>保存</a>
 		</div>
 		<!--收货人信息-->
-		<div class="com-list pane-body" id="company-list" style="height: 116px;">
+		<div class="company com-list pane-body" id="company-list" style="height: 116px;" ng-class="{'active':$open01}">
 			<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">
@@ -635,28 +643,5 @@
          $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
             $(".bomb-box").hide();
         })
-		/*展开收缩功能*/
-		$('.addrs-open .open').click(function () {
-			$(this).toggleClass("active");
-			if($(this).hasClass("active")){
-				$(this).html("收起<i class='fa fa-angle-up'></i>");
-				var size=$("#address-list .row").size();
-				$("#address-list").css("height","auto");
-			}else{
-				$(this).html("展开<i class='fa fa-angle-down'></i>");
-				$("#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");
-			}
-		});
     })
 </script>

+ 7 - 1
src/main/webapp/resources/tpl/index/purc/vendor_detail.html

@@ -24,6 +24,12 @@
     .pro-add-data02.open{
         display: inline-block;
     }
+    .textMore{
+        display: block;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
 </style>
 <div class="wrap">
 	<div class="content">
@@ -64,7 +70,7 @@
                         <span class="wid02">操作</span>
                     </dt>
                     <dd ng-repeat = "contact in vendorContacts| orderBy:'-id'">
-                        <span class="wid01">{{contact.venduser}}</span>
+                        <span class="textMore wid01">{{contact.venduser}}</span>
                         <span class="wid01" ng-bind="contact.sex == 'F' ? '女' : '男'"></span>
                         <span class="wid01">{{contact.position}}</span>
                         <span>{{contact.tel}}</span>