修改B2B样式问题

src/main/webapp/resources/js/common/b2bServices.js

@@ -2756,7 +2756,7 @@ define([ 'angular', 'common/services', 'common/utils', 'big'], function(angular,
         return $resource(b2bUrl + '/sale/inquiry', {}, {
             // 获取最新的已采纳的价信息
             agreed: {
-                url: b2bUrl + 'sale/inquiry/recentPrice/:prId',
+                url: b2bUrl + '/sale/inquiry/recentPrice/:prId',
                 method: 'GET'
             }
         });

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/CartController.js

@@ -214,6 +214,8 @@ define(['app/app'], function(app) {
                     if (page) {
                         params.total(page.totalElement);
                         $defer.resolve(page.content);
+                      $scope.infoCommon = page
+                      $scope.infoCommon.all = page.content.length
                     }
                 }, function (response) {
                     $scope.loading = false;

src/main/webapp/resources/js/usercenter/controllers/b2b/Purc/purcChangeNewCtrl.js

@@ -189,6 +189,7 @@ define(['app/app'], function(app) {
                         if (page) {
                             params.total(page.totalElement);
                             $defer.resolve(page.content);
+                            console.log(page.content)
                         }
                     }, function (response) {
                         $scope.loading = false;
@@ -202,7 +203,7 @@ define(['app/app'], function(app) {
             // 单选
             $scope.checkOne = function (order) {
                 var changeflag = false;
-                order.checked = !order.checked;
+                // order.checked = !order.checked;
                 if ((order.checked) && ($scope.checkedOrder != null) && ($scope.checkedOrder != order)) {
                     $scope.checkedOrder.checked = false;
                     angular.forEach($scope.checkedOrder.orderItems, function (item) {
@@ -253,7 +254,7 @@ define(['app/app'], function(app) {
                     });
                     checkItems = [];
                 }
-                item.checked = !item.checked;
+                // item.checked = !item.checked;
                 if (item.checked) {
                     checkItems.push(item);
                     if ($scope.checkedOrder == null) {

src/main/webapp/resources/js/usercenter/controllers/b2b/order/purcChangeListCtrl.js

@@ -166,6 +166,8 @@ define(['app/app'], function(app) {
                     if (page) {
                         params.total(page.totalElement);
                         $defer.resolve(page.content);
+                      $scope.infoCommon = page
+                      $scope.infoCommon.all = page.content.length
                         $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
                     }
                 }, function (response) {

src/main/webapp/resources/js/usercenter/controllers/b2b/order/purcDeputyOrderCtrl.js

@@ -192,6 +192,8 @@ define(['app/app'], function(app) {
                         params.total(page.totalElement);
                         $scope.total = page.totalElement;
                         $defer.resolve(page.content);
+                        $scope.infoCommon = page
+                        $scope.infoCommon.all = page.content.length
                         $scope.keywordXls = angular.copy(pageParams.searchFilter.keyword);//保存当前取值的关键词
                     }
                 }, function (response) {

src/main/webapp/resources/js/usercenter/controllers/b2b/order/purcMakeOutOrderCtrl.js

@@ -157,6 +157,8 @@ define(['app/app'], function(app) {
                     if (page) {
                         params.total(page.totalElement);
                         $defer.resolve(page.content);
+                      $scope.infoCommon = page
+                      $scope.infoCommon.all = page.content.length
                         $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
                     }
                 }, function (response) {

src/main/webapp/resources/js/usercenter/controllers/b2b/order/usercenterOrderCtrl.js

@@ -201,6 +201,8 @@ define(['app/app'], function(app) {
                             $defer.resolve(page.content);
                             $scope.total = page.totalElement;
                             params.total(page.totalElement);
+                            $scope.infoCommon = page
+                            $scope.infoCommon.all = page.content.length
                             $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
                         }
                     }, function (response) {

src/main/webapp/resources/view/usercenter/b2b/Purc/cart.html

@@ -151,8 +151,383 @@
 	height: inherit !important;
 }
 </style>
+<style>
+	.com_tab {
+		height: 40px;
+		margin-bottom: 10px;
+	}
+	.com_tab ul {
+		width: 100%;
+		margin: 0 auto;
+		height: 40px;
+		line-height: 40px;
+		background: #fff;
+	}
+	.com_tab ul li {
+		height: 40px;
+		text-align: center;
+		float: left;
+		position: relative;
+		min-width: 110px;
+	}
+	.com_tab:nth-of-type(1) ul li.active > a {
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff !important;
+	}
+	.com_tab ul li a {
+		min-width: 110px;
+	}
+	.com_tab ul li > a {
+		font-size: 14px;
+		height: 40px;
+		padding: 0 20px;
+		display: inline-block;
+	}
+	.com_tab:nth-of-type(1) ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li.active:after {
+		display: block;
+	}
+	.oder01 ul li.active a{
+		border-bottom: 1px solid #fff;
+		color: #f15601;
+	}
+	.oder01 ul li.active a em {
+		color: #f15601;
+	}
+	.oder01 ul li a em {
+		color: #323232
+	}
+	.screen {
+		background: #fff;
+		padding-top: 10px;
+		padding-right: 11px;
+		line-height: 32px;
+		padding-left: 22px;
+		width: 100%;
+		height: 50px;
+		position: relative;
+	}
+	.screen .sreach input {
+		border: #5078cb 1px solid;
+		height: 32px;
+		width: 280px;
+		box-shadow: none;
+		padding-left: 10px;
+		background: #fff;
+		float: left;
+		vertical-align: middle;
+		font-size: 14px;
+	}
+	.screen .sreach a.seek {
+		width: 58px;
+		height: 32px;
+		background: #5078cb;
+		color: #fff;
+		line-height: 32px;
+		float: none;
+		border-radius: 2px;
+		vertical-align: unset;
+	}
+	.order-table {
+		background: #fff;
+		width: 100%;
+	}
+	.order-table .header > th {
+		height: 38px;
+		text-align: center;
+		background: #fff;
+		border-top: 1px solid #e8e8e8;
+		border-bottom: 1px solid #e8e8e8;
+		font-size: 14px;
+	}
+
+	.order-table .sep-row {
+		height: 10px;
+	}
+
+	.order-table .selector {
+		vertical-align: middle;
+		margin: 0 0 2px 0;
+	}
+
+	.toolbar label {
+		margin-right: 10px;
+		margin-bottom: 0;
+	}
+
+	.toolbar .select_all {
+		margin: 0 6px 0 10px;
+		line-height: 20px;
+	}
+
+	.toolbar .btn {
+		-moz-border-radius: 2px;
+		margin-right: 5px;
+		border: 1px solid #dcdcdc;
+		border-radius: 2px;
+		-webkit-border-radius: 2px;
+	}
+
+	.order-table .order-hd {
+		background: #f5f5f5;
+		height: 40px;
+		line-height: 40px;
+	}
+
+	.order-table .order-hd td.first {
+		padding-left: 20px;
+	}
+
+	.order-table .order-hd .order-main span {
+		margin-right: 8px;
+	}
+
+	.order-table .order-hd .order-code {
+		font-style: normal;
+		font-family: verdana;
+	}
+
+	.order-table .order-hd .order-sum {
+		position: relative;
+		padding: 0 5px;
+	}
+
+	.order-table .order-hd .dropdown-toggle {
+		line-height: 40px;
+		display: block;
+		color: #5078cb;
+		/*padding: 0 10px;*/
+	}
+
+
+	.order-table .operates {
+		display: none;
+	}
+
+	.order-table > tbody:hover .operates {
+		display: block;
+	}
+
+	.order-table .order-bd {
+		border-bottom: 1px solid #e6e6e6;
+	}
+
+	.order-table .order-bd > td {
+		padding: 10px 5px;
+	}
+
+	.order-table .order-bd .product {
+		padding-left: 20px;
+	}
+
+	.input-xs, .input-group-xs > .form-control, .input-group-xs > .input-group-addon, .input-group-xs > .input-group-btn > .btn {
+		height: 26px;
+		padding: 0 5px;
+		font-size: 12px;
+		line-height: 1.5;
+		border-radius: 3px;
+	}
+	.order-table .order-hd .dropdown-toggle:hover + .order-snapshot {
+		display: block;
+	}
+	.order-table .order-hd .order-snapshot{
+		padding: 10px 15px;
+		display: none;
+		width: 250px;
+		position: absolute;
+		top: 32px;
+		left: 39px;
+		border: 1px solid rgba(0,0,0,0.15);
+		-webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-moz-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-o-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		box-shadow: 0 0 5px rgba(0,0,0,0.3);
+	}
+	.order-snapshot .title {
+		border-top: 1px dashed #ddd;
+	}
+
+	.order-snapshot .dl-horizontal dt {
+		width: 60px;
+		text-align: left;
+		font-weight: normal;
+		color: #999;
+		padding: 4px 0;
+	}
+
+	.order-snapshot .dl-horizontal dd {
+		margin-left: 80px;
+		padding: 4px 0;
+	}
+
+	/*arrow*/
+	.order-send {
+		position: relative;
+	}
+
+	.order-send.arrow-border:before, .arrow-border:after {
+		content: '';
+		position: absolute;
+		top: 20px;
+		width: 0;
+		height: 0;
+		border: 7px solid transparent;
+	}
+
+	.order-send.arrow-border.arrow-bottom-right:before {
+		content: '';
+		position: absolute;
+		left: -13px;
+		border-bottom-color: #fff;
+		border-right-color: #fff;
+		margin-top: -10px;
+	}
+
+	.menu .new-dot {
+		width: 20px;
+		height: 20px;
+		line-height: 20px;
+		font-size: 12px;
+		color: #fff;
+		font-weight: inherit;
+		top: -2px;
+	}
+	.f14{
+		font-size:14px;
+	}
+	.screen .sreach input {
+		width: 288px
+	}
+	.modal {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 1050;
+		display: none;
+		overflow: hidden;
+		-webkit-overflow-scrolling: touch;
+		outline: 0;
+		margin: 0 !important;
+	}
+	.modal-open .modal {
+		overflow-x: hidden;
+		overflow-y: auto;
+	}
+	#empty {
+		padding: 70px 0;
+		margin: 0 auto;
+		text-align: center;
+	}
+	#empty .left_img {
+		display: inline-block;
+		color: #3f84f6;
+	}
+	#empty .left_img a {
+		font-size: 25px;
+		color: #3f84f6;
+	}
+	#empty .right_link p {
+		margin: 0;
+		font-size: 14px;
+		color: #666;
+	}
+	#empty_info .empty_title {
+		color: #3f84f6;
+		font-size: 18px;
+	}
+	#empty_info .empty_explain {
+		font-size: 16px;
+		color: #999;
+	}
+	#empty_info .empty_explain .info {
+		text-indent: -22px;
+	}
+	.f16 {
+		font-size: 16px !important;
+	}
+	.f14 {
+		font-size: 14px !important;
+	}
+	#empty_info {
+		padding-left: 60px;
+		padding-bottom: 40px;
+	}
+	table tbody tr td {
+		border-bottom: #e8e8e8 1px solid;
+		border-right: #e8e8e8 1px solid;
+		border-left:1px solid #e8e8e8;
+		font-size: 14px;
+		color: #333;
+	}
+	.ng-table-pager::after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+		margin-top: 0px !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
+	}
+	.fixed {
+		width: 40px;
+	}
+	.text-trans {
+		left: 50%;
+		right: auto;
+		top: 50%;
+		margin: -20px 0 0 -40px;
+	}
+	.com_tab:nth-of-type(2) ul li.active > a {
+		border: 0px
+	}
+	.com_tab:nth-of-type(2) ul li.active a {
+		color: #fff !important;
+	}
+	.com_tab:nth-of-type(2) ul {
+		/* border-top: 3px solid #f15601; */
+		border-bottom: 0px solid #f15601;
+	}
+</style>
 <link rel="stylesheet" href="static/css/b2bPublic.css">
-<div class="block fr" id="public">
+<div class="block user_right fr" style="position: relative" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<!--<i></i>-->
 	<div class="wrap">
@@ -165,43 +540,41 @@
 		<a ui-sref="purc_newOrder" title="新增采购单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
 	</div>
 </div>
-<div class="condition block">
-	<!--搜索时间筛选-->
 	<div class="screen check-filter">
-		<div class="radio-block date-radio">
-			时间筛选：
+		<div class="radio-block date-radio" style="width: 33%">
+			时间：
 			<label class="com-check-radio">
-				<input type="radio" id="oneMonth" name="date" ng-click="autoMonth = false;changeDateZone(1);condition.$open=false" checked>
+				<input type="radio" id="oneMonth" name="date" ng-click="changeDateZone(1);condition.$open=false" checked>
 				<label for="oneMonth"></label>
 				30天
 			</label>
 			<label class="com-check-radio">
-				<input type="radio" id="threeMonth" name="date" ng-click="autoMonth = false;changeDateZone(3);condition.$open=false">
+				<input type="radio" id="threeMonth" name="date" ng-click="changeDateZone(3);condition.$open=false">
 				<label for="threeMonth"></label>
 				90天
 			</label>
 			<label class="com-check-radio">
-				<input type="radio" id="sixMonth" name="date" ng-click="autoMonth = false;changeDateZone(6);condition.$open=false">
+				<input type="radio" id="sixMonth" name="date" ng-click="changeDateZone(6);condition.$open=false">
 				<label for="sixMonth"></label>
 				180天
 			</label>
 			<label class="com-check-radio">
-				<input type="radio" id="autoMonth" name="date" ng-click="autoMonth = true;condition.$open=!condition.$open;changeDateZone(-1)">
+				<input type="radio" id="autoMonth" name="date" ng-click="condition.$open=!condition.$open;changeDateZone(-1)">
 				<label for="autoMonth"></label>
 				自定义
 			</label>
 		</div>
 		<div class="sreach fr">
-			<div ng-show="autoMonth" class="date fl">
+			<div ng-show="condition.$open" class="date fl">
 				<div class="data-input">
 					<input type="text" ng-model="condition.dateFrom"
-						   class="form-control select-adder" placeholder="起始时间"
-						   datepicker-popup="yyyy-MM-dd"
-						   is-open="condition.$fromOpened"
-						   max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
-						   ng-click="openFilterDatePicker($event, condition, '$fromOpened')"
-						   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
-						   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 class="form-control select-adder" placeholder="起始时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$fromOpened"
+								 max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
 					/>
 					<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
 				</div>
@@ -209,25 +582,23 @@
 				<em>–</em>
 				<div class="data-input">
 					<input type="text" ng-model="condition.dateTo"
-						   class="form-control select-adder" placeholder="结束时间"
-						   datepicker-popup="yyyy-MM-dd"
-						   is-open="condition.$toOpened"
-						   min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
-						   ng-click="openFilterDatePicker($event, condition, '$toOpened')"
-						   ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
-						   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 class="form-control select-adder" placeholder="结束时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$toOpened"
+								 min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
 					/>
 					<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" class="form-control input-sm" ng-model="keyword"
-					   ng-search="onSearch(keyword)" placeholder="输入单据编号、客户名称、物料名称搜索"/>
-				<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
 			</div>
 		</div>
 	</div>
-</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
@@ -280,23 +651,22 @@
 	</tbody>
 	<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first" colspan="5">
+			<td class="first" colspan="5" style="border: 0">
 				<div class="order-main">
 					<!--<span> <input type="checkbox" class="selector"
 						ng-model="order.$selected" ng-click="checkOne(order)">
 					</span> -->
-					<span class="text-num text-bold"
-						ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
+					<span class="text-num text-bold">日期：{{::order.date | date:'yyyy-MM-dd'}}</span>
 					<span>订单号：<a
-						class="text-num" ng-bind="::order.code" ui-sref="purc_cart_detail({id:order.id})" target="_self"></a></span>
-					<span ng-bind="::order.receiveName"></span>
+						class="text-num" style="color: #5078cb" ng-bind="::order.code" ui-sref="purc_cart_detail({id:order.id})" target="_self"></a></span>
+					<span><img src="static/img/user/images/shop_home.png">{{::order.receiveName}}</span>
 				</div>
 			</td>
-			<td class="order-sum">{{::order.currency}}： <span
+			<td class="order-sum" style="border: 0">{{::order.currency}}： <span
 				ng-bind="getCartTotal(order.orderItems) | number : 2"
 				class="text-num text-bold"></span>
 			</td>
-			<td class="text-center">
+			<td class="text-center" style="border: 0">
 				<a ng-click="copyorder(order.id)" ng-disabled="hasClick">复制</a>
 				<a ng-click="deleteCart(order.id)" ng-disabled="hasClick">删除</a>
 			</td>
@@ -306,13 +676,12 @@
 			<td class="product">
 				<div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}" title="第{{::item.number}}行">{{::item.number}}</div>
 				<div class="text-num text-bold">
-					<span ng-bind="::item.product.code"></span>
+					<span>物料编号：{{::item.product.code}}</span>
 				</div>
 				<div>
-					<span ng-bind="::item.product.title"></span>
+					<span>物料名称：{{::item.product.title}}</span>
 				</div>
-				<div class="text-muted"
-					ng-bind="::item.product.spec"></div>
+				<div class="text-muted">物料规格：{{::item.product.spec}}</div>
 				<div class="text-muted text-bold" ng-if="item.vendspec"><span ng-bind="::item.vendspec"></span></div>
 				<div class="text-bold text-inverse" ng-if="item.factory">送货工厂：<span ng-bind="::item.factory"></span></div>
 				<div class="text-bold text-inverse" ng-if="item.remark">备注：<span ng-bind="::item.remark"></span></div>
@@ -360,4 +729,7 @@
 		</tr>
 	</tbody>
 </table>
+	<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+		显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+	</div>
 </div>

src/main/webapp/resources/view/usercenter/b2b/Purc/change_detail.html

@@ -136,7 +136,7 @@
 	}
 	.bottomB {
 		border-bottom: 2px solid #f5f5f5;
-		padding: 15px 30px 15px 15px;
+		padding: 15px 0 15px;
 	}
 
 	.title-div .f14{
@@ -175,38 +175,45 @@
 		</div>
 	</div>
 	<div class="pane-body">
-		<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
+		<div class="bottomB">
+		<div class="title-div">
 			<span class="f14">单据信息</span>&nbsp;
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
+			<div class="col-xs-6">
 				<span class="title">流水号</span>
 				<div class="content" ng-bind="::change.code"></div>
 			</div>
-			<div class="col-xs-3">
+			<div class="col-xs-6">
 				<span class="title">日期</span>
 				<div class="content" ng-bind="::change.date | date:'yyyy-MM-dd'"></div>
 			</div>
+
+		</div>
+		<div class="row row-sm item">
 			<div class="col-xs-6">
 				<span class="title">原供应商</span>
 				<div class="content" ng-bind="::change.apVendorName"></div>
 			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-3">
+			<div class="col-xs-6">
 				<span class="title">录单人</span>
 				<div class="content" ng-bind="::change.recorder"></div>
 			</div>
-			<div class="col-xs-9">
+
+		</div>
+		<div class="row row-sm item">
+			<div class="col-xs-12">
 				<span class="title">备注</span>
 				<div class="content" ng-bind="::change.remark"></div>
 			</div>
 		</div>
-		<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
+		</div>
+		<div class="bottomB">
+		<div class="title-div">
 			<span class="f14">原采购单</span>&nbsp;
 		</div>
 		<div class="row row-sm item">
-			<div class="col-xs-3">
+			<div class="col-xs-12">
 				<span class="title">采购单号</span>
 				<div class="content">
 					<a ng-bind="::change.orderCode"
@@ -214,7 +221,9 @@
 				</div>
 			</div>
 		</div>
-		<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
+		</div>
+		<div class="bottomB">
+		<div class="title-div">
 			<span class="f14">交易信息变更</span>&nbsp;
 		</div>
 		<div class="row row-sm item">
@@ -260,9 +269,12 @@
 				</div>
 			</div>
 		</div>
-		<div class="title-div" style="border-bottom: 1px dashed #3f84f6; position: relative;">
+		</div>
+		<div class="bottomB">
+		<div class="title-div">
 			<span class="f14">产品变更详情</span>
 		</div>
+		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover" style="margin-bottom: 0;">
 				<thead>

src/main/webapp/resources/view/usercenter/b2b/Purc/change_new.html

@@ -467,7 +467,7 @@
 						</tbody>
 					</table>
 				</div>
-				<div class="savebtn">
+				<div class="savebtn" style="cursor: pointer;">
 					<button ng-click="save()" ng-disabled="orderChange.$invalid">提交</button>
 				</div>
 			</div>

src/main/webapp/resources/view/usercenter/b2b/Purc/order_detail.html

@@ -17,9 +17,8 @@
 		overflow: hidden;
 	}
 	.block .product div.text-overflow span{
-		float: left;
-		display: inline-block;
-		width: 340px;
+		/*display: inline-block;*/
+		width: 240px;
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		overflow: hidden;
@@ -125,7 +124,7 @@
 		background: #f9f9f9;
 	}
 	#order-detail-list .table-default .header th {
-		display: inline-block;
+		/*display: inline-block;*/
 		border-bottom: none;
 		font-weight: normal;
 		color: #999;
@@ -163,7 +162,7 @@
 	}
 	.bottomB {
 		border-bottom: 2px solid #f5f5f5;
-		padding: 15px 30px 15px 15px;
+		padding: 15px 0px 15px 0px;
 	}
 
 	.title-div .f14{
@@ -192,6 +191,7 @@
 	.text-trans {
 		top: -20px;
 	}
+
 </style>
 <!--<div class="loading" ng-class="{'in': loading}">
 	<i></i>
@@ -205,79 +205,86 @@
 		</div>
 	</div>
 	<div class="pane-body">
-		<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
-			<span class="f14">采购资料</span>&nbsp;
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">采购单号</span>
-				<div class="content" ng-bind="::order.code"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">日期</span>
-				<div class="content" ng-bind="::order.date | date:'yyyy-MM-dd'"></div>
-			</div>
-			<div class="col-xs-6">
-				<span class="title">供应商</span>
-				<div class="content" ng-bind="::order.receiveName"></div>
+		<div class="bottomB">
+			<div class="title-div" >
+				<span class="f14">采购资料</span>&nbsp;
 			</div>
-		</div>
-		<div class="row row-sm item">
-			<!--<div class="col-xs-3">
-				<span class="title">采购类型</span>
-				<div class="content" ng-bind="::order.type"></div>
-			</div>-->
-			<div class="col-xs-3">
-				<span class="title">录单人</span>
-				<div class="content" ng-bind="::order.recorder"></div>
+			<div class="row row-sm item">
+				<div class="col-xs-6">
+					<span class="title">采购单号</span>
+					<div class="content" ng-bind="::order.code"></div>
+				</div>
+				<div class="col-xs-6">
+					<span class="title">日期</span>
+					<div class="content" ng-bind="::order.date | date:'yyyy-MM-dd'"></div>
+				</div>
+
 			</div>
-			<!--<div class="col-xs-3">
-				<span class="title">审批人</span>
-				<div class="content" ng-bind="::order.auditor"></div>
+			<div class="row row-sm item">
+				<div class="col-xs-6">
+					<span class="title">供应商</span>
+					<div class="content" ng-bind="::order.receiveName"></div>
+				</div>
+				<!--<div class="col-xs-3">
+					<span class="title">采购类型</span>
+					<div class="content" ng-bind="::order.type"></div>
+				</div>-->
+				<div class="col-xs-6">
+					<span class="title">录单人</span>
+					<div class="content" ng-bind="::order.recorder"></div>
+				</div>
+				<!--<div class="col-xs-3">
+					<span class="title">审批人</span>
+					<div class="content" ng-bind="::order.auditor"></div>
+				</div>
+				<div class="col-xs-3">
+					<span class="title">采购员</span>
+					<div class="content" ng-bind="::order.user.userName"></div>
+				</div>-->
 			</div>
-			<div class="col-xs-3">
-				<span class="title">采购员</span>
-				<div class="content" ng-bind="::order.user.userName"></div>
-			</div>-->
 		</div>
-		<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
-			<span class="f14">交易信息</span>&nbsp;
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">币别</span>
-				<div class="content" ng-bind="::order.currency"></div>
+		<div class="bottomB">
+			<div class="title-div" >
+				<span class="f14">交易信息</span>&nbsp;
 			</div>
-			<div class="col-xs-3">
-				<span class="title">金额</span>
-				<div ng-if="!isUser" class="content" ng-bind="::order.total | number:2"></div>
+			<div class="row row-sm item">
+				<div class="col-xs-6">
+					<span class="title">币别</span>
+					<div class="content" ng-bind="::order.currency"></div>
+				</div>
+				<div class="col-xs-6">
+					<span class="title">金额</span>
+					<div ng-if="!isUser" class="content" ng-bind="::order.total | number:2"></div>
+				</div>
 			</div>
-			<div class="col-xs-6">
-				<span class="title">付款方式</span>
-				<div class="content" ng-bind="::order.payments"></div>
+			<div class="row row-sm item">
+				<div class="col-xs-6">
+					<span class="title">付款方式</span>
+					<div class="content" ng-bind="::order.payments"></div>
+				</div>
+				<div class="col-xs-6">
+					<span class="title">交货地址</span>
+					<div class="content" ng-bind="::order.shipAddress"></div>
+				</div>
 			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-9">
-				<span class="title">交货地址</span>
-				<div class="content" ng-bind="::order.shipAddress"></div>
+			<div class="row row-sm item">
+				<div class="col-xs-12">
+					<span class="title">备注</span>
+					<div class="content-hide content" ng-bind="::order.remark"></div>
+				</div>
 			</div>
 		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-12">
-				<span class="title">备注</span>
-				<div class="content-hide content" ng-bind="::order.remark"></div>
+		<div class="bottomB">
+			<div class="title-div">
+				<span class="f14">物料清单</span>&nbsp;
 			</div>
 		</div>
-		<div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
-			<span class="f14">物料清单</span>&nbsp;
-		</div>
 		<div class="block">
 			<table class="block table table-default table-striped table-hover" style="margin-bottom: 0;">
 				<thead>
 				<tr class="header">
-					<th width="50">序号</th>
-					<th width="270">物料</th>
+					<!--<th width="50">序号</th>-->
+					<th>物料</th>
 					<th width="110">单价</th>
 					<th width="100">数量</th>
 					<th width="120">交货日期</th>
@@ -289,17 +296,20 @@
 			<table class="block table table-default table-striped table-hover" ng-class="{'scoroll':order.orderItems.length>10}">
 				<tbody>
 				<tr ng-repeat="item in order.orderItems track by item.id">
-					<td class="text-center text-num f-16 text-success "  width="50">
-						<span ng-bind="::item.number"></span>
-					</td>
-					<td width="270" class="product">
+					<!--<td class="text-center text-num f-16 text-success "  width="50">-->
+						<!--<span ng-bind="::item.number"></span>-->
+					<!--</td>-->
+					<td class="product">
+						<div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}" title="第{{::item.number}}行">{{::item.number}}</div>
 						<div class="text-num text-bold text-overflow" title="{{::item.product.code}}">
-							<span ng-bind="::item.product.code"></span>
+							物料编号：<span ng-bind="::item.product.code"></span>
 						</div>
 						<div class="text-overflow" title="{{::item.product.title}}">
-							<span ng-bind="::item.product.title"></span>
+							物料名称：<span ng-bind="::item.product.title"></span>
+						</div>
+						<div class="text-muted text-over" title="{{::item.product.spec}}">
+							物料规格：{{::item.product.spec}}
 						</div>
-						<div class="text-muted text-over" ng-bind="::item.product.spec" title="{{::item.product.spec}}"></div>
 						<div class="text-muted text-bold text-overflow" ng-if="item.vendspec" title="{{item.vendspec}}"><span ng-bind="::item.vendspec"></span></div>
 						<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><span ng-bind="::item.factory"></span></div>
 						<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><span ng-bind="::item.remark"></span></div>

src/main/webapp/resources/view/usercenter/b2b/modal/enableOrderList.html

@@ -110,6 +110,380 @@
     overflow: auto;
 }
 </style>
+<style>
+    .com_tab {
+        height: 40px;
+        margin-bottom: 10px;
+    }
+    .com_tab ul {
+        width: 100%;
+        margin: 0 auto;
+        height: 40px;
+        line-height: 40px;
+        background: #fff;
+    }
+    .com_tab ul li {
+        height: 40px;
+        text-align: center;
+        float: left;
+        position: relative;
+        min-width: 110px;
+    }
+    .com_tab:nth-of-type(1) ul li.active > a {
+        border-bottom: #fff;
+        background: #5078cb;
+        color: #fff !important;
+    }
+    .com_tab ul li a {
+        min-width: 110px;
+    }
+    .com_tab ul li > a {
+        font-size: 14px;
+        height: 40px;
+        padding: 0 20px;
+        display: inline-block;
+    }
+    .com_tab:nth-of-type(1) ul li::after {
+        background:url('static/img/vendor/images/downicon.png');
+        width: 11px;
+        height: 6px;
+        position: absolute;
+        bottom: 0px;
+        left: 50%;
+        content: ' ';
+        margin-left: -5px;
+        display: none;
+    }
+    .com_tab ul li::after {
+        background:url('static/img/vendor/images/downicon.png');
+        width: 11px;
+        height: 6px;
+        position: absolute;
+        bottom: 0px;
+        left: 50%;
+        content: ' ';
+        margin-left: -5px;
+        display: none;
+    }
+    .com_tab ul li.active:after {
+        display: block;
+    }
+    .oder01 ul li.active a{
+        border-bottom: 1px solid #fff;
+        color: #f15601;
+    }
+    .oder01 ul li.active a em {
+        color: #f15601;
+    }
+    .oder01 ul li a em {
+        color: #323232
+    }
+    .screen {
+        background: #fff;
+        padding-top: 10px;
+        padding-right: 11px;
+        line-height: 32px;
+        padding-left: 22px;
+        width: 100%;
+        height: 50px;
+        position: relative;
+    }
+    .screen .sreach input {
+        border: #5078cb 1px solid;
+        height: 32px;
+        width: 280px;
+        box-shadow: none;
+        padding-left: 10px;
+        background: #fff;
+        float: left;
+        vertical-align: middle;
+        font-size: 14px;
+    }
+    .screen .sreach a.seek {
+        width: 58px;
+        height: 32px;
+        background: #5078cb;
+        color: #fff;
+        line-height: 32px;
+        float: none;
+        border-radius: 2px;
+        vertical-align: unset;
+    }
+    .order-table {
+        background: #fff;
+        width: 100%;
+    }
+    .order-table .header > th {
+        height: 38px;
+        text-align: center;
+        background: #fff;
+        border-top: 1px solid #e8e8e8;
+        border-bottom: 1px solid #e8e8e8;
+        font-size: 14px;
+    }
+
+    .order-table .sep-row {
+        height: 10px;
+    }
+
+    .order-table .selector {
+        vertical-align: middle;
+        margin: 0 0 2px 0;
+    }
+
+    .toolbar label {
+        margin-right: 10px;
+        margin-bottom: 0;
+    }
+
+    .toolbar .select_all {
+        margin: 0 6px 0 10px;
+        line-height: 20px;
+    }
+
+    .toolbar .btn {
+        -moz-border-radius: 2px;
+        margin-right: 5px;
+        border: 1px solid #dcdcdc;
+        border-radius: 2px;
+        -webkit-border-radius: 2px;
+    }
+
+    .order-table .order-hd {
+        background: #f5f5f5;
+        height: 40px;
+        line-height: 40px;
+    }
+
+    .order-table .order-hd td.first {
+        padding-left: 20px;
+    }
+
+    .order-table .order-hd .order-main span {
+        margin-right: 8px;
+    }
+
+    .order-table .order-hd .order-code {
+        font-style: normal;
+        font-family: verdana;
+    }
+
+    .order-table .order-hd .order-sum {
+        position: relative;
+        padding: 0 5px;
+    }
+
+    .order-table .order-hd .dropdown-toggle {
+        line-height: 40px;
+        display: block;
+        color: #5078cb;
+        /*padding: 0 10px;*/
+    }
+
+
+    .order-table .operates {
+        display: none;
+    }
+
+    .order-table > tbody:hover .operates {
+        display: block;
+    }
+
+    .order-table .order-bd {
+        border-bottom: 1px solid #e6e6e6;
+    }
+
+    .order-table .order-bd > td {
+        padding: 10px 5px;
+    }
+
+    .order-table .order-bd .product {
+        padding-left: 20px;
+    }
+
+    .input-xs, .input-group-xs > .form-control, .input-group-xs > .input-group-addon, .input-group-xs > .input-group-btn > .btn {
+        height: 26px;
+        padding: 0 5px;
+        font-size: 12px;
+        line-height: 1.5;
+        border-radius: 3px;
+    }
+    .order-table .order-hd .dropdown-toggle:hover + .order-snapshot {
+        display: block;
+    }
+    .order-table .order-hd .order-snapshot{
+        padding: 10px 15px;
+        display: none;
+        width: 250px;
+        position: absolute;
+        top: 32px;
+        left: 39px;
+        border: 1px solid rgba(0,0,0,0.15);
+        -webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+        -moz-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+        -o-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+        box-shadow: 0 0 5px rgba(0,0,0,0.3);
+    }
+    .order-snapshot .title {
+        border-top: 1px dashed #ddd;
+    }
+
+    .order-snapshot .dl-horizontal dt {
+        width: 60px;
+        text-align: left;
+        font-weight: normal;
+        color: #999;
+        padding: 4px 0;
+    }
+
+    .order-snapshot .dl-horizontal dd {
+        margin-left: 80px;
+        padding: 4px 0;
+    }
+
+    /*arrow*/
+    .order-send {
+        position: relative;
+    }
+
+    .order-send.arrow-border:before, .arrow-border:after {
+        content: '';
+        position: absolute;
+        top: 20px;
+        width: 0;
+        height: 0;
+        border: 7px solid transparent;
+    }
+
+    .order-send.arrow-border.arrow-bottom-right:before {
+        content: '';
+        position: absolute;
+        left: -13px;
+        border-bottom-color: #fff;
+        border-right-color: #fff;
+        margin-top: -10px;
+    }
+
+    .menu .new-dot {
+        width: 20px;
+        height: 20px;
+        line-height: 20px;
+        font-size: 12px;
+        color: #fff;
+        font-weight: inherit;
+        top: -2px;
+    }
+    .f14{
+        font-size:14px;
+    }
+    .screen .sreach input {
+        width: 288px
+    }
+    .modal {
+        position: fixed;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        z-index: 1050;
+        display: none;
+        overflow: hidden;
+        -webkit-overflow-scrolling: touch;
+        outline: 0;
+        margin: 0 !important;
+    }
+    .modal-open .modal {
+        overflow-x: hidden;
+        overflow-y: auto;
+    }
+    #empty {
+        padding: 70px 0;
+        margin: 0 auto;
+        text-align: center;
+    }
+    #empty .left_img {
+        display: inline-block;
+        color: #3f84f6;
+    }
+    #empty .left_img a {
+        font-size: 25px;
+        color: #3f84f6;
+    }
+    #empty .right_link p {
+        margin: 0;
+        font-size: 14px;
+        color: #666;
+    }
+    #empty_info .empty_title {
+        color: #3f84f6;
+        font-size: 18px;
+    }
+    #empty_info .empty_explain {
+        font-size: 16px;
+        color: #999;
+    }
+    #empty_info .empty_explain .info {
+        text-indent: -22px;
+    }
+    .f16 {
+        font-size: 16px !important;
+    }
+    .f14 {
+        font-size: 14px !important;
+    }
+    #empty_info {
+        padding-left: 60px;
+        padding-bottom: 40px;
+    }
+    table tbody tr td {
+        border-bottom: #e8e8e8 1px solid;
+        border-right: #e8e8e8 1px solid;
+        border-left:1px solid #e8e8e8;
+        font-size: 14px;
+        color: #333;
+    }
+    .ng-table-pager::after {
+        clear: both;
+        content: ' ';
+        zoom: 1;
+        display: block;
+        visibility: hidden;
+    }
+    .ng-table-pager {
+        padding-right: 20px;
+        padding-top: 50px;
+        margin-right: 0 !important;
+    }
+    .text-mns {
+        padding-right: 15px;
+        position: absolute;
+        bottom: 64px;
+        right: 20px;
+        font-size: 12px;
+    }
+    .Boom18 {
+        bottom: 18px;
+    }
+    .fixed {
+        width: 40px;
+    }
+    .text-trans {
+        left: 50%;
+        right: auto;
+        top: 50%;
+        margin: -20px 0 0 -40px;
+    }
+    .com_tab:nth-of-type(2) ul li.active > a {
+        border: 0px
+    }
+    .com_tab:nth-of-type(2) ul li.active a {
+        color: #fff !important;
+    }
+    .com_tab:nth-of-type(2) ul {
+        /* border-top: 3px solid #f15601; */
+        border-bottom: 0px solid #f15601;
+    }
+</style>
 <link rel="stylesheet" href="static/css/b2bPublic.css">
 <div class="block" id="public">
     <div class="loading in" ng-class="{'in': loading}">
