1、卖家商机管理样式优化

src/main/webapp/resources/js/vendor/controllers/b2b/saleInquiryCtrl.js

@@ -196,6 +196,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/vendor/controllers/b2b/saleInquiryMouldCtrl.js

@@ -182,6 +182,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);//保存当前取值的关键词 $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
                     }
                 }, function (response) {

src/main/webapp/resources/js/vendor/controllers/b2b/saleQuotationListCtrl.js

@@ -171,6 +171,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/vendor/controllers/b2b/saleTenderCtrl.js

@@ -211,6 +211,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.keywordXls = angular.copy($scope.keyword); // 保存当前取值的关键词  做导出时需要的字段
                             angular.forEach(page.content, function (purcTender) {
                                 purcTender.vendorHasBid = false;

src/main/webapp/resources/js/vendor/controllers/b2b/saleTenderQuestionListCtrl.js

@@ -208,6 +208,8 @@ define(['app/app'], function (app) {
                         $scope.loading = false;
                         params.total(page.totalElement);
                         $defer.resolve(page.content);
+                      $scope.infoCommon = page
+                      $scope.infoCommon.all = page.content.length
                         // $scope.keywordXls = angular.copy($scope.keyword); // 保存当前取值的关键词  做导出时需要的字段
                     }, function (response) {
                         $scope.loading = false;

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

@@ -683,7 +683,7 @@
   <div class="oder01" style="margin-bottom: 0px">
     <ul>
       <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><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=='done'}" ng-click="setActive('done')"><a>已报价<span>(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 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=='agreed'}" ng-click="setActive('agreed')"><a>已采纳</a></li>
       <li ng-class="{'active': active=='refused'}" ng-click="setActive('refused')"><a>未采纳</a></li>

src/main/webapp/resources/view/vendor/b2b/change/sale_inquiry_mould_detail.html

@@ -51,14 +51,16 @@
     box-shadow: none;
     border: none;
     background: none;
-    background: #f9f9f9;
+    background: #f5f8fe;
   }
   #order-detail-list .table-default .header th {
     border-bottom: none;
     font-weight: normal;
-    color: #999;
-    padding: 8px 0;
+    color: #333;
+    font-size: 14px;
+    padding: 0;
     text-align: center;
+    line-height: 40px;
   }
   #order-detail-list .table-default tbody tr {
     background: none;
@@ -93,7 +95,7 @@
     color: #5078cb;
     font-size: 14px;
     font-weight: 600;
-    height: 50px;
+    height: 40px;
     padding-top: 11px;
     position: relative;
   }
@@ -109,7 +111,7 @@
     border-top: none;
   }
   .text-trans {
-    top: -4px;
+    top: 14px;
     right: 20px;
   }
   .f14{
@@ -165,11 +167,117 @@
     white-space: nowrap;
   }
   .headerline {
-    width: 93%;
+    font-size: 24px;
+    font-family: Microsoft YaHei, SimHei, Verdana;
+    font-weight: 500;
+    line-height: 22px;
+    margin: 25px 0 25px -15px;
+    clear: both;
+    zoom: 1;
+    border-top: 1px solid #eee;
+    position: relative;
+    font-size: 18px;
+  }
+  .headerline .content {
+    position: absolute;
+    top: -12px;
+    left: 25px;
+    line-height: 24px;
+    padding: 0 15px 0 10px;
+    background: #fff;
+    z-index: 2;
+  }
+  #order-detail-list .row {
+    width: 96%;
     margin: 0 auto;
     line-height: 30px;
+  }
+  .attach .item {
+    position: relative;
+    cursor: pointer;
+    width: 180px;
+    height: 180px;
+    border: 1px solid #d6d6d6;
+    margin-bottom: 25px;
+    margin-right: 25px;
+    -webkit-box-shadow: 2px 2px 8px rgba(0, 0, 0, .2);
+    -moz-box-shadow: 2px 2px 8px rgba(0, 0, 0, .2);
+    box-shadow: 2px 2px 8px rgba(0, 0, 0, .2);
+    zoom: 1;
+  }
+  .base-info .item {
+    line-height: 26px;
+    /* border-bottom: 1px dotted #e8e8e8; */
     padding: 5px 0;
   }
