页面细节修改

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

src/main/webapp/resources/css/public.css

@@ -1,234 +1,37 @@
-body {
-	line-height: 1.6;
-	font-family: "Helvetica Neue", "Hiragino Sans GB", "Microsoft YaHei",
-		"\9ED1\4F53", Arial, sans-serif;
-	color: #222;
-	font-size: 14px;
-	background-color: #eff2f9;
-}
-
-#top, #header, #footer {
-	min-width: 1170px;
-}
-
-#top>.container, #header>.container, #footer>.container {
-	width: 1170px;
-	margin: 0 auto;
-	padding: 0 15px;
-}
-
-h1,h2,h3 {
-	font-size: 20px;
-	font-weight: 400;
-	font-style: normal;
-}
-
-.has-feedback-left {
-	position: relative;
-}
-
-.form-control-feedback-left {
-	position: absolute;
-	top: 0;
-	left: 0;
-	z-index: 2;
-	display: block;
-	width: 30px;
-	height: 34px;
-	line-height: 2.3;
-	text-align: center;
-	pointer-events: none;
-	color: #bbb;
-	font-size: 16px;
-}
-
-.has-feedback-left>.form-control {
-	padding-left: 30px;
-}
-
-.btn-inverse {
-	color: #fff;
-	background-color: #44b549;
-	background-image: -moz-linear-gradient(top, #44b549 0, #44b549 100%);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#44b549),
-		to(#44b549));
-	background-image: -webkit-linear-gradient(top, #44b549 0, #44b549 100%);
-	background-image: -o-linear-gradient(top, #44b549 0, #44b549 100%);
-	background-image: linear-gradient(to bottom, #44b549 0, #44b549 100%);
-	border-color: #44b549;
-	width: 120px;
-}
-
-.btn-inverse:hover,.btn-inverse:focus,.btn-inverse:active {
-	background-color: #2f9833;
-	background-image: -moz-linear-gradient(top, #2f9833 0, #2f9833 100%);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#2f9833),
-		to(#2f9833));
-	background-image: -webkit-linear-gradient(top, #2f9833 0, #2f9833 100%);
-	background-image: -o-linear-gradient(top, #2f9833 0, #2f9833 100%);
-	background-image: linear-gradient(to bottom, #2f9833 0, #2f9833 100%);
-	border-color: #2f9833;
-	color: #fff;
-}
-
-.form-control {
-	border-color: #e0e0e0;
-}
-
-.loading {
-	display: none;
-	position: absolute;
-	width: 100%;
-	height: 100%;
-	bottom: 0;
-	left: 0;
-}
-
-.loading.in {
-	display: block;
-}
-
-.loading.in>i {
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	margin: -33px 0 0 -33px;
-	background: url("../img/all/loading.gif") no-repeat center center;
-	width: 66px;
-	height: 66px;
-}
-/*header*/
-#top {
-	background: #fff;
-	border-top: 4px solid #44b549;
-	border-bottom: 1px solid #d9dadc;
-}
-
-#top .navbar-header .navbar-brand {
-	height: 50px;
-	line-height: 50px;
-}
-
-#top .navbar-header .title {
-	background: url("../img/logo/uas_gray.png") no-repeat center center;
-	width: 87px;
-	height: 50px;
-}
-
-#top .navbar-header b {
-	display: block;
-	width: 1px;
-	height: 18px;
-	margin: 18px 10px 0 11px;
-	z-index: 100;
-	float: left;
-	background: #ccc;
-}
-
-.navbar-header span {
-	float: left;
-	height: 50px;
-	line-height: 50px;
-	font-size: 20px;
-	color: #666;
-}
-/*body*/
-.block {
-	background-color: #fff;
-	width: 100%;
-	position: relative;
-}
-
-.body {
-	width: 1170px;
-	margin: 0 auto;
-	padding: 0 15px;
-}
-
-.body:before,.body:after {
-	content: " ";
-  	display: table;
-  	clear: both;
-}
-
-.notice-container {
-	padding: 36px 0 88px;
-}
-
-.notice-container .table a {
-	color: #222;
-}
-
-.notice-container .table a:hover {
-	text-decoration: none;
-	color: #459ae9;
-}
-
-.notice-container .doc {
-	padding: 50px 75px;
-}
-
-.notice-container .doc .row .title {
- 	text-align: center;
-  	font-size: 20px;
-  	font-weight:bold;
-  	margin-bottom:3%;
-}
-.notice-container .doc hr{
-	border:none;
-	border-top:1px solid #B8B9B8;
-}
-
-.notice-container .doc .row .left .textNotice{
-	text-align:justify;
-}
-
-.notice-container .doc .photo{
-	padding-top: 10px;
-	margin: 5%  auto;
-	text-align: center;
-}
-
-.notice-container .doc .row .right{
-	background-color: #EFEFEF;
-	padding: 50px 20px;
-    line-height: 30px;
-	border: solid 1px #cccccc;
-	height: 400px;
-}
-
-.notice-container .doc .row .right .head h4{
-	display: inline;
-	font-family:"Microsoft YaHei";
-	font-weight:nobold;
-}
-
-.notice-container .doc .row .right .content .list-unstyled{
-	margin-top: 10px;
-}
-
-.notice-container .doc .row .right .footer{
-	float: right;
-}
-
-.notice-container .doc .sign {
-  	text-align: right;
-}
-
-/*footer*/
-#footer {
-	color: #f1f1f1;
-	background-color: #b8b9b9;
-	padding: 20px 0;
-	font-size: 12px;
-}
-#footer a {
-	color: #f1f1f1;
-}
-#footer ul {
-	margin: 0;
-}
-#footer .list-inline>li:not(:last-child):after {
-	margin-left: 15px;
-	content: "|"
-}
+#public .com_title{width: 100%;margin: 0px auto;height: 40px;line-height: 40px;font-size: 14px;color: #323232;background: #f5f5f5;}
+#public .com_title font{color: #327ebe;}
+#public .com_title .search{position: relative;}
+#public .com_title .search input{width: 300px;padding-left: 10px;height: 36px;background: #fff;float: left;vertical-align: middle;border: #3578ba 1px solid;font-size: 14px;text-align: center;padding-right: 85px;line-height: 36px;}
+#public .com_title .search a.seek{vertical-align: middle;display: inline-block;line-height: 36px;text-align: center;height: 36px;width: 85px;border-left: 0;background: #3578ba;color: #fff;text-align: center;font-size: 16px;float: right;border: #3578ba 1px solid;position: absolute;right: 0;}
+#public .com_title .search a.seek:hover{background: #1f6199;color: #fff;}
+.fl{float: left;}
+.fr{float: right;}
+/*切换导航*/
+#public .menu{background: #fff;padding: 0;border-bottom: #e8e8e8 1px solid;}
+#public .menu .btn-group{width: 100px;border: none;height: 45px;}
+#public .menu .row{height: 40px;line-height: 40px;}
+#public .menu .btn-group > .btn-info{border-bottom: #000 1px solid;}
+#public .menu .btn-group .btn{color: #000;}
+#public .menu .btn-group .btn-info{color: #d32526;background: #fff;border-bottom: #d32526 2px solid !important;}
+#public .menu .btn-group .btn{border: none;font-size: 16px;font-family: "Microsoft YaHei", "微软雅黑";}
+#public .menu .btn-group .btn em{color: #d32526;font-style: inherit;}
+#public .menu .btn-group .btn:hover{background: #fff;color: #d32526;}
+#public #topSearch{font-size: 16px;}
+#public .form-group-sm .form-control{height: 36px;line-height: 36px;border: #327ebe 1px solid;border-radius: 0px;font-size: 14px;}
+#public .search-bg .col-xs-6{margin-left: 90px;}
+#public .search-bg .input-group-addon{width: 85px;height: 36px;display: inline-block;background: #327ebe;font-size: 16px;text-align: center;line-height: 36px;color: #fff;padding: 0;border: none;border-radius: 0;position: absolute;top: 0;right: 0;}
+#public .order-table .header th{height: 40px;line-height: 40px;background: none;font-size: 14px;}
+#public .order-table .order-hd{font-size: 14px;}
+#public .order-table .order-bd{height: 100px;}
+#public .order-table .order-bd .product{line-height: 30px;font-size: 14px;}
+.height10{width: 100%;height: 10px;background: #f5f5f5;}
+#public .order-table .order-bd>td{ font-size: 14px;}
+#public .order-table{  background: #fff; }
+/*购物车*/
+#public .cart-table .header th{height: 40px;line-height: 40px;background: none;font-size: 14px;}
+#public .cart-table .cart-hd{font-size: 14px;}
+#public .cart-table .cart-bd{height: 100px;}
+#public .cart-table .cart-bd .product{line-height: 30px;font-size: 14px;}
+#public .cart-table .cart-bd>td{ font-size: 14px;}
+#public .cart-table{background: #fff;}
+#public .toolbar-top{font-size: 14px;}

src/main/webapp/resources/tpl/index/baseInfo/prodList.html

@@ -1,9 +1,7 @@
 <style>
     .order-table .header>th {
-        height: 38px;
+        height: 40px;
         text-align: center;
-        background: #f5f5f5;
-        border-top: 1px solid #e8e8e8;
         border-bottom: 1px solid #e8e8e8;
     }
 
@@ -36,8 +34,8 @@
 
     .order-table .order-hd {
         /*background: #f5f5f5;*/
-        height: 80px;
-        line-height: 80px;
+        height: 60px;
+        line-height: 60px;
         font-size: 14px;
     }
 
@@ -118,40 +116,35 @@
 }
 .order-hd td{
     line-height: 20px;
+    word-break: break-word;
 }
 .toolbar td a{
     margin-left: 18px;
 }
+#public .com_title{
+    margin-bottom: 10px;
+}
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
     <div class="loading in" ng-class="{'in': loading}">
         <i></i>
     </div>
-    <div class="condition block">
-        <div class="row" style="margin-bottom: 10px; padding: 0 15px;">
-            <div class="col-xs-10">
-                <div class="search">
-                    <div class="form-group form-group-sm has-feedback">
-                        <input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入物料名称、物料编码搜索" /><span
-                            class="form-control-feedback text-simple"><i
-                            class="fa fa-search"></i></span>
-                    </div>
-                </div>
-            </div>
-            <div class="col-xs-2">
-                <div class="text-default f14 total">
-                    共 <span ng-bind="tableParams.total()" class="text-num"></span>
-                </div>
-            </div>
+    <div class="com_title">服务>销售模块<font>>产品资料</font>
+        <div class="search fr">
+            <input type="text" placeholder="输入物料名称、物料编码搜索" ng-model="keyword" ng-search="onSearch(keyword)">
+            <a class="seek" ng-click="onSearch(keyword)">搜索</a>
         </div>
+    </div>
+    <div class="condition block">
         <table class="order-table block " ng-table="tableParams">
             <thead>
             <tr class="header">
                 <th width="140">物料名称</th>
                 <th width="120">物料编码</th>
                 <th width="220">物料规格</th>
-                <th width="140">品牌</th>
-                <th width="70">标准料号</th>
+                <th width="110">品牌</th>
+                <th width="100">标准料号</th>
                 <th width="120">原厂型号</th>
                 <th width="70">单位</th>
                 <th width ="100">操作</th>
@@ -179,17 +172,13 @@
                         <a ng-bind="::product.title" ui-sref="sale.productDetail({id:product.id})" target="_self"></a>
                     </div>
                 </td>
-                <td width="120" class="text-center"><span title="{{product.code}}" ng-bind="::product.code"></span></td>
-                <td width="220" class="order-sum text-center">
-                    <span title="{{product.spec}}" ng-bind="::product.spec"></span>
-                </td>
-                <td width="140" class="line-h20 text-center">
-                    <span title="{{product.brand}}" ng-bind="::product.brand"></span>
-                </td>
-                <td width="70" class="text-center"><span title="标准料号" ng-bind="::product.cmpUuId"></span></td>
-                <td width="120" class="text-center"><span title="原厂型号" ng-bind="::product.cmpCode"></span></td>
-                <td width="70" class="text-center"><span title="单位" ng-bind="::product.unit"></span></td>
-                <td width="100" class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"><i class="fa fa-lg fa-trash"></i></a></td>
+                <td class="text-center" title="{{product.code}}" ng-bind="::product.code"></td>
+                <td class="order-sum text-center"  title="{{product.spec}}" ng-bind="::product.spec"></td>
+                <td class="line-h20 text-center" title="{{product.brand}}" ng-bind="::product.brand"></td>
+                <td class="text-center" title="标准料号" ng-bind="::product.cmpUuId"></td>
+                <td class="text-center" title="原厂型号" ng-bind="::product.cmpCode"></td>
+                <td class="text-center" title="单位" ng-bind="::product.unit"></td>
+                <td class="text-center"><a ui-sref="sale.productDetail({id:product.id})" target="_self"><i class="fa fa-lg fa-edit"></i></a>|<a ng-click="deleteById(product.id)"><i class="fa fa-lg fa-trash"></i></a></td>
             </tr>
             </tbody>
         </table>

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

@@ -106,84 +106,92 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="condition block">
+	<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-9">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
-			<div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
+			<div class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>发票日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+				<button type="button" class="btn btn-default"
+						ng-click="openDatePicker($event, condition, '$fromOpened')">
+					<i class="fa fa-calendar"></i>
+				</button>
+			</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+				<button type="button" class="btn btn-default"
+						ng-click="openDatePicker($event, condition, '$toOpened')">
+					<i class="fa fa-calendar"></i>
+				</button>
+			</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
 					</div>
-			  </div>
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">

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

@@ -91,15 +91,15 @@
     color: #56a022;
 }
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
  	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>  
 