@@ -245,38 +619,37 @@
             <tr class="order-hd"
                 ng-class="{'text-bold': order.display>0}">
                 <td class="text-center">
-                    <input type="checkbox" ng-click="checkOne(order)" ng-model="!item.change && order.checked" >
+                    <input type="checkbox" ng-click="checkOne(order)" ng-model="order.checked" >
                 </td>
-                <td class="first" colspan="4">
+                <td class="first" colspan="5">
                     <div class="order-main">
-					<span class="text-num text-bold"
-                          ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
-                        <span>订单号：<a
-                                class="text-num" ng-bind="::order.code" target="_self"></a></span>
-                        <span ng-bind="::order.receiveName"></span>
+                        <span class="text-num text-bold">日期：{{::order.date | date:'yyyy-MM-dd'}}</span>
+                        <span>订单号：<a class="text-num" ng-bind="::order.code" target="_self"></a></span>
+                        <span><img src="static/img/user/images/shop_home.png" style="margin-right: 5px">{{::order.receiveName}}</span>
+                        <span
+                            class=" text-num text-bold">{{::order.currency}}：{{getCartTotal(order.orderItems) | number : 2}}</span>
                     </div>
                 </td>
-                <td class="order-sum">{{::order.currency}}： <span
-                        ng-bind="getCartTotal(order.orderItems) | number : 2"
-                        class="text-num text-bold"></span>
-                </td>
+                <!--<td class="order-sum" colspan="2">{{::order.currency}}： -->
+                <!--</td>-->
             </tr>
             <tr class="order-bd" ng-repeat="item in order.orderItems">
                 <td class="text-center">
