页面细节修改

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

src/main/webapp/resources/css/add.css

@@ -538,14 +538,14 @@ input:focus, select:focus {
 	border: none;
 	position: relative;
 	font-size: 14px;
-	top: -6px;
+	/*top: -6px;*/
 	color: #666;
 }
 
 .pro-add-data dl dd div.fr input:focus {
-	box-shadow: none;
-	border: none !important;
-	border-bottom: #3578ba 1px solid !important;
+	/*box-shadow: none;
+	border: none !important;*/
+	border: #3578ba 1px solid !important;
 }
 
 .com_title01 {
@@ -1407,7 +1407,7 @@ option {
 }
 
 .oder-change .purc li div span {
-	width: 255px;
+	width: 275px;
 	float: left;
 	display: inline-block;
 	height: 40px;
@@ -2246,4 +2246,18 @@ scale
 }
 .pro-add-data02 table tbody tr:hover td{
 	background: #f5f5f5;
-}
+}
+
+/*蒋下划线改成框*/
+.pro-add-data dl dd div.fr input{
+	border: #bfbfbf 1px solid !important;
+	padding-left: 10px;
+}
+.bor01{
+	width: 187px;
+	height: 34px;
+	border: #bfbfbf 1px solid !important;
+	font-size: 14px;
+	padding-left: 10px;
+	line-height: 34px;
+}

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

@@ -2624,4 +2624,8 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 
 }
 
-input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
+input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}
+
+.bule{
+	color: #3a89d1 !important;
+}

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

@@ -18,8 +18,8 @@
 #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 .search-bg .col-xs-6{/*margin-left: 90px;*/}
+#public .search-bg .input-group-addon{width: 70px;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;}
@@ -34,4 +34,52 @@
 #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;}
+#public .toolbar-top{font-size: 14px;}
+.com-text-1{
+    font-size: 14px;
+    margin-left: 20px;
+}
+
+.pub-com_head {
+    width: 100%;
+    height: 40px;
+    line-height: 44px;
+    background: url("../img/approvalFlow/comm_bg01.png") no-repeat left;
+    background-color: #f5f5f5;
+    background-size: 100% 100%;
+}
+
+.pub-com_head span {
+    margin-left: 30px;
+    color: #000;
+    font-size: 14px;
+}
+.pub-com_head  .p-right{
+    float: right;
+}
+.pub-com_head  .p-right a{
+    color: #3a89d1;
+    font-size: 14px;
+    margin-right: 20px;
+}
+.pub-com_head  .p-right a:hover{
+    color: #d32526;
+    text-decoration: underline;
+}
+#public .condition .toggle{
+    font-size: 14px;
+}
+#public .search-bg .col-xs-6{
+    width: 40%;
+    padding: 0;
+}
+#public .search-bg #topSearch{
+    width: 47%;
+}
+#public .toolbar-top .text-center .text-simple{
+    color: #3a89d1;
+    font-size: 14px;
+}
+#public #bg-white,#public #bg-white .search-bg{
+    background: #f5f5f5;
+}

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

@@ -130,10 +130,93 @@
     <div class="loading in" ng-class="{'in': loading}">
         <i></i>
     </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 class="pub-com_head">
+        <span>产品资料</span>
+        <div class="p-right">
+            <a href="product/baseInfo/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格">导出</a>
+            <a ui-sref="sale.newProdInfo">新增</a>
+            <a ui-sref="sale.uploadByBatch" title="批量导入">批量导入</a>
+        </div>
+    </div>
+    <div class="condition block" style="padding: 10px 15px;">
+        <div class="search-bg condition block"  style="padding: 10px 15px;">
+            <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">
+                            <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 class="condition block">
@@ -149,21 +232,12 @@
                 <th width="70">单位</th>
                 <th width ="100">操作</th>
             </tr>
-            <tr class="sep-row">
+            <!--<tr class="sep-row">
                 <td colspan="5"></td>
             </tr>