+  .attach .item .bg {
+    position: absolute;
+    width: 100%;
+    height: 149px;
+    line-height: 149px;
+    left: 0;
+    top: 0;
+    overflow: hidden;
+    text-align: center;
+    vertical-align: middle;
+    background-color: #f6f6f9;
+    color: #999;
+  }
+  .attach .bg .global_icon {
+    margin: 20px auto;
+  }
+  .global_icon.larger {
+    height: 118px;
+    width: 118px;
+  }
+  .global_icon {
+    background: url(static/img/full_ico.png) no-repeat bottom right;
+  }
+  .icon_undefined_l {
+    background-position: 0 -735px;
+  }
+  #order-detail-list .title {
+    font-weight: inherit;
+  }
+  .attach .item .title {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    padding: 0 5px;
+    color: #222;
+    border-top: 1px solid #ccc;
+    background-color: #fff;
+    z-index: 10;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  .attach .item .download {
+    position: absolute;
+    left: 0;
+    top: 119px;
+    width: 0;
+    height: 30px;
+    line-height: 30px;
+    background: #090909;
+    opacity: 0;
+    text-align: center;
+    z-index: 99;
+    -webkit-transition: width 0.2s ease-in-out;
+    -moz-transition: width 0.2s ease-in-out;
+    transition: width 0.2s ease-in-out;
+  }
+  .attach .download a {
+    color: #fff;
+  }
+  .attach .item:hover .download {
+    width: 100%;
+    opacity: .5;
+  }
 </style>
 <div class="pane base-info fr" id="order-detail-list">
   <div class="pub-com_head">
@@ -180,7 +288,7 @@
     </div>
   </div>
   <div class="pane-body">
-    <div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
+    <div class="title-div">
       <span class="f14">单据信息</span>&nbsp;
     </div>
     <div class="row row-sm item">
@@ -232,7 +340,7 @@
         </div>
       </div>
     </div>
-    <div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
+    <div class="title-div">
       <span class="f14">商品价格详情</span>&nbsp;
     </div>
     <div class="block">
@@ -298,7 +406,7 @@
               </div>
             </div>
           </td>
-          <td class="text-center" width="100">
+          <td class="text-center" width="100" style="position: relative;">
             <div ng-if="inquiryMould.status == 200 && inquiryMould.overdue == 0 && inquiryMould.valid != 0 && inquiryMould.adoptStatus == null" class="block">
               <span class="text-waiting">待报价</span>
             </div>
@@ -329,7 +437,7 @@
         </tbody>
       </table>
     </div>
-    <div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
+    <div class="title-div">
       <span class="f14">供应商附件</span>&nbsp;
     </div>
     <div class="block">

src/main/webapp/resources/view/vendor/b2b/sale/sale_tender_detail.html

@@ -78,13 +78,13 @@
 
   /* 基本信息 */
   .base-info {
-    border-bottom: 1px solid #e8e8e8;
+    /*border-bottom: 1px solid #e8e8e8;*/
     padding-bottom: 30px;
     margin-bottom: 0; /* 去除index中公共样式影响 */
   }
 
   .prod-info {
-    border-bottom: 1px solid #e8e8e8;
+    /*border-bottom: 1px solid #e8e8e8;*/
     padding-bottom: 30px;
     padding-top: 20px;
   }
@@ -203,8 +203,9 @@
   /*投标单*/
   .tender-list,.tender-list02{width:100%;margin: 0 auto;background: #fff;}
   .tender-list dl{width: 100%;margin:0 auto;}
-  .tender-list dl dt{width: 100%;margin:0 auto;height: 40px;}
-  .tender-list dl dt span{height: 40px;line-height: 48px;display: inline-block;color: #333;}
+  .tender-list dl dt{width: 100%;margin:0 auto;height: 40px;
+    background: #f5f8fe;}
+  .tender-list dl dt span{height: 40px;line-height: 40px;display: inline-block;color: #333;}
   .tender-list dl dd{width: 100%;margin:0 auto;min-height: 100px;border-bottom: #ccc 1px dashed;overflow: hidden;}
   .tender-list dl dd:hover{border: #5078cb 2px solid;}
   .tender-list dl dd span{min-height: 100px;line-height: 50px;display: inline-block;}
@@ -239,7 +240,7 @@
     margin-right: 50px;
     margin-top: -5px;
   }
-  .base-info{
+  .base-info-content{
     box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
     -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
     -o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
@@ -265,7 +266,181 @@
     float: right;
   }
 </style>
-<div class="ng-scope pane base-info fr" id="order-detail-list">
+<style>
+  .base-info-content {
+    box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    -o-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    border-radius: 5px;
+    /*min-height: 1066px;*/
+    background: #fff;
+    width: 1026px;
+  }
+  #order-detail-list {
+    font-size: 14px;
+  }
+  .pub-com_head, .com_head {
+    width: 100%;
+    height: 35px;
+    line-height: 35px;
+    background: #5078cb;
+    border-radius: 5px 5px 0 0;
+    /* background: url(../img/approvalFlow/comm_bg01.png) no-repeat left; */
+    /* background-color: #f5f5f5; */
+    /* background-size: 100% 100%; */
+  }
+  .pub-com_head span, .com_head span {
+    margin-left: 10px;
+    color: #fff;
+    font-size: 14px;
+    font-weight: bold;
+  }
+  .pub-com_head .p-right {
+    float: right;
+  }
+  .pane .pane-body {
+    /*padding: 15px!important;*/
+  }
+  com_title01, .title-div {
+    /*border-bottom: 1px dashed #3f84f6 !important;*/
+  }
+  .title-div {
+    color: #5078cb;
+    font-size: 14px;
+    font-weight: 600;
+    /*padding-left: 20px !important;*/
+    height: 50px;
+    padding-top: 11px;
+    position: relative;
+  }
+  .f14 {
+    font-size: 14px !important;
+  }
+  #order-detail-list .row {
+    /*width: 96%;*/
+    margin: 0 auto;
+    line-height: 30px;
+  }
+  .base-info-content .item {
+    line-height: 26px;
+    /* border-bottom: 1px dotted #e8e8e8; */
+    padding: 5px 0;
+  }
+  #order-detail-list .title {
+    font-weight: inherit;
+  }
+  .base-info-content .title {
+    float: left;
+    width: 92px;
+    color: #969595;
+    font-weight: bold;
+  }
+  #order-detail-list .content {
+    /*color: #666;*/
+  }
+  .base-info-content .content {
+    float: left;
+    white-space: nowrap;
+  }
+  .title-div .end {
+    position: absolute;
+    top: 10px;
+    right: 0;
+    line-height: 24px;
+    padding-left: 15px;
+    background: #fff;
+    z-index: 2;
+  }
+  .block {
+    background-color: #fff;
+    border-radius: 5px;
+    width: 100%;
+    /*position: relative;*/
+    margin-bottom: 0px;
+  }
+  #order-detail-list .table-default .header {
+    box-shadow: none;
+    border: none;
+    background: none;
+    background: #f9f9f9;
+  }
+  #order-detail-list .table-default .header th {
+    /*display: inline-block;*/
+    border-bottom: none;
+    font-weight: normal;
+    color: #999;
+    padding: 8px 0;
+    text-align: center;
+  }
+  #order-detail-list .table-default th, #order-detail-list .table-default td {
+    /*border-top: #ddd 1px dotted;*/
+  }
+  #order-detail-list .table-default tbody tr {
+    background: none;
+    position: relative;
+  }
+  #order-detail-list table.table-default.pms tbody tr td {
+    vertical-align: middle;
+    color: #323232;
+    min-height: 140px;
+    position: relative;
+    padding: 15px 0;
+    font-size: 14px;
+  }
+  [ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak, .ng-hide:not(.ng-hide-animate) {
+    display: none !important;
+  }
+  .text-bold {
+    font-weight: 700;
+  }
+
+  .text-num {
+    font-style: normal;
+    word-break: break-all;
+    font-size: 14px;
+  }
+  .text-muted {
+    color: #333;
+    font-size: 14px;
+  }
+  .bottomB {
+    border-bottom: 2px solid #f5f5f5;
+    padding: 15px 30px 15px 15px;
+  }
+
+  .title-div .f14{
+    border-left: 5px solid #5078cb;padding-left: 10px;
+  }
+
+  .order-number {
+    position: absolute;
+    top: -1px;
+    left: -1px;
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    text-align: center;
+    background: #f9f9f9;
+    font-weight: 500;
+    border: solid 1px #d5d5d5;
+    border-radius: 0 0 10px 0;
+  }
+  #order-detail-list .table-default.pms tbody tr td.product {
+    padding-left: 30px;
+  }
+  #order-detail-list .table-default tbody tr td{
+    border-right: 1px solid #e8e8e8;
+  }
+  .text-trans {
+    top: 14px;
+    right: 20px;
+  }
+  .f14{
+    font-size: 14px;
+  }
+</style>
+<div class="ng-scope pane base-info-content fr" id="order-detail-list">
   <form name="bidForm">
     <div class="purc-bid">
       <div class="list-unstyled">