-                    <input type="checkbox" ng-click="checkItem(item, order, $index)" ng-model="!item.change && item.checked">
+                    <input type="checkbox" ng-click="checkItem(item, order, $index)" ng-model="item.checked">
                 </td>
                 <td class="product">
                     <div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}"
                          title="第{{::item.number}}行">{{::item.number}}
                     </div>
                     <div class="text-num text-bold">
-                        <span ng-bind="::item.product.code"></span>
+                        物料编号：<span ng-bind="::item.product.code"></span>
                     </div>
                     <div>
-                        <span ng-bind="::item.product.title"></span>
+                        物料名称：<span ng-bind="::item.product.title"></span>
+                    </div>
+                    <div class="text-muted">
+                        物料规格：{{::item.product.spec}}
                     </div>
-                    <div class="text-muted"
-                         ng-bind="::item.product.spec"></div>
                     <div class="text-muted text-bold" ng-if="item.vendspec"><span ng-bind="::item.vendspec"></span>
                     </div>
                     <div class="text-bold text-inverse" ng-if="item.factory">送货工厂：<span ng-bind="::item.factory"></span>

src/main/webapp/resources/view/usercenter/b2b/order/changeList.html

@@ -7,9 +7,9 @@
 		border-bottom: 1px solid #e8e8e8;
 	}
 