-            <tr class="toolbar toolbar-top">
-                <td colspan="5">
-                </td>
-                <td colspan="3" class="text-center">
-                    <a href="product/baseInfo/xls?keyword={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
-                    <a ui-sref="sale.newProdInfo">新增 <i class="fa fa-lg fa-plus-square"></i></a>
-                    <a ui-sref="sale.uploadByBatch" title="批量导入">批量导入 <i class="fa fa-file-excel-o"></i></a>
-                </td>
-            </tr>
             <tr class="sep-row">
                 <td colspan="5"></td>
-            </tr>
+            </tr>-->
             </thead>
             <tbody ng-repeat="product in $data">
             <tr class="order-hd">

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

@@ -3,7 +3,6 @@
 	height: 38px;
 	text-align: center;
 	background: #f5f5f5;
-	border-top: 1px solid #e8e8e8;
 	border-bottom: 1px solid #e8e8e8;
 }
 
@@ -98,6 +97,12 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
+<div class="pub-com_head">
+	<span>委外变更单</span>
+	<div class="p-right">
+		<a href="make/changes/xls?_state={{active}}&searchFilter={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+	</div>
+</div>
 <div class="condition block">
 	<div class="search-bg condition block">
 		<div class="row">
@@ -185,28 +190,16 @@
 			<th>商品</th>
 			<th width="100">单价</th>
 			<th>数量</th>
-			<th width="120">计划加工日期</th>
-			<th width="140">备注</th>
+			<th width="130">计划加工日期</th>
+			<th width="130">备注</th>
 			<th width="80">操作</th>
 		</tr>
-		<tr class="sep-row">
+		<!--<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="5">
-				<div>
-					<!-- <label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
-						class="btn btn-default btn-xs" title="不支持批量回复">批量回复</a> -->
-				</div> <!-- 分页 -->
-			</td>
-			<td class="text-center">
-				<a href="make/changes/xls?_state={{active}}&searchFilter={{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="6"></td>
-		</tr>
+		</tr>-->
 	</thead>
 	<tbody ng-repeat="change in $data track by change.id">
 		<tr class="order-hd">

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

@@ -98,6 +98,12 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
+<div class="pub-com_head">
+	<span>委外单</span>
+	<div class="p-right">
+		<a href="make/outorders/xls?_state={{active}}&searchFilter={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+	</div>
+</div>
 <div class="condition block">
 	<div class="search-bg condition block">
 		<div class="row">
@@ -192,17 +198,17 @@
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
-		<tr class="toolbar toolbar-top">
+		<!--<tr class="toolbar toolbar-top">
 			<td colspan="5">
 				<div>
-					<!-- <label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label>  -->
-				</div> <!-- 分页 -->
+					&lt;!&ndash; <label><input type="checkbox" class="selector select_all"
+						ng-model="selectAll">全选</label>  &ndash;&gt;
+				</div> &lt;!&ndash; 分页 &ndash;&gt;
 			</td>
 			<td class="text-center">
 				<a href="make/outorders/xls?_state={{active}}&searchFilter={{keywordXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 			</td>
-		</tr>
+		</tr>-->
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>

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

@@ -1,4 +1,4 @@
-<div class="block">
+<!--<div class="block">
 	<div class="state-wrap" ng-controller="TodoCtrl">
 		<ul class="list-unstyled list-inline">
 			<li class="first"><a ui-sref="make.index"><span>所有订单</span></a></li>
@@ -12,7 +12,7 @@
 					class="tm-h"></em></a></li>
 		</ul>
 	</div>
-</div>
+</div>-->
 <div class="block">
 	<div ui-view></div>
 </div>

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

@@ -8,10 +8,22 @@
 	<meta name="Description" content=""/>
 	<link rel="stylesheet" href="static/css/add.css "/>
 </head>