@@ -280,8 +455,9 @@
         </div>
       </div>
       <div class="bid-content ng-scope">
-        <div class="title-div" style="border-bottom: 1px dashed #3f84f6;">
-          <span>基本信息</span>&nbsp;
+        <div class="bottomB">
+        <div class="title-div" >
+          <span class="f14">基本信息</span>&nbsp;
           <!-- 投标单状态 -->
           <div class="img-status" ng-if="saleTender.status == '待投标' && tender.overdue != 1">
             <img src="static/img/tender/daitoubiao.png">
@@ -393,12 +569,17 @@
             <div class="unchanged-info">{{saleTender.saleTenderItems[0].description}}</div>
           </div>
         </div>
+        </div>
+        <div class="title-div" >
+          <span class="f14">产品信息</span>
+        </div>
+        <!--<div class="com_title01"><span>产品信息</span><em>*</em></div>-->
         <div class="wrap">
-          <div class="content">
+          <div class="content" style="float:none">
             <!-- 非全包产品信息展示 -->
             <div class="tender-list" ng-if="tender.ifAll != 1">
               <!--产品信息-->
-              <div class="com_title01"><span>产品信息</span><em>*</em></div>
+
               <dl ng-show = "tender.result != 1 || tender.auditStatus == 0" >
                 <dt>
                   <span>序号</span>
@@ -521,8 +702,10 @@
             </div>
           </div>
         </div>
-        <div  class="title-div" style="border-bottom: 1px dashed #3f84f6;">
-          <span>投标企业基本信息</span>
+
+        <div class="bottomB">
+        <div  class="title-div" >
+          <span class="f14">投标企业基本信息</span>
           <span style="color: rgb(211,37,38);">*</span>
         </div>
         <div class="row prod-info">

src/main/webapp/resources/view/vendor/b2b/sale_inquiry.html