-	.order-table .sep-row {
-		height: 10px;
-	}
+	/*.order-table .sep-row {*/
+		/*height: 10px;*/
+	/*}*/
 
 	.order-table .selector {
 		vertical-align: middle;
@@ -66,7 +66,7 @@
 	}
 
 	.order-table>tbody:hover {
-		border-color: #56a022;
+		border-color: #5078cb;
 		border-width: 2px;
 	}
 
@@ -102,8 +102,382 @@
 		top: -2px;
 	}
 </style>
+<style>
+	.com_tab {
+		height: 40px;
+		margin-bottom: 10px;
+	}
+	.com_tab ul {
+		width: 100%;
+		margin: 0 auto;
+		height: 40px;
+		line-height: 40px;
+		background: #fff;
+	}
+	.com_tab ul li {
+		height: 40px;
+		text-align: center;
+		float: left;
+		position: relative;
+		min-width: 110px;
+	}
+	.com_tab:nth-of-type(1) ul li.active > a {
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff !important;
+	}
+	.com_tab ul li a {
+		min-width: 110px;
+	}
+	.com_tab ul li > a {
+		font-size: 14px;
+		height: 40px;
+		padding: 0 20px;
+		display: inline-block;
+	}
+	.com_tab:nth-of-type(1) ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li.active:after {
+		display: block;
+	}
+	.oder01 ul li.active a{
+		border-bottom: 1px solid #fff;
+		color: #f15601;
+	}
+	.oder01 ul li.active a em {
+		color: #f15601;
+	}
+	.oder01 ul li a em {
+		color: #323232
+	}
+	.screen {
+		background: #fff;
+		padding-top: 10px;
+		padding-right: 11px;
+		line-height: 32px;
+		padding-left: 22px;
+		width: 100%;
+		height: 50px;
+		position: relative;
+	}
+	.screen .sreach input {
+		border: #5078cb 1px solid;
+		height: 32px;
+		width: 280px;
+		box-shadow: none;
+		padding-left: 10px;
+		background: #fff;
+		float: left;
+		vertical-align: middle;
+		font-size: 14px;
+	}
+	.screen .sreach a.seek {
+		width: 58px;
+		height: 32px;
+		background: #5078cb;
+		color: #fff;
+		line-height: 32px;
+		float: none;
+		border-radius: 2px;
+		vertical-align: unset;
+	}
+	.order-table {
+		background: #fff;
+		width: 100%;
+	}
+	.order-table .header > th {
+		height: 38px;
+		text-align: center;
+		background: #fff;
+		border-top: 1px solid #e8e8e8;
+		border-bottom: 1px solid #e8e8e8;
+		font-size: 14px;
+	}
+
+	.order-table .sep-row {
+		height: 10px;
+	}
+
+	.order-table .selector {
+		vertical-align: middle;
+		margin: 0 0 2px 0;
+	}
+
+	.toolbar label {
+		margin-right: 10px;
+		margin-bottom: 0;
+	}
+
+	.toolbar .select_all {
+		margin: 0 6px 0 10px;
+		line-height: 20px;
+	}
+
+	.toolbar .btn {
+		-moz-border-radius: 2px;
+		margin-right: 5px;
+		border: 1px solid #dcdcdc;
+		border-radius: 2px;
+		-webkit-border-radius: 2px;
+	}
+
+	.order-table .order-hd {
+		background: #f5f5f5;
+		height: 40px;
+		line-height: 40px;
+	}
+
+	.order-table .order-hd td.first {
+		padding-left: 20px;
+	}
+
+	.order-table .order-hd .order-main span {
+		margin-right: 8px;
+	}
+
+	.order-table .order-hd .order-code {
+		font-style: normal;
+		font-family: verdana;
+	}
+
+	.order-table .order-hd .order-sum {
+		position: relative;
+		padding: 0 5px;
+	}
+
+	.order-table .order-hd .dropdown-toggle {
+		line-height: 40px;
+		display: block;
+		color: #5078cb;
+		/*padding: 0 10px;*/
+	}
+
+
+	.order-table .operates {
+		display: none;
+	}
+
+	.order-table > tbody:hover .operates {
+		display: block;
+	}
+
+	.order-table .order-bd {
+		border-bottom: 1px solid #e6e6e6;
+	}
+
+	.order-table .order-bd > td {
+		padding: 10px 5px;
+	}
+
+	.order-table .order-bd .product {
+		padding-left: 20px;
+	}
+
+	.input-xs, .input-group-xs > .form-control, .input-group-xs > .input-group-addon, .input-group-xs > .input-group-btn > .btn {
+		height: 26px;
+		padding: 0 5px;
+		font-size: 12px;
+		line-height: 1.5;
+		border-radius: 3px;
+	}
+	.order-table .order-hd .dropdown-toggle:hover + .order-snapshot {
+		display: block;
+	}
+	.order-table .order-hd .order-snapshot{
+		padding: 10px 15px;
+		display: none;
+		width: 250px;
+		position: absolute;
+		top: 32px;
+		left: 39px;
+		border: 1px solid rgba(0,0,0,0.15);
+		-webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-moz-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-o-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		box-shadow: 0 0 5px rgba(0,0,0,0.3);
+	}
+	.order-snapshot .title {
+		border-top: 1px dashed #ddd;
+	}
+
+	.order-snapshot .dl-horizontal dt {
+		width: 60px;
+		text-align: left;
+		font-weight: normal;
+		color: #999;
+		padding: 4px 0;
+	}
+
+	.order-snapshot .dl-horizontal dd {
+		margin-left: 80px;
+		padding: 4px 0;
+	}
+
+	/*arrow*/
+	.order-send {
+		position: relative;
+	}
+
+	.order-send.arrow-border:before, .arrow-border:after {
+		content: '';
+		position: absolute;
+		top: 20px;
+		width: 0;
+		height: 0;
+		border: 7px solid transparent;
+	}
+
+	.order-send.arrow-border.arrow-bottom-right:before {
+		content: '';
+		position: absolute;
+		left: -13px;
+		border-bottom-color: #fff;
+		border-right-color: #fff;
+		margin-top: -10px;
+	}
+
+	.menu .new-dot {
+		width: 20px;
+		height: 20px;
+		line-height: 20px;
+		font-size: 12px;
+		color: #fff;
+		font-weight: inherit;
+		top: -2px;
+	}
+	.f14{
+		font-size:14px;
+	}
+	.screen .sreach input {
+		width: 288px
+	}
+	.modal {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 1050;
+		display: none;
+		overflow: hidden;
+		-webkit-overflow-scrolling: touch;
+		outline: 0;
+		margin: 0 !important;
+	}
+	.modal-open .modal {
+		overflow-x: hidden;
+		overflow-y: auto;
+	}
+	#empty {
+		padding: 70px 0;
+		margin: 0 auto;
+		text-align: center;
+	}
+	#empty .left_img {
+		display: inline-block;
+		color: #3f84f6;
+	}
+	#empty .left_img a {
+		font-size: 25px;
+		color: #3f84f6;
+	}
+	#empty .right_link p {
+		margin: 0;
+		font-size: 14px;
+		color: #666;
+	}
+	#empty_info .empty_title {
+		color: #3f84f6;
+		font-size: 18px;
+	}
+	#empty_info .empty_explain {
+		font-size: 16px;
+		color: #999;
+	}
+	#empty_info .empty_explain .info {
+		text-indent: -22px;
+	}
+	.f16 {
+		font-size: 16px !important;
+	}
+	.f14 {
+		font-size: 14px !important;
+	}
+	#empty_info {
+		padding-left: 60px;
+		padding-bottom: 40px;
+	}
+	table tbody tr td {
+		border-bottom: #e8e8e8 1px solid;
+		border-right: #e8e8e8 1px solid;
+		border-left:1px solid #e8e8e8;
+		font-size: 14px;
+		color: #333;
+	}
+	.ng-table-pager::after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
+	}
+	.fixed {
+		width: 40px;
+	}
+	.text-trans {
+		left: 50%;
+		right: auto;
+		top: 50%;
+		margin: -20px 0 0 -65px
+	}
+	.com_tab:nth-of-type(2) ul li.active > a {
+		border: 0px
+	}
+	.com_tab:nth-of-type(2) ul li.active a {
+		color: #fff !important;
+	}
+	.com_tab:nth-of-type(2) ul {
+		/* border-top: 3px solid #f15601; */
+		border-bottom: 0px solid #f15601;
+	}
+</style>
 <link rel="stylesheet" href="static/css/b2bPublic.css">
-<div class="block user_right fr" id="public">
+<div class="block user_right fr" style="position: relative">
 	<!--<div class="pub-com_head">-->
 		<!--<span>采购变更单</span>-->
 		<!--<div class="p-right">-->
@@ -117,113 +491,92 @@
 			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
-	<div class="tab_top" style="margin-bottom: 10px">
-		<ul class="fl" style="width: 100%">
+	<div class="com_tab" style="margin-bottom: 10px">
+		<ul style="width: 100%">
 			<li ng-class="{'active': storeType=='purcOrder'}"><a ui-sref="purc_usercenter_order">采购订单</a></li>
 			<li ng-class="{'active': storeType=='purcChange'}"><a ui-sref="purc_change_list">采购变更单</a></li>
 			<li ng-class="{'active': storeType=='deputy'}"><a ui-sref="purc_deputy">代采订单</a></li>
 			<li ng-class="{'active': storeType=='outorder'}"><a ui-sref="purc_make_outorder">委外订单</a></li>
-			<li class="down-purchase">
-				<a class="tab_add" ui-sref="purc_change_new" type="button" title="新增采购变更单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
-				<span class='tab_add' ng-click="exportXls()" style="cursor:pointer">
+			<li class="down-purchase"  style="margin-right: 20px;color: #fff;min-width: 80px">
+				<a class='tab_add' ng-click="exportXls()" style="color: #5078cb !important;padding: 0;min-width: 80px">
 					<i class="fa fa-file-excel-o fa-fw"></i>导出Excel
-				</span>
+				</a>
 				<form style="display: none;" id="down-load-purchase" method="get">
 					<input type="hidden" name="ids" ng-value="localInfo.ids">
 				</form>
 			</li>
+			<li class="down-purchase"  style="margin-right: 0px;color: #fff;min-width: 80px">
+				<a class="tab_add" style="color: #5078cb !important;padding: 0;min-width: 80px" ui-sref="purc_change_new" type="button" title="新增采购变更单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
+			</li>
+
 		</ul>
 	</div>
