应收对账单、应付对账单新UI调整。

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

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -23,28 +23,36 @@
 	padding-right: 20px;
 }
 
-.order-table td.info {
-	padding-right: 30px;
-}
-
 .order-table td .static p {
 	display: inline-block;
 	line-height: 30px;
 	padding-top: 5px;
-	padding-left: 15px;
 	padding-bottom: 0px;
-	width: 180px;
+	width: 150px;
 	font-size: 14px;
 	color: #666;
+	padding-left: 15px;
 	border-left: solid 1px #e8e8e8;
 }
-
+	.order-table td .static p:first-child{
+		border-left: none;
+		width: 180px;
+		padding-left: 0;
+	}
+	.order-table td .static p:last-child{
+		margin-left: 22px;
+	}
+	.order-table td .static p:nth-of-type(3){
+		margin-left: 20px;
+	}
 .order-table td .main {
 	margin-top: 5px;
 	margin-bottom: 20px;
 	color: #333;
 }
-
+.static{
+	margin: 12px 0;
+}
 .order-table td .main strong {
 	font-size: 14px;
 }
@@ -99,6 +107,13 @@
 .order-table td{
 	font-size: 14px;
 }
+	.order-table th{
+		text-align: center;
+	}
+	.order-table .text-trans{
+		margin-top: -17px;
+		margin-right: 14px;
+	}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -209,50 +224,41 @@
 			</div>
 		</div>
 	</div>
-	<div ng-if="active=='all' && tableParams.total() == 0" class="row">
-		<div class="col-xs-12" style="text-align: center;">
-			<h3 class="text-simple"><i class="fa fa-spinner"></i> &nbsp;您还未生成对账单，请立即新增对账</h3>
-		</div>
-		<div class="col-xs-12" style="margin-top:15px; text-align: center;">
-			<a class="text-simple append" ui-sref="fa.apCheckList"><big><i class="fa fa-plus-square"></i> 新增对账单</big></a>
-		</div>
-	</div>
 	<table class="order-table block" ng-table="tableParams">
+		<thead>
+			<tr class="header">
+				<th width="150">对账期间</th>
+				<th width="180">对账总额</th>
+				<th width="180">明细条目</th>
+				<th width="180">商品总数</th>
+				<th width="100">对账结果</th>
+				<th width="100">操作</th>
+			</tr>
+		</thead>
 		<tbody ng-repeat="check in $data">
 			<tr>
-				<td class="first info" width="700px">
+				<td class="first info" colspan="4">
 					<div class="">
-						<span>单据编号：</span>
-						<span class="text-num"><a ui-sref="fa.apCheck_detail({id:check.id})" title="点击查看详情">{{::check.code}}</a></span> 
-						<span class="pull-right text-num" title="录单时间">{{::check.recordDate | date:'MM月dd日 HH:mm'}} <i class="fa fa-clock-o"></i></span>
-					</div>
-					<div class="main">
-						<strong><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.custName}}</strong>
-						<span class="">
-							  对账期间：<span class="f14 text-num">{{::check.beginDate | date:'yyyy/MM/dd'}} - {{::check.endDate | date:'yyyy/MM/dd'}}</span>
-						</span>
+						<span class="text-num" title="录单时间">{{::check.recordDate | date:'MM月dd日 HH:mm'}} <i class="fa fa-clock-o"></i></span>&nbsp;&nbsp;&nbsp;
+						<span><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.custName}}</span>
+						<span style="margin-left: 100px;">单据编号：</span>
+						<span class="text-num"><a ui-sref="fa.apCheck_detail({id:check.id})" title="点击查看详情">{{::check.code}}</a></span>
 					</div>
 					<div class="static">
+						<p><span class="f14 text-num">{{::check.beginDate | date:'yyyy/MM/dd'}} - {{::check.endDate | date:'yyyy/MM/dd'}}</span></p>
 						<p>
 							<strong class="text-num">{{::check.checkAmount | number:2}}</strong>
-							<span class="text-number">{{::check.currency}}</span><br>
-							对账总额
+							<span class="text-number">{{::check.currency}}</span>
 						</p>
 						<p>
 							<strong class="text-num">{{::check.items.length}}</strong> 条<br>
-							明细条目
 						</p>
 						<p>
-							<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i><br>
-							商品总数
+							<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i>
 						</p>
 					</div>
 				</td>
 				<td class="status">
-					<div class="">对账结果
-						<a ng-click="print(check)" class="pull-right" title="打印{{check.print? '(已打印)':'(未打印)'}}" ng-class="{'unPrinted' : !check.print, 'text-muted': check.print}"><i
-						class="fa fa-print fa-lg"></i>&nbsp;打印</a> 
-					</div>
 					<div ng-if="check.checkStatus == '未对账'" class="text-center text-muted f14"><br>未对账！</div>
 					<div></div>
 					<div ng-if="check.checkStatus == '已确认'" class="text-center text-muted f14">
@@ -264,12 +270,17 @@
 					<div ng-if="check.checkStatus == '已作废'" class="text-center text-muted f14">
 						<br> <i class="fa fa-check-square-o"></i> 已作废
 					</div>
+				</td>
+				<td>
 					<div ng-hide="check.status" class="block">
 						 <span class="text-trans error">未提交</span>
 					</div>
 					<div ng-show="check.status" class="block">
 						 <span class="text-trans success">已提交</span>
 					</div>