@@ -1,3 +1,4 @@
+<!--<link rel="stylesheet" href="static/css/b2bPublic.css">-->
 <style>
 	.order-table .header>th {
 		height: 38px;
@@ -70,7 +71,7 @@
 		height: 21px;
 		line-height: 21px;
 		color: #ff0101;
-		font-size: 13px;
+		font-size: 14px;
 		background-color: #e8e8e8;
 	}
 	.order-table .order-hd .order-code {
@@ -91,6 +92,10 @@
 		border-width: 2px;
 	}
 
+	.order-table>tbody:hover .order-bd {
+		background: #f8fafe
+	}
+
 	.order-table .operates {
 		display: none;
 	}
@@ -105,7 +110,7 @@
 
 	.order-table .order-bd>td {
 		padding: 10px 5px;
-		vertical-align: top;
+		vertical-align: middle;
 		position: relative;
 	}
 
@@ -213,9 +218,6 @@
 	#public .order-table, #public .inquiry-table {
 		width: 1026px;
 	}
-	#public .ng-table-pager{
-		margin-top: 20px;
-	}
 	.no-circle-icon {
 		display: inline-block;
 		padding: 0 5px;
@@ -240,9 +242,372 @@
 		font-size: 14px;
 		color: #5078cb;
 	}
+	.block {
+		width: auto;
+	}
 </style>
-<link rel="stylesheet" href="static/css/b2bPublic.css">
-<div class="block user_right fr" id="public">
+<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: #e8e8e8 1px solid;
+		font-size: 14px;
+		color: #666;
+	}
+	.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 {
+		position: absolute;
+		left: 0px;
+		top: 0px;
+		width: 40px;
+	}
+</style>
+<div class="block user_right fr" id="public" style="position: relative">
 	<!--<div class="pub-com_head">-->
 		<!--<span>客户采购询价</span>-->
 		<!--<div class="p-right">-->
@@ -267,33 +632,15 @@
 			</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=='agreed'}" ng-click="setActive('agreed')">已采纳</button>
-            </div>
-            <div class="btn-group btn-group-sm">
-                <button type="button" class="btn btn-default btn-line"
-                        ng-class="{'btn-info':active=='refused'}" ng-click="setActive('refused')">未采纳</button>
-            </div>
-            <div class="btn-group btn-group-sm">
-                <button type="button" class="btn btn-default btn-line"
-                        ng-class="{'btn-info':active=='invalid'}" ng-click="setActive('invalid')">已失效</button>
-            </div>
-        </div>
+	<div class="oder01" style="margin-bottom: 0px">
+		<ul>
+			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
+			<li ng-class="{'active': active=='done'}" ng-click="setActive('done');setOrdersReadByState()"><a>已报价(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>
+			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待报价(<em ng-class="{'color-black': !unread.notReply }" ng-bind="unread.notReply || 0"></em>)</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>
+			<li ng-class="{'active': active=='refused'}" ng-click="setActive('refused')"><a>已失效</a></li>
+		</ul>
 	</div>
 	<div class="condition block">
         <!--搜索时间筛选-->
@@ -366,13 +713,13 @@
 			<th width="110"><span class="text-default">≥</span>分段数</th>
 			<th width="90">价格</th>
 			<th width="80">最小订购</th>
-			<th width="80">最小包装</th>
+			<th width="100">最小包装</th>
 			<th width="120">有效期</th>
-			<th width="75">操作</th>
-		</tr>
-		<tr class="sep-row">
-			<td colspan="8"></td>
+			<th width="100">操作</th>
 		</tr>
+		<!--<tr class="sep-row">-->
+			<!--<td colspan="8"></td>-->
+		<!--</tr>-->
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>
@@ -445,9 +792,15 @@
 		</tr>
 		<tr class="order-bd">
 			<td class="product">
-				<div class="text-num text-bold" ng-bind="::inquiryItem.product.code"></div>
-				<div ng-bind="::inquiryItem.product.title"></div>
-				<div class="text-muted" ng-bind="::inquiryItem.product.spec"></div>
+				<div class="text-num text-bold" title="{{::inquiryItem.product.code}}">
+					物料编号：{{::inquiryItem.product.code}}
+				</div>
+				<div title="{{::inquiryItem.product.title}}">
+					物料名称：{{::inquiryItem.product.title}}
+				</div>
+				<div class="text-muted" title="{{::inquiryItem.product.spec}}">
+					物料规格：{{::inquiryItem.product.spec}}
+				</div>
 				<div ng-if="::inquiryItem.brand && !inquiryItem.$editing" class="text-muted">
 					品牌：<span ng-bind="::inquiryItem.brand"></span>
 				</div>
@@ -675,4 +1028,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/vendor/b2b/sale_inquiryMould.html

@@ -62,10 +62,14 @@
 	}
 
 	.order-table>tbody:hover {
-		border-color: #d32526;
+		border-color: #3c7cf5;
 		border-width: 2px;
 	}
 
+	.order-table>tbody:hover .order-bd {
+		background: #f8fafe
+	}
+
 	.order-table .order-bd {
 		border-bottom: 1px solid #e6e6e6;
 	}
@@ -137,7 +141,8 @@
 	}
 
 	tbody td .text-trans {
-		right:20px;
+		right:10px;
+		top: 5px;
 	}
 
 	tbody td .input-price {
@@ -182,8 +187,367 @@
 		width: 30px;
 	}
 </style>