-	<div class="condition block">
+	<div class="menu condition block">
 		<div class="row">
-			<div class="col-xs-2"><a class="text-simple append" ui-sref="fa.apCheckList"><big><i class="fa fa-plus-square"></i> 新增对账单</big></a></div>
-			<div class="col-xs-4">
+			<div class="col-xs-7">
 				<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"
@@ -121,82 +121,93 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-2 f12" style="text-align: right;height: 25px;line-height: 25px;">
+			<div class="col-xs-4 f12" style="text-align: right;height: 40px;line-height: 40px; margin-right: 20px; float: right;">
+				<a class="text-simple append" ui-sref="fa.apCheckList"><big><i class="fa fa-plus-square"></i> 新增对账单</big></a>&nbsp;&nbsp;&nbsp;
 				<a href="sale/apCheck/allxls?_state={{active}}&searchFilter={{searchFilterXls}}" 
 					target="_self" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
 			</div>
 		</div>
-		<div class="row" style="margin-top : 20px">
-			<div class="col-xs-8">
-				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+	</div>
+	<div class="height10">&nbsp;</div>
+	<div class="condition block">
+		<div class="search-bg condition block">
+			<div class="row">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+					企业{{tableParams.total()}}家
+				</div>
+				<div class="col-xs-6">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<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 class="col-xs-2">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				<div class="fr toggle">
+					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 				</div>
 			</div>
-			<div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
-			</div>
-		</div>
-		<div class="more" ng-class="{'open': condition.$open}">
-			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>对账日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
+			<div class="more" ng-class="{'open': condition.$open}">
+				<form class="form-inline">
+					<div class="form-group ">
+						<label>日期：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+							<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 							</button>
-						</span>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+								<li><a ng-click="changeDateZone(6)">半年内</a></li>
+								<li><a ng-click="changeDateZone()">半年前</a></li>
+							</ul>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateFrom"
+								   class="form-control" placeholder="从"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							<span class="input-group-btn">
+					<button type="button" class="btn btn-default"
+							ng-click="openDatePicker($event, condition, '$fromOpened')">
+						<i class="fa fa-calendar"></i>
+					</button>
+				</span>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateTo"
+								   class="form-control" placeholder="到"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+							<span class="input-group-btn">
+					<button type="button" class="btn btn-default"
+							ng-click="openDatePicker($event, condition, '$toOpened')">
+						<i class="fa fa-calendar"></i>
+					</button>
+				</span>
+						</div>
 					</div>
-					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
+					<div class="form-group">
+						<label>采纳结果：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+							<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 							</button>
-						</span>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeAgreed()">全部</a></li>
+								<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+								<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+							</ul>
+						</div>
 					</div>
-			  </div>
-			</form>
+				</form>
+			</div>
 		</div>
 	</div>
 	<div ng-if="active=='all' && tableParams.total() == 0" class="row">

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

@@ -55,19 +55,25 @@
 	#tip {
 		margin: 10px;
 	}
+	.searchcolor .col-xs-2{
+		text-align: right;
+		font-size: 14px;
+	}
+	.searchcolor .col-xs-2 label{
+		font-weight: normal;
+	}
 </style>
 
 <div style="margin-right:20px;">
-<div width="100%">
-	<div class="block searchcolor">
+<div>
+	<div class="block searchcolor" style="padding-top: 10px; padding-bottom: 20px;">
 	
  	<!-- 	<div class="loading in" ng-class="{'in': loading}">
 			<i></i>
 		</div> -->
 		<div class="row" id="tip">（<a class="text-inverse">*提示</a>：为了提高反应速率，现在所有单据都由用户手动筛选得出）</div>
   		<div class="row">
-  			
-  			<div class="col-xs-1">
+  			<div class="col-xs-2">
 				<label>&nbsp;&nbsp;客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</label>
 			</div>
  			<div class="col-xs-3">
@@ -78,7 +84,7 @@
 						class="fa fa-search"></i></span>
 				</div>
 			</div>
-			<div class="col-xs-1">
+			<div class="col-xs-2">
 				<label>应付供应商：</label>
 			</div>
  			<div class="col-xs-3">
@@ -89,35 +95,39 @@
 						class="fa fa-search"></i></span>
 				</div>
 			</div>
-			<div class="col-xs-1">
+		</div>
+		<div class="row">
+			<div class="col-xs-2">
 				<label>送货工厂：</label>
 			</div>
 			<div class="col-xs-3">
 				<div class="form-group form-group-sm has-feedback">
 					<input type="search" class="form-control input-sm"
-						ng-model="factory" placeholder="请输入送货工厂名称" /><span
+						   ng-model="factory" placeholder="请输入送货工厂名称" /><span
 						class="form-control-feedback text-simple"><i
 						class="fa fa-search"></i></span>
 				</div>
 			</div>
-			<div class="col-xs-1">
+			<div class="col-xs-2">
 				<label>物料名称：</label>
 			</div>
 			<div class="col-xs-3">
 				<div class="form-group form-group-sm has-feedback">
 					<input type="search" class="form-control input-sm"
-						ng-model="prodTitle" placeholder="请输入物料名称" /><span
+						   ng-model="prodTitle" placeholder="请输入物料名称" /><span
 						class="form-control-feedback text-simple"><i
 						class="fa fa-search"></i></span>
 				</div>
 			</div>
-			<div class="col-xs-1">
+		</div>
+		<div class="row">
+			<div class="col-xs-2">
 				<label>&nbsp;&nbsp;规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格：</label>
 			</div>
 			<div class="col-xs-3">
 				<div class="form-group form-group-sm has-feedback">
 					<input type="search" class="form-control input-sm"
-						ng-model="prodSpec" placeholder="请输入物料规格" /><span
+						   ng-model="prodSpec" placeholder="请输入物料规格" /><span
 						class="form-control-feedback text-simple"><i
 						class="fa fa-search"></i></span>
 				</div>
@@ -126,9 +136,9 @@
 		<div class="more">
 			<form class="form-inline">
 			<div class="row">
-			  <div class="col-xs-6">	
+			  <div class="col-xs-6">
 			  <div class="form-group ">
-			    <label>单据日期：</label>
+			    <label style="margin-left: 20px;">单据日期：</label>
 			    <div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="sdateFrom"
 							class="form-control" placeholder="起始日期" 

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

@@ -85,82 +85,90 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
 	<div class="condition block">
-		<div class="row">
-			<div class="col-xs-9">
-				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+		<div class="search-bg condition block">
+			<div class="row">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+					企业{{tableParams.total()}}家
+				</div>
+				<div class="col-xs-6">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				<div class="fr toggle">
+					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 				</div>
 			</div>
-			<div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
-			</div>
-		</div>
-		<div class="more" ng-class="{'open': condition.$open}">
-			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>发票日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
+			<div class="more" ng-class="{'open': condition.$open}">
+				<form class="form-inline">
+					<div class="form-group ">
+						<label>日期：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+							<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 							</button>
-						</span>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+								<li><a ng-click="changeDateZone(6)">半年内</a></li>
+								<li><a ng-click="changeDateZone()">半年前</a></li>
+							</ul>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateFrom"
+								   class="form-control" placeholder="从"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							<span class="input-group-btn">
+					<button type="button" class="btn btn-default"
+							ng-click="openDatePicker($event, condition, '$fromOpened')">
+						<i class="fa fa-calendar"></i>
+					</button>
+				</span>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateTo"
+								   class="form-control" placeholder="到"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+							<span class="input-group-btn">
+					<button type="button" class="btn btn-default"
+							ng-click="openDatePicker($event, condition, '$toOpened')">
+						<i class="fa fa-calendar"></i>
+					</button>
+				</span>
+						</div>
 					</div>
-					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
+					<div class="form-group">
+						<label>采纳结果：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+							<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 							</button>
-						</span>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeAgreed()">全部</a></li>
+								<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+								<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+							</ul>
+						</div>
 					</div>
-			  </div>
-			</form>
+				</form>
+			</div>
 		</div>
 	</div>
 	<table class="order-table block" ng-table="tableParams">

src/main/webapp/resources/tpl/index/make/accept.html

@@ -99,86 +99,90 @@
 	border-bottom-left-radius: 0;
 }
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
 	<div class="condition block">
-		<div class="row">
-			<div class="col-xs-9">
-				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm"
-							ng-model="keyword" ng-search="onSearch()"
-							placeholder="输入商品名称、单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+		<div class="search-bg condition block">
+			<div class="row">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+					企业{{tableParams.total()}}家
+				</div>
+				<div class="col-xs-6">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				<div class="fr toggle">
+					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 				</div>
 			</div>
-			<div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span> <i
-					class="fa fa-fw"
-					ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
-			</div>
-		</div>
-		<div class="more" ng-class="{'open': condition.$open}">
-			<form class="form-inline">
-				<div class="form-group ">
-					<label>日期：</label>
-					<div class="btn-group btn-menu" dropdown
-						is-open="condition.$dateZoneOpen">
-						<button type="button" dropdown-toggle style="width: 85px;"
-							class="btn btn-default btn-xs dropdown-toggle">
-							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-						</button>
-						<ul class="dropdown-menu">
-							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-							<li><a ng-click="changeDateZone(6)">半年内</a></li>
-							<li><a ng-click="changeDateZone()">半年前</a></li>
-						</ul>
-					</div>
-					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" current-text="今天" clear-text="清除"
-							close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
+			<div class="more" ng-class="{'open': condition.$open}">
+				<form class="form-inline">
+					<div class="form-group ">
+						<label>日期：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+							<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 							</button>
-						</span>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+								<li><a ng-click="changeDateZone(6)">半年内</a></li>
+								<li><a ng-click="changeDateZone()">半年前</a></li>
+							</ul>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateFrom"
+								   class="form-control" placeholder="从"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							<span class="input-group-btn">
+	<button type="button" class="btn btn-default"
+			ng-click="openDatePicker($event, condition, '$fromOpened')">
+		<i class="fa fa-calendar"></i>
+	</button>
+</span>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateTo"
+								   class="form-control" placeholder="到"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+							<span class="input-group-btn">
+	<button type="button" class="btn btn-default"
+			ng-click="openDatePicker($event, condition, '$toOpened')">
+		<i class="fa fa-calendar"></i>
+	</button>
+</span>
+						</div>
 					</div>
-					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" current-text="今天" clear-text="清除"
-							close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
+					<div class="form-group">
+						<label>采纳结果：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+							<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 							</button>
-						</span>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeAgreed()">全部</a></li>
+								<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+								<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+							</ul>
+						</div>
 					</div>
-				</div>
-			</form>
+				</form>
+			</div>
 		</div>
 	</div>
 	<table class="order-table block" ng-table="tableParams">

src/main/webapp/resources/tpl/index/make/change.html

@@ -93,93 +93,92 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="condition block">
+	<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-9">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
-			<!-- <div class="col-xs-2 toggle">
+			<div class="fr toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
-			</div> -->
+			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
+						<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
+						<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
 					</div>
-			  </div>
-			  <div class="form-group">
-			    <label>处理结果：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
-				  <button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeAgreed()">全部</a></li>
-				    <li><a ng-click="changeAgreed(1)">已同意</a></li>
-				    <li><a ng-click="changeAgreed(0)">不同意</a></li>
-				  </ul>
 				</div>
-			  </div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
@@ -211,7 +210,7 @@
 	</thead>
 	<tbody ng-repeat="change in $data track by change.id">
 		<tr class="order-hd">
-			<td class="first">
+			<td class="first" width="700">
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
 						ng-model="change.$selected">

src/main/webapp/resources/tpl/index/make/notice.html

@@ -169,11 +169,12 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="condition block">
+<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
 				<div class="btn-group btn-group-sm btn-group-justified">
@@ -199,78 +200,99 @@
 					</div>
 				</div>
 			</div>
+		</div>
+	</div>
+<div class="height10">&nbsp;</div>
+<div class="condition block">
+	<div class="search-bg condition block">
+		<div class="row">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
 			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-2 toggle">
+			<div class="fr toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>交货日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
+						<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
+						<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
 					</div>
-			  </div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
+					</div>
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th width="280">商品</th>
+			<th width="240">商品</th>
 			<th width="120">备注</th>
-			<th width="240">数量</th>
-			<th width="90">价格</th>
+			<th width="200">数量</th>
+			<th width="120">价格</th>
 			<th width="120">交货日期</th>
-			<th width="60">操作</th>
+			<th width="100">操作</th>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
@@ -346,6 +368,7 @@
 				</div>
 				<div class="text-muted text-ellipsis"
 					ng-bind="::notice.orderItem.product.spec"></div>
+				<div class="text-bold text-inverse" ng-if="notice.orderItem.factory">送货工厂：<span ng-bind="::notice.orderItem.factory"></span></div>						
 			</td>
 			<td class="text-center">
 				<div ng-show="!notice.$editing">{{notice.remark}}</div>
@@ -465,81 +488,4 @@
 		</tr>
 	</tbody>
 </table>