-	<div class="menu condition block">
-		<div class="btn-group btn-group-sm btn-group-justified">
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部
-					<b class="new-dot" ng-if="unread.all > 0">({{unread.all>99?'99+':unread.all}})</b>
-				</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='done'}" ng-click="setActive('done');setOrdersReadByState()">已处理
-					<b class="new-dot" ng-if="unread.replied > 0">({{unread.replied>99?'99+':unread.replied}})</b>
-				</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待确认
-					<b class="new-dot" ng-if="unread.notReply > 0">({{unread.notReply>99?'99+':unread.notReply}})</b>
-				</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='unread'}" ng-click="setActive('unread')">无需确认
-					<b class="new-dot" ng-if="unread.unNeedReply > 0">({{unread.unNeedReply>99?'99+':unread.unNeedReply}})</b>
-				</button>
-			</div>
-		</div>
+	<div class="oder01">
+		<ul>
+			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部<span ng-if="unread.all>0">(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</span></a></li>
+			<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已处理<span  ng-if="unread.replied>0">(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</span></a></li>
+			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待确认<span  ng-if="unread.notReply>0">(<em ng-class="{'color-black': !unread.notReply }" ng-bind="unread.notReply || 0"></em>)</span></a></li>
+			<li ng-class="{'active': active=='unread'}" ng-click="setActive('waiting')"><a>无需确认<span  ng-if="unread.unNeedReply>0">(<em ng-class="{'color-black': !unread.unNeedReply }" ng-bind="unread.unNeedReply || 0"></em>)</span></a></li>
+		</ul>
 	</div>
 	<!--<div class="height10">&nbsp;</div>-->
-	<div class="condition block">
-		<!--搜索时间筛选-->
-		<div class="screen check-filter">
-			<div class="radio-block date-radio">
-				时间筛选：
-				<label class="com-check-radio">
-					<input type="radio" id="oneMonth" name="date" ng-click="autoMonth = false;changeDateZone(1);condition.$open=false" checked>
-					<label for="oneMonth"></label>
-					30天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="threeMonth" name="date" ng-click="autoMonth = false;changeDateZone(3);condition.$open=false">
-					<label for="threeMonth"></label>
-					90天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="sixMonth" name="date" ng-click="autoMonth = false;changeDateZone(6);condition.$open=false">
-					<label for="sixMonth"></label>
-					180天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="autoMonth" name="date" ng-click="autoMonth = true;condition.$open=!condition.$open;changeDateZone(-1)">
-					<label for="autoMonth"></label>
-					自定义
-				</label>
-			</div>
-			<div class="sreach fr">
-				<div ng-show="autoMonth" class="date fl">
-					<div class="data-input">
-						<input type="text" ng-model="condition.dateFrom"
-							   class="form-control select-adder" placeholder="起始时间"
-							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.$fromOpened"
-							   max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openFilterDatePicker($event, condition, '$fromOpened')"
-							   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						/>
-						<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
-					</div>
-
-					<em>–</em>
-					<div class="data-input">
-						<input type="text" ng-model="condition.dateTo"
-							   class="form-control select-adder" placeholder="结束时间"
-							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.$toOpened"
-							   min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openFilterDatePicker($event, condition, '$toOpened')"
-							   ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						/>
-						<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
-					</div>
+	<div class="screen check-filter">
+		<div class="radio-block date-radio" style="width: 33%">
+			时间：
+			<label class="com-check-radio">
+				<input type="radio" id="oneMonth" name="date" ng-click="changeDateZone(1);condition.$open=false" checked>
+				<label for="oneMonth"></label>
+				30天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="threeMonth" name="date" ng-click="changeDateZone(3);condition.$open=false">
+				<label for="threeMonth"></label>
+				90天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="sixMonth" name="date" ng-click="changeDateZone(6);condition.$open=false">
+				<label for="sixMonth"></label>
+				180天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="autoMonth" name="date" ng-click="condition.$open=!condition.$open;changeDateZone(-1)">
+				<label for="autoMonth"></label>
+				自定义
+			</label>
+		</div>
+		<div class="sreach fr">
+			<div ng-show="condition.$open" class="date fl">
+				<div class="data-input">
+					<input type="text" ng-model="condition.dateFrom"
+								 class="form-control select-adder" placeholder="起始时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$fromOpened"
+								 max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
+					/>
+					<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
 				</div>
-				<div class="sreach-input fr">
-					<input type="search" class="form-control input-sm" ng-model="keyword"
-						   ng-search="onSearch(keyword)" placeholder="输入单据编号、客户名称、物料名称搜索"/>
-					<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+
+				<em>–</em>
+				<div class="data-input">
+					<input type="text" ng-model="condition.dateTo"
+								 class="form-control select-adder" placeholder="结束时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$toOpened"
+								 min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
+					/>
+					<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
 				</div>
 			</div>
+			<div class="sreach-input fr">
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+			</div>
 		</div>
 	</div>
 	<table class="order-table block" ng-table="tableParams">
@@ -235,9 +588,9 @@
 			<th width="120">交货日期</th>
 			<th width="120">变更内容</th>
 		</tr>
-		<tr class="sep-row">
-			<td colspan="6"></td>
-		</tr>
+		<!--<tr class="sep-row">-->
+			<!--<td colspan="6"></td>-->
+		<!--</tr>-->
 		</thead>
 		<tbody ng-repeat="change in $data track by change.id">
 		<tr class="order-hd">
@@ -403,4 +756,7 @@
 		</tr>
 		</tbody>
 	</table>
+	<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+		显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+	</div>
 </div>

src/main/webapp/resources/view/usercenter/b2b/order/deputyOrder.html

@@ -193,8 +193,382 @@
 		font-size: 14px;
 	}
 </style>
+<style>
+	.com_tab {
+		height: 40px;
+		margin-bottom: 10px;
+	}
+	.com_tab ul {
+		width: 100%;
+		margin: 0 auto;
+		height: 40px;
+		line-height: 40px;
+		background: #fff;
+	}
+	.com_tab ul li {
+		height: 40px;
+		text-align: center;
+		float: left;
+		position: relative;
+		min-width: 110px;
+	}
+	.com_tab:nth-of-type(1) ul li.active > a {
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff !important;
+	}
+	.com_tab ul li a {
+		min-width: 110px;
+	}
+	.com_tab ul li > a {
+		font-size: 14px;
+		height: 40px;
+		padding: 0 20px;
+		display: inline-block;
+	}
+	.com_tab:nth-of-type(1) ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li.active:after {
+		display: block;
+	}
+	.oder01 ul li.active a{
+		border-bottom: 1px solid #fff;
+		color: #f15601;
+	}
+	.oder01 ul li.active a em {
+		color: #f15601;
+	}
+	.oder01 ul li a em {
+		color: #323232
+	}
+	.screen {
+		background: #fff;
+		padding-top: 10px;
+		padding-right: 11px;
+		line-height: 32px;
+		padding-left: 22px;
+		width: 100%;
+		height: 50px;
+		position: relative;
+	}
+	.screen .sreach input {
+		border: #5078cb 1px solid;
+		height: 32px;
+		width: 280px;
+		box-shadow: none;
+		padding-left: 10px;
+		background: #fff;
+		float: left;
+		vertical-align: middle;
+		font-size: 14px;
+	}
+	.screen .sreach a.seek {
+		width: 58px;
+		height: 32px;
+		background: #5078cb;
+		color: #fff;
+		line-height: 32px;
+		float: none;
+		border-radius: 2px;
+		vertical-align: unset;
+	}
+	.order-table {
+		background: #fff;
+		width: 100%;
+	}
+	.order-table .header > th {
+		height: 38px;
+		text-align: center;
+		background: #fff;
+		border-top: 1px solid #e8e8e8;
+		border-bottom: 1px solid #e8e8e8;
+		font-size: 14px;
+	}
+
+	.order-table .sep-row {
+		height: 10px;
+	}
+
+	.order-table .selector {
+		vertical-align: middle;
+		margin: 0 0 2px 0;
+	}
+
+	.toolbar label {
+		margin-right: 10px;
+		margin-bottom: 0;
+	}
+
+	.toolbar .select_all {
+		margin: 0 6px 0 10px;
+		line-height: 20px;
+	}
+
+	.toolbar .btn {
+		-moz-border-radius: 2px;
+		margin-right: 5px;
+		border: 1px solid #dcdcdc;
+		border-radius: 2px;
+		-webkit-border-radius: 2px;
+	}
+
+	.order-table .order-hd {
+		background: #f5f5f5;
+		height: 40px;
+		line-height: 40px;
+	}
+
+	.order-table .order-hd td.first {
+		padding-left: 20px;
+	}
+
+	.order-table .order-hd .order-main span {
+		margin-right: 8px;
+	}
+
+	.order-table .order-hd .order-code {
+		font-style: normal;
+		font-family: verdana;
+	}
+
+	.order-table .order-hd .order-sum {
+		position: relative;
+		padding: 0 5px;
+	}
+
+	.order-table .order-hd .dropdown-toggle {
+		line-height: 40px;
+		display: block;
+		color: #5078cb;
+		/*padding: 0 10px;*/
+	}
+
+
+	.order-table .operates {
+		display: none;
+	}
+
+	.order-table > tbody:hover .operates {
+		display: block;
+	}
+
+	.order-table .order-bd {
+		border-bottom: 1px solid #e6e6e6;
+	}
+
+	.order-table .order-bd > td {
+		padding: 10px 5px;
+	}
+
+	.order-table .order-bd .product {
+		padding-left: 20px;
+	}
+
+	.input-xs, .input-group-xs > .form-control, .input-group-xs > .input-group-addon, .input-group-xs > .input-group-btn > .btn {
+		height: 26px;
+		padding: 0 5px;
+		font-size: 12px;
+		line-height: 1.5;
+		border-radius: 3px;
+	}
+	.order-table .order-hd .dropdown-toggle:hover + .order-snapshot {
+		display: block;
+	}
+	.order-table .order-hd .order-snapshot{
+		padding: 10px 15px;
+		display: none;
+		width: 250px;
+		position: absolute;
+		top: 32px;
+		left: 39px;
+		border: 1px solid rgba(0,0,0,0.15);
+		-webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-moz-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-o-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		box-shadow: 0 0 5px rgba(0,0,0,0.3);
+	}
+	.order-snapshot .title {
+		border-top: 1px dashed #ddd;
+	}
+
+	.order-snapshot .dl-horizontal dt {
+		width: 60px;
+		text-align: left;
+		font-weight: normal;
+		color: #999;
+		padding: 4px 0;
+	}
+
+	.order-snapshot .dl-horizontal dd {
+		margin-left: 80px;
+		padding: 4px 0;
+	}
+
+	/*arrow*/
+	.order-send {
+		position: relative;
+	}
+
+	.order-send.arrow-border:before, .arrow-border:after {
+		content: '';
+		position: absolute;
+		top: 20px;
+		width: 0;
+		height: 0;
+		border: 7px solid transparent;
+	}
+
+	.order-send.arrow-border.arrow-bottom-right:before {
+		content: '';
+		position: absolute;
+		left: -13px;
+		border-bottom-color: #fff;
+		border-right-color: #fff;
+		margin-top: -10px;
+	}
+
+	.menu .new-dot {
+		width: 20px;
+		height: 20px;
+		line-height: 20px;
+		font-size: 12px;
+		color: #fff;
+		font-weight: inherit;
+		top: -2px;
+	}
+	.f14{
+		font-size:14px;
+	}
+	.screen .sreach input {
+		width: 288px
+	}
+	.modal {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 1050;
+		display: none;
+		overflow: hidden;
+		-webkit-overflow-scrolling: touch;
+		outline: 0;
+		margin: 0 !important;
+	}
+	.modal-open .modal {
+		overflow-x: hidden;
+		overflow-y: auto;
+	}
+	#empty {
+		padding: 70px 0;
+		margin: 0 auto;
+		text-align: center;
+	}
+	#empty .left_img {
+		display: inline-block;
+		color: #3f84f6;
+	}
+	#empty .left_img a {
+		font-size: 25px;
+		color: #3f84f6;
+	}
+	#empty .right_link p {
+		margin: 0;
+		font-size: 14px;
+		color: #666;
+	}
+	#empty_info .empty_title {
+		color: #3f84f6;
+		font-size: 18px;
+	}
+	#empty_info .empty_explain {
+		font-size: 16px;
+		color: #999;
+	}
+	#empty_info .empty_explain .info {
+		text-indent: -22px;
+	}
+	.f16 {
+		font-size: 16px !important;
+	}
+	.f14 {
+		font-size: 14px !important;
+	}
+	#empty_info {
+		padding-left: 60px;
+		padding-bottom: 40px;
+	}
+	table tbody tr td {
+		border-bottom: #e8e8e8 1px solid;
+		border-right: #e8e8e8 1px solid;
+		border-left:1px solid #e8e8e8;
+		font-size: 14px;
+		color: #333;
+	}
+	.ng-table-pager::after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
+	}
+	.fixed {
+		width: 40px;
+	}
+	.text-trans {
+		left: 50%;
+		right: auto;
+		top: 50%;
+		margin: -20px 0 0 -40px;
+	}
+	.com_tab:nth-of-type(2) ul li.active > a {
+		border: 0px
+	}
+	.com_tab:nth-of-type(2) ul li.active a {
+		color: #fff !important;
+	}
+	.com_tab:nth-of-type(2) ul {
+		/* border-top: 3px solid #f15601; */
+		border-bottom: 0px solid #f15601;
+	}
+</style>
 <link rel="stylesheet" href="static/css/b2bPublic.css">
-<div class="block user_right fr main-content" id="public">
+<div class="block user_right fr main-content" style="position: relative">
 <!--<div class="pub-com_head">-->
 	<!--<span>代采订单</span>-->
 	<!--<div class="p-right">-->
@@ -209,111 +583,97 @@
 			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
-	<div class="tab_top" style="margin-bottom: 10px">
-		<ul class="fl" style="width: 100%">
+	<div class="com_tab" style="margin-bottom: 10px">
+		<ul style="width: 100%">
 			<li ng-class="{'active': storeType=='purcOrder'}"><a ui-sref="purc_usercenter_order">采购订单</a></li>
 			<li ng-class="{'active': storeType=='purcChange'}"><a ui-sref="purc_change_list">采购变更单</a></li>
 			<li ng-class="{'active': storeType=='deputy'}"><a ui-sref="purc_deputy">代采订单</a></li>
 			<li ng-class="{'active': storeType=='outorder'}"><a ui-sref="purc_make_outorder">委外订单</a></li>
-			<li class="down-purchase">
+			<li class="down-purchase"  style="margin-right: 20px;color: #fff;min-width: 80px">
+				<a style="color: #5078cb !important;padding: 0;min-width: 80px" class="tab_add" ui-sref="purc_new_deputy" type="button" title="新增代采订单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
+			</li>
+			<li class="down-purchase"  style="margin-right: 0;color: #fff;min-width: 80px">
+				<a style="color: #5078cb !important;padding: 0;min-width: 80px" class="tab_add" ui-sref="purc_deputy_log" type="button" title="错误日志"><i class="fa fa-file-text"></i> 错误日志</a>
+			</li>
+			<li class="down-purchase"  style="margin-right: 0px;color: #fff;min-width: 80px">
 				<span class="tab_add" ng-if="!isUser">总金额: {{odersAmount| number}} </span>
-				<a class="tab_add" ui-sref="purc_new_deputy" type="button" title="新增代采订单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
-				<a class="tab_add" ui-sref="purc_deputy_log" type="button" title="错误日志"><i class="fa fa-file-text"></i> 错误日志</a>
+				<!--<a class="tab_add" style="color: #5078cb !important;padding: 0;min-width: 80px" ui-sref="purc_newOrder" title="新增采购单"><i class="fa fa-plus-square fa-fw"></i>新增</a>-->
 			</li>
+
 		</ul>
 	</div>