-<link rel="stylesheet" href="static/css/b2bPublic.css">
-<div class="block user_right fr"  id="public">
+<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;
+		font-size: 14px;
+		color: #666;
+	}
+	.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 {
+		position: absolute;
+		left: 0px;
+		top: 0px;
+		width: 40px;
+	}
+</style>
+<div class="block user_right fr"  id="public" style="position: relative">
 	<!--<div class="pub-com_head">-->
 		<!--<span>客户模具询价</span>-->
 		<!--<div class="p-right">-->
@@ -198,9 +562,9 @@
 			<li ng-class="{'active': storeType=='quotation'}"><a ui-sref="saleQuotationList">主动报价</a></li>
 			<li ng-class="{'active': storeType=='tender'}"><a ui-sref="saleTenderList">客户招标</a></li>
 			<li ng-class="{'active': storeType=='attend'}"><a ui-sref="purchasAttendtion">商机关注</a></li>
-			<li class="down-purchase">
+			<li class="down-purchase" style="float:right">
                     <span ng-click="exportXls()">
-                        <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
+                        <i class="fa fa-file-excel-o fa-fw" style="color:#5078cb"></i>导出Excel
                     </span>
 				<form style="display: none;" id="down-load-purchase" method="get">
 					<input type="hidden" name="ids" ng-value="localInfo.ids">
@@ -208,118 +572,86 @@
 			</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=='end'}" ng-click="setActive('end')">已过期</button>-->
-			<!--</div>-->
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='invalid'}" ng-click="setActive('invalid')">已失效</button>
-			</div>
-		</div>
+	<div class="oder01" style="margin-bottom: 0px">
+		<ul>
+			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
+			<li ng-class="{'active': active=='done'}" ng-click="setActive('done');setOrdersReadByState()"><a>已报价(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>
+			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待报价(<em ng-class="{'color-black': !unread.notReply }" ng-bind="unread.notReply || 0"></em>)</a></li>
+			<li ng-class="{'active': active=='invalid'}" ng-click="setActive('invalid')"><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()" 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">
 		<thead>
 		<tr class="header">
 			<th>模具信息</th>
-			<th></th>
 			<th width="180">价格</th>
-			<th width=""></th>
 			<th width="80">有效日期</th>
-			<th width="0"></th>
-			<th width="180">操作</th>
-		</tr>
-		<tr class="sep-row">
-			<td colspan="7"></td>
+			<th width="100">操作</th>
 		</tr>
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>
-			<td colspan="7">
+			<td colspan="4">
 				<div id="empty">
 					<div class="left_img">
 						<a href="http://www.ubtob.com/" target="_blank" title="优软云首页"><img src="static/img/empty/uas_empty.png"></a>
@@ -332,7 +664,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td colspan="7">
+			<td colspan="4">
 				<div id="empty_info">
 					<div class="f16 text-center empty_title">
 						<p>为什么我没有接收到客户的询价单？</p>
@@ -357,26 +689,22 @@
 		</tbody>
 		<tbody ng-repeat="inquiryMould in $data track by inquiryMould.id">
 		<tr class="order-hd">
-			<td class="first" colspan="3">
+			<td class="first" colspan="2">
 				<div class="order-main">
 					<span class="no-circle-icon icon" ng-if="isUnread(inquiryMould.id)" title="标记为未查看">未读</span>
 					<span class="circle-icon icon" ng-if="!isUnread(inquiryMould.id)" title="标记为已查看">已读</span>
 					 <span class="text-num text-bold" title="{{inquiryMould.date}}">日期：<span ng-bind="::inquiryMould.date | date:'yyyy-MM-dd'"></span></span>
 					<span><img src="static/img/user/images/shop_home.png"><span ng-bind="::inquiryMould.enterprise.enName"></span></span>
-					<span>流水号：<a class="text-num order-detail" ng-bind="::inquiryMould.code" ui-sref="saleInquiryMouldDetail({id:inquiryMould.id})" target="_self"
+					<span>流水号：<a style="color: #5078cb" class="text-num order-detail" ng-bind="::inquiryMould.code" ui-sref="saleInquiryMouldDetail({id:inquiryMould.id})" target="_self"
 								 ng-click="setOrdersRead(inquiryMould.id)" title="查看详情"></a>
 						</span>
 					币别：<span ng-bind="inquiryMould.currency"></span>
 					<span>税率：</span><input class="taxrate-input" ng-model="inquiryMould.taxrate" ng-pattern="/^[0-9][0-9]{0,1}$/" ng-disabled="!inquiryMould.$editing">%
 				</div>
 			</td>
-			<td>
-			</td>
 			<td class = "text-center enddate">
 				<span ng-bind="::inquiryMould.endDate | date:'yyyy-MM-dd'"></span>
 			</td>
-			<td>
-			</td>
 			<td class="text-center">
 				<div>
 					<!-- <a ng-click="print(inquiryMould)" class="text-muted" title="打印"><i
@@ -420,7 +748,7 @@
 			</td>
 		</tr>
 		<tr class="order-bd">
-			<td class="product">
+			<td class="product" colspan="2">
 				<div class="text-mould" ng-repeat="items in inquiryMould.inquiryMouldItems">
 					<div class="text-num text-bold text-ps" >
 						<span>模具：</span>{{items.psCode}}-{{items.psName}}
@@ -455,8 +783,6 @@
 						</span>
 				</div>
 			</td>
-			<td class="text-center">
-			</td>
 			<td class="text-center">
 				<div ng-repeat="items in inquiryMould.inquiryMouldItems">
 					<input type="text" class="text-right input-price input-xs" ng-model="items.price" placeholder="单价(请填数字)" ng-blur="blurPrice(items.price)"
@@ -499,11 +825,6 @@
 					</div>
 				</div>
 			</td>
-			<td></td>
-			<td>
-			</td>
-			<td>
-			</td>
 			<td class="text-center">
 				<div ng-if="inquiryMould.status == 200 && inquiryMould.overdue == 0 && inquiryMould.valid != 0 && inquiryMould.adoptStatus == null" class="block">
 					<span class="text-waiting">待报价</span>
@@ -528,4 +849,7 @@
 		</tr>
 		</tbody>
 	</table>
+	<div ng-if="infoCommon.totalElement > 0" class="text-mns text-right" ng-class="infoCommon.totalElement >= 5 ? '': 'Boom18'">
+		显示&nbsp;{{(infoCommon .page - 1 ) * infoCommon.size + 1}}-{{infoCommon.all >= 5 ? infoCommon.page *  infoCommon.size: (infoCommon.page - 1 ) * infoCommon.size + infoCommon.all}}&nbsp;条，共&nbsp;{{infoCommon.totalElement}}&nbsp;条
+	</div>
 </div>

src/main/webapp/resources/view/vendor/b2b/sale_quotationList.html

@@ -81,10 +81,15 @@
 	}
 
 	.order-table>tbody:hover {
-		border-color: #56a022;
+		border-color: #3c7cf5;
 		border-width: 2px;
 	}
 