-</div>
-	<script type="text/ng-template" id="sendByBatch.html">
-        <div class="modal-header">
-            <h3 class="modal-title">批量发货</h3>
-        </div>
-		<form class="sampleSend" name="sampleSendForm" ng-submit="ok(sampleSendForm)">
-        	<div class="modal-body">
-				<div class="row" style="margin-bottom:10px;line-height:30px;">
-					<label class="col-md-3 col-sm-3 text-right"><span class="text-inverse">*</span> 发货单号：</label>
-					<div class="col-md-6 col-sm-6">
-					<input class="form-control input-sm" ng-model="saleSend.code" required type="text" placeholder="请输入发货单号"></div>
-				</div>
-				<div class="row" style="margin-bottom:10px;line-height:30px;">
-					<label class="col-md-3 col-sm-3 text-right">备注：</label>
-					<div class="col-md-6 col-sm-6">
-					<input class="form-control input-sm" ng-model="saleSend.remark" type="text" placeholder="备注"></div>
-				</div>
-				<div id="batchContainer" style="height:450px;overflow-y :scroll;border-collapse: collapse; ">
-					<table class="table table-bordered table-hover">
-						<tbody id="fixedHeader" class="fixedHeader">
-							<tr class="text-center">
-								<th width="30px"></th>
-								<th>商品</th>
-								<th width="90px">剩余未发</th>
-								<th width="100px">本次发货</th>
-								<th width="120px">单价</th>
-								<th width="120px">交货日期</th>
-								<th width="120px">订单</th>
-								<th width="50px" class="text-center">操作</th>
-							</tr>
-						</tbody>
-						<tbody>
-							<tr class="repeat" ng-repeat="notice in notices | orderBy: 'notice.orderItem.product.code'" ng-if="notice.$selected">
-								<td>
-									{{$index+1}}
-								</td>
-								<td>
-									<div ng-bind="::notice.orderItem.product.code"></div>
-									<div ng-bind="::notice.orderItem.product.title"></div>
-									<div class="text-muted" ng-bind="::notice.orderItem.product.spec"></div>
-								</td>
-								<td valign="middle" >
-									<div>
-										<span class="text-num" ng-bind="notice.qty-notice.endQty"></span>&nbsp;
-										<span ng-bind="notice.orderItem.product.unit"></span>
-									</div>
-								</td>
-								<td>
-									<input style="width:80px;" ng-model="notice.thisSendQty" 
-									ng-init="notice.thisSendQty = notice.qty-notice.endQty" class="form-control input-sm" type="number">
-								</td>
-								<td>
-									<div class="text-num">
-										<span ng-bind="::currency(notice.orderItem.order.currency)"></span>
-										<span ng-bind="::notice.orderItem.price|number:6"></span>
-									</div>
-								</td>
-								<td>
-									<div ng-bind="::notice.delivery | date: 'yyyy-MM-dd'"></div>
-								</td>
-								<td>
-									<div ng-bind="::notice.orderItem.order.code"></div>
-									<div>第 <span ng-bind="::notice.orderItem.number"></span> 行</div>
-								</td>
-								<td class="text-center">
-									<a ng-click="removeOne($index)"><i class="fa fa-trash-o fa-lg"></i></a>
-								</td>
-							</tr>
-						</tbody>
-					</table>
-				</div>
-        	</div>
-        	<div class="modal-footer">
-            	<button class="btn btn-primary" ng-click="sendByBatch()" type="button">确认发货</button>
-            	<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
-        	</div>
-		</form>
-    </script>
+</div>

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

@@ -108,11 +108,12 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="condition block">
+<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
 				<div class="btn-group btn-group-sm btn-group-justified">
@@ -134,88 +135,99 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-5">
+		</div>
+	</div>
+<div class="height10">&nbsp;</div>
+<div class="condition block">
+	<div class="search-bg condition block">
+		<div class="row">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、用料、客户名称或单据流水号搜索" />
-						<div class="search-advance text-link" ng-class="{'active': searchAdvance}" dropdown-toggle>高级搜索</div>
-						<div class="dropdown-menu">
-						   <div class="block">
-						   </div>
-						</div>
-						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
-			<div class="col-xs-2 toggle">
+			<div class="fr toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>单据日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+					<button type="button" class="btn btn-default"
+							ng-click="openDatePicker($event, condition, '$fromOpened')">
+						<i class="fa fa-calendar"></i>
+					</button>
+				</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+					<button type="button" class="btn btn-default"
+							ng-click="openDatePicker($event, condition, '$toOpened')">
+						<i class="fa fa-calendar"></i>
+					</button>
+				</span>
 					</div>
-			  </div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
+					</div>
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
 			<th>商品</th>
 			<th width="80">单价</th>
 			<th width="100">数量</th>
-			<th width="120">交货日期</th>
+			<th width="100">交货日期</th>
 			<th width="180">单据状态</th>
-			<th width="80">操作</th>
+			<th width="100">操作</th>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
@@ -392,7 +404,7 @@
 				</div>
 			</td>
 		</tr>
-		<tr class="order-bd" ng-if="!order.$collapsed">
+		<tr class="order-bd" ng-if="!order.$collapsed" style="height: 10px">
 			<td colspan="6">
 				<div class="row">
 				</div>

src/main/webapp/resources/tpl/index/make/outorder.html

@@ -93,93 +93,92 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="condition block">
+	<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-9">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
-			<div class="col-xs-2 toggle">
+			<div class="fr toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+<button type="button" class="btn btn-default"
+		ng-click="openDatePicker($event, condition, '$fromOpened')">
+	<i class="fa fa-calendar"></i>
+</button>
+</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+<button type="button" class="btn btn-default"
+		ng-click="openDatePicker($event, condition, '$toOpened')">
+	<i class="fa fa-calendar"></i>
+</button>
+</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
 					</div>
-			  </div>
-			  <div class="form-group">
-			    <label>处理结果：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
-				  <button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeAgreed()">全部</a></li>
-				    <li><a ng-click="changeAgreed(1)">已同意</a></li>
-				    <li><a ng-click="changeAgreed(0)">不同意</a></li>
-				  </ul>
 				</div>
-			  </div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">

src/main/webapp/resources/tpl/index/make/returns.html

@@ -104,86 +104,90 @@
 	border-bottom-left-radius: 0;
 }
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
 	<div class="condition block">
-		<div class="row">
-			<div class="col-xs-9">
-				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm"
-							ng-model="keyword" ng-search="onSearch()"
-							placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+		<div class="search-bg condition block">
+			<div class="row">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+					企业{{tableParams.total()}}家
+				</div>
+				<div class="col-xs-6">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				<div class="fr toggle">
+					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 				</div>
 			</div>
-			<div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span> <i
-					class="fa fa-fw"
-					ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
-			</div>
-		</div>
-		<div class="more" ng-class="{'open': condition.$open}">
-			<form class="form-inline">
-				<div class="form-group ">
-					<label>日期：</label>
-					<div class="btn-group btn-menu" dropdown
-						is-open="condition.$dateZoneOpen">
-						<button type="button" dropdown-toggle style="width: 85px;"
-							class="btn btn-default btn-xs dropdown-toggle">
-							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-						</button>
-						<ul class="dropdown-menu">
-							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-							<li><a ng-click="changeDateZone(6)">半年内</a></li>
-							<li><a ng-click="changeDateZone()">半年前</a></li>
-						</ul>
-					</div>
-					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" current-text="今天" clear-text="清除"
-							close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
+			<div class="more" ng-class="{'open': condition.$open}">
+				<form class="form-inline">
+					<div class="form-group ">
+						<label>日期：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+							<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 							</button>
-						</span>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+								<li><a ng-click="changeDateZone(6)">半年内</a></li>
+								<li><a ng-click="changeDateZone()">半年前</a></li>
+							</ul>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateFrom"
+								   class="form-control" placeholder="从"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							<span class="input-group-btn">
+	<button type="button" class="btn btn-default"
+			ng-click="openDatePicker($event, condition, '$fromOpened')">
+		<i class="fa fa-calendar"></i>
+	</button>
+</span>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateTo"
+								   class="form-control" placeholder="到"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+							<span class="input-group-btn">
+	<button type="button" class="btn btn-default"
+			ng-click="openDatePicker($event, condition, '$toOpened')">
+		<i class="fa fa-calendar"></i>
+	</button>
+</span>
+						</div>
 					</div>
-					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" current-text="今天" clear-text="清除"
-							close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
+					<div class="form-group">
+						<label>采纳结果：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+							<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 							</button>
-						</span>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeAgreed()">全部</a></li>
+								<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+								<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+							</ul>
+						</div>
 					</div>
-				</div>
-			</form>
+				</form>
+			</div>
 		</div>
 	</div>
 	<table class="order-table block" ng-table="tableParams">

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

@@ -137,7 +137,8 @@
 	font-size: 16px;
 }
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>

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

@@ -134,11 +134,12 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="condition block">
+<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
 				<div class="btn-group btn-group-sm btn-group-justified">
@@ -164,79 +165,90 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-5">
+		</div>
+	</div>
+<div class="height10">&nbsp;</div>
+<div class="condition block">
+	<div class="search-bg condition block">
+		<div class="row">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" />
-<!-- 						<div class="search-advance text-link" ng-class="{'active': searchAdvance}" dropdown-toggle>高级搜索</div>
- -->						<div id="searchContainer" class="dropdown-menu">
-						</div>
-						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
+						<a class="btn input-group-addon" ng-click="onSearch()">搜索</a>
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
-			<div class="col-xs-2 toggle">
+			<div class="fr toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
 				<div class="form-group ">
-					<label>单据日期：</label>
-					<div class="btn-group btn-menu" dropdown
-						is-open="condition.$dateZoneOpen">
-						<button type="button" dropdown-toggle style="width: 85px;"
-							class="btn btn-default btn-xs dropdown-toggle">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
 							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 						</button>
 						<ul class="dropdown-menu">
-							<li><a ng-click="changeDateZone(-1)">不限</a></li>
 							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 							<li><a ng-click="changeDateZone(6)">半年内</a></li>
 							<li><a ng-click="changeDateZone()">半年前</a></li>
 						</ul>
 					</div>
-					<div class="input-group input-group-xs input-trigger">
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo" current-text="今天"
-							clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()"> <span
-							class="input-group-btn">
-							<button type="button" class="btn btn-default"
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+						<span class="input-group-btn">
+						<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
 					</div>
-					<div class="input-group input-group-xs input-trigger">
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()"> <span
-							class="input-group-btn">
-							<button type="button" class="btn btn-default"
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
+						<span class="input-group-btn">
+						<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
 					</div>
 				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">

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

@@ -14,7 +14,6 @@
     /* 主体 */
     .purc-bid {
         line-height: 2;
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
     }
 
@@ -36,14 +35,12 @@
 
     /* 读取显示无法修改的数据 */
     .unchanged-info {
-        font-family: "Microsoft Yahei Regular";
         color: #969595;
         overflow: hidden;
     }
 
     /* 二级标题栏 */
     .title-div {
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
         font-weight: 600;
         padding-left: 30px;
@@ -85,7 +82,6 @@
         width: 94px;
         height: 36px;
         font-size: 14px;
-        font-family: "Microsoft Yahei Regular";
         color: #fff;
         border-radius: 0;
     }
@@ -103,7 +99,6 @@
         height: 50px;
         background-color: #fff;
         color: rgb(50, 50, 50);
-        font-family: "Microsoft Yahei Regular";
         border-bottom: 1px solid #327ebe;
     }
 
@@ -118,14 +113,12 @@
 
     .tender-table > tbody {
         height: 100px;
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
         color: #323232;
         border: 1px solid transparent;
     }
 
     .tender-table tbody tr td a {
-        font-family: "Microsoft Yahei Regular";
         color: #327ebe;
         font-size: 12px;
     }
@@ -190,7 +183,7 @@
     .tender-list02 .change01{width: 16px;height: 14px;display: inline-block;float: right;line-height: 7px;position: absolute;top: 13px;}
     .tender-list02 .change01 i{width:100%;display: inline-block;height: 7px;color: #000;}
     .tender-list02 .change01:hover i{color: #5078cb;}
-    .tender-list02 .explain{width: 90%;height: 30px;border: none;text-align: center;}
+    .tender-list02 .explain{width: 90%;height: 30px;border: none;text-align: center; line-height: 30px;}
     .tender-list02 .save{margin-top: 30px;}
     .tender-list02 .save a{width:94px;height: 36px;display: inline-block;background: #3578ba;text-align: center;color: #fff;font-size: 14px;float: right;line-height: 36px;margin-right: 40px;}
     .tender-list02 .save a:hover{background: #1f4fb2;}

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

@@ -31,12 +31,14 @@
 	border: none;
 }
 .pane-header{
-	border-radius: 0px 0 0px 0px;
+	/*border-radius: 0px 0 0px 0px;
 	box-shadow: 0 0 3px #ccc;
-	background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);
+	background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);*/
 	height: 40px;
 	font-size: 14px;
-	line-height: 40px;
+	line-height: 40px;}
+#customer-tab .pane-header th{
+	border-bottom: none;
 }
 .table>tbody+tbody{
 	border-top: none;
@@ -49,19 +51,28 @@
 }
 #customer-tab tbody tr{
 	background: none;
-	height: 60px;
+	height: 100px;
 	border-top: #e8e8e8 1px solid;
-	line-height: 60px;
+	line-height: 100px;
 }
 #customer-tab tbody tr td{
 	text-align: center;
 	line-height: 20px;
 	vertical-align: inherit;
-	font-size: 12px;
+	font-size: 14px;
 }
 #customer-tab tbody tr:hover{
 	border: #d32526 1px solid;
 }