+<style>
+    #pub .purc li div span .select02{
+        background: none;
+        -webkit-appearance: inherit;
+        appearance: inherit;
+        -o-appearance: inherit;
+        -moz-appearance: inherit;
+        -ms-appearance: inherit;
+        border: #bfbfbf 1px solid !important;
+        width: 187px;
+    }
+</style>
 <body>
-<div class="wrap">
+<div class="wrap" id="pub">
 	<div class="content">
-		<div class="com_title">服务>采购模块>采购单<font>>新增采购单</font></div>
+		<!--<div class="com_title">服务>采购模块>采购单<font>>新增采购单</font></div>-->
 		<div class="com_head"><span>新增采购单</span></div>
 		<!--B2B商务采购变更-添加-->
         <form class="oder-change clearfix" name="orderForm" id="orderForm">
@@ -29,7 +41,7 @@
                 <li>
                     <div class="fl">
                         <em>供应商：</em>
-                        <span><input type="text" ng-model="order.cust.enName" placeholder="点击选择供应商" class="editable" readonly="readonly" style="cursor: pointer;" ng-click="dbfindCust()" ng-required="true"></span>
+                        <span><input type="text" ng-model="order.cust.enName" placeholder="点击选择供应商" class="bor01" readonly="readonly" style="cursor: pointer;" ng-click="dbfindCust()" ng-required="true"></span>
                     </div>
                     <div class="fr">
                         <em>供应商联系人：</em>
@@ -39,7 +51,7 @@
 								ng-options="(contact.venduser + '' + contact.tel) for contact in contacts">
 								<option value="">请选择供应商联系人</option>
 							</select>
-							<a class="add-address" ng-if="id!=null" ng-click="addContact(venduu)">+联系人</a>
+							<a class="add-address" ng-if="id!=null" ng-click="addContact(venduu)">+增加联系人</a>
                         </span>
                     </div>
                 </li>
@@ -47,7 +59,7 @@
                     <div class="fl">
                         <em>付款方式：</em>
                         <span>
-                        	 <input  ng-model="order.payments" list="paymentmethod" class="select02 wid152" >
+                        	 <input  ng-model="order.payments" list="paymentmethod" class="select02 wid152" placeholder="选择付款方式"/>
                              <datalist id="paymentmethod">
                              	<option value="月结30天">月结30天</option>
                                 <option value="月结60天">月结60天</option>
@@ -81,7 +93,7 @@
                 <li class="beizhu">
                     <div class="fl">
                         <em>备注：</em>
-                        <span><input type="text" ng-model="order.remark" class="editable" placeholder="请填写备注" style="cursor: pointer;" ng-required="true"></span>
+                        <span><input type="text" ng-model="order.remark" class="bor01" placeholder="请填写备注" style="cursor: pointer; width: 568px;" ng-required="true"/></span>
                     </div>
                 </li>
             </ul>

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

@@ -148,19 +148,9 @@
         font-weight: inherit;
     }
 </style>
-<div>
+<link rel="stylesheet" href="static/css/public.css">
+<div id="public">
     <!-- 顶部导航及搜索框 -->
-    <div class="top-nav">
-        <div class="col-xs-8" style="font-size: 14px; height: 36px; padding-top: 10px;">
-            <span>服务>采购模块></span><span style="color: #327EBE;">代采订单</span>
-        </div>
-        <div class="input-group search-group col-xs-4">
-            <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入订单号、公司名、姓名查询" />
-            <span class="input-group-btn">
-            <button id="search_btn" class="btn btn-selected x-rss-btn x-background-whiteblue" ng-click="onSearch()">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
-        </span>
-        </div>
-    </div>
     <div class="block main-content">
         <div class="loading in" ng-class="{'in': loading}">
         <i></i>
@@ -179,9 +169,9 @@
                                     ng-class="{'btn-selected':active=='todo'}" ng-click="setActive('todo')">待审核</button>
                         </div>
                     </div>
-                    <div class="col-xs-1 pull-right" style="padding-top: 5px;">
+                   <!-- <div class="col-xs-1 pull-right" style="padding-top: 5px;">
             		            共<span class="text-num">{{total}}</span>