+	.order-table>tbody:hover .order-bd {
+		background: #f8fafe
+	}
+
+
 	.order-table .operates {
 		display: none;
 	}
@@ -185,8 +190,367 @@
 		color: #339999!important;
 	}
 </style>
-<link rel="stylesheet" href="static/css/b2bPublic.css">
-<div class="block">
+<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;
+		font-size: 14px;
+		color: #666;
+	}
+	.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 {
+		position: absolute;
+		left: 0px;
+		top: 0px;
+		width: 40px;
+	}
+</style>
+<!--<div class="block user_right fr"  id="public" style="position: relative">-->
 	<!--<div class="pub-com_head">-->
 		<!--<span>主动报价</span>-->
 		<!--<div class="p-right">-->
@@ -194,8 +558,8 @@
 			<!--<a href="#" ng-click="exportXls()" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-text fa-fw"></i>导出</a>-->
 		<!--</div>-->
 	<!--</div>-->
-</div>
-<div id="public" class="block user_right fr">
+<!--</div>-->
+<div class="block user_right fr"  id="public" style="position: relative">
 	<div class="tab_top" style="margin-bottom: 10px">
 		<ul class="fl" style="width: 100%">
 			<li ng-class="{'active': storeType=='seekPurchase'}"><a ui-sref="vendorSeekPurchase">公共询价</a></li>
@@ -208,7 +572,7 @@
 				<a ui-sref="sale_quotation_new" title="新增主动报价单" style="color: #5078cb;"><i class="fa fa-plus-square fa-fw"></i>新增</a>
 			</li>
 			<li class="down-purchase">
-                    <span ng-click="exportXls()">
+                    <span ng-click="exportXls()" style="color:#5078cb">
                         <i class="fa fa-file-excel-o fa-fw"></i>导出Excel
                     </span>
 				<form style="display: none;" id="down-load-purchase" method="get">
@@ -217,101 +581,73 @@
 			</li>
 		</ul>
 	</div>
-	<div class="menu condition block list">
-		<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')">全部</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')">已报价</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='agreed'}"
-						ng-click="setActive('agreed')">已采纳</button>
-			</div>
-			<div class="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='refused'}"
-						ng-click="setActive('refused')">未采纳</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=='invalid'}"
-						ng-click="setActive('invalid')">已失效</button>
-			</div>
-		</div>
+	<div class="oder01" style="margin-bottom: 0px">
+		<ul>
+			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部</a></li>
+			<li ng-class="{'active': active=='done'}" ng-click="setActive('done');"><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>
+			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>未提交</a></li>
+			<li ng-class="{'active': active=='invalid'}" ng-click="setActive('invalid')"><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>
 	<table class="order-table block" ng-table="tableParams" >
@@ -325,9 +661,9 @@
 			<th width="120">有效期</th>
 			<th width="75">操作</th>
 		</tr>
-		<tr class="sep-row">
-			<td colspan="7"></td>
-		</tr>
+		<!--<tr class="sep-row">-->
+			<!--<td colspan="7"></td>-->
+		<!--</tr>-->
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>
@@ -347,36 +683,45 @@
 		</tbody>
 		<tbody ng-repeat="quotationItem in $data track by quotationItem.id">
 		<tr class="order-hd">