+#customer-tab .com_title{
+	margin-bottom: 10px;
+}
+#customer-tab tbody tr td a{
+	color: #3578ba;
+}
+#customer-tab tbody tr td a:hover{
+	color: #d32526;
+}
 </style>
 <div class="wrap" id="customer-tab">
 	<div class="content">
@@ -78,11 +89,11 @@
 				<tr class="pane-header">
 					<th width="180" class="text-center">企业名称</th>
 					<th width="120" class="text-center">简称</th>
-					<th width="220" class="text-center">地址</th>
+					<th width="200" class="text-center">地址</th>
 					<th width="100" class="text-center">联系人</th>
 					<th width="80" class="text-center">职位</th>
 					<th width="80" class="text-center">联系方式</th>
-					<th width="150" class="text-center">操作</th>
+					<th width="170" class="text-center">操作</th>
 				</tr>
 			</thead>
 			<tbody>

src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -104,81 +104,92 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="condition block">
+	<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-9">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
+			<div class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
-			<!-- <div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
-			</div> -->
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+		<button type="button" class="btn btn-default"
+				ng-click="openDatePicker($event, condition, '$fromOpened')">
+			<i class="fa fa-calendar"></i>
+		</button>
+	</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+		<button type="button" class="btn btn-default"
+				ng-click="openDatePicker($event, condition, '$toOpened')">
+			<i class="fa fa-calendar"></i>
+		</button>
+	</span>
 					</div>
-			  </div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
+					</div>
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -103,81 +103,92 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block"  id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="condition block">
+	<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-9">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
+			<div class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
-			<!-- <div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
-			</div> -->
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+<button type="button" class="btn btn-default"
+		ng-click="openDatePicker($event, condition, '$fromOpened')">
+	<i class="fa fa-calendar"></i>
+</button>
+</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+<button type="button" class="btn btn-default"
+		ng-click="openDatePicker($event, condition, '$toOpened')">
+	<i class="fa fa-calendar"></i>
+</button>
+</span>
 					</div>
-			  </div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
+					</div>
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -103,81 +103,92 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block"  id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="condition block">
+	<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-9">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
+			<div class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
-			<!-- <div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
-			</div> -->
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+	<button type="button" class="btn btn-default"
+			ng-click="openDatePicker($event, condition, '$fromOpened')">
+		<i class="fa fa-calendar"></i>
+	</button>
+</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+	<button type="button" class="btn btn-default"
+			ng-click="openDatePicker($event, condition, '$toOpened')">
+		<i class="fa fa-calendar"></i>
+	</button>
+</span>
 					</div>
-			  </div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
+					</div>
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">

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

@@ -103,86 +103,92 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="condition block">
+	<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-9">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
-			<div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
+			<div class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
 				<div class="form-group ">
-					<label>单据日期：</label>
-					<div class="btn-group btn-menu" dropdown
-						is-open="condition.$dateZoneOpen">
-						<button type="button" dropdown-toggle style="width: 85px;"
-							class="btn btn-default btn-xs dropdown-toggle">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
 							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 						</button>
 						<ul class="dropdown-menu">
-							<li><a ng-click="changeDateZone(-1)">不限</a></li>
 							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 							<li><a ng-click="changeDateZone(6)">半年内</a></li>
 							<li><a ng-click="changeDateZone()">半年前</a></li>
 						</ul>
 					</div>
-					<div class="input-group input-group-xs input-trigger">
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo" current-text="今天"
-							clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()"> <span
-							class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+						<span class="input-group-btn">
+	<button type="button" class="btn btn-default"
+			ng-click="openDatePicker($event, condition, '$fromOpened')">
+		<i class="fa fa-calendar"></i>
+	</button>
+</span>
 					</div>
-					<div class="input-group input-group-xs input-trigger">
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()"> <span
-							class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
+						<span class="input-group-btn">
+	<button type="button" class="btn btn-default"
+			ng-click="openDatePicker($event, condition, '$toOpened')">
+		<i class="fa fa-calendar"></i>
+	</button>
+</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
 					</div>
 				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">

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

@@ -125,130 +125,91 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="condition block">
+	<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-9">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称、认定单号、送样单号或认定结果搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
-			<div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
+			<div class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
-		<!-- <div class="more" ng-class="{'open': condition.$open}">
+		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')">
-						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
-					</div>
-			  </div>
-			</form>
-		</div>
-	</div> -->
-	<div class="more" ng-class="{'open': condition.$open}">
-			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>录入日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+			<button type="button" class="btn btn-default"
+					ng-click="openDatePicker($event, condition, '$fromOpened')">
+				<i class="fa fa-calendar"></i>
+			</button>
+		</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+			<button type="button" class="btn btn-default"
+					ng-click="openDatePicker($event, condition, '$toOpened')">
+				<i class="fa fa-calendar"></i>
+			</button>
+		</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
 					</div>
-			  </div>
+				</div>
 			</form>
 		</div>
+	</div>
 </div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>

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

@@ -93,11 +93,12 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block"  id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="condition block">
+<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
 				<div class="btn-group btn-group-sm btn-group-justified">
@@ -115,7 +116,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-5">
+			<!--<div class="col-xs-5">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -128,76 +129,98 @@
 				<div class="text-default f14 total">
 					共 <span ng-bind="tableParams.total()" class="text-num"></span>
 				</div>
-			</div>
+			</div>-->
 			<!-- <div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div> -->
 		</div>
+	</div>
+<div class="height10">&nbsp;</div>
+<div class="condition block">
+	<div class="search-bg condition block">
+		<div class="row">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
+				<div class="search">
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
+			</div>
+		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
+						<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
+						<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+							<i class="fa fa-calendar"></i>
+						</button>
+					</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
 					</div>
-			  </div>
-			  <div class="form-group">
-			    <label>处理结果：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
-				  <button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeAgreed()">全部</a></li>
-				    <li><a ng-click="changeAgreed(1)">已同意</a></li>
-				    <li><a ng-click="changeAgreed(0)">不同意</a></li>
-				  </ul>
 				</div>
-			  </div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th width="600">商品</th>
 			<th width="100">单价</th>
 			<th>数量</th>
 			<th width="120">交货日期</th>
@@ -237,7 +260,7 @@
 			</td>
 			<td colspan="3"><a
 				ng-bind="::change.enterprise.enName"></a></td>
-			<td colspan="1" class="">
+			<td colspan="1" class="" style="line-height: 20px; padding-top: 5px;">
 				<span ng-bind="change.description"></span>
 			</td>
 			<td colspan="1" class="text-center">
@@ -264,8 +287,8 @@
 			</td>
 		</tr>
 		<tr ng-if="change.$editing" class="br-b">
-			<td colspan="3"></td>
-			<td>
+			<td colspan="2"></td>
+			<td colspan="2">
 				<div style="margin: 0 auto" ng-init="change.$agreed = 1">
 					<div class="form-group">
 						<label class="radio-inline"> <input type="radio"

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

@@ -5,7 +5,7 @@
 	padding: 0;
 	line-height: 38px;
 	border-bottom-width: 0;
-	background: #f5f5f5;
+	/*background: #f5f5f5;*/
 	border: none;
 	font-size: 14px;
 }

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

@@ -1,555 +1,581 @@
 <style>
-.order-table .header>th {
-	height: 38px;
-	text-align: center;
-	background: #f5f5f5;
-	border-top: 1px solid #e8e8e8;
-	border-bottom: 1px solid #e8e8e8;
-}
+	.order-table .header>th {
+		height: 38px;
+		text-align: center;
+		background: #f5f5f5;
+		border-top: 1px solid #e8e8e8;
+		border-bottom: 1px solid #e8e8e8;
+	}
 
-.order-table .sep-row {
-	height: 10px;
-}
+	.order-table .sep-row {
+		height: 10px;
+	}
 
-.order-table .selector {
-	vertical-align: middle;
-	margin: 0 0 2px 0;
-}
+	.order-table .selector {
+		vertical-align: middle;
+		margin: 0 0 2px 0;
+	}
 
-.toolbar label {
-	margin-right: 10px;
-	margin-bottom: 0;
-}
+	.toolbar label {
+		margin-right: 10px;
+		margin-bottom: 0;
+	}
 
-.toolbar .select_all {
-	margin: 0 6px 0 10px;
-	line-height: 20px;
-}
+	.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;
-}
+	.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 {
+		background: #f5f5f5;
+		height: 40px;
+		line-height: 40px;
+	}
 
-.order-table .order-hd td.first {
-	padding-left: 20px;
-}
+	.order-table .order-hd td.first {
+		padding-left: 20px;
+	}
 
-.order-table .order-hd .order-main span {
-	margin-right: 8px;
-}
+	.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-code {
+		font-style: normal;
+		font-family: verdana;
+	}
 
-.order-table .order-hd .order-sum {
-	padding: 0 5px;
-}
+	.order-table .order-hd .order-sum {
+		padding: 0 5px;
+	}
 
-.order-table>tbody {
-	border: 1px solid transparent;
-}
+	.order-table>tbody {
+		border: 1px solid transparent;
+	}
 
-.order-table>tbody:hover {
-	border-color: #d32526;
-	border-width: 2px;
-}
+	.order-table>tbody:hover {
+		border-color: #d32526;
+		border-width: 2px;
+	}
 
-.order-table .operates {
-	display: none;
-}
+	.order-table .operates {
+		display: none;
+	}
 
-.order-table>tbody:hover .operates {
-	display: block;
-}
+	.order-table>tbody:hover .operates {
+		display: block;
+	}
 
-.order-table .order-bd {
-	border-bottom: 1px solid #e6e6e6;
-}
+	.order-table .order-bd {
+		border-bottom: 1px solid #e6e6e6;
+	}
 
-.order-table .order-bd>td {
-	padding: 10px 5px;
-	vertical-align: top;
-	position: relative;
-}
+	.order-table .order-bd>td {
+		padding: 10px 5px;
+		vertical-align: top;
+		position: relative;
+	}
 
-.order-table .order-bd .product {
-	padding-left: 20px;
-}
+	.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
+	.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;
-}
+		height: 26px;
+		padding: 0 5px;
+		font-size: 12px;
+		line-height: 1.5;
+		border-radius: 3px;
+	}
 
-.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
-	border-top-left-radius: 0;
-	border-bottom-left-radius: 0;
-}
+	.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
+		border-top-left-radius: 0;
+		border-bottom-left-radius: 0;
+	}
 