-                    </div>
+                    </div>-->
                 </div>
                 <div class="col-xs-2 pull-right" style="padding-left: 0;padding-right: 15px; border-left: 16px solid #f5f5f5;">
                     <a ui-sref="purc.newdeputy" type="button" title="新增代采订单" class="btn btn-tender">
@@ -190,6 +180,87 @@
                     </a>
                 </div>
             </div>
+            <div class="condition block" style="padding: 10px 15px;">
+                <div class="search-bg condition block"  style="padding: 10px 15px;">
+                    <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">
+                                    <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="tender-table block" ng-table="tableParams">
             <thead>

src/main/webapp/resources/tpl/index/purc/modal/purc_order_vendor.html

@@ -1,20 +1,25 @@
-<style>
-.headerline .content {
-	width: 200px;
-	font-size: 14px;
-}
-.modal-body {
-	min-height: 350px;
-}
-.modal {
- 	top: 70px;
-}
-
-@media screen and (max-width: 1366px) {
-	.modal {
- 		top: -20px;
-}
-}
+<style>
+.headerline .content {
+	width: 200px;
+	font-size: 14px;
+}
+.modal-body {
+	min-height: 350px;
+}
+.modal {
+ 	top: 70px;
+}
+
+@media screen and (max-width: 1366px) {
+	.modal {
+ 		top: -20px;
+}
+}
+.form-horizontal .form-control{
+	border: #3578ba 1px solid;
+	height: 36px;
+	line-height: 36px;
+}
 </style>
 <div class="modal-body">
 	<div class="headerline">
@@ -44,18 +49,18 @@
 				<td class="text-center" ng-bind="::vendor.vendorEnterprise.uu"></td>
 				<td class="text-center" ng-bind="::vendor.vendorEnterprise.enName"></td>
 				<td class="text-center" ng-bind="::vendor.vendorEnterprise.enAddress"></td>
-				<td class="text-center" ng-if="prod && vendor.vendorEnterprise.uu!=venduu"><a title="选择" href="javascript:void(0)" ng-click="check(vendor)" style="text-decoration: none;">选择</a></td>
-				<td class="text-center" ng-if="vendor.vendorEnterprise.uu==venduu"><a style="text-decoration: none;">已选择</a></td>
+				<td class="text-center" ng-if="prod && vendor.vendorEnterprise.uu!=venduu"><a title="选择" href="javascript:void(0)" ng-click="check(vendor)" style="text-decoration: none;">选择</a></td>
+				<td class="text-center" ng-if="vendor.vendorEnterprise.uu==venduu"><a style="text-decoration: none;">已选择</a></td>
 				<td class="text-center" ng-if="!prod && vendor.vendorEnterprise.uu!=venduu"><a title="选择" href="javascript:void(0)" ng-click="checkVendor(vendor)" style="text-decoration: none;">选择</a></td>
 			</tr>
 		</tbody>
 	</table>
 </div>
-<div class="modal-footer">
-	<div class="pull-left" ng-if="ensure && prod">
-		<span style="color: red; font-size: 14px;">重新选择供应商将会清掉已经选择的产品信息，请确认是否执行？</span>
-		<br>
-	</div>
+<div class="modal-footer">
+	<div class="pull-left" ng-if="ensure && prod">
+		<span style="color: red; font-size: 14px;">重新选择供应商将会清掉已经选择的产品信息，请确认是否执行？</span>
+		<br>
+	</div>
 	<button class="btn btn-success btn-sm" ng-if="ensure && prod" ng-click="checkVendor(vendorInfo)">确定</button>
 	<button class="btn btn-danger btn-sm" ng-click="cancel()" type="button">取消</button>
 </div>

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