-	<div class="menu condition block">
-		<div class="btn-group btn-group-sm btn-group-justified">
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-select"
-						ng-class="{'btn-selected':active=='all'}" ng-click="setActive('all')">全部</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-select"
-						ng-class="{'btn-selected':active=='todo'}" ng-click="setActive('todo')">待提交</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-select"
-						ng-class="{'btn-selected':active=='done'}" ng-click="setActive('done')">未下载</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-select"
-						ng-class="{'btn-selected':active=='end'}" ng-click="setActive('end')">已下载</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-select"
-						ng-class="{'btn-selected':active=='agreed'}" ng-click="setActive('agreed')">已同意</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-select"
-						ng-class="{'btn-selected':active=='refused'}" ng-click="setActive('refused')">不同意</button>
-			</div>
-		</div>
+
+	<div class="oder01">
+		<ul>
+			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
+			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待提交</a></li>
+			<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>未下载</a></li>
+			<li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已下载</a></li>
+			<li ng-class="{'active': active=='agreed'}" ng-click="setActive('agreed')"><a>已同意</a></li>
+			<li ng-class="{'active': active=='refused'}" ng-click="setActive('refused')"><a>不同意</a></li>
+		</ul>
 	</div>
-	<!--<div class="height10">&nbsp;</div>-->
-	<div class="condition block">
-		<!--搜索时间筛选-->
-		<div class="screen check-filter">
-			<div class="radio-block date-radio">
-				时间筛选：
-				<label class="com-check-radio">
-					<input type="radio" id="oneMonth" name="date" ng-click="autoMonth = false;changeDateZone(1);condition.$open=false" checked>
-					<label for="oneMonth"></label>
-					30天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="threeMonth" name="date" ng-click="autoMonth = false;changeDateZone(3);condition.$open=false">
-					<label for="threeMonth"></label>
-					90天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="sixMonth" name="date" ng-click="autoMonth = false;changeDateZone(6);condition.$open=false">
-					<label for="sixMonth"></label>
-					180天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="autoMonth" name="date" ng-click="autoMonth = true;condition.$open=!condition.$open;changeDateZone(-1)">
-					<label for="autoMonth"></label>
-					自定义
-				</label>
-			</div>
-			<div class="sreach fr">
-				<div ng-show="autoMonth" class="date fl">
-					<div class="data-input">
-						<input type="text" ng-model="condition.dateFrom"
-							   class="form-control select-adder" placeholder="起始时间"
-							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.$fromOpened"
-							   max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openFilterDatePicker($event, condition, '$fromOpened')"
-							   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						/>
-						<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
-					</div>
 
-					<em>–</em>
-					<div class="data-input">
-						<input type="text" ng-model="condition.dateTo"
-							   class="form-control select-adder" placeholder="结束时间"
-							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.$toOpened"
-							   min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openFilterDatePicker($event, condition, '$toOpened')"
-							   ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						/>
-						<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
-					</div>
+	<div class="screen check-filter">
+		<div class="radio-block date-radio" style="width: 33%">
+			时间：
+			<label class="com-check-radio">
+				<input type="radio" id="oneMonth" name="date" ng-click="changeDateZone(1);condition.$open=false" checked>
+				<label for="oneMonth"></label>
+				30天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="threeMonth" name="date" ng-click="changeDateZone(3);condition.$open=false">
+				<label for="threeMonth"></label>
+				90天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="sixMonth" name="date" ng-click="changeDateZone(6);condition.$open=false">
+				<label for="sixMonth"></label>
+				180天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="autoMonth" name="date" ng-click="condition.$open=!condition.$open;changeDateZone(-1)">
+				<label for="autoMonth"></label>
+				自定义
+			</label>
+		</div>
+		<div class="sreach fr">
+			<div ng-show="condition.$open" class="date fl">
+				<div class="data-input">
+					<input type="text" ng-model="condition.dateFrom"
+								 class="form-control select-adder" placeholder="起始时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$fromOpened"
+								 max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
+					/>
+					<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
 				</div>
-				<div class="sreach-input fr">
-					<input type="search" class="form-control input-sm" ng-model="keyword"
-						   ng-search="onSearch(keyword)" placeholder="输入单据编号、客户名称、物料名称搜索"/>
-					<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+
+				<em>–</em>
+				<div class="data-input">
+					<input type="text" ng-model="condition.dateTo"
+								 class="form-control select-adder" placeholder="结束时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$toOpened"
+								 min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
+					/>
+					<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
 				</div>
 			</div>
+			<div class="sreach-input fr">
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+			</div>
 		</div>
 	</div>
+	<!--<div class="height10">&nbsp;</div>-->
 	<table class="tender-table block" ng-table="tableParams">
 		<thead>
 		<tr class="header">
@@ -377,13 +737,16 @@
 			</td>
 		</tr>
 
-		<tr style="height:16px;">
-			<td colspan="5" style="background-color: #f5f5f5;">
-				<div style="height: 16px; background-color: #f5f5f5;">
-					<!-- 间隙 -->
-				</div>
-			</td>
-		</tr>
+		<!--<tr style="height:16px;">-->
+			<!--<td colspan="5" style="background-color: #f5f5f5;">-->
+				<!--<div style="height: 16px; background-color: #f5f5f5;">-->
+					<!--&lt;!&ndash; 间隙 &ndash;&gt;-->
+				<!--</div>-->
+			<!--</td>-->
+		<!--</tr>-->
 		</tbody>
 	</table>
+	<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+		显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+	</div>
 </div>

src/main/webapp/resources/view/usercenter/b2b/order/deputyOrder_detail.html

@@ -145,6 +145,11 @@
 		background-color: #fff;
 		height: 49px;
 	}
+	.width100 {
+		 width: 100%;
+		 max-width: 100%;
+		margin: 0 auto;
+	}
 </style>
 <div class="warp">
 	<div class="purchase fr block user_right">

src/main/webapp/resources/view/usercenter/b2b/order/deputyOrder_new.html

@@ -153,7 +153,7 @@
 		<form  name="order" autocomplete="off">
 			<!--<div class="com_title">服务>采购模块><font>>代采订单</font></div>-->
 			<div class="com_head"><span>代采订单</span></div>
-			<div class="purchase_form">
+			<div class="purchase_form" style="margin-top: 0px">
 				<!--基本信息-->
 				<div class="com_title01"><span>基本信息</span></div>
 				<div class="purchase_form01 clearfix">

src/main/webapp/resources/view/usercenter/b2b/order/outorder.html

@@ -66,7 +66,7 @@
 	}
 
 	.order-table>tbody:hover {
-		border-color: #56a022;
+		border-color: #5078cb;
 		border-width: 2px;
 	}
 
@@ -95,8 +95,382 @@
 		color: #3f84f6 !important ;
 	}
 </style>
+<style>
+	.com_tab {
+		height: 40px;
+		margin-bottom: 10px;
+	}
+	.com_tab ul {
+		width: 100%;
+		margin: 0 auto;
+		height: 40px;
+		line-height: 40px;
+		background: #fff;
+	}
+	.com_tab ul li {
+		height: 40px;
+		text-align: center;
+		float: left;
+		position: relative;
+		min-width: 110px;
+	}
+	.com_tab:nth-of-type(1) ul li.active > a {
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff !important;
+	}
+	.com_tab ul li a {
+		min-width: 110px;
+	}
+	.com_tab ul li > a {
+		font-size: 14px;
+		height: 40px;
+		padding: 0 20px;
+		display: inline-block;
+	}
+	.com_tab:nth-of-type(1) ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li.active:after {
+		display: block;
+	}
+	.oder01 ul li.active a{
+		border-bottom: 1px solid #fff;
+		color: #f15601;
+	}
+	.oder01 ul li.active a em {
+		color: #f15601;
+	}
+	.oder01 ul li a em {
+		color: #323232
+	}
+	.screen {
+		background: #fff;
+		padding-top: 10px;
+		padding-right: 11px;
+		line-height: 32px;
+		padding-left: 22px;
+		width: 100%;
+		height: 50px;
+		position: relative;
+	}
+	.screen .sreach input {
+		border: #5078cb 1px solid;
+		height: 32px;
+		width: 280px;
+		box-shadow: none;
+		padding-left: 10px;
+		background: #fff;
+		float: left;
+		vertical-align: middle;
+		font-size: 14px;
+	}
+	.screen .sreach a.seek {
+		width: 58px;
+		height: 32px;
+		background: #5078cb;
+		color: #fff;
+		line-height: 32px;
+		float: none;
+		border-radius: 2px;
+		vertical-align: unset;
+	}
+	.order-table {
+		background: #fff;
+		width: 100%;
+	}
+	.order-table .header > th {
+		height: 38px;
+		text-align: center;
+		background: #fff;
+		border-top: 1px solid #e8e8e8;
+		border-bottom: 1px solid #e8e8e8;
+		font-size: 14px;
+	}
+
+	.order-table .sep-row {
+		height: 10px;
+	}
+
+	.order-table .selector {
+		vertical-align: middle;
+		margin: 0 0 2px 0;
+	}
+
+	.toolbar label {
+		margin-right: 10px;
+		margin-bottom: 0;
+	}
+
+	.toolbar .select_all {
+		margin: 0 6px 0 10px;
+		line-height: 20px;
+	}
+
+	.toolbar .btn {
+		-moz-border-radius: 2px;
+		margin-right: 5px;
+		border: 1px solid #dcdcdc;
+		border-radius: 2px;
+		-webkit-border-radius: 2px;
+	}
+
+	.order-table .order-hd {
+		background: #f5f5f5;
+		height: 40px;
+		line-height: 40px;
+	}
+
+	.order-table .order-hd td.first {
+		padding-left: 20px;
+	}
+
+	.order-table .order-hd .order-main span {
+		margin-right: 8px;
+	}
+
+	.order-table .order-hd .order-code {
+		font-style: normal;
+		font-family: verdana;
+	}
+
+	.order-table .order-hd .order-sum {
+		position: relative;
+		padding: 0 5px;
+	}
+
+	.order-table .order-hd .dropdown-toggle {
+		line-height: 40px;
+		display: block;
+		color: #5078cb;
+		/*padding: 0 10px;*/
+	}
+
+
+	.order-table .operates {
+		display: none;
+	}
+
+	.order-table > tbody:hover .operates {
+		display: block;
+	}
+
+	.order-table .order-bd {
+		border-bottom: 1px solid #e6e6e6;
+	}
+
+	.order-table .order-bd > td {
+		padding: 10px 5px;
+	}
+
+	.order-table .order-bd .product {
+		padding-left: 20px;
+	}
+
+	.input-xs, .input-group-xs > .form-control, .input-group-xs > .input-group-addon, .input-group-xs > .input-group-btn > .btn {
+		height: 26px;
+		padding: 0 5px;
+		font-size: 12px;
+		line-height: 1.5;
+		border-radius: 3px;
+	}
+	.order-table .order-hd .dropdown-toggle:hover + .order-snapshot {
+		display: block;
+	}
+	.order-table .order-hd .order-snapshot{
+		padding: 10px 15px;
+		display: none;
+		width: 250px;
+		position: absolute;
+		top: 32px;
+		left: 39px;
+		border: 1px solid rgba(0,0,0,0.15);
+		-webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-moz-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-o-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		box-shadow: 0 0 5px rgba(0,0,0,0.3);
+	}
+	.order-snapshot .title {
+		border-top: 1px dashed #ddd;
+	}
+
+	.order-snapshot .dl-horizontal dt {
+		width: 60px;
+		text-align: left;
+		font-weight: normal;
+		color: #999;
+		padding: 4px 0;
+	}
+
+	.order-snapshot .dl-horizontal dd {
+		margin-left: 80px;
+		padding: 4px 0;
+	}
+
+	/*arrow*/
+	.order-send {
+		position: relative;
+	}
+
+	.order-send.arrow-border:before, .arrow-border:after {
+		content: '';
+		position: absolute;
+		top: 20px;
+		width: 0;
+		height: 0;
+		border: 7px solid transparent;
+	}
+
+	.order-send.arrow-border.arrow-bottom-right:before {
+		content: '';
+		position: absolute;
+		left: -13px;
+		border-bottom-color: #fff;
+		border-right-color: #fff;
+		margin-top: -10px;
+	}
+
+	.menu .new-dot {
+		width: 20px;
+		height: 20px;
+		line-height: 20px;
+		font-size: 12px;
+		color: #fff;
+		font-weight: inherit;
+		top: -2px;
+	}
+	.f14{
+		font-size:14px;
+	}
+	.screen .sreach input {
+		width: 288px
+	}
+	.modal {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 1050;
+		display: none;
+		overflow: hidden;
+		-webkit-overflow-scrolling: touch;
+		outline: 0;
+		margin: 0 !important;
+	}
+	.modal-open .modal {
+		overflow-x: hidden;
+		overflow-y: auto;
+	}
+	#empty {
+		padding: 70px 0;
+		margin: 0 auto;
+		text-align: center;
+	}
+	#empty .left_img {
+		display: inline-block;
+		color: #3f84f6;
+	}
+	#empty .left_img a {
+		font-size: 25px;
+		color: #3f84f6;
+	}
+	#empty .right_link p {
+		margin: 0;
+		font-size: 14px;
+		color: #666;
+	}
+	#empty_info .empty_title {
+		color: #3f84f6;
+		font-size: 18px;
+	}
+	#empty_info .empty_explain {
+		font-size: 16px;
+		color: #999;
+	}
+	#empty_info .empty_explain .info {
+		text-indent: -22px;
+	}
+	.f16 {
+		font-size: 16px !important;
+	}
+	.f14 {
+		font-size: 14px !important;
+	}
+	#empty_info {
+		padding-left: 60px;
+		padding-bottom: 40px;
+	}
+	table tbody tr td {
+		border-bottom: #e8e8e8 1px solid;
+		border-right: #e8e8e8 1px solid;
+		border-left:1px solid #e8e8e8;
+		font-size: 14px;
+		color: #333;
+	}
+	.ng-table-pager::after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
+	}
+	.fixed {
+		width: 40px;
+	}
+	.text-trans {
+		left: 50%;
+		right: auto;
+		top: 50%;
+		margin: -20px 0 0 -40px;
+	}
+	.com_tab:nth-of-type(2) ul li.active > a {
+		border: 0px
+	}
+	.com_tab:nth-of-type(2) ul li.active a {
+		color: #fff !important;
+	}
+	.com_tab:nth-of-type(2) ul {
+		/* border-top: 3px solid #f15601; */
+		border-bottom: 0px solid #f15601;
+	}
+</style>
 <link rel="stylesheet" href="static/css/b2bPublic.css">