+					<div class="" style="margin-top: 33px;margin-right: 20px;">
+						<a ng-click="print(check)" class="pull-right" title="打印{{check.print? '(已打印)':'(未打印)'}}" ng-class="{'unPrinted' : !check.print, 'text-muted': check.print}"><i class="fa fa-print fa-lg"></i>&nbsp;打印</a>
+					</div>
 					<!-- <a ui-sref="fa.apCheck_detail({id:check.id})" class="operate operate-undo text-center" 
 						 target="_blank">查看详情</a>	 -->		 
 				</td>
@@ -277,4 +288,12 @@
 			<tr></tr>
 		</tbody>
 	</table>
+	<div ng-if="active=='all' && tableParams.total() == 0" class="row">
+		<div class="col-xs-12" style="text-align: center;">
+			<h3 class="text-simple"><i class="fa fa-spinner"></i> &nbsp;您还未生成对账单，请立即新增对账</h3>
+		</div>
+		<div class="col-xs-12" style="margin-top:15px; text-align: center;">
+			<a class="text-simple append" ui-sref="fa.apCheckList"><big><i class="fa fa-plus-square"></i> 新增对账单</big></a>
+		</div>
+	</div>
 </div>

src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -23,28 +23,36 @@
 		padding-right: 20px;
 	}
 
-	.order-table td.info {
-		padding-right: 30px;
-	}
-
 	.order-table td .static p {
 		display: inline-block;
 		line-height: 30px;
 		padding-top: 5px;
-		padding-left: 15px;
 		padding-bottom: 0px;
-		width: 180px;
+		width: 150px;
 		font-size: 14px;
 		color: #666;
+		padding-left: 15px;
 		border-left: solid 1px #e8e8e8;
 	}
-
+	.order-table td .static p:first-child{
+		border-left: none;
+		width: 180px;
+		padding-left: 0;
+	}
+	.order-table td .static p:last-child{
+		margin-left: 22px;
+	}
+	.order-table td .static p:nth-of-type(3){
+		margin-left: 20px;
+	}
 	.order-table td .main {
 		margin-top: 5px;
 		margin-bottom: 20px;
 		color: #333;
 	}
-
+	.static{
+		margin: 12px 0;
+	}
 	.order-table td .main strong {
 		font-size: 14px;
 	}
@@ -99,6 +107,13 @@
 	.order-table td{
 		font-size: 14px;
 	}
+	.order-table th{
+		text-align: center;
+	}
+	.order-table .text-trans{
+		margin-top: -17px;
+		margin-right: 14px;
+	}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -177,38 +192,40 @@
 		</div>
 	</div>
 	<table class="order-table block" ng-table="tableParams">
+		<thead>
+		<tr class="header">
+			<th width="150">对账期间</th>
+			<th width="180">对账总额</th>
+			<th width="180">明细条目</th>
+			<th width="180">商品总数</th>
+			<th width="100">对账结果</th>
+			<th width="100">操作</th>
+		</tr>
+		</thead>
 		<tbody ng-repeat="check in $data">
 			<tr>
-				<td class="first info" width="700px">
+				<td class="first info" colspan="4">
 					<div class="">
+						<span class="text-num" title="录单时间">{{::check.date | date:'MM月dd日 HH:mm'}} <i class="fa fa-clock-o"></i></span>&nbsp;&nbsp;&nbsp;
+						<span><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.vendor.enName}}</span>
 						<span>单据编号：</span>
-						<span class="text-num"><a ui-sref="fa.arCheck_detail({id:check.id})" title="点击查看详情">{{::check.code}}</a></span> 
-						<span class="pull-right text-num" title="录单时间">{{::check.date | date:'MM月dd日 HH:mm'}} <i class="fa fa-clock-o"></i></span>
-					</div>
-					<div class="main">
-						<strong><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.vendor.enName}}</strong>
-						<span class="">
-							  对账期间：<span class="f14 text-num">{{::check.fromDate | date:'yyyy/MM/dd'}} - {{::check.toDate | date:'yyyy/MM/dd'}}</span>
-						</span>
+						<span class="text-num"><a ui-sref="fa.arCheck_detail({id:check.id})" title="点击查看详情">{{::check.code}}</a></span>
 					</div>
 					<div class="static">
+						<p class="f14 text-num">{{::check.fromDate | date:'yyyy/MM/dd'}} - {{::check.toDate | date:'yyyy/MM/dd'}}</p>
 						<p>
 							<strong class="text-num">{{::check.checkAmount | number:6}}</strong>
 							<span class="text-number">{{::check.currency}}</span><br>
-							对账总额
 						</p>
 						<p>
 							<strong class="text-num">{{::check.items.length}}</strong> 条<br>
-							明细条目
 						</p>
 						<p>
 							<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i><br>
-							商品总数
 						</p>
 					</div>
 				</td>
-				<td class="status">
-					<div class="">对账结果</div>
+				<td class="status" colspan="2">
 					<div ng-if="check.status == 200" class="text-center text-muted f14"><br>还未开始对账！</div>
 					<div ng-if="check.status == 201 && check.items.length == check.agree" class="text-center text-muted f14">
 						<br> <i class="fa fa-check-square-o"></i> 已全部确认