修复错误路径

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

src/main/webapp/resources/tpl/index/sale/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,84 +200,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">
-						<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(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>