-@media ( min-width : 768px) {
-	.form-horizontal .form-group-xs .control-label {
-		padding-top: 5px;
+	@media ( min-width : 768px) {
+		.form-horizontal .form-group-xs .control-label {
+			padding-top: 5px;
+		}
 	}
-}
 
-.info-container .info:hover {
-	color: #CC3333;
-}
-.input-error{
-	background-color: #fff8ee;
-    border-color: #CC0033;
-}
-input.input-error:focus {
-	background-color: #fff8ee;
-	border-color: #CC0033;
-}
+	.info-container .info:hover {
+		color: #CC3333;
+	}
+	.input-error{
+		background-color: #fff8ee;
+		border-color: #CC0033;
+	}
+	input.input-error:focus {
+		background-color: #fff8ee;
+		border-color: #CC0033;
+	}
+	.block{
+		/*background: #f5f5f5;*/
+	}
+	.order-table{
+		background: #fff;
+	}
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
-	<div class="condition block">
-			<div class="row">
-				<div class="col-xs-4">
-					<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"
+	<div class="menu condition block">
+		<div class="row">
+			<div class="col-xs-4">
+				<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"
+					</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"
+					</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"
+					</div>
+					<div class="btn-group btn-group-sm">
+						<button type="button" class="btn btn-default btn-line"
 								ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已过期</button>
-						</div>
 					</div>
 				</div>
-				<div class="col-xs-5">
-					<div class="search">
-						<div class="form-group form-group-sm has-feedback">
-							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-								class="form-control-feedback text-simple"><i
-								class="fa fa-search"></i></span>
-						</div>
+			</div>
+			<!--<div class="col-xs-5">
+				<div class="search">
+					<div class="form-group form-group-sm has-feedback">
+						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
+							class="form-control-feedback text-simple"><i
+							class="fa fa-search"></i></span>
 					</div>
 				</div>
-				<div class="col-xs-1">
-					<div class="text-default f14 total">
-						共 <span ng-bind="tableParams.total()" class="text-num"></span>
+			</div>
+			<div class="col-xs-1">
+				<div class="text-default f14 total">
+					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+				</div>
+			</div>-->
+		</div>
+	</div>
+	<div class="height10">&nbsp;</div>
+	<div class="condition block">
+		<div class="search-bg condition block">
+			<div class="row">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+					企业{{tableParams.total()}}家
+				</div>
+				<div class="col-xs-6">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<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 class="col-xs-2 toggle">
+				<div class="fr toggle">
 					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
-				</div> -->
+				</div>
 			</div>
 			<div class="more" ng-class="{'open': condition.$open}">
 				<form class="form-inline">
-				  <div class="form-group ">
-				    <label>日期：</label>
-				    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-					  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-					    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-					  </button>
-					  <ul class="dropdown-menu">
-						<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-					    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-					    <li><a ng-click="changeDateZone()">半年前</a></li>
-					  </ul>
-					</div>
-				    <div class="form-group input-group input-group-xs input-trigger">
+					<div class="form-group ">
+						<label>日期：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+							<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+							</button>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+								<li><a ng-click="changeDateZone(6)">半年内</a></li>
+								<li><a ng-click="changeDateZone()">半年前</a></li>
+							</ul>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
 							<input type="text" ng-model="condition.dateFrom"
-								class="form-control" placeholder="从"
-								datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-								ng-required="true"
-								current-text="今天" clear-text="清除" close-text="关闭"
-								datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   class="form-control" placeholder="从"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 								<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+										ng-click="openDatePicker($event, condition, '$fromOpened')">
 									<i class="fa fa-calendar"></i>
 								</button>
 							</span>
 						</div>
 						<div class="form-group input-group input-group-xs input-trigger">
 							<input type="text" ng-model="condition.dateTo"
-								class="form-control" placeholder="到"
-								datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-								ng-required="true"
-								current-text="今天" clear-text="清除" close-text="关闭"
-								datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   class="form-control" placeholder="到"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 								<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+										ng-click="openDatePicker($event, condition, '$toOpened')">
 									<i class="fa fa-calendar"></i>
 								</button>
 							</span>
 						</div>
-				  </div>
-				  <div class="form-group">
-				    <label>采纳结果：</label>
-				    <div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
-					  <button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
-					    	{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-					  </button>
-					  <ul class="dropdown-menu">
-						<li><a ng-click="changeAgreed()">全部</a></li>
-					    <li><a ng-click="changeAgreed(1)">已采纳</a></li>
-					    <li><a ng-click="changeAgreed(0)">未采纳</a></li>
-					  </ul>
 					</div>
-				  </div>
+					<div class="form-group">
+						<label>采纳结果：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+							<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+							</button>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeAgreed()">全部</a></li>
+								<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+								<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+							</ul>
+						</div>
+					</div>
 				</form>
 			</div>
 		</div>
+	</div>
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
-			<tr class="header">
-				<th>商品</th>
-				<th width="90"><span class="text-default">≥</span>分段数</th>
-				<th width="90">价格</th>
-				<th width="80">最小订购</th>
-				<th width="80">最小包装</th>
-				<th width="120">有效期</th>
-				<th width="75">操作</th>
-			</tr>
-			<tr class="sep-row">
-				<td colspan="7"></td>
-			</tr>
-			<tr class="toolbar toolbar-top">
-				<td colspan="6">
-					<div>
-						<label><input ng-disabled="true" type="checkbox" class="selector select_all"
-							ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
-							class="btn btn-default btn-xs">批量报价</a>
-					</div> <!-- 分页 -->
-				</td>
-				<td class="text-center">
-					<a href="sale/inquiry/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
-				</td>
-			</tr>
-			<tr class="sep-row">
-				<td colspan="7"></td>
-			</tr>
+		<tr class="header">
+			<th>商品</th>
+			<th width="90"><span class="text-default">≥</span>分段数</th>
+			<th width="90">价格</th>
+			<th width="80">最小订购</th>
+			<th width="80">最小包装</th>
+			<th width="120">有效期</th>
+			<th width="75">操作</th>
+		</tr>
+		<tr class="sep-row">
+			<td colspan="7"></td>
+		</tr>
+		<tr class="toolbar toolbar-top">
+			<td colspan="6">
+				<div>
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+								  ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
+																	 class="btn btn-default btn-xs">批量报价</a>
+				</div> <!-- 分页 -->
+			</td>
+			<td class="text-center">
+				<a href="sale/inquiry/xls?_state={{active}}&keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
+		</tr>
+		<tr class="sep-row">
+			<td colspan="7"></td>
+		</tr>
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
-			<tr>
-				<td colspan="7">
-					<div class="row text-muted info-container" style="padding: 50px 10px;">
-						<div class="col-md-4 text-center">
-							<br>
-							<br>
-							<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
-							<div class="f16">当前没有对应的客户询价单！</div>
+		<tr>
+			<td colspan="7">
+				<div class="row text-muted info-container" style="padding: 50px 10px;">
+					<div class="col-md-4 text-center">
+						<br>
+						<br>
+						<div><img src="static/img/all/info.png" width="130px" height="90px"></div>
+						<div class="f16">当前没有对应的客户询价单！</div>
+					</div>
+					<div class="col-md-8 br-l">
+						<div class="f16">
+							<p>为什么我没有接收到客户的询价单？</p>
 						</div>
-						<div class="col-md-8 br-l">
-							<div class="f16">
-								<p>为什么我没有接收到客户的询价单？</p>
-							</div>
-							<div class="f14">
-								<div class="info">
-									<p>1、您的客户还没有提交审核询价单<br>
+						<div class="f14">
+							<div class="info">
+								<p>1、您的客户还没有提交审核询价单<br>
 									解决：与您的客户沟通确认单据是否已经审核（只有客户ERP中已经审核的单据才能接收到）</p>
-								</div>
-								<div class="info">
-									<p>2、客户ERP中供应商信息有误<br>
+							</div>
+							<div class="info">
+								<p>2、客户ERP中供应商信息有误<br>
 									解决：与您的客户沟通确认您的信息在客户的供应商资料中是否维护正确，尤其是企业UU号</p>
-								</div>
-								<div class="info">
-									<p>3、您的客户正在使用旧版本的UAS商务平台<br>
+							</div>
+							<div class="info">
+								<p>3、您的客户正在使用旧版本的UAS商务平台<br>
 									解决：我们仍有部分用户在使用旧版本UAS商务平台系统，你可以用您的企业UU号和管理员个人UU号 <a href="http://www.usoftchina.com" class="text-bold text-link" title="http://www.usoftchina.com" target="_blank">登陆旧版本UAS商务平台</a></p>
-								</div>
 							</div>
-							<br>
-							<br>
 						</div>
+						<br>
+						<br>
 					</div>
-				</td>
-			</tr>
+				</div>
+			</td>
+		</tr>
 		</tbody>
 		<tbody ng-repeat="inquiryItem in $data track by inquiryItem.id">
-			<tr class="order-hd">
-				<td class="first">
-					<div class="order-main">
+		<tr class="order-hd">
+			<td class="first">
+				<div class="order-main">
 						<span> <input type="checkbox" class="selector"
-							ng-model="inquiryItem.$selected">
+									  ng-model="inquiryItem.$selected">
 						</span> <span class="text-num text-bold"
-							title="{{inquiryItem.inquiry.date}}"
-							ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
-							class="text-num" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" target="_self"></a></span>
-					</div>
-				</td>
-				<td colspan="2"><span
+									  title="{{inquiryItem.inquiry.date}}"
+									  ng-bind="::inquiryItem.inquiry.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
+						class="text-num" ng-bind="::inquiryItem.inquiry.code" ui-sref="sale.inquiry_detail({id:inquiryItem.inquiry.id})" target="_self"></a></span>
+				</div>
+			</td>
+			<td colspan="2"><span
 					ng-bind="::inquiryItem.inquiry.enterprise.enName"></span></td>
-				<td>
-					币别：<span ng-bind="::inquiryItem.currency"></span>
-				</td>
-				<td>
-					税率：<span ng-bind="::inquiryItem.taxrate || 0"></span>%
-				</td>
-				<td class="text-right" colspan="1" class="order-sum">
-					<div ng-if="inquiryItem.replyable">
-						<span class="text-inverse text-bold" ng-bind="::inquiryItem.inquiry.endDate | timespan"></span> 
-						<span class="text-muted">后截止报价</span>
-					</div>
-				</td>
-				<td class="text-center">
-					<div class="operates">
-						<!-- <a ng-click="print(inquiryItem)" class="text-muted" title="打印"><i
-							class="fa fa-print fa-lg"></i></a> -->
-					</div>
-				</td>
-			</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 ng-if="inquiryItem.inquiry.attachs.length" class="text-muted">
-						附件：<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
-					</div>
-					<div ng-if="::inquiryItem.brand && !inquiryItem.$editing" class="text-muted">
-						品牌：<spans ng-bind="::inquiryItem.brand"></span>
-					</div>
-					<div ng-if="::inquiryItem.vendorprodcode && !inquiryItem.$editing" class="text-muted">
-						供应商物料编号：<spans ng-bind="::inquiryItem.vendorprodcode"></span>
-					</div>
-					<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
-						<input type="text" class="form-control input-xs"
-							ng-model="inquiryItem.brand" placeholder="物料品牌">
-					</div>
-					<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
-						<input type="text" class="form-control input-xs"
-							ng-model="inquiryItem.vendorprodcode" placeholder="供应商物料编号">
-					</div>
-					<div class="form-group" ng-if="inquiryItem.$editing" style="width: 220px;">
-						<input type="number" class="form-control input-xs" ng-change="verify(inquiryItem.leadtime,'leadtime')"
-							ng-model="inquiryItem.leadtime" placeholder="交货周期(确切天数)" style="display: inline-block;width: 180px;">
-						<span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
-						<div style="margin-left: 50px;"class="text-bold text-inverse" ng-show="!leadtimeVerify">请填数字!</div>
-					</div>
-				</td>
-				<td class="text-center">
-					<div ng-show="!inquiryItem.$editing">
-						<div ng-repeat="reply in inquiryItem.replies">
-							<span ng-bind="reply.lapQty"></span>
-						</div>
+			<td>
+				币别：<span ng-bind="::inquiryItem.currency"></span>
+			</td>
+			<td>
+				税率：<span ng-bind="::inquiryItem.taxrate || 0"></span>%
+			</td>
+			<td class="text-right" colspan="1" class="order-sum">
+				<div ng-if="inquiryItem.replyable">
+					<span class="text-inverse text-bold" ng-bind="::inquiryItem.inquiry.endDate | timespan"></span>
+					<span class="text-muted">后截止报价</span>
+				</div>
+			</td>
+			<td class="text-center">
+				<div class="operates">
+					<!-- <a ng-click="print(inquiryItem)" class="text-muted" title="打印"><i
+                        class="fa fa-print fa-lg"></i></a> -->
+				</div>
+			</td>
+		</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 ng-if="inquiryItem.inquiry.attachs.length" class="text-muted">
+					附件：<a class="file" ng-repeat="attach in inquiryItem.inquiry.attachs" href="file/{{attach.id}}">{{::attach.name}}</a>
+				</div>
+				<div ng-if="::inquiryItem.brand && !inquiryItem.$editing" class="text-muted">
+					品牌：<spans ng-bind="::inquiryItem.brand"></span>
+				</div>
+				<div ng-if="::inquiryItem.vendorprodcode && !inquiryItem.$editing" class="text-muted">
+					供应商物料编号：<spans ng-bind="::inquiryItem.vendorprodcode"></span>
+				</div>
+				<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
+					<input type="text" class="form-control input-xs"
+						   ng-model="inquiryItem.brand" placeholder="物料品牌">
+				</div>
+				<div class="form-group" ng-if="inquiryItem.$editing" style="width: 180px;">
+					<input type="text" class="form-control input-xs"
+						   ng-model="inquiryItem.vendorprodcode" placeholder="供应商物料编号">
+				</div>
+				<div class="form-group" ng-if="inquiryItem.$editing" style="width: 220px;">
+					<input type="number" class="form-control input-xs" ng-change="verify(inquiryItem.leadtime,'leadtime')"
+						   ng-model="inquiryItem.leadtime" placeholder="交货周期(确切天数)" style="display: inline-block;width: 180px;">
+					<span ng-if="!inquiryItem.leadtime" class="text-inverse"> 必填*</span>
+					<div style="margin-left: 50px;"class="text-bold text-inverse" ng-show="!leadtimeVerify">请填数字!</div>
+				</div>
+			</td>
+			<td class="text-center">
+				<div ng-show="!inquiryItem.$editing">
+					<div ng-repeat="reply in inquiryItem.replies">
+						<span ng-bind="reply.lapQty"></span>
 					</div>
-					<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
-						<div ng-repeat="reply in inquiryItem.replies">
-							<div class="form-group input-group input-group-xs">
-								<input type="text" class="form-control input-xs" ng-change="verifylapQty(reply.lapQty,$index)"
-									ng-model="reply.lapQty" min="{{reply.lapQty == 0 ? 0 : 1}}"
-									ng-Readonly="$index == 0"
-									placeholder="数量" /> <span class="input-group-btn" ng-show="$index != 0">
+				</div>
+				<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
+					<div ng-repeat="reply in inquiryItem.replies">
+						<div class="form-group input-group input-group-xs">
+							<input type="text" class="form-control input-xs" ng-change="verifylapQty(reply.lapQty,$index)"
+								   ng-model="reply.lapQty" min="{{reply.lapQty == 0 ? 0 : 1}}"
+								   ng-Readonly="$index == 0"
+								   placeholder="数量" /> <span class="input-group-btn" ng-show="$index != 0">
 									<button class="btn btn-default" type="button"
-										ng-click="removeStep(inquiryItem, $index)">
+											ng-click="removeStep(inquiryItem, $index)">
 										<i class="fa fa-trash-o"></i>
 									</button>
 								</span>
-							</div>
-							<div class="text-bold text-inverse" style="margin-top:-15px" ng-show="!replylapQtys[$index]">请填数字!</div>
 						</div>
-						<a ng-click="addStep(inquiryItem)" class="btn btn-default btn-xs"
-							ng-show="!inquiryItem.custLap">添加分段</a>
+						<div class="text-bold text-inverse" style="margin-top:-15px" ng-show="!replylapQtys[$index]">请填数字!</div>
 					</div>
-				</td>
-				<td class="text-center br-l">
-					<div ng-show="!inquiryItem.$editing">
-						<div ng-repeat="reply in inquiryItem.replies">
-							<span ng-bind="reply.price | number:6"></span> <span
-								ng-show="reply.price == null" class="text-muted">-</span>
-						</div>
-						<div class="dropdown">
-							<a href="javascript:void(0);" class="dropdown-toggle text-default"
-								ng-mouseover="getHistory(inquiryItem)">历史报价<i
+					<a ng-click="addStep(inquiryItem)" class="btn btn-default btn-xs"
+					   ng-show="!inquiryItem.custLap">添加分段</a>
+				</div>
+			</td>
+			<td class="text-center br-l">
+				<div ng-show="!inquiryItem.$editing">
+					<div ng-repeat="reply in inquiryItem.replies">
+						<span ng-bind="reply.price | number:6"></span> <span
+							ng-show="reply.price == null" class="text-muted">-</span>
+					</div>
+					<div class="dropdown">
+						<a href="javascript:void(0);" class="dropdown-toggle text-default"
+						   ng-mouseover="getHistory(inquiryItem)">历史报价<i
 								class="fa fa-fw fa-angle-down"></i></a>
-							<div class="dropdown-menu pane" style="width: 270px;">
-								<div class="pane-body">
-									<ul class="list-unstyled list-menu">
-										<li ng-repeat="historyItem in ::inquiryItem.history">
-											<div ng-class="{'text-inverse': $index==0}">
-												<div class="row row-sm"
-													ng-repeat="historyReply in historyItem.replies">
-													<div class="col-xs-5">≥{{historyReply.lapQty}}</div>
-													<div class="col-xs-5">价格{{historyReply.price | number:6}}</div>
-												</div>
-											</div>
-											<div class="text-muted">{{historyItem.inquiry.date |
-												date:'yyyy-MM-dd'}}{{historyItem.inquiry.enterprise.enName}}
+						<div class="dropdown-menu pane" style="width: 270px;">
+							<div class="pane-body">
+								<ul class="list-unstyled list-menu">
+									<li ng-repeat="historyItem in ::inquiryItem.history">
+										<div ng-class="{'text-inverse': $index==0}">
+											<div class="row row-sm"
+												 ng-repeat="historyReply in historyItem.replies">
+												<div class="col-xs-5">≥{{historyReply.lapQty}}</div>
+												<div class="col-xs-5">价格{{historyReply.price | number:6}}</div>
 											</div>
-										</li>
-									</ul>
-									<div
+										</div>
+										<div class="text-muted">{{historyItem.inquiry.date |
+											date:'yyyy-MM-dd'}}{{historyItem.inquiry.enterprise.enName}}
+										</div>
+									</li>
+								</ul>
+								<div
 										ng-show="!inquiryItem.history || inquiryItem.history.length == 0"
 										class="text-center text-muted">暂无历史报价</div>
-								</div>
 							</div>
 						</div>
 					</div>
-					<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
-						<div ng-repeat="reply in inquiryItem.replies">
-							<div class="form-group">
-								<input type="text" class="form-control input-xs " ng-class="{'input-error': !replyPrices[$index]}" ng-model="reply.price"
-									 ng-change="verify(reply.price,$index)" placeholder="单价(必填)"  />
-									 <div class="text-bold text-inverse" style="margin-bottom:-15px" ng-show="!replyPrices[$index]">请填数字!</div>
-							</div>
+				</div>
+				<div style="margin: 0 auto;" ng-if="inquiryItem.$editing">
+					<div ng-repeat="reply in inquiryItem.replies">
+						<div class="form-group">
+							<input type="text" class="form-control input-xs " ng-class="{'input-error': !replyPrices[$index]}" ng-model="reply.price"
+								   ng-change="verify(reply.price,$index)" placeholder="单价(必填)"  />
+							<div class="text-bold text-inverse" style="margin-bottom:-15px" ng-show="!replyPrices[$index]">请填数字!</div>
 						</div>
 					</div>
-				</td>
-				<td class="text-center br-l">
-					<div ng-show="!inquiryItem.$editing">
-						<span ng-bind="inquiryItem.minOrderQty"></span> <span
-							ng-show="inquiryItem.minOrderQty == null" class="text-muted">-</span>
-					</div>
-					<div ng-if="inquiryItem.$editing">
-						<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.minOrderQty,'minOrderQty')"
-							ng-class="{'input-error': !minOrderQtyVerify}" ng-model="inquiryItem.minOrderQty" placeholder="最小订购" >
-						<div class="text-bold text-inverse" ng-show="!minOrderQtyVerify">请填数字!</div>
-					</div>
-				</td>
-				<td class="text-center br-l">
-					<div ng-show="!inquiryItem.$editing">
-						<span ng-bind="inquiryItem.minPackQty"></span> <span
-							ng-show="inquiryItem.minPackQty == null" class="text-muted">-</span>
-					</div>
-					<div ng-if="inquiryItem.$editing">
-						<input type="text" class="form-control input-xs"
-							ng-model="inquiryItem.minPackQty" placeholder="最小包装" 
-							ng-change="verify(inquiryItem.minPackQty,'minPackQty')" ng-class="{'input-error': !minPackQtyVerify}" >
-						<div class="text-bold text-inverse" ng-show="!minPackQtyVerify">请填数字!</div>
+				</div>
+			</td>
+			<td class="text-center br-l">
+				<div ng-show="!inquiryItem.$editing">
+					<span ng-bind="inquiryItem.minOrderQty"></span> <span
+						ng-show="inquiryItem.minOrderQty == null" class="text-muted">-</span>
+				</div>
+				<div ng-if="inquiryItem.$editing">
+					<input type="text" class="form-control input-xs" ng-change="verify(inquiryItem.minOrderQty,'minOrderQty')"
+						   ng-class="{'input-error': !minOrderQtyVerify}" ng-model="inquiryItem.minOrderQty" placeholder="最小订购" >
+					<div class="text-bold text-inverse" ng-show="!minOrderQtyVerify">请填数字!</div>
+				</div>
+			</td>
+			<td class="text-center br-l">
+				<div ng-show="!inquiryItem.$editing">
+					<span ng-bind="inquiryItem.minPackQty"></span> <span
+						ng-show="inquiryItem.minPackQty == null" class="text-muted">-</span>
+				</div>
+				<div ng-if="inquiryItem.$editing">
+					<input type="text" class="form-control input-xs"
+						   ng-model="inquiryItem.minPackQty" placeholder="最小包装"
+						   ng-change="verify(inquiryItem.minPackQty,'minPackQty')" ng-class="{'input-error': !minPackQtyVerify}" >
+					<div class="text-bold text-inverse" ng-show="!minPackQtyVerify">请填数字!</div>
+				</div>
+			</td>
+			<td class="text-center br-l">
+				<div ng-show="!inquiryItem.$editing"
+					 ng-init="parseDate(inquiryItem)">
+					<div ng-show="inquiryItem.vendFromDate">
+						<span class="text-muted">从 </span><span
+							ng-bind="inquiryItem.vendFromDate | date:'yyyy-MM-dd'"></span> <span
+							class="text-muted">到 </span><span
+							ng-bind="inquiryItem.vendToDate | date:'yyyy-MM-dd'"></span>
 					</div>
-				</td>
-				<td class="text-center br-l">
-					<div ng-show="!inquiryItem.$editing"
-						ng-init="parseDate(inquiryItem)">
-						<div ng-show="inquiryItem.vendFromDate">
-							<span class="text-muted">从 </span><span
-								ng-bind="inquiryItem.vendFromDate | date:'yyyy-MM-dd'"></span> <span
-								class="text-muted">到 </span><span
-								ng-bind="inquiryItem.vendToDate | date:'yyyy-MM-dd'"></span>
-						</div>
-						<div ng-show="!inquiryItem.vendFromDate">
-							<span class="text-muted">-</span>
-						</div>
+					<div ng-show="!inquiryItem.vendFromDate">
+						<span class="text-muted">-</span>
 					</div>
-					<div ng-if="inquiryItem.$editing">
-						<div class="form-group input-group input-group-xs input-trigger">
-							<input type="text" ng-model="inquiryItem.vendFromDate"
-								class="form-control" placeholder="开始日期"
-								datepicker-popup="yyyy-MM-dd" is-open="inquiryItem.$fromOpened"
-								min-date="getMinDate(inquiryItem)" ng-required="true"
-								current-text="今天" clear-text="清除" close-text="关闭"
-								datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								ng-focus="openDatePicker($event, inquiryItem, '$fromOpened')">
-							<span class="input-group-btn">
+				</div>
+				<div ng-if="inquiryItem.$editing">
+					<div class="form-group input-group input-group-xs input-trigger">
+						<input type="text" ng-model="inquiryItem.vendFromDate"
+							   class="form-control" placeholder="开始日期"
+							   datepicker-popup="yyyy-MM-dd" is-open="inquiryItem.$fromOpened"
+							   min-date="getMinDate(inquiryItem)" ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, inquiryItem, '$fromOpened')">
+						<span class="input-group-btn">
 								<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, inquiryItem, '$fromOpened')">