-			<td class="first" colspan="3">
+			<td class="first" colspan="7">
 				<div class="order-main">
 					<!--<span> <input type="checkbox" class="selector" ng-model="quotationItem.$selected"></span>-->
 					<span class="text-num text-bold" title="{{quotationItem.date}}">日期：<span ng-bind="::quotationItem.date | date:'yyyy-MM-dd'"></span></span>
 					<span><img src="static/img/user/images/shop_home.png"><span ng-bind="::quotationItem.cust.enName"></span></span>
-					<span>流水号：<a class="text-num order-detail" ng-bind="::quotationItem.code" ui-sref="sale_quotation_item({id:quotationItem.id})" title="查看详情" target="_self"></a></span>
-				</div>
-			</td>
-			<td ng-if="!isUser">
-				币别：<span ng-bind="::quotationItem.currency"></span>
-			</td>
-			<td ng-if="isUser"></td>
-			<td>
-				税率：<span ng-bind="::quotationItem.taxrate || 0"></span>%
-			</td>
-			<td class="text-left" colspan="1" title="录入人">
-				<i class="fa fa-user text-muted"></i>  {{::quotationItem.user.userName}}
-			</td>
-			<td class="text-center">
-				<div class="operates">
-					<!-- <a ng-click="print(quotationItem)" class="text-muted" title="打印"><i
-						class="fa fa-print fa-lg"></i></a> -->
+					<span>流水号：<a style="color: #5078cb" class="text-num order-detail" ng-bind="::quotationItem.code" ui-sref="sale_quotation_item({id:quotationItem.id})" title="查看详情" target="_self"></a></span>
+					<span ng-if="!isUser">币别：<span ng-bind="::quotationItem.currency"></span></span>
+					<span>税率：<span ng-bind="::quotationItem.taxrate || 0"></span>%</span>
+					<span  title="录入人"><i class="fa fa-user text-muted"></i>  {{::quotationItem.user.userName}}</span>
 				</div>
 			</td>
+			<!--<td ng-if="!isUser">-->
+				<!--币别：<span ng-bind="::quotationItem.currency"></span>-->
+			<!--</td>-->
+			<!--<td ng-if="isUser"></td>-->
+			<!--<td>-->
+				<!--税率：<span ng-bind="::quotationItem.taxrate || 0"></span>%-->
+			<!--</td>-->
+			<!--<td class="text-left" colspan="1" title="录入人">-->
+				<!--<i class="fa fa-user text-muted"></i>  {{::quotationItem.user.userName}}-->
+			<!--</td>-->
+			<!--<td class="text-center">-->
+				<!--<div class="operates">-->
+					<!--&lt;!&ndash; <a ng-click="print(quotationItem)" class="text-muted" title="打印"><i-->
+						<!--class="fa fa-print fa-lg"></i></a> &ndash;&gt;-->
+				<!--</div>-->
+			<!--</td>-->
 		</tr>
 		<tr class="order-bd">
 			<td class="product" ng-repeat="pro in quotationItem.quotationItems">
-				<div class="text-num text-bold" ng-bind="::pro.product.code"></div>
-				<div ng-bind="::pro.product.title"></div>
-				<div class="text-muted" ng-bind="::pro.product.spec"></div>
+				<div class="text-num text-bold">
+					物料编号：{{::pro.product.code}}
+				</div>
+				<div>
+					物料名称：{{::pro.product.title}}
+				</div>
+				<div class="text-muted">
+					物料规格：{{::pro.product.spec}}
+				</div>
 				<div ng-if="::pro.brand && !pro.$editing" class="text-muted">
 					品牌：<span ng-bind="::pro.brand"></span>
 				</div>
@@ -484,5 +829,8 @@
 		</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>
-</div>
+<!--</div>-->

src/main/webapp/resources/view/vendor/b2b/sale_tenderList.html

@@ -212,8 +212,368 @@
 		width: 216px !important;
 	}
 </style>
-<link rel="stylesheet" href="static/css/b2bPublic.css">
-<div id="public" class="block user_right fr">
+<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;
+		font-size: 14px;
+		color: #666;
+	}
+	.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 {
+		position: absolute;
+		left: 0px;
+		top: 0px;
+		width: 40px;
+	}
+</style>
+
+<div class="block user_right fr"  id="public" style="position: relative">
 	<!-- 顶部导航及搜索框 -->
 	<!--<div class="pub-com_head">-->
 		<!--<span>客户招标</span>-->
@@ -229,117 +589,84 @@
 			<li ng-class="{'active': storeType=='quotation'}"><a ui-sref="saleQuotationList">主动报价</a></li>
 			<li ng-class="{'active': storeType=='tender'}"><a ui-sref="saleTenderList">客户招标</a></li>
 			<li ng-class="{'active': storeType=='attend'}"><a ui-sref="purchasAttendtion">商机关注</a></li>
