采购订单筛选调整、操作日志统一样式。

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

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

@@ -1,14 +1,70 @@
+<style>
+	.com_head {
+		width: 100%;
+		height: 40px;
+		line-height: 44px;
+		background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
+		background-color: #f5f5f5;
+		background-size: 100% 100%;
+	}
+
+	.com_head span {
+		margin-left: 30px;
+		color: #000;
+		font-size: 14px;
+	}
+	.title-div .pull-right{
+		float: right;
+		margin-right: 15px;
+		font-weight: normal;
+	}
+	.title-div .pull-right a{
+		font-weight: normal;
+		font-size: 14px;
+		color: #5078cb;
+	}
+	#order-detail-list .table-default .header th{
+		color: #323232;
+		font-weight: bold;
+		border-bottom: #e8e8e8 1px solid;
+	}
+	#order-detail-list .table>tbody+tbody{
+		border-top: none;
+	}
+	#order-detail-list .table-default td{
+		border-bottom: #e8e8e8 1px solid;
+		border-top: none;
+	}
+	#order-detail-list .table-default td i{
+		color: #5078cb;
+	}
+	#order-detail-list tbody tr{
+		height: 60px;
+	}
+	#order-detail-list{
+		padding-bottom: 10px;
+	}
+	.pane{
+		box-shadow: none;
+		margin-bottom: 0;
+		border-bottom: 1px solid #e8e8e8;
+	}
+	.pane .pane-body{
+		padding: 0;
+	}
+</style>
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="pane base-info" style="max-height: 500px;overflow: auto;">
-	<div class="pane-header">
-		数据传输日志
+<div class="pane base-info">
+	<div class="com_head"><span>操作日志</span></div>
+	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+		<span class="f14">数据传输日志</span>
 		<div class="pull-right">
 			<a href="log/erp/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
 	</div>
-	<div class="pane-body">
+	<div class="pane-body" id="order-detail-list" style="max-height: 500px;overflow: auto;">
 		<table class="block table table-default table-striped"
 			ng-table="erpParams">
 			<thead>
@@ -18,7 +74,7 @@
 					<th width="80">操作人员</th>
 					<th width="120">请求资源</th>
 					<th>请求动作</th>
-					<th width="60">数据包</th>
+					<th width="80">数据包</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -34,14 +90,14 @@
 		</table>
 	</div>
 </div>
-<div class="pane base-info" style="max-height: 500px;overflow: auto;">
-	<div class="pane-header">
-		平台使用日志
+<div class="pane base-info">
+	<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
+		<span class="f14">平台使用日志</span>
 		<div class="pull-right">
 			<a href="log/usage/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
 	</div>
-	<div class="pane-body">
+	<div class="pane-body" id="order-detail-list" style="max-height: 500px;overflow: auto;">
 		<table class="block table table-default table-striped"
 			ng-table="usageParams">
 			<thead>

src/main/webapp/resources/tpl/index/purc/order.html

@@ -6,7 +6,7 @@
 }
 
 .condition .more .form-group {
-	margin-bottom: 10px;
+	margin-bottom: 0;
 }
 
 .order-table .header>th {