+										ng-click="openDatePicker($event, inquiryItem, '$fromOpened')">
 									<i class="fa fa-calendar"></i>
 								</button>
 							</span>
-						</div>
-						<div class="form-group input-group input-group-xs input-trigger">
-							<input type="text" ng-model="inquiryItem.vendToDate"
-								class="form-control" placeholder="结束日期"
-								datepicker-popup="yyyy-MM-dd" is-open="inquiryItem.$toOpened"
-								min-date="inquiryItem.vendFromDate" ng-required="true"
-								current-text="今天" clear-text="清除" close-text="关闭"
-								datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								ng-focus="openDatePicker($event, inquiryItem, '$toOpened')">
-							<span class="input-group-btn">
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
+						<input type="text" ng-model="inquiryItem.vendToDate"
+							   class="form-control" placeholder="结束日期"
+							   datepicker-popup="yyyy-MM-dd" is-open="inquiryItem.$toOpened"
+							   min-date="inquiryItem.vendFromDate" ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, inquiryItem, '$toOpened')">
+						<span class="input-group-btn">
 								<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, inquiryItem, '$toOpened')">
+										ng-click="openDatePicker($event, inquiryItem, '$toOpened')">
 									<i class="fa fa-calendar"></i>
 								</button>
 							</span>
-						</div>
-						<div>
-							<span class="text-bold text-inverse">注意：</span>
-							<div><strong>交货周期</strong>和<strong>单价</strong>为必填项;<strong>分段</strong>是指按购买数量分成几个等级，然后在不同范围内报出对应的价格，一般量越大价格越低!</div>
-						</div>
 					</div>
-				</td>
-				<td class="text-center br-l">
-					<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null" class="block">
-						<span class="text-trans warning">已报价</span>
-						<div ng-if="inquiryItem.replyable" style="padding-top: 50px;">
-							<div ng-show="!inquiryItem.$editing">
-								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">修改报价</a>
+					<div>
+						<span class="text-bold text-inverse">注意：</span>
+						<div><strong>交货周期</strong>和<strong>单价</strong>为必填项;<strong>分段</strong>是指按购买数量分成几个等级，然后在不同范围内报出对应的价格，一般量越大价格越低!</div>
+					</div>
+				</div>
+			</td>
+			<td class="text-center br-l">
+				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == null" class="block">
+					<span class="text-trans warning">已报价</span>
+					<div ng-if="inquiryItem.replyable" style="padding-top: 50px;">
+						<div ng-show="!inquiryItem.$editing">
+							<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">修改报价</a>
+						</div>
+						<div ng-show="inquiryItem.$editing">
+							<div>
+								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">取消</a>
 							</div>
-							<div ng-show="inquiryItem.$editing">
-								<div>
-									<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">取消</a>
-								</div>
-								<div>
-									<button ng-click="onReplyClick(inquiryItem, true)"
+							<div>
+								<button ng-click="onReplyClick(inquiryItem, true)"
 										ng-disabled="!isValid(inquiryItem, true)"
 										class="btn btn-link btn-xs text-inverse">
-										保存并<br>确认报价
-									</button>
-								</div>
+									保存并<br>确认报价
+								</button>
 							</div>
 						</div>
-						<div ng-if="inquiryItem.inquiry.check == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>
-					</div>
-					<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1" class="block">
-						<span class="text-trans success">报价已采纳</span>
-					</div>
-					<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0" class="block">
-						<span class="text-trans error">报价未采纳</span>
 					</div>
-					<div ng-if="inquiryItem.status == 200">
-						<div ng-if="inquiryItem.replyable">
-							<div ng-show="!inquiryItem.$editing">
-								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">报 价</a>
+					<div ng-if="inquiryItem.inquiry.check == 1" class="text-muted" style="padding-top: 50px;">客户正在<br>审批...</div>
+				</div>
+				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 1" class="block">
+					<span class="text-trans success">报价已采纳</span>
+				</div>
+				<div ng-if="inquiryItem.status == 201 && inquiryItem.agreed == 0" class="block">
+					<span class="text-trans error">报价未采纳</span>
+				</div>
+				<div ng-if="inquiryItem.status == 200">
+					<div ng-if="inquiryItem.replyable">
+						<div ng-show="!inquiryItem.$editing">
+							<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">报 价</a>
+						</div>
+						<div ng-show="inquiryItem.$editing">
+							<div>
+								<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">取消</a>
 							</div>