-			<li class="down-purchase">
+			<li class="down-purchase" style="float: right">
 				<span ui-sref-active="active"><a style="color: #5078cb;" ui-sref="saleTenderQuestionList">招标提问列表</a></span>
 			</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=='end'}" ng-click="setActive('end')">已结标
-				</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=='done'}" ng-click="setActive('done')">已投标
-				</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 class="oder01" style="margin-bottom: 0px">
+		<ul>
+			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
+			<li ng-class="{'active': active=='end'}" ng-click="setActive('end');"><a>已结标</a></li>
+			<li ng-class="{'active': active=='waiting'}" ng-click="setActive('waiting')"><a>待评标</a></li>
+			<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已投标</a></li>
+			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待投标(<em ng-class="{'color-black': !unread.notReply }" ng-bind="unread.notReply || 0"></em>)</a></li>
+			<li ng-class="{'active': active=='invalid'}" ng-click="setActive('invalid')"><a>已过期</a></li>
+		</ul>
+	</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>
+
+				<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="btn-group btn-group-sm">
-				<button type="button" class="btn btn-default btn-line"
-						ng-class="{'btn-info':active=='invalid'}" ng-click="setActive('invalid')">已过期
-				</button>
+			<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="block main-content">
 		<!-- 选项菜单和新增按钮 -->
-		<div class="block">
-			<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>
-						<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>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
 		<!-- 除已评标的显示 -->
-		<table class="tender-table block" ng-table="tableParams">
+		<table class="tender-table block order-table" ng-table="tableParams">
 			<thead ng-show="active != 'end' && active != 'waiting'">
 			<tr class="header">
 				<th width="300">招标信息</th>
@@ -429,13 +756,13 @@
 					</div>
 				</td>
 			</tr>
-			<tr>
-				<td colspan="6">
-					<div style="height: 16px; background-color: #f5f5f5;">
-						<!-- 间隙 -->
-					</div>
-				</td>
-			</tr>
+			<!--<tr>-->
+				<!--<td colspan="6">-->
+					<!--<div style="height: 16px; background-color: #f5f5f5;">-->
+						<!--&lt;!&ndash; 间隙 &ndash;&gt;-->
+					<!--</div>-->
+				<!--</td>-->
+			<!--</tr>-->
 			</tbody>
 			<!-- 已评标和已结标显示 -->
 			<thead ng-show="active == 'end' || active == 'waiting'">
@@ -513,5 +840,8 @@
             </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>
 </div>

src/main/webapp/resources/view/vendor/b2b/sale_tender_question_list.html

@@ -235,106 +235,457 @@
 		color: #333 !important;
 	}
 </style>
-<link rel="stylesheet" href="static/css/b2bPublic.css">
-<div id="public" class="block user_right fr">
+<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;
+		font-size: 14px;
+		color: #666;
+
+	}
+	.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 {
+		position: absolute;
+		left: 0px;
+		top: 0px;
+		width: 40px;
+	}
+	.tender-table > tbody.is-done > tr:first-child td {
+		padding: 10px 0;
+		border: 0;
+		background: #fff;
+	}
+	.tender-table > tbody.is-done .pro-line-sty02 {
+		background: #fff;
+	}
+	.tender-table > tbody.is-done:hover .pro-line-sty02 {
+		background: #f8fafe;
+	}
+	.text-trans {
+		top: 40px;
+		right: 20px;
+	}
+</style>
+<!--<link rel="stylesheet" href="static/css/b2bPublic.css">-->
+<div id="public" class="block user_right fr" style="position: relative;">
 	<!-- 顶部导航及搜索框 -->
 	<div class="pub-com_head">
 		<span>招标提问列表</span>
 		<div class="p-right">
 		</div>
 	</div>
-	<div class="menu condition block">
-		<!-- TODO增加红点显示 -->
-		<div class="btn-group btn-group-sm btn-group-justified" style="margin-top: 15px;">
-			<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 class="oder01" style="margin-bottom: 0px">
+		<ul>
+			<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !unread.all }" ng-bind="unread.all || 0"></em>)</a></li>
+			<li ng-class="{'active': active=='done'}" ng-click="setActive('done');"><a>已回复(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>
+			<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待回复(<em ng-class="{'color-black': !unread.notReply }" ng-bind="unread.notReply || 0"></em>)</a></li>
+		</ul>
+	</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>
+
+				<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="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 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="block main-content">
-		<!-- 选项菜单和新增按钮 -->
-		<div class="block">
-			<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>
-						<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>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
 		<table class="tender-table block" ng-table="tableParams">
 			<thead>
 			<tr class="header">
@@ -386,7 +737,7 @@
 				<td class="list-notnum" width="150">{{question.saleTenderAnswer.questionEndDate | date:'yyyy-MM-dd'}}</td>
 				<td class="list-notnum" width="150">{{question.inDate | date:'yyyy-MM-dd'}}</td>
 				<td class="list-notnum" width="150">{{question.replyDate | date:'yyyy-MM-dd'}}</td>
-				<td>
+				<td style="position: relative;">
 					<div ng-if="question.saleTenderAnswer.status == 201" class="block question-status">
 						<span class="text-trans success">已回复</span>
 					</div>
@@ -397,5 +748,8 @@
 			</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>
 </div>