-<div class="block user_right fr" id="public">
+<div class="block user_right fr" style="position: relative;">
 	<!--<div class="pub-com_head">-->
 		<!--<span>委外订单</span>-->
 		<!--<div class="p-right">-->
@@ -112,84 +486,83 @@
 			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
-	<div class="tab_top" style="margin-bottom: 10px">
-		<ul class="fl" style="width: 100%">
+
+	<div class="com_tab" style="margin-bottom: 10px">
+		<ul style="width: 100%">
 			<li ng-class="{'active': storeType=='purcOrder'}"><a ui-sref="purc_usercenter_order">采购订单</a></li>
 			<li ng-class="{'active': storeType=='purcChange'}"><a ui-sref="purc_change_list">采购变更单</a></li>
 			<li ng-class="{'active': storeType=='deputy'}"><a ui-sref="purc_deputy">代采订单</a></li>
 			<li ng-class="{'active': storeType=='outorder'}"><a ui-sref="purc_make_outorder">委外订单</a></li>
-			<li class="down-purchase">
-				<span class='tab_add' ng-click="exportXls()" style="cursor:pointer">
+			<li class="down-purchase"  style="margin-right: 20px;color: #fff;min-width: 80px">
+				<a class='tab_add' ng-click="exportXls()" style="color: #5078cb !important;padding: 0;min-width: 80px">
 					<i class="fa fa-file-excel-o fa-fw"></i>导出Excel
-				</span>
+				</a>
 				<form style="display: none;" id="down-load-purchase" method="get">
 					<input type="hidden" name="ids" ng-value="localInfo.ids">
 				</form>
 			</li>
+
+
 		</ul>
 	</div>
-	<!--<div class="height10">&nbsp;</div>-->
-	<div class="condition block">
-		<!--搜索时间筛选-->
-		<div class="screen check-filter">
-			<div class="radio-block date-radio">
-				时间筛选：
-				<label class="com-check-radio">
-					<input type="radio" id="oneMonth" name="date" ng-click="autoMonth = false;changeDateZone(1);condition.$open=false" checked>
-					<label for="oneMonth"></label>
-					30天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="threeMonth" name="date" ng-click="autoMonth = false;changeDateZone(3);condition.$open=false">
-					<label for="threeMonth"></label>
-					90天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="sixMonth" name="date" ng-click="autoMonth = false;changeDateZone(6);condition.$open=false">
-					<label for="sixMonth"></label>
-					180天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="autoMonth" name="date" ng-click="autoMonth = true;condition.$open=!condition.$open;changeDateZone(-1)">
-					<label for="autoMonth"></label>
-					自定义
-				</label>
-			</div>
-			<div class="sreach fr">
-				<div ng-show="autoMonth" class="date fl">
-					<div class="data-input">
-						<input type="text" ng-model="condition.dateFrom"
-							   class="form-control select-adder" placeholder="起始时间"
-							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.$fromOpened"
-							   max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openFilterDatePicker($event, condition, '$fromOpened')"
-							   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						/>
-						<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
-					</div>
 
-					<em>–</em>
-					<div class="data-input">
-						<input type="text" ng-model="condition.dateTo"
-							   class="form-control select-adder" placeholder="结束时间"
-							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.$toOpened"
-							   min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openFilterDatePicker($event, condition, '$toOpened')"
-							   ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						/>
-						<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
-					</div>
+	<div class="screen check-filter">
+		<div class="radio-block date-radio" style="width: 33%">
+			时间：
+			<label class="com-check-radio">
+				<input type="radio" id="oneMonth" name="date" ng-click="changeDateZone(1);condition.$open=false" checked>
+				<label for="oneMonth"></label>
+				30天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="threeMonth" name="date" ng-click="changeDateZone(3);condition.$open=false">
+				<label for="threeMonth"></label>
+				90天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="sixMonth" name="date" ng-click="changeDateZone(6);condition.$open=false">
+				<label for="sixMonth"></label>
+				180天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="autoMonth" name="date" ng-click="condition.$open=!condition.$open;changeDateZone(-1)">
+				<label for="autoMonth"></label>
+				自定义
+			</label>
+		</div>
+		<div class="sreach fr">
+			<div ng-show="condition.$open" class="date fl">
+				<div class="data-input">
+					<input type="text" ng-model="condition.dateFrom"
+								 class="form-control select-adder" placeholder="起始时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$fromOpened"
+								 max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
+					/>
+					<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
 				</div>
-				<div class="sreach-input fr">
-					<input type="search" class="form-control input-sm" ng-model="keyword"
-						   ng-search="onSearch()" placeholder="输入单据编号、客户名称、物料名称搜索"/>
-					<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
+
+				<em>–</em>
+				<div class="data-input">
+					<input type="text" ng-model="condition.dateTo"
+								 class="form-control select-adder" placeholder="结束时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$toOpened"
+								 min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
+					/>
+					<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
 				</div>
 			</div>
+			<div class="sreach-input fr">
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+			</div>
 		</div>
 	</div>
 	<table class="order-table block" ng-table="tableParams">
@@ -407,4 +780,7 @@
 		</tr>
 		</tbody>
 	</table>
+	<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+		显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+	</div>
 </div>

src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html

@@ -17,9 +17,9 @@
 		border-bottom: 1px solid #e8e8e8;
 	}
 
-	.order-table .sep-row {
-		height: 10px;
-	}
+	/*.order-table .sep-row {*/
+		/*height: 10px;*/
+	/*}*/
 
 	.order-table .selector {
 		vertical-align: middle;
@@ -72,7 +72,7 @@
         border-bottom: 10px #ddd solid;
     }*/
 	.order-table>tbody:hover{
-		border: #3f84f6 2px solid !important;
+		border: #5078cb 2px solid !important;
 	}
 	/*.order-table>tbody:hover .order-hd td{
         border-top: #d32526 2px solid !important;
@@ -174,16 +174,391 @@
 		overflow: hidden;
 	}
 	.order-table .product div.text-overflow span{
-		float: left;
-		display: inline-block;
+		/*float: left;*/
+		/*display: inline-block;*/
 		width: 265px;
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		overflow: hidden;
 	}
+
+</style>
+<style>
+	.com_tab {
+		height: 40px;
+		margin-bottom: 10px;
+	}
+	.com_tab ul {
+		width: 100%;
+		margin: 0 auto;
+		height: 40px;
+		line-height: 40px;
+		background: #fff;
+	}
+	.com_tab ul li {
+		height: 40px;
+		text-align: center;
+		float: left;
+		position: relative;
+		min-width: 110px;
+	}
+	.com_tab:nth-of-type(1) ul li.active > a {
+		border-bottom: #fff;
+		background: #5078cb;
+		color: #fff !important;
+	}
+	.com_tab ul li a {
+		min-width: 110px;
+	}
+	.com_tab ul li > a {
+		font-size: 14px;
+		height: 40px;
+		padding: 0 20px;
+		display: inline-block;
+	}
+	.com_tab:nth-of-type(1) ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li::after {
+		background:url('static/img/vendor/images/downicon.png');
+		width: 11px;
+		height: 6px;
+		position: absolute;
+		bottom: 0px;
+		left: 50%;
+		content: ' ';
+		margin-left: -5px;
+		display: none;
+	}
+	.com_tab ul li.active:after {
+		display: block;
+	}
+	.oder01 ul li.active a{
+		border-bottom: 1px solid #fff;
+		color: #f15601;
+	}
+	.oder01 ul li.active a em {
+		color: #f15601;
+	}
+	.oder01 ul li a em {
+		color: #323232
+	}
+	.screen {
+		background: #fff;
+		padding-top: 10px;
+		padding-right: 11px;
+		line-height: 32px;
+		padding-left: 22px;
+		width: 100%;
+		height: 50px;
+		position: relative;
+	}
+	.screen .sreach input {
+		border: #5078cb 1px solid;
+		height: 32px;
+		width: 280px;
+		box-shadow: none;
+		padding-left: 10px;
+		background: #fff;
+		float: left;
+		vertical-align: middle;
+		font-size: 14px;
+	}
+	.screen .sreach a.seek {
+		width: 58px;
+		height: 32px;
+		background: #5078cb;
+		color: #fff;
+		line-height: 32px;
+		float: none;
+		border-radius: 2px;
+		vertical-align: unset;
+	}
+	.order-table {
+		background: #fff;
+		width: 100%;
+	}
+	.order-table .header > th {
+		height: 38px;
+		text-align: center;
+		background: #fff;
+		border-top: 1px solid #e8e8e8;
+		border-bottom: 1px solid #e8e8e8;
+		font-size: 14px;
+	}
+
+	.order-table .sep-row {
+		height: 10px;
+	}
+
+	.order-table .selector {
+		vertical-align: middle;
+		margin: 0 0 2px 0;
+	}
+
+	.toolbar label {
+		margin-right: 10px;
+		margin-bottom: 0;
+	}
+
+	.toolbar .select_all {
+		margin: 0 6px 0 10px;
+		line-height: 20px;
+	}
+
+	.toolbar .btn {
+		-moz-border-radius: 2px;
+		margin-right: 5px;
+		border: 1px solid #dcdcdc;
+		border-radius: 2px;
+		-webkit-border-radius: 2px;
+	}
+
+	.order-table .order-hd {
+		background: #f5f5f5;
+		height: 40px;
+		line-height: 40px;
+	}
+
+	.order-table .order-hd td.first {
+		padding-left: 20px;
+	}
+
+	.order-table .order-hd .order-main span {
+		margin-right: 8px;
+	}
+
+	.order-table .order-hd .order-code {
+		font-style: normal;
+		font-family: verdana;
+	}
+
+	.order-table .order-hd .order-sum {
+		position: relative;
+		padding: 0 5px;
+	}
+
+	.order-table .order-hd .dropdown-toggle {
+		line-height: 40px;
+		display: block;
+		color: #5078cb;
+		/*padding: 0 10px;*/
+	}
+
+
+	.order-table .operates {
+		display: none;
+	}
+
+	.order-table > tbody:hover .operates {
+		display: block;
+	}
+
+	.order-table .order-bd {
+		border-bottom: 1px solid #e6e6e6;
+	}
+
+	.order-table .order-bd > td {
+		padding: 10px 5px;
+	}
+
+	.order-table .order-bd .product {
+		padding-left: 20px;
+	}
+
+	.input-xs, .input-group-xs > .form-control, .input-group-xs > .input-group-addon, .input-group-xs > .input-group-btn > .btn {
+		height: 26px;
+		padding: 0 5px;
+		font-size: 12px;
+		line-height: 1.5;
+		border-radius: 3px;
+	}
+	.order-table .order-hd .dropdown-toggle:hover + .order-snapshot {
+		display: block;
+	}
+	.order-table .order-hd .order-snapshot{
+		padding: 10px 15px;
+		display: none;
+		width: 250px;
+		position: absolute;
+		top: 32px;
+		left: 39px;
+		border: 1px solid rgba(0,0,0,0.15);
+		-webkit-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-moz-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		-o-box-shadow: 0 0 5px rgba(0,0,0,0.3);
+		box-shadow: 0 0 5px rgba(0,0,0,0.3);
+	}
+	.order-snapshot .title {
+		border-top: 1px dashed #ddd;
+	}
+
+	.order-snapshot .dl-horizontal dt {
+		width: 60px;
+		text-align: left;
+		font-weight: normal;
+		color: #999;
+		padding: 4px 0;
+	}
+
+	.order-snapshot .dl-horizontal dd {
+		margin-left: 80px;
+		padding: 4px 0;
+	}
+
+	/*arrow*/
+	.order-send {
+		position: relative;
+	}
+
+	.order-send.arrow-border:before, .arrow-border:after {
+		content: '';
+		position: absolute;
+		top: 20px;
+		width: 0;
+		height: 0;
+		border: 7px solid transparent;
+	}
+
+	.order-send.arrow-border.arrow-bottom-right:before {
+		content: '';
+		position: absolute;
+		left: -13px;
+		border-bottom-color: #fff;
+		border-right-color: #fff;
+		margin-top: -10px;
+	}
+
+	.menu .new-dot {
+		width: 20px;
+		height: 20px;
+		line-height: 20px;
+		font-size: 12px;
+		color: #fff;
+		font-weight: inherit;
+		top: -2px;
+	}
+	.f14{
+		font-size:14px;
+	}
+	.screen .sreach input {
+		width: 288px
+	}
+	.modal {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 1050;
+		display: none;
+		overflow: hidden;
+		-webkit-overflow-scrolling: touch;
+		outline: 0;
+		margin: 0 !important;
+	}
+	.modal-open .modal {
+		overflow-x: hidden;
+		overflow-y: auto;
+	}
+	#empty {
+		padding: 70px 0;
+		margin: 0 auto;
+		text-align: center;
+	}
+	#empty .left_img {
+		display: inline-block;
+		color: #3f84f6;
+	}
+	#empty .left_img a {
+		font-size: 25px;
+		color: #3f84f6;
+	}
+	#empty .right_link p {
+		margin: 0;
+		font-size: 14px;
+		color: #666;
+	}
+	#empty_info .empty_title {
+		color: #3f84f6;
+		font-size: 18px;
+	}
+	#empty_info .empty_explain {
+		font-size: 16px;
+		color: #999;
+	}
+	#empty_info .empty_explain .info {
+		text-indent: -22px;
+	}
+	.f16 {
+		font-size: 16px !important;
+	}
+	.f14 {
+		font-size: 14px !important;
+	}
+	#empty_info {
+		padding-left: 60px;
+		padding-bottom: 40px;
+	}
+	table tbody tr td {
+		border-bottom: #e8e8e8 1px solid;
+		border-right: #e8e8e8 1px solid;
+		border-left:1px solid #e8e8e8;
+		font-size: 14px;
+		color: #333;
+	}
+	.ng-table-pager::after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.ng-table-pager {
+		padding-right: 20px;
+		padding-top: 50px;
+		margin-right: 0 !important;
+	}
+	.text-mns {
+		padding-right: 15px;
+		position: absolute;
+		bottom: 64px;
+		right: 20px;
+		font-size: 12px;
+	}
+	.Boom18 {
+		bottom: 18px;
+	}
+	.fixed {
+		width: 40px;
+	}
+	.text-trans {
+		left: 50%;
+		right: auto;
+		top: 50%;
+		margin: -20px 0 0 -40px;
+	}
+	.com_tab:nth-of-type(2) ul li.active > a {
+		border: 0px
+	}
+	.com_tab:nth-of-type(2) ul li.active a {
+		color: #fff !important;
+	}
+	.com_tab:nth-of-type(2) ul {
+		/* border-top: 3px solid #f15601; */
+		border-bottom: 0px solid #f15601;
+	}
 </style>
 <link rel="stylesheet" href="static/css/b2bPublic.css">