-							<div ng-show="inquiryItem.$editing">
-								<div>
-									<a ng-click="inquiryItem.$editing=!inquiryItem.$editing">取消</a>
-								</div>
-								<div>
-									<button ng-click="onReplyClick(inquiryItem)"
+							<div>
+								<button ng-click="onReplyClick(inquiryItem)"
 										ng-disabled="!isValid(inquiryItem)"
 										class="btn btn-link btn-xs text-default">保存</button>
-								</div>
-								<div>
-									<button ng-click="onReplyClick(inquiryItem, true)"
+							</div>
+							<div>
+								<button ng-click="onReplyClick(inquiryItem, true)"
 										ng-disabled="!isValid(inquiryItem, true)"
 										class="btn btn-link btn-xs text-inverse">
-										保存并<br>确认报价
-									</button>
-								</div>
+									保存并<br>确认报价
+								</button>
 							</div>
 						</div>
-						<div ng-if="!inquiryItem.replyable" class="block">
-							<span class="text-trans error">已过期</span>
-						</div>
 					</div>
-				</td>
-			</tr>
+					<div ng-if="!inquiryItem.replyable" class="block">
+						<span class="text-trans error">已过期</span>
+					</div>
+				</div>
+			</td>
+		</tr>
 		</tbody>
 	</table>
 </div>

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

