分页条数超过20条之后，分页框架才显示。

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

src/main/webapp/resources/css/index.css

@@ -3077,6 +3077,12 @@ input::-webkit-clear{display:none;}
 #myquest-public .group-container{
 	width: 100%;
 }
+#myquest-public table>tbody:last-child{
+	border-bottom: none !important;
+}
+#myquest-public table{
+	margin-bottom: 0;
+}
 #myquest-public .group-container .btn-group {
 	width: 160px;
 	border: none;
@@ -4177,4 +4183,19 @@ input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textar
 }
 .height72{
 	height: 72px !important;
+}
+
+::-webkit-scrollbar {
+	width: 8px;
+	height: 8px;
+}
+
+::-webkit-scrollbar-thumb {
+	background-color: #d8d4d4;
+	border-radius: 5px;
+	padding-left: 0 !important;
+}
+
+::-webkit-scrollbar-thumb:hover {
+	background-color: #b1abab;
 }

src/main/webapp/resources/lib/angular/ng-table.min.js

@@ -393,7 +393,7 @@ function(a) {
         a.put("ng-table/filters/select.html", '<select ng-options="data.id as data.title for data in column.data" ng-model="params.filter()[name]" ng-show="filter==\'select\'" class="filter filter-select form-control" name="{{column.filterName}}"> </select>'),
         a.put("ng-table/filters/text.html", '<input type="text" name="{{column.filterName}}" ng-model="params.filter()[name]" ng-if="filter==\'text\'" class="input-filter form-control"/>'),
         a.put("ng-table/header.html", '<tr> <th ng-repeat="column in $columns" ng-class="{ \'sortable\': parse(column.sortable), \'sort-asc\': params.sorting()[parse(column.sortable)]==\'asc\', \'sort-desc\': params.sorting()[parse(column.sortable)]==\'desc\' }" ng-click="sortBy(column, $event)" ng-show="column.show(this)" ng-init="template=column.headerTemplateURL(this)" class="header {{column.class}}"> <div ng-if="!template" ng-show="!template" ng-bind="parse(column.title)"></div> <div ng-if="template" ng-show="template"><div ng-include="template"></div></div> </th> </tr> <tr ng-show="show_filter" class="ng-table-filters"> <th ng-repeat="column in $columns" ng-show="column.show(this)" class="filter"> <div ng-repeat="(name, filter) in column.filter"> <div ng-if="column.filterTemplateURL" ng-show="column.filterTemplateURL"> <div ng-include="column.filterTemplateURL"></div> </div> <div ng-if="!column.filterTemplateURL" ng-show="!column.filterTemplateURL"> <div ng-include="\'ng-table/filters/\' + filter + \'.html\'"></div> </div> </div> </th> </tr>'),
-        a.put("ng-table/pager.html", '<div class="ng-cloak ng-table-pager"> <div ng-if="params.settings().counts.length" class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)">&laquo;上一页</a> <a ng-switch-when="first" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)">下一页&raquo;</a> </li> <li ng-if="pages.length != 0"><div class="page-record"><span>共{{params.maxpage()}}页,共{{params.total()}}条;</span><span>到第<input type="text" ng-model="page.number" placeholder="{{params.page()}}"/>页<button ng-click="params.page(page.number)" ng-disabled="page.number > {{params.maxpage()}} || page.number < 1">确定</button></span></div></li></ul> </div> ')
+        a.put("ng-table/pager.html", '<div class="ng-cloak ng-table-pager" ng-if="params.total() > 20"> <div ng-if="params.settings().counts.length" class="ng-table-counts btn-group pull-right"> <button ng-repeat="count in params.settings().counts" type="button" ng-class="{\'active\':params.count()==count}" ng-click="params.count(count)" class="btn btn-default"> <span ng-bind="count"></span> </button> </div> <ul class="pagination ng-table-pagination"> <li ng-class="{\'disabled\': !page.active}" ng-repeat="page in pages" ng-switch="page.type"> <a ng-switch-when="prev" ng-click="params.page(page.number)">&laquo;上一页</a> <a ng-switch-when="first" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="page" ng-click="params.page(page.number)" href=""><span ng-bind="page.number"></span></a> <a ng-switch-when="more" ng-click="params.page(page.number)">&#8230;</a> <a ng-switch-when="last" ng-click="params.page(page.number)"><span ng-bind="page.number"></span></a> <a ng-switch-when="next" ng-click="params.page(page.number)">下一页&raquo;</a> </li> <li ng-if="pages.length != 0"><div class="page-record"><span>共{{params.maxpage()}}页,共{{params.total()}}条;</span><span>到第<input type="text" ng-model="page.number" placeholder="{{params.page()}}"/>页<button ng-click="params.page(page.number)" ng-disabled="page.number > {{params.maxpage()}} || page.number < 1">确定</button></span></div></li></ul> </div> ')
     }]),
     b
 });

src/main/webapp/resources/tpl/index/sale/sample_detail.html

@@ -118,7 +118,7 @@
 						<th width="100">送样时间</th>
 						<th width="70">采购单价</th>
 						<th width="70">送样数量</th>
-						<th width="40">交货周期</th>
+						<th width="60">交货周期</th>
 						<th width="90">送样人</th>
 						<th width="140">其他信息</th>
 					</tr>
@@ -159,12 +159,15 @@
 							<div ng-if="send.adress">产地：<span ng-bind="send.minBuyQty"></span></div>
 							<div ng-if="send.addressMark">产地标识：<span ng-bind="send.addressMark"></span></div>
 							<div ng-if="send.ratio">口水料比例：<span ng-bind="send.ratio"></span>%</div>
-							<div class="row row-sm" ng-if="send.attachs.length > 0">
-								<div class="col-xs-3">附件：</div>
-								<div class="col-xs-9">
+							<div ng-if="send.attachs.length > 0">
+								附件：<span ng-repeat="attach in send.attachs"><a href="file/{{attach.id}}" class="file">{{attach.name}}</a></span>
+							</div>
+							<!--<div class="row row-sm" ng-if="send.attachs.length > 0">
+								<div class="col-xs-4">附件：</div>
+								<div class="col-xs-8">
 									<div ng-repeat="attach in send.attachs"><a href="file/{{attach.id}}" class="file">{{attach.name}}</a></div>
 								</div>
-							</div>
+							</div>-->
 						</td>
 					</tr>
 				</tbody>

src/main/webapp/resources/tpl/index/sale/send_detail.html

@@ -27,10 +27,13 @@
 		border-color: #3399CC;
 		background-color: #eee;
 	}
-	.input-xs:FOCUS {
+	.input-xs:focus {
 		border-color: #3399CC;
 		background-color: #ffffff;
 	}
+	#order-detail-list .table-default tbody tr td{
+		word-break: break-all;
+	}
 </style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>