-<div class="block user_right fr" id="public">
+<div class="block user_right fr" style="position: relative;">
 <!--<div class="pub-com_head">-->
 	<!--<span>采购订单</span>-->
 	<!--<div class="p-right">-->
@@ -198,116 +573,119 @@
 			<li><a ui-sref="buyer_order" href="#/order">优软商城</a></li>
 		</ul>
 	</div>
-	<div class="tab_top" style="margin-bottom: 10px">
-		<ul class="fl" style="width: 100%">
+
+	<div class="com_tab" style="margin-bottom: 10px">
+		<ul style="width: 100%">
 			<li ng-class="{'active': storeType=='purcOrder'}"><a ui-sref="purc_usercenter_order">采购订单</a></li>
 			<li ng-class="{'active': storeType=='purcChange'}"><a ui-sref="purc_change_list">采购变更单</a></li>
 			<li ng-class="{'active': storeType=='deputy'}"><a ui-sref="purc_deputy">代采订单</a></li>
 			<li ng-class="{'active': storeType=='outorder'}"><a ui-sref="purc_make_outorder">委外订单</a></li>
-			<li class="down-purchase">
-				<a class="tab_add" ui-sref="purc_newOrder" title="新增采购单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
-				<a class="tab_add" ui-sref="purc_cart" title="购物车"><i class="fa fa-shopping-cart fa-fw"></i>购物车</a>
-				<span class='tab_add' ng-click="exportXls()" style="cursor:pointer">
+			<li class="down-purchase"  style="margin-right: 20px;color: #fff;min-width: 80px">
+				<a class='tab_add' ng-click="exportXls()" style="color: #5078cb !important;padding: 0;min-width: 80px">
 					<i class="fa fa-file-excel-o fa-fw"></i>导出Excel
-				</span>
+				</a>
 				<form style="display: none;" id="down-load-purchase" method="get">
 					<input type="hidden" name="ids" ng-value="localInfo.ids">
 				</form>
 			</li>
+			<li class="down-purchase"  style="margin-right: 0;color: #fff;min-width: 80px">
+				<a style="color: #5078cb !important;padding: 0;min-width: 80px" class="tab_add" ui-sref="purc_cart" title="购物车"><i class="fa fa-shopping-cart fa-fw"></i>购物车</a>
+			</li>
+			<li class="down-purchase"  style="margin-right: 0px;color: #fff;min-width: 80px">
+				<a class="tab_add" style="color: #5078cb !important;padding: 0;min-width: 80px" ui-sref="purc_newOrder" title="新增采购单"><i class="fa fa-plus-square fa-fw"></i>新增</a>
+			</li>
+
 		</ul>
 	</div>
-	<div class="menu condition block">
-		<div class="btn-group btn-group-sm btn-group-justified">
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部
-					<b class="new-dot" ng-if="unread.all > 0">({{unread.all>99?'99+':unread.all}})</b>
-				</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='done'}" ng-click="setActive('done')">已回复
-					<b class="new-dot" ng-if="unread.replied > 0">({{unread.replied>99?'99+':unread.replied}})</b>
-				</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='todo'}" ng-click="setActive('todo')">待回复</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='waiting'}" ng-click="setActive('waiting')">待交货</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已结案</button>
-			</div>
-		</div>
+	<!--<div class="tab_top" style="margin-bottom: 10px">-->
+		<!--<ul class="fl" style="width: 100%">-->
+			<!--<li ng-class="{'active': storeType=='purcOrder'}"><a ui-sref="purc_usercenter_order">采购订单</a></li>-->
+			<!--<li ng-class="{'active': storeType=='purcChange'}"><a ui-sref="purc_change_list">采购变更单</a></li>-->
+			<!--<li ng-class="{'active': storeType=='deputy'}"><a ui-sref="purc_deputy">代采订单</a></li>-->
+			<!--<li ng-class="{'active': storeType=='outorder'}"><a ui-sref="purc_make_outorder">委外订单</a></li>-->
+			<!--<li class="down-purchase">-->
+				<!--<a class="tab_add" ui-sref="purc_newOrder" title="新增采购单"><i class="fa fa-plus-square fa-fw"></i>新增</a>-->
+				<!--<a class="tab_add" ui-sref="purc_cart" title="购物车"><i class="fa fa-shopping-cart fa-fw"></i>购物车</a>-->
+				<!--<span class='tab_add' ng-click="exportXls()" style="cursor:pointer">-->
+					<!--<i class="fa fa-file-excel-o fa-fw"></i>导出Excel-->
+				<!--</span>-->
+				<!--<form style="display: none;" id="down-load-purchase" method="get">-->
+					<!--<input type="hidden" name="ids" ng-value="localInfo.ids">-->
+				<!--</form>-->
+			<!--</li>-->
+		<!--</ul>-->
+	<!--</div>-->
+
+	<div class="oder01">
+		<ul>
+			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部<span ng-if="unread.all>0">(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</span></a></li>
+			<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已回复<span  ng-if="unread.replied>0">(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</span></a></li>
+			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待回复</a></li>
+			<li ng-class="{'active': active=='waiting'}" ng-click="setActive('waiting')"><a>待交货</a></li>
+			<li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已结案</a></li>
+		</ul>
 	</div>
-	<!--<div class="height10">&nbsp;</div>-->
-	<div class="condition block">
-		<!--搜索时间筛选-->
-		<div class="screen check-filter">
-			<div class="radio-block date-radio">
-				时间筛选：
-				<label class="com-check-radio">
-					<input type="radio" id="oneMonth" name="date" ng-click="autoMonth = false;changeDateZone(1);condition.$open=false" checked>
-					<label for="oneMonth"></label>
-					30天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="threeMonth" name="date" ng-click="autoMonth = false;changeDateZone(3);condition.$open=false">
-					<label for="threeMonth"></label>
-					90天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="sixMonth" name="date" ng-click="autoMonth = false;changeDateZone(6);condition.$open=false">
-					<label for="sixMonth"></label>
-					180天
-				</label>
-				<label class="com-check-radio">
-					<input type="radio" id="autoMonth" name="date" ng-click="autoMonth = true;condition.$open=!condition.$open;changeDateZone(-1)">
-					<label for="autoMonth"></label>
-					自定义
-				</label>
-			</div>
-			<div class="sreach fr">
-				<div ng-show="autoMonth" class="date fl">
-					<div class="data-input">
-						<input type="text" ng-model="condition.dateFrom"
-							   class="form-control select-adder" placeholder="起始时间"
-							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.$fromOpened"
-							   max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openFilterDatePicker($event, condition, '$fromOpened')"
-							   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						/>
-						<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
-					</div>
 
-					<em>–</em>
-					<div class="data-input">
-						<input type="text" ng-model="condition.dateTo"
-							   class="form-control select-adder" placeholder="结束时间"
-							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.$toOpened"
-							   min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openFilterDatePicker($event, condition, '$toOpened')"
-							   ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
-							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						/>
-						<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
-					</div>
+	<div class="screen check-filter">
+		<div class="radio-block date-radio" style="width: 33%">
+			时间：
+			<label class="com-check-radio">
+				<input type="radio" id="oneMonth" name="date" ng-click="changeDateZone(1);condition.$open=false" checked>
+				<label for="oneMonth"></label>
+				30天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="threeMonth" name="date" ng-click="changeDateZone(3);condition.$open=false">
+				<label for="threeMonth"></label>
+				90天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="sixMonth" name="date" ng-click="changeDateZone(6);condition.$open=false">
+				<label for="sixMonth"></label>
+				180天
+			</label>
+			<label class="com-check-radio">
+				<input type="radio" id="autoMonth" name="date" ng-click="condition.$open=!condition.$open;changeDateZone(-1)">
+				<label for="autoMonth"></label>
+				自定义
+			</label>
+		</div>
+		<div class="sreach fr">
+			<div ng-show="condition.$open" class="date fl">
+				<div class="data-input">
+					<input type="text" ng-model="condition.dateFrom"
+								 class="form-control select-adder" placeholder="起始时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$fromOpened"
+								 max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
+					/>
+					<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
 				</div>
-				<div class="sreach-input fr">
-					<input type="search" class="form-control input-sm" ng-model="keyword"
-						   ng-search="onSearch(keyword)" placeholder="输入单据编号、客户名称、物料名称搜索"/>
-					<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+
+				<em>–</em>
+				<div class="data-input">
+					<input type="text" ng-model="condition.dateTo"
+								 class="form-control select-adder" placeholder="结束时间"
+								 datepicker-popup="yyyy-MM-dd"
+								 is-open="condition.$toOpened"
+								 min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
+								 ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
+								 datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								 style="width: 130px"
+					/>
+					<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
 				</div>
 			</div>
+			<div class="sreach-input fr">
+				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
+				<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
+			</div>
 		</div>
 	</div>
+	<!--<div class="height10">&nbsp;</div>-->
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 		<tr class="header">
@@ -360,7 +738,7 @@
 		</tbody>
 		<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first" colspan="5">
+			<td class="first" colspan="4" style="border: 0">
 				<div class="order-main">
 					<span class="no-circle-icon icon" ng-if="isUnread(order.id)" title="标记为未查看">未读</span>
 					<span class="circle-icon icon" ng-if="!isUnread(order.id)" title="标记为已查看">已读</span>
@@ -370,17 +748,17 @@
 					<span class="text-num text-bold"
 						  ng-bind="::order.date | date:'yyyy-MM-dd'"></span>
 					<span><img src="static/img/user/images/shop_home.png"><span ng-bind="::order.receiveName"></span></span>
-					<span style="margin-left: 126px;">订单号：<a title="查看详情"
+					<span>订单号：<a title="查看详情"
 								 class="text-num order-detail" ng-bind="::order.code" ui-sref="purc_order_detail({id:order.id})" target="_self"
 								 ng-click="setOrdersRead(order.id)"></a></span>
 				</div>
 			</td>
-			<td ng-if="!isUser" class="order-sum">{{::order.currency}}： <span
+			<td  style="border: 0" ng-if="!isUser" class="order-sum" colspan="2">{{::order.currency}}： <span
 					ng-bind="getOrderTotal(order.orderItems) | number : 2"
 					class="text-num text-bold"></span>
 			</td>
-			<td ng-if="isUser" class="order-sum"></td>
-			<td class="text-center">
+			<td ng-if="isUser" class="order-sum"  style="border: 0"></td>
+			<td class="text-center"  style="border: 0">
 				<span ng-if="order.custPrint" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #5D6C79">已打印</span>
 				<span ng-if="!order.custPrint" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #CA3955">未打印</span>
 				<div class="operates">
@@ -501,4 +879,7 @@
 		</tr> -->
 		</tbody>
 	</table>
+	<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 20 ? '': 'Boom18'">
+		显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 20 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+	</div>
 </div>