@@ -157,13 +157,19 @@ tbody td div.text-mould {
 .dropdown-menu .pane-body ul>li{
 	
 }
-
+.block{
+	/*background: #f5f5f5;*/
+}
+.order-table{
+	background: #fff;
+}
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block"  id="public">
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
-	<div class="condition block">
+	<div class="menu condition block">
 			<div class="row">
 				<div class="col-xs-4">
 					<div class="btn-group btn-group-sm btn-group-justified">
@@ -189,7 +195,7 @@ tbody td div.text-mould {
 						</div>
 					</div>
 				</div>
-				<div class="col-xs-5">
+				<!--<div class="col-xs-5">
 					<div class="search">
 						<div class="form-group form-group-sm has-feedback">
 							<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
@@ -202,72 +208,91 @@ tbody td div.text-mould {
 					<div class="text-default f14 total">
 						共 <span ng-bind="tableParams.total()" class="text-num"></span>
 					</div>
+				</div>-->
+			</div>
+		</div>
+	<div class="height10">&nbsp;</div>
+	<div class="condition block">
+		<div class="search-bg condition block">
+			<div class="row">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+					企业{{tableParams.total()}}家
 				</div>
-				<div class="col-xs-2 toggle">
+				<div class="col-xs-6">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<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 class="fr toggle">
 					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
-				</div> 
+				</div>
 			</div>
 			<div class="more" ng-class="{'open': condition.$open}">
 				<form class="form-inline">
-				  <div class="form-group ">
-				    <label>日期：</label>
-				    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-					  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-					    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-					  </button>
-					  <ul class="dropdown-menu">
-						<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-					    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-					    <li><a ng-click="changeDateZone()">半年前</a></li>
-					  </ul>
-					</div>
-				    <div class="form-group input-group input-group-xs input-trigger">
+					<div class="form-group ">
+						<label>日期：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+							<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+							</button>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+								<li><a ng-click="changeDateZone(6)">半年内</a></li>
+								<li><a ng-click="changeDateZone()">半年前</a></li>
+							</ul>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
 							<input type="text" ng-model="condition.dateFrom"
-								class="form-control" placeholder="从"
-								datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-								ng-required="true"
-								current-text="今天" clear-text="清除" close-text="关闭"
-								datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								ng-focus="openDatePicker($event, condition, '$fromOpened')">
+								   class="form-control" placeholder="从"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 							<span class="input-group-btn">
 								<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$fromOpened')">
+										ng-click="openDatePicker($event, condition, '$fromOpened')">
 									<i class="fa fa-calendar"></i>
 								</button>
 							</span>
 						</div>
 						<div class="form-group input-group input-group-xs input-trigger">
 							<input type="text" ng-model="condition.dateTo"
-								class="form-control" placeholder="到"
-								datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-								ng-required="true"
-								current-text="今天" clear-text="清除" close-text="关闭"
-								datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-								ng-focus="openDatePicker($event, condition, '$toOpened')">
+								   class="form-control" placeholder="到"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$toOpened')">
 							<span class="input-group-btn">
 								<button type="button" class="btn btn-default"
-									ng-click="openDatePicker($event, condition, '$toOpened')">
+										ng-click="openDatePicker($event, condition, '$toOpened')">
 									<i class="fa fa-calendar"></i>
 								</button>
 							</span>
 						</div>
-				  </div>
-				  <div class="form-group">
-				    <label>采纳结果：</label>
-				    <div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
-					  <button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
-					    	{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-					  </button>
-					  <ul class="dropdown-menu">
-						<li><a ng-click="changeAgreed()">全部</a></li>
-					    <li><a ng-click="changeAgreed(1)">已采纳</a></li>
-					    <li><a ng-click="changeAgreed(0)">未采纳</a></li>
-					  </ul>
 					</div>
-				  </div>
+					<div class="form-group">
+						<label>采纳结果：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+							<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+							</button>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeAgreed()">全部</a></li>
+								<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+								<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+							</ul>
+						</div>
+					</div>
 				</form>
 			</div>
 		</div>
+	</div>
 	<table class="order-table block" ng-table="tableParams">
 		<thead>
 			<tr class="header">

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

@@ -6,7 +6,7 @@
 }
 
 .condition .more .form-group {
-	margin-bottom: 10px;
+	/*margin-bottom: 10px;*/
 }
 
 .order-table .header>th {
@@ -132,13 +132,16 @@
 .info-container .info:hover {
 	color: #CC3333;
 }
-
+.order-table{
+	background: #fff;
+}
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="condition block">
+<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
 				<div class="btn-group btn-group-sm btn-group-justified">
@@ -164,13 +167,13 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-5">
+			<!--<div class="col-xs-5">
 				<div class="search">
 					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
 						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" />
 						<div class="search-advance text-link" ng-class="{'active': searchAdvance}" dropdown-toggle>高级搜索</div>
 						<div id="searchContainer" class="dropdown-menu">
-							<!-- <div class="block">
+							&lt;!&ndash; <div class="block">
 								<form action="" class="form-horizontal">
 									<div class="form-group">
 										<label for="" class="col-xs-3 text-right control-label">关键词：</label>
@@ -200,7 +203,7 @@
 										</div>
 									</div>
 								</form>
-							</div> -->
+							</div> &ndash;&gt;
 						</div>
 						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>
 					</div>
@@ -213,112 +216,95 @@
 			</div>
 			<div class="col-xs-2 toggle">
 				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
+			</div>-->
+		</div>
+	</div>
+<div class="height10">&nbsp;</div>
+<div class="condition block">
+	<div class="search-bg condition block">
+		<div class="row">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
+				<div class="search">
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
 				<div class="form-group ">
-					<label>单据日期：</label>
-					<div class="btn-group btn-menu" dropdown
-						is-open="condition.$dateZoneOpen">
-						<button type="button" dropdown-toggle style="width: 85px;"
-							class="btn btn-default btn-xs dropdown-toggle">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
 							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 						</button>
 						<ul class="dropdown-menu">
-							<li><a ng-click="changeDateZone(-1)">不限</a></li>
 							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
 							<li><a ng-click="changeDateZone(6)">半年内</a></li>
 							<li><a ng-click="changeDateZone()">半年前</a></li>
 						</ul>
 					</div>
-					<div class="input-group input-group-xs input-trigger">
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo" current-text="今天"
-							clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()"> <span
-							class="input-group-btn">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+						<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
+									ng-click="openDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
 					</div>
-					<div class="input-group input-group-xs input-trigger">
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()"> <span
-							class="input-group-btn">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
+						<span class="input-group-btn">
 							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
+									ng-click="openDatePicker($event, condition, '$toOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
 					</div>
 				</div>
-				<!-- <div class="form-group ">
-					<label>交货日期：</label>
-					<div class="btn-group btn-menu" dropdown
-						is-open="condition.$deliveryZoneOpen">
-						<button type="button" dropdown-toggle style="width: 85px;"
-							class="btn btn-default btn-xs dropdown-toggle">
-							{{deliveryZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
 						</button>
 						<ul class="dropdown-menu">
-							<li><a ng-click="changeDeliveryZone(-1)">不限</a></li>
-							<li><a ng-click="changeDeliveryZone(1)">一个月内</a></li>
-							<li><a ng-click="changeDeliveryZone(2)">两个月内</a></li>
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
 						</ul>
 					</div>
-					<div class="input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.deliveryFrom"
-							class="form-control" placeholder="点击选择起始交货日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$deliveryFromOpened"
-							ng-required="true" max-date="condition.deliveryTo" current-text="今天"
-							clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$deliveryFromOpened')"
-							ng-change="onDateCondition()"> <span
-							class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$deliveryFromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
-					</div>
-					<div class="input-group input-group-xs input-trigger">
-						<input type="text" ng-model="condition.deliveryTo"
-							class="form-control" placeholder="点击选择截止交货日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$deliveryToOpened"
-							ng-required="true" min-date="condition.deliveryFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$deliveryToOpened')"
-							ng-change="onDateCondition()"> <span
-							class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$deliveryToOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
-					</div>
-				</div> -->
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th width="400">商品</th>
 			<th width="80">单价</th>
 			<th width="100">数量</th>
 			<th width="120">交货日期</th>

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

@@ -119,7 +119,22 @@
 .inline-hide {
 	display: none;
 }
-
+.btn-group-justified .btn{
+	border: none;
+	font-size: 14px;
+	outline：none;
+}
+.btn-group-justified .btn-info{
+	background: none;
+	color: #3a89d1;
+}
+.btn-group-justified .btn:hover{
+	background: none;
+	color: #3a89d1;
+}
+.btn-group-justified .btn:active{
+	background: none;
+}
 </style>
 <div class="block">
 	<div class="condition block">

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

@@ -1,113 +1,122 @@
 <style>
-.list {
-	border-top: solid 1px #e8e8e8;
-}
-
+	.list {
+		border-top: solid 1px #e8e8e8;
+	}
+	.order-table{
+		background: #fff;
+	}
 </style>
-<div class="loading in" ng-class="{'in': loading}">
-	<i></i>
-</div>
-<div class="condition block list">
-	<div class="row">
-		<div class="col-xs-4">
-			<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=='todo'}" ng-click="setActive('todo')">未提交</button>
+<link rel="stylesheet" href="static/css/public.css">
+<div id="public">
+	<div class="loading in" ng-class="{'in': loading}">
+		<i></i>
+	</div>
+	<div class="menu condition block list">
+		<div class="row">
+			<div class="col-xs-4">
+				<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=='todo'}" ng-click="setActive('todo')">未提交</button>
+					</div>
 				</div>
 			</div>
-		</div>
-		<div class="col-xs-5">
-			<div class="search">
-				<div class="form-group form-group-sm has-feedback">
-					<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-						class="form-control-feedback text-simple"><i
-						class="fa fa-search"></i></span>
-				</div>
 			</div>
 		</div>
-		<div class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
+	<div class="height10">&nbsp;</div>
+	<div class="condition block">
+		<div class="search-bg condition block">
+			<div class="row">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+					企业{{tableParams.total()}}家
 				</div>
-			</div>
-		<div class="col-xs-2 toggle" ng-if="false">
-			<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
-		</div>
-	</div>
-	<div class="more" ng-class="{'open': condition.$open}">
-		<form class="form-inline">
-		  <div class="form-group ">
-		    <label>日期：</label>
-		    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-			  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-			    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-			  </button>
-			  <ul class="dropdown-menu">
-				<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-			    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-			    <li><a ng-click="changeDateZone()">半年前</a></li>
-			  </ul>
-			</div>
-		    <div class="form-group input-group input-group-xs input-trigger">
-					<input type="text" ng-model="condition.dateFrom"
-						class="form-control" placeholder="从"
-						datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-						ng-required="true"
-						current-text="今天" clear-text="清除" close-text="关闭"
-						datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						ng-focus="openDatePicker($event, condition, '$fromOpened')">
-					<span class="input-group-btn">
-						<button type="button" class="btn btn-default"
-							ng-click="openDatePicker($event, condition, '$fromOpened')">
-							<i class="fa fa-calendar"></i>
-						</button>
-					</span>
+				<div class="col-xs-6">
+					<div class="search">
+						<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+							<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 class="form-group input-group input-group-xs input-trigger">
-					<input type="text" ng-model="condition.dateTo"
-						class="form-control" placeholder="到"
-						datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-						ng-required="true"
-						current-text="今天" clear-text="清除" close-text="关闭"
-						datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						ng-focus="openDatePicker($event, condition, '$toOpened')">
-					<span class="input-group-btn">
-						<button type="button" class="btn btn-default"
-							ng-click="openDatePicker($event, condition, '$toOpened')">
-							<i class="fa fa-calendar"></i>
-						</button>
-					</span>
+				<div class="fr toggle">
+					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 				</div>
-		  </div>
-		  <div class="form-group">
-		    <label>采纳结果：</label>
-		    <div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
-			  <button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
-			    	{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-			  </button>
-			  <ul class="dropdown-menu">
-				<li><a ng-click="changeAgreed()">全部</a></li>
-			    <li><a ng-click="changeAgreed(1)">已采纳</a></li>
-			    <li><a ng-click="changeAgreed(0)">未采纳</a></li>
-			  </ul>
 			</div>
-		  </div>
-		</form>
+			<div class="more" ng-class="{'open': condition.$open}">
+				<form class="form-inline">
+					<div class="form-group ">
+						<label>日期：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+							<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+							</button>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+								<li><a ng-click="changeDateZone(6)">半年内</a></li>
+								<li><a ng-click="changeDateZone()">半年前</a></li>
+							</ul>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateFrom"
+								   class="form-control" placeholder="从"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default"
+										ng-click="openDatePicker($event, condition, '$fromOpened')">
+									<i class="fa fa-calendar"></i>
+								</button>
+							</span>
+						</div>
+						<div class="form-group input-group input-group-xs input-trigger">
+							<input type="text" ng-model="condition.dateTo"
+								   class="form-control" placeholder="到"
+								   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+								   ng-required="true"
+								   current-text="今天" clear-text="清除" close-text="关闭"
+								   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+								   ng-focus="openDatePicker($event, condition, '$toOpened')">
+							<span class="input-group-btn">
+								<button type="button" class="btn btn-default"
+										ng-click="openDatePicker($event, condition, '$toOpened')">
+									<i class="fa fa-calendar"></i>
+								</button>
+							</span>
+						</div>
+					</div>
+					<div class="form-group">
+						<label>采纳结果：</label>
+						<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+							<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+								{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+							</button>
+							<ul class="dropdown-menu">
+								<li><a ng-click="changeAgreed()">全部</a></li>
+								<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+								<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+							</ul>
+						</div>
+					</div>
+				</form>
+			</div>
+		</div>
 	</div>
-</div>
-<table class="order-table block" ng-table="tableParams" >
-	<thead>
+	<table class="order-table block" ng-table="tableParams" >
+		<thead>
 		<tr class="header">
-			<th>商品</th>
+			<th width="400px">商品</th>
 			<th width="90"><span class="text-default">≥</span>分段数</th>
 			<th width="90">价格</th>
 			<th width="80">最小订购</th>
@@ -122,7 +131,7 @@
 			<td colspan="6">
 				<div>
 					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label>
+								  ng-model="selectAll">全选</label>
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
@@ -132,8 +141,8 @@
 		<tr class="sep-row">
 			<td colspan="7"></td>
 		</tr>
-	</thead>
-	<tbody ng-if="tableParams.total() == 0">
+		</thead>
+		<tbody ng-if="tableParams.total() == 0">
 		<tr>
 			<td class="text-center" colspan="7">
 				<br>
@@ -144,21 +153,21 @@
 				</div>
 			</td>
 		</tr>
-	</tbody>
-	<tbody ng-repeat="quotationItem in $data track by quotationItem.id">
+		</tbody>
+		<tbody ng-repeat="quotationItem in $data track by quotationItem.id">
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
-						ng-model="quotationItem.$selected">
+								  ng-model="quotationItem.$selected">
 					</span> <span class="text-num text-bold"
-						title="{{quotationItem.date}}"
-						ng-bind="::quotationItem.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
+								  title="{{quotationItem.date}}"
+								  ng-bind="::quotationItem.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
 						class="text-num" ng-bind="::quotationItem.code" ui-sref="sale.quotation.item({id:quotationItem.id})" target="_self"></a></span>
 				</div>
 			</td>
 			<td colspan="2"><span
-				ng-bind="::quotationItem.cust.enName"></span></td>
+					ng-bind="::quotationItem.cust.enName"></span></td>
 			<td>
 				币别：<span ng-bind="::quotationItem.currency"></span>
 			</td>
@@ -209,15 +218,15 @@
 					</div>
 					<div class="dropdown">
 						<a href="javascript:void(0);" class="dropdown-toggle text-default"
-							ng-mouseover="getHistory(quotationItem)">历史报价<i
-							class="fa fa-fw fa-angle-down"></i></a>
+						   ng-mouseover="getHistory(quotationItem)">历史报价<i
+								class="fa fa-fw fa-angle-down"></i></a>
 						<div class="dropdown-menu pane" style="width: 270px;">
 							<div class="pane-body">
 								<ul class="list-unstyled list-menu">
 									<li ng-repeat="historyItem in ::quotationItem.history">
 										<div ng-class="{'text-inverse': $index==0}">
 											<div class="row row-sm"
-												ng-repeat="historyReply in historyItem.replies">
+												 ng-repeat="historyReply in historyItem.replies">
 												<div class="col-xs-5">≥{{historyReply.lapQty}}</div>
 												<div class="col-xs-5">价格{{historyReply.price | number:6}}</div>
 											</div>
@@ -228,7 +237,7 @@
 									</li>
 								</ul>
 								<div ng-show="!quotationItem.history || quotationItem.history.length == 0"
-									class="text-center text-muted">暂无历史报价</div>
+									 class="text-center text-muted">暂无历史报价</div>
 							</div>
 						</div>
 					</div>
@@ -248,7 +257,7 @@
 			</td>
 			<td class="text-center br-l">
 				<div ng-show="!quotationItem.$editing"
-					ng-init="parseDate(quotationItem)">
+					 ng-init="parseDate(quotationItem)">
 					<div ng-show="quotationItem.endDate">
 						<span class="text-muted">从 </span><span
 							ng-bind="quotationItem.date | date:'yyyy-MM-dd'"></span> <span
@@ -272,9 +281,11 @@
 				</div>
 				<div ng-if="quotationItem.status == 100">
 					<a ui-sref="sale.quotation.item({id:quotationItem.id})">详情>></a>
-					
+
 				</div>
 			</td>
 		</tr>
-	</tbody>
-</table>
+		</tbody>
+	</table>
+</div>
+

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

@@ -103,81 +103,92 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
 <div class="condition block">
+	<div class="search-bg condition block">
 		<div class="row">
-			<div class="col-xs-9">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
-			<div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
+			<div class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+<button type="button" class="btn btn-default"
+		ng-click="openDatePicker($event, condition, '$fromOpened')">
+	<i class="fa fa-calendar"></i>
+</button>
+</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+<button type="button" class="btn btn-default"
+		ng-click="openDatePicker($event, condition, '$toOpened')">
+	<i class="fa fa-calendar"></i>
+</button>
+</span>
+					</div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
 					</div>
-			  </div>
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">

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

@@ -124,11 +124,12 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block" id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="condition block">
+<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
 				<div class="btn-group btn-group-sm btn-group-justified">
@@ -146,75 +147,90 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-5">
+		</div>
+	</div>
+<div class="height10">&nbsp;</div>
+<div class="condition block">
+	<div class="search-bg condition block">
+		<div class="row">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
+			<div class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
-			<!-- <div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
-			</div> -->
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="从"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$fromOpened')">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+				<button type="button" class="btn btn-default"
+						ng-click="openDatePicker($event, condition, '$fromOpened')">
+					<i class="fa fa-calendar"></i>
+				</button>
+			</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="到"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, condition, '$toOpened')">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+				<button type="button" class="btn btn-default"
+						ng-click="openDatePicker($event, condition, '$toOpened')">
+					<i class="fa fa-calendar"></i>
+				</button>
+			</span>
 					</div>
-			  </div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
+					</div>
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">

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

@@ -107,11 +107,12 @@
 }
 
 </style>
-<div class="block">
+<link rel="stylesheet" href="static/css/public.css">
+<div class="block"  id="public">
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="condition block">
+<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
 				<div class="btn-group btn-group-sm btn-group-justified">
@@ -130,83 +131,95 @@
 					</div>
 				</div>
 			</div>
-			<div class="col-xs-5">
+		</div>
+	</div>
+<div class="height10">&nbsp;</div>
+<div class="condition block">
+	<div class="search-bg condition block">
+		<div class="row">
+			<div id="topSearch" style="float: left">
+				<span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
+				企业{{tableParams.total()}}家
+			</div>
+			<div class="col-xs-6">
 				<div class="search">
-					<div class="form-group form-group-sm has-feedback">
-						<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
-							class="form-control-feedback text-simple"><i
-							class="fa fa-search"></i></span>
+					<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick" on-toggle="searchAdvance=open">
+						<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 class="col-xs-1">
-				<div class="text-default f14 total">
-					共 <span ng-bind="tableParams.total()" class="text-num"></span>
-				</div>
-			</div>
-			<div class="col-xs-2 toggle">
-				<a ng-click="condition.$open=!condition.$open" class="text-simple">
-					<span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span>
-					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
-				</a>
+			<div class="fr toggle">
+				<a ng-click="condition.$open=!condition.$open" class="text-simple"><span ng-bind="condition.$open ? '简化筛选条件' : '更多筛选条件'"></span><i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
 			</div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">
-			  <div class="form-group ">
-			    <label>发货日期：</label>
-			    <div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
-				  <button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
-				    	{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
-				  </button>
-				  <ul class="dropdown-menu">
-				  	<li><a ng-click="changeDateZone(-1)">不限</a></li>
-					<li><a ng-click="changeDateZone(1)">一个月内</a></li>
-				    <li><a ng-click="changeDateZone(6)">半年内</a></li>
-				    <li><a ng-click="changeDateZone()">半年前</a></li>
-				  </ul>
-				</div>
-			    <div class="form-group input-group input-group-xs input-trigger">
+				<div class="form-group ">
+					<label>日期：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$dateZoneOpen">
+						<button type="button" dropdown-toggle style="width: 85px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{dateZoneText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeDateZone(1)">一个月内</a></li>
+							<li><a ng-click="changeDateZone(6)">半年内</a></li>
+							<li><a ng-click="changeDateZone()">半年前</a></li>
+						</ul>
+					</div>
+					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateFrom"
-							class="form-control" placeholder="点击选择起始日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							ng-required="true" max-date="condition.dateTo"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="从"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$fromOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$fromOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+					<button type="button" class="btn btn-default"
+							ng-click="openDatePicker($event, condition, '$fromOpened')">
+						<i class="fa fa-calendar"></i>
+					</button>
+				</span>
 					</div>
 					<div class="form-group input-group input-group-xs input-trigger">
 						<input type="text" ng-model="condition.dateTo"
-							class="form-control" placeholder="点击选择截止日期" readonly="readonly"
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
-							current-text="今天" clear-text="清除" close-text="关闭"
-							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-click="openDatePicker($event, condition, '$toOpened')"
-							ng-change="onDateCondition()">
+							   class="form-control" placeholder="到"
+							   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+							   ng-required="true"
+							   current-text="今天" clear-text="清除" close-text="关闭"
+							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							   ng-focus="openDatePicker($event, condition, '$toOpened')">
 						<span class="input-group-btn">
-							<button type="button" class="btn btn-default"
-								ng-click="openDatePicker($event, condition, '$toOpened')">
-								<i class="fa fa-calendar"></i>
-							</button>
-						</span>
+					<button type="button" class="btn btn-default"
+							ng-click="openDatePicker($event, condition, '$toOpened')">
+						<i class="fa fa-calendar"></i>
+					</button>
+				</span>
 					</div>
-			  </div>
+				</div>
+				<div class="form-group">
+					<label>采纳结果：</label>
+					<div class="btn-group btn-menu" dropdown is-open="condition.$agreedOpen">
+						<button type="button" dropdown-toggle style="width: 70px;" class="btn btn-default btn-xs dropdown-toggle">
+							{{agreedText}}<i class="fa fa-fw fa-angle-down icon-right"></i></span>
+						</button>
+						<ul class="dropdown-menu">
+							<li><a ng-click="changeAgreed()">全部</a></li>
+							<li><a ng-click="changeAgreed(1)">已采纳</a></li>
+							<li><a ng-click="changeAgreed(0)">未采纳</a></li>
+						</ul>
+					</div>
+				</div>
 			</form>
 		</div>
 	</div>
+</div>
 <table class="order-table block" ng-table="tableParams">
 	<thead>
 		<tr class="header">
-			<th>商品</th>
-			<th width="170px">商品价格</th>
+			<th width="500">商品</th>
+			<th width="170">商品价格</th>
 			<th width="120">发货数量</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>

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

@@ -13,7 +13,6 @@
     /* 主体 */
     .purc-bid {
         line-height: 2;
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
     }
     .purc-bid .row {
@@ -33,13 +32,11 @@
 
     /* 读取显示无法修改的数据 */
     .unchanged-info {
-        font-family: "Microsoft Yahei Regular";
         color: #969595;
         overflow: hidden;
     }
     /* 二级标题栏 */
     .title-div {
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
         font-weight: 600;
         padding-left: 30px;
@@ -127,7 +124,6 @@
         width: 94px;
         height: 36px;
         font-size: 14px;
-        font-family: "Microsoft Yahei Regular";
         color: #fff;
         border-radius: 0;
     }

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

@@ -135,7 +135,7 @@
         font-weight: inherit;
     }
 </style>
-<div ng-controller="SaleTenderCtrl" style=" margin-top: 20px;">
+<div ng-controller="SaleTenderCtrl">
     <!-- 顶部导航及搜索框 -->
     <div class="top-nav">
         <div class="col-xs-8" style="font-size: 14px; height: 36px; padding-top: 10px;">