@@ -20,7 +20,6 @@
     /* 主体 */
     .purc-tender {
         line-height: 2;
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
     }
     .purc-tender .row {
@@ -39,7 +38,6 @@
     }
     /* 二级标题栏 */
     .title-div {
-        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
         font-weight: 600;
         padding-left: 30px;
@@ -55,13 +53,21 @@
     }
     /* 输入框 */
     .tender-input {
-        border: none;
-        border-bottom: 1px solid #323232;
-        text-align: center;
+        /*border: #bfbfbf 1px solid !important;
+        padding-left: 10px;
+        height: 34px;
+        line-height: 34px;
+        width: 160px;*/
+    }
+    .tender-input01{
+        border: #bfbfbf 1px solid !important;
+        padding-left: 10px;
+        height: 34px;
+        line-height: 34px;
+        width: 160px;
     }
     .tender-input:focus{
-        outline:none;
-        border-bottom: 1px solid #5078cb;
+        border: #3578ba 1px solid !important;
     }
 
     /* 收货地址 */
@@ -98,15 +104,17 @@
 
     select.select-menu {
         /*Chrome和Firefox里面的边框是不一样的，所以复写了一下*/
-        border: solid 1px #5078cb;
-
+        border: solid 1px #bfbfbf;
+        height: 34px;
+        line-height: 34px;
+        width: 160px;
         /*很关键：将默认的select选择框样式清除*/
-        appearance:none;
+       /* appearance:none;
         -moz-appearance:none;
-        -webkit-appearance:none;
+        -webkit-appearance:none;*/
 
         /*在选择框的最右侧中间显示小箭头图片*/
-        background: url("resources/img/tender/select.png") no-repeat scroll right center transparent;
+        /*background: url("resources/img/tender/select.png") no-repeat scroll right center transparent;*/
 
 
         /*为下拉小箭头留出一点位置，避免被文字覆盖*/
@@ -238,7 +246,6 @@
         width: 94px;
         height: 36px;
         font-size: 14px;
-        font-family: "Microsoft Yahei Regular";
         color: #fff;
         border-radius: 0;
     }
@@ -289,7 +296,7 @@
     /*招标单*/
     .tender-list02 dl{width: 100%;margin:0 auto;}
     .tender-list02 dl dt{width: 100%;margin:0 auto;height: 40px;}
-    .tender-list02 dl dt span{height: 50px;line-height: 50px;display: inline-block;color: #999;}
+    .tender-list02 dl dt span{height: 50px;line-height: 50px;display: inline-block;color: #323232;}
     .tender-list02 dl dd{width: 100%;margin:0 auto;height: 50px;border-bottom: #ccc 1px dotted;overflow: hidden; position: relative;}
     .tender-list02 dl dd:hover{border: #d32526 1px solid;}
     .tender-list02 dl dd:hover span a{ display: inline-block;}
@@ -376,21 +383,21 @@
             </div>
             <div class="tender-content ng-scope" ng-controller="PurcNewTenderCtrl">
                 <div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-                    <span>基本信息</span>&nbsp;
+                    <span class="f14">基本信息</span>&nbsp;
                     <span style="color: rgb(211,37,38);">*</span>
                 </div>
                 <div class="row base-info">
                     <div class = "col-xs-4">
                         <div class="tender-desc">招标标题：</div>
-                        <input class="tender-input" type="text" name="title" ng-model="tender.title" required/>
+                        <input class="tender-input01" type="text" name="title" ng-model="tender.title" required/>
                     </div>
                     <div class = "col-xs-4">
                         <div class="tender-desc">联系人：</div>
-                        <input class="tender-input" type="text" name="user" ng-model="tender.user" required/>
+                        <input class="tender-input01" type="text" name="user" ng-model="tender.user" required/>
                     </div>
                     <div class = "col-xs-4">
                         <div class="tender-desc">联系电话：</div>
-                        <input class="tender-input" type="text" name="userTel" ng-model="tender.userTel" required/>
+                        <input class="tender-input01" type="text" name="userTel" ng-model="tender.userTel" required/>
                     </div>
                     <div class = "col-xs-4">
                         <div class="tender-desc">交易币别：</div>
@@ -411,7 +418,7 @@
                     <div class="col-xs-12">
                         <div class="tender-desc">收货地址：</div>
                         <span>
-                             <select class="select fl" style="width: 70%; height: 30px;" ng-model="tender.shipAddress"
+                             <select class="select fl" style="width: 70%; height: 34px; line-height: 34px;" ng-model="tender.shipAddress"
                                      ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
 								<option value="">请选择收货地址</option>
 							</select>
@@ -471,10 +478,10 @@
                             <!-- href="file/{{attach.id}}" -->
                             <div class="attach-file" ng-repeat="attach in attaches">{{attach.name}}&nbsp;&nbsp;<a ng-click="removeAttach(attach.id, $index)" title="删除"><i class="fa fa-trash-o"></i></a></div>
                         </div>
-                        <div style="margin-left: 100px; color: #969595; font-size: 12px; font-family: 'Microsoft Yahei Regular';">
+                        <div style="margin-left: 100px; color: #969595; font-size: 12px; ">
                             提示：选择附件大小不超过5MB，可上传JPG,PNG,EXCEL,WORD,PDF
                         </div>
-                        <!--<div style="margin-left: 100px; color: #969595; font-size: 12px; font-family: 'Microsoft Yahei Regular';">
+                        <!--<div style="margin-left: 100px; color: #969595; font-size: 12px; ">
                             如果需要上传多个文件，请尝试同时选取多个文件
                         </div>-->
                     </div>
@@ -541,11 +548,11 @@
                         <div class="col-xs-2 control-label" style="width: 100px;">供应商{{$index + 1}}</div>
                         <div for="uu{{$index + 1}}" class="col-xs-1" style="width: 20px;">UU</div>
                         <div class="col-xs-2">
-                            <input class="tender-input" ng-model="en.uu" type="number" id="uu{{$index + 1}}" readonly ng-required="tender.ifOpen == 0">
+                            <input class="tender-input01" ng-model="en.uu" type="number" id="uu{{$index + 1}}" readonly ng-required="tender.ifOpen == 0">
                         </div>
                         <div for="enName{{$index + 1}}" class="col-xs-1" style="width: 60px; margin-left: 20px; margin-right: -20px;">名称</div>
                         <div class="col-xs-3">
-                            <input ng-model="en.enName" type="text" style="width: 100%;" class="tender-input" readonly id="enName{{$index + 1}}"
+                            <input ng-model="en.enName" type="text" style="width: 100%;" class="tender-input01" readonly id="enName{{$index + 1}}"
                                    ng-required="tender.ifOpen == 0">
                         </div>
                         <div class="col-xs-1">

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

@@ -135,20 +135,9 @@
         font-weight: inherit;
     }
 </style>
-<div ng-controller="PurcTenderCtrl">
+<link rel="stylesheet" href="static/css/public.css">
+<div ng-controller="PurcTenderCtrl" id="public">
     <!-- 顶部导航及搜索框 -->
-    <div class="top-nav">
-        <div class="col-xs-8" style="font-size: 14px; height: 36px; padding-top: 10px;">
-            <span>服务>采购模块></span><span style="color: #327EBE;">招标</span>
-        </div>
-        <div class="input-group search-group col-xs-4">
-            <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword"
-                   ng-search="onSearch()" placeholder="输入招标信息"/>
-            <span class="input-group-btn">
-            <button id="search_btn" class="btn btn-selected x-rss-btn x-background-whiteblue" ng-click="onSearch()">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
-        </span>
-        </div>
-    </div>
     <div class="block main-content">
         <div class="loading in" ng-class="{'in': loading}">
             <i></i>
@@ -180,9 +169,9 @@
                             </button>
                         </div>
                     </div>
-                    <div class="col-xs-1 pull-right" style="padding-top: 5px;">
+                  <!--  <div class="col-xs-1 pull-right" style="padding-top: 5px;">
                         共<span class="text-num">{{tableParams.total()}}</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>
@@ -195,6 +184,87 @@
                     </a>
                 </div>
             </div>
+            <div class="condition block" style="padding: 10px 15px;">
+                <div class="search-bg condition block"  style="padding: 10px 15px;">
+                    <div class="row">
+                        <div id="topSearch" style="float: left">
+                            <span class="text-muted f16"><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="输入企业名称、简称或申请人搜索"  style="width: 100%"/>
+                                    <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">
+                                    <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 class="more" ng-class="{'open': condition.$open}">
                 <form class="form-inline">
                     <div class="form-group ">

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

@@ -74,14 +74,97 @@
 	color: #d32526;
 }
 </style>
-<div class="wrap" id="customer-tab">
-	<div class="content">
-		<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>
+<link rel="stylesheet" href="static/css/public.css">
+<div class="pub-com_head">
+	<span>供应商资料</span>
+	<div class="p-right">
+	</div>
+</div>
+<div id="public">
+	<div class="condition block" style="padding: 10px 15px;">
+		<div class="search-bg condition block"  style="padding: 10px 15px;">
+			<div class="row">
+				<div id="topSearch" style="float: left">
+					<span class="text-muted f16"><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="输入企业名称、简称或申请人搜索"  style="width: 100%"/>
+							<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">
+							<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>
+<div class="wrap" id="customer-tab">
+	<div class="content">
 		<!--供应商列表-->
 		<table class="table  table-hover"
 			ng-table="customerParams">

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

@@ -52,7 +52,7 @@
 	<div class="pane-header">
 		客户资料 （共{{::totalCount}}个）
 		<div class="pull-right">
-			<a href="vendor/customer/xls" target="_self" class="text-simple"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			<a href="vendor/customer/xls" target="_self" class="text-simple bule"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 		</div>
 	</div>
 	<div class="pane-body">

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

@@ -135,20 +135,9 @@
         font-weight: inherit;
     }
 </style>
-<div ng-controller="SaleTenderCtrl">
+<link rel="stylesheet" href="static/css/public.css">
+<div ng-controller="SaleTenderCtrl" id="public">
     <!-- 顶部导航及搜索框 -->
-    <div class="top-nav">
-        <div class="col-xs-8" style="font-size: 14px; height: 36px; padding-top: 10px;">
-            <span>服务>销售模块></span><span style="color: #327EBE;">投标</span>
-        </div>
-        <div class="input-group search-group col-xs-4">
-            <input id="search_input" type="search" class="form-control input-sm" ng-model="keyword"
-                   ng-search="onSearch()" placeholder="输入投标信息"/>
-            <span class="input-group-btn">
-            <button id="search_btn" class="btn btn-selected x-rss-btn x-background-whiteblue" ng-click="onSearch()">&nbsp;&nbsp;搜索&nbsp;&nbsp;</button>
-        </span>
-        </div>
-    </div>
     <div class="block main-content">
         <!-- 设计页面是暂时隐藏 -->
         <!--<div class="loading in" ng-class="{'in': loading}">-->
@@ -181,9 +170,9 @@
                             </button>
                         </div>
                     </div>
-                    <div class="col-xs-1 pull-right" style="padding-top: 5px;">
+                   <!-- <div class="col-xs-1 pull-right" style="padding-top: 5px;">
                         共<span class="text-num">{{tableParams.total()}}</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>
@@ -195,6 +184,87 @@
                     </a>
                 </div>-->
             </div>
+            <div class="condition block" style="padding: 10px 15px;">
+                <div class="search-bg condition block"  style="padding: 10px 15px;">
+                    <div class="row">
+                        <div id="topSearch" style="float: left">
+                            <span class="text-muted f16"><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="输入企业名称、简称或申请人搜索"  style="width: 100%"/>
+                                    <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">
+                                    <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 class="more" ng-class="{'open': condition.$open}">
                 <form class="form-inline">
                     <div class="form-group ">