销售、采购、财务列表所有的列表加上对应单据导航及右侧统一放置操作按钮（例如：新增、导出操作）

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

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

@@ -59,10 +59,13 @@
     float: right;
 }
 .pub-com_head  .p-right a{
-    color: #3a89d1;
+    color: #5078cb;
     font-size: 14px;
     margin-right: 20px;
 }
+.pub-com_head  .p-right a img{
+    margin-right: 3px;
+}
 .pub-com_head  .p-right a:hover{
     color: #d32526;
     text-decoration: underline;

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

@@ -111,6 +111,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="sale/apBill/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" 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" style="padding: 10px 15px;">
 			<div class="row">
@@ -190,21 +196,6 @@
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="5">
-				<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/apBill/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" 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>
 	</thead>
 	<tbody ng-repeat="bill in $data">
 		<tr class="order-hd">

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

@@ -104,8 +104,15 @@
 <div class="block" id="public">
  	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
-	</div>  
-
+	</div>
+	<div class="pub-com_head">
+		<span>应收对账单</span>
+		<div class="p-right">
+			<a class="text-simple append" ui-sref="fa.apCheckList" title="新增对账单"><img src="static/img/icon/add.png">新增对账单</a>&nbsp;&nbsp;&nbsp;
+			<a href="sale/apCheck/allxls?_state={{active}}&searchFilter={{searchFilterXls}}"
+			   target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
 	<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-7">
@@ -131,13 +138,11 @@
 				</div>
 			</div>
 			<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" title="新增对账单"><big><img src="static/img/icon/add.png" style="margin-right: 3px;">新增对账单</big></a>&nbsp;&nbsp;&nbsp;
-				<a href="sale/apCheck/allxls?_state={{active}}&searchFilter={{searchFilterXls}}" 
-					target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+
 			</div>
 		</div>
 	</div>
-	<div class="height10">&nbsp;</div>
+	<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">

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

@@ -105,6 +105,11 @@
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
+	<div class="pub-com_head">
+		<span>应付对账单</span>
+		<div class="p-right">
+		</div>
+	</div>
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">

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

@@ -104,6 +104,14 @@
 	<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/accept/xls?_state={{active}}&keyword={{keywordXls.keyword}}&fromDate={{keywordXls.fromDate}}&endDate={{keywordXls.endDate}}"
+			   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" style="padding: 10px 15px;">
 			<div class="row">
@@ -183,23 +191,23 @@
 			<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 ng-disabled="true" type="checkbox"
+						&lt;!&ndash; 	<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> <!-- 分页 -->
+							class="btn btn-default btn-xs">批量处理</a> &ndash;&gt;
+					</div> &lt;!&ndash; 分页 &ndash;&gt;
 				</td>
-				<td class="text-center"><a
-					href="make/accept/xls?_state={{active}}&keyword={{keywordXls.keyword}}&fromDate={{keywordXls.fromDate}}&endDate={{keywordXls.endDate}}"
+				<td class="text-center">
+					<a href="make/accept/xls?_state={{active}}&keyword={{keywordXls.keyword}}&fromDate={{keywordXls.fromDate}}&endDate={{keywordXls.endDate}}"
 					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="accept in $data">
 			<tr class="order-hd">

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

@@ -113,6 +113,13 @@
 <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/orders/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="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
@@ -137,7 +144,7 @@
 			</div>
 		</div>
 	</div>
-<div class="height10">&nbsp;</div>
+<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -217,22 +224,6 @@
 		<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="checkboxes.checked" ng-click="checkAll()">全选</label> <a ng-if="active=='todo'" href="javascript:void(0)"
-						class="btn btn-default btn-xs" ng-click="replyByBatch()">&nbsp;批量回复&nbsp;</a> -->
-				</div> <!-- 分页 -->
-			</td>
-			<td class="text-center">
-				<a href="make/orders/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>
 	</thead>
 	<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dbclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">

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

@@ -109,6 +109,13 @@
 	<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/return/xls?_state={{active}}&keyword={{keywordXls.keyword}}&fromDate={{keywordXls.fromDate}}&endDate={{keywordXls.endDate}}" 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" style="padding: 10px 15px;">
 			<div class="row">
@@ -188,23 +195,6 @@
 			<tr class="sep-row">
 				<td colspan="6"></td>
 			</tr>
-			<tr class="toolbar toolbar-top">
-				<td colspan="5">
-					<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="make/return/xls?_state={{active}}&keyword={{keywordXls.keyword}}&fromDate={{keywordXls.fromDate}}&endDate={{keywordXls.endDate}}" 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>
 		</thead>
 		<tbody ng-repeat="returns in $data">
 			<tr class="order-hd">

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

@@ -71,8 +71,8 @@
     }
 
     .div-menu {
-        border-bottom: 16px solid #f5f5f5;
-        height: 56px;
+        border-bottom: 1px solid #e8e8e8;
+      /*  height: 56px;*/
     }
 
     .div-menu .btn-select:hover {
@@ -177,6 +177,13 @@
         <div class="loading in" ng-class="{'in': loading}">
         <i></i>
         </div>
+        <div class="pub-com_head">
+            <span>代采订单</span>
+            <div class="p-right">
+                <a ui-sref="purc.newdeputy" type="button" title="新增代采订单"><img src="static/img/icon/add.png">新增</a>
+                <a ui-sref="purc.deputylog" type="button" title="错误日志"><i class="fa fa-file-text"></i> 错误日志</a>
+            </div>
+        </div>
         <!-- 选项菜单和新增按钮 -->
         <div class="block">
             <div class="row div-menu">
@@ -212,14 +219,7 @@
                     </div>-->
                 </div>
                 <div class="deputy-btn col-xs-3">
-                    <a ui-sref="purc.newdeputy" type="button" title="新增代采订单">
-                        <img src="static/img/icon/add.png">
-                        <span class="f14" style="color: #5078cb;line-height: 25px;">代采订单</span>
-                    </a>
-                    <a ui-sref="purc.deputylog" type="button" title="新增代采订单">
-                        <i class="fa fa-file-text"></i>
-                        <span class="f14" style="color: #5078cb;line-height: 25px;">错误日志</span>
-                    </a>
+
                 </div>
             </div>
             <div class="condition block">

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

@@ -282,15 +282,25 @@ margin-left: 55px;
 }
 .inquiry-cz a img{
 	margin-right: 3px;
-}
+}#public .menu .btn-group{
+	height: inherit !important;
+ }
 </style>
 <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="pub-com_head">
+		<span>采购询价</span>
+		<div class="p-right">
+			<a ui-sref="purc.inquiry_unapply" title="待提交"><img src="static/img/icon/wait.png"/>待发布</a>
+			<a ui-sref="purc.inquiry_new" title="新增询价单"><img src="static/img/icon/add.png"/>新增</a>
+			<a href="purc/inquiry/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
 	<div class="menu condition block">
-		<div class="row" style="border-bottom: 16px solid #f5f5f5; height: 56px;">
+		<div class="row">
 			<div class="col-xs-9">
 				<div class="btn-group btn-group-sm btn-group-justified">
 					<div class="btn-group btn-group-sm">
@@ -320,8 +330,7 @@ margin-left: 55px;
 				</div>
 			</div>
 			<div class="inquiry-cz col-xs-2">
-				<a ui-sref="purc.inquiry_unapply" title="待提交"><img src="static/img/icon/wait.png"/>待发布</a>
-				<a ui-sref="purc.inquiry_new" title="新增询价单"><img src="static/img/icon/add.png"/>询价单</a>
+
 			</div>
 		</div>
 	</div>
@@ -405,16 +414,6 @@ margin-left: 55px;
 		<tr class="sep-row">
 			<td colspan="7"></td>
 		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="6">
-			</td>
-			<td class="text-center">
-				<a href="purc/inquiry/xls?_state={{active}}&searchFilter={{searchFilterXls}}" 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>

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

@@ -147,11 +147,21 @@
 .buy-cart a img{
 	margin-right: 3px;
 }
+#public .menu .btn-group{
+	height: inherit !important;
+}
 </style>
 <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="pub-com_head">
+	<span>采购订单</span>
+	<div class="p-right">
+		<a ui-sref="purc.newOrder" title="新增采购单"><img src="static/img/icon/add.png"/>新增</a>
+		<a ui-sref="purc.cart" title="购物车"><img src="static/img/icon/cart.png"/>购物车</a>
+		<a href="sale/orders/purc/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+	</div>
 </div>
 <div class="menu condition block">
 		<div class="row">
@@ -180,12 +190,11 @@
 				</div>
 			</div>
 			<div class="buy-cart col-xs-2">
-				<a ui-sref="purc.newOrder" title="新增采购单"><img src="static/img/icon/add.png"/>采购单</a>
-				<a ui-sref="purc.cart" title="购物车"><img src="static/img/icon/cart.png"/>购物车</a>
+
 			</div>
 		</div>
 	</div>
-<div class="height10">&nbsp;</div>
+<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -263,22 +272,6 @@
 			<th width="180">单据状态</th>
 			<th width="120">供应商</th>
 		</tr>
-		<tr class="sep-row">
-			<td colspan="5"></td>
-		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="6">
-				<div>
-				</div> <!-- 分页 -->
-			</td>
-			<td class="text-center">
-				<a href="sale/orders/purc/xls?_state={{active}}&searchFilter={{searchFilterXls}}" 
-					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>
 	</thead>
 	<tbody ng-if="tableParams.total() == 0">
 		<tr>

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

@@ -71,8 +71,8 @@
     }
 
     .div-menu {
-        border-bottom: 16px solid #f5f5f5;
-        height: 56px;
+        border-bottom: 1px solid #e8e8e8;
+       /* height: 56px;*/
     }
 
     .div-menu .btn-select:hover {
@@ -148,6 +148,14 @@
         <div class="loading in" ng-class="{'in': loading}">
             <i></i>
         </div>
+        <div class="pub-com_head">
+            <span>采购招标</span>
+            <div class="p-right">
+                <a ui-sref="purc.tender" type="button" title="新增招标单" class="btn btn-tender">
+                    <img src="static/img/icon/add.png">新增
+                </a>
+            </div>
+        </div>
         <!-- 选项菜单和新增按钮 -->
         <div class="block">
             <div class="row div-menu">
@@ -183,10 +191,7 @@
                     <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 pull-right" style="width: 125px;">
-                    <a ui-sref="purc.tender" type="button" title="新增招标单" class="btn btn-tender">
-                        <img src="static/img/icon/add.png">
-                        <span class="f14" style="color: #5078cb; line-height: 25px;">招标单</span>
-                    </a>
+
                 </div>
             </div>
             <div class="condition block">

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

@@ -109,6 +109,12 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
+	<div class="pub-com_head">
+		<span>MRB单</span>
+		<div class="p-right">
+			<a href="sale/MRB/xls?searchFilter={{searchFilterXls}}" 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" style="padding: 10px 15px;">
 			<div class="row">
@@ -188,21 +194,6 @@
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="5">
-				<!--<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 clas="text-center">
-				<a href="sale/MRB/xls?searchFilter={{searchFilterXls}}" 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>
 	</thead>
 	<tbody ng-repeat="MRB in $data">
 		<tr class="order-hd">

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

@@ -108,6 +108,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="sale/badIn/xls?searchFilter={{searchFilterXls}}" 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" style="padding: 10px 15px;">
             <div class="row">
@@ -187,21 +193,6 @@
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="5">
-				<!--<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/badIn/xls?searchFilter={{searchFilterXls}}" 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>
 	</thead>
 	<tbody ng-repeat="badIn in $data">
 		<tr class="order-hd">

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

@@ -108,6 +108,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="sale/badOut/xls?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" style="padding: 10px 15px;">
             <div class="row">
@@ -187,21 +193,6 @@
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="5">
-				<!--<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/badOut/xls?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>
 	</thead>
 	<tbody ng-repeat="badOut in $data">
 		<tr class="order-hd">

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

@@ -109,6 +109,13 @@
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
+	<div class="pub-com_head">
+		<span>客户采购验收单</span>
+		<div class="p-right">
+			<a href="sale/accept/xls?searchFilter={{searchFilterXls}}" 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" style="padding: 10px 15px;">
 			<div class="row">
@@ -188,22 +195,6 @@
 			<tr class="sep-row">
 				<td colspan="6"></td>
 			</tr>
-			<tr class="toolbar toolbar-top">
-				<td colspan="5">
-					<!--<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/accept/xls?searchFilter={{searchFilterXls}}"
-					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>
 		</thead>
 		<tbody ng-repeat="accept in $data">
 			<tr class="order-hd">

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

@@ -136,6 +136,14 @@
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
+	<div class="pub-com_head">
+		<span>客户认定单</span>
+		<div class="p-right">
+			<a href="sale/sample/approval/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}"
+			target="_self" class="text-simple" title="导出Excel表格"><i
+				class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
 	<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
@@ -231,26 +239,6 @@
 				<th width="140">送样信息</th>
 				<th width="70">操作</th>
 			</tr>
-			<tr class="sep-row">
-				<td colspan="5"></td>
-			</tr>
-			<tr class="toolbar toolbar-top">
-				<td colspan="4">
-					<!--<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/sample/approval/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}"
-					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="5"></td>
-			</tr>
 		</thead>
 		<tbody ng-repeat="approval in $data">
 			<tr class="order-hd">

src/main/webapp/resources/tpl/index/sale/change.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="sale/changes/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+	</div>
+</div>
 <div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
@@ -135,7 +141,7 @@
 			</div> -->
 		</div>
 	</div>
-<div class="height10">&nbsp;</div>
+<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -215,21 +221,6 @@
 		<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="sale/changes/xls?_state={{active}}&searchFilter={{searchFilterXls}}" 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>
 	</thead>
 	<tbody ng-repeat="change in $data track by change.id">
 		<tr class="order-hd">

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

@@ -131,6 +131,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="sale/inquiry/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
 	<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
@@ -185,7 +191,7 @@
 			</div>-->
 		</div>
 	</div>
-	<div class="height10">&nbsp;</div>
+	<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -266,21 +272,6 @@
 		<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}}&searchFilter={{searchFilterXls}}" 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>

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

@@ -171,6 +171,12 @@ tbody td div.text-mould {
 	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
+	<div class="pub-com_head">
+		<span>客户模具询价</span>
+		<div class="p-right">
+			<a href="sale/mould/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
 	<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
@@ -213,7 +219,7 @@ tbody td div.text-mould {
 			</div>-->
 		</div>
 	</div>
-	<div class="height10">&nbsp;</div>
+	<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -294,21 +300,6 @@ tbody td div.text-mould {
 			<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/mould/xls?_state={{active}}&searchFilter={{searchFilterXls}}" 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>

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

@@ -174,6 +174,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="sale/notice/xls?_state={{active}}&keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+	</div>
+</div>
 <div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
@@ -202,7 +208,7 @@
 			</div>
 		</div>
 	</div>
-<div class="height10">&nbsp;</div>
+<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -296,7 +302,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/notice/xls?_state={{active}}&keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+
 			</td>
 		</tr>
 		<tr class="sep-row">

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

@@ -150,6 +150,13 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
+	<div class="pub-com_head">
+		<span>客户采购订单</span>
+		<div class="p-right">
+			<a href="sale/orders/xls?_state={{active}}&searchFilter={{searchFilterXls}}"
+			   target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
 <div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
@@ -232,7 +239,7 @@
 			</div>-->
 		</div>
 	</div>
-<div class="height10">&nbsp;</div>
+<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -334,8 +341,7 @@
 				</div> <!-- 分页 -->
 			</td>
 			<td class="text-center">
-				<a href="sale/orders/xls?_state={{active}}&searchFilter={{searchFilterXls}}" 
-					target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+
 			</td>
 		</tr>
 		<tr class="sep-row">

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

@@ -168,6 +168,10 @@
 				<!--<i class="fa fa-list"></i> 列表-->
 			<!--</a>-->
 		<span class="time-per fr"  ng-if="enteryStatus"><em>录入人：{{::item.quotation.user.userName}}</em><time>日期：{{::item.quotation.date | date:'yyyy-MM-dd HH:mm:ss'}}</time></span>
+		<div class="p-right" ng-if="!enteryStatus">
+			<a ui-sref="sale.quotation.new" title="新增主动报价单"><img src="static/img/icon/add.png"/>新增</a>
+			<a href="sale/quotation/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
 		</div>
 	</div>
 	<div ui-view style="background: #fff;"></div>

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

@@ -51,12 +51,12 @@
 					</div>
 				</div>
 			</div>
-			<div class="inquiry-cz col-xs-2">
+			<!--<div class="inquiry-cz col-xs-2">
 				<a ui-sref="sale.quotation.new"><img src="static/img/icon/add.png"/>主动报价单</a>
-			</div>
+			</div>-->
 		</div>
 	</div>
-<div class="height10">&nbsp;</div>
+<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -137,20 +137,6 @@
 		<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>
-				</div> &lt;!&ndash; 分页 &ndash;&gt;-->
-			</td>
-			<td class="text-center">
-				<a href="sale/quotation/xls?_state={{active}}&searchFilter={{searchFilterXls}}" 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>

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

@@ -109,6 +109,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="sale/return/xls?searchFilter={{searchFilterXls}}" 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" style="padding: 10px 15px;">
 			<div class="row">
@@ -188,23 +194,6 @@
 			<tr class="sep-row">
 				<td colspan="6"></td>
 			</tr>
-			<tr class="toolbar toolbar-top">
-				<td colspan="5">
-					<!--<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/return/xls?searchFilter={{searchFilterXls}}" 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>
 		</thead>
 		<tbody ng-repeat="returns in $data">
 			<tr class="order-hd">

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

@@ -129,6 +129,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="sale/sample/xls?_state={{active}}&searchFilter={{searchFilterXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+	</div>
+</div>
 <div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
@@ -153,7 +159,7 @@
 			</div>
 		</div>
 	</div>
-<div class="height10">&nbsp;</div>
+<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -233,21 +239,6 @@
 		<tr class="sep-row">
 			<td colspan="5"></td>
 		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="5">
-				<!--<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/sample/xls?_state={{active}}&searchFilter={{searchFilterXls}}" 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="5"></td>
-		</tr>
 	</thead>
 	<tbody ng-repeat="sample in $data">
 		<tr class="order-hd">

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

@@ -133,6 +133,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="sale/notice/sends/xls?_state={{active}}&keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+		</div>
+	</div>
 	<div class="menu condition block">
 		<div class="row">
 			<div class="col-xs-4">
@@ -153,7 +159,7 @@
 			</div>
 		</div>
 	</div>
-	<div class="height10">&nbsp;</div>
+	<!--<div class="height10">&nbsp;</div>-->
 	<div class="condition block">
 		<div class="search-bg condition block" style="padding: 10px 15px;">
 			<div class="row">
@@ -232,22 +238,6 @@
 		<tr class="sep-row">
 			<td colspan="5"></td>
 		</tr>
-		<tr class="toolbar toolbar-top">
-			<td colspan="4">
-				<!--<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/notice/sends/xls?_state={{active}}&keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" 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="5"></td>
-		</tr>
 		</thead>
 		<tbody ng-repeat="send in $data">
 		<tr class="order-hd">

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

@@ -179,17 +179,82 @@
     .main-content{
         border: #e8e8e8 1px solid;
     }
+    .div-menu{
+        border-bottom: 0;
+    }
+    #public .menu{
+        border-bottom: 0 !important;
+    }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div id="public">
     <!-- 顶部导航及搜索框 -->
+    <div class="pub-com_head">
+        <span>客户招标</span>
+        <div class="p-right">
+        </div>
+    </div>
+    <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"
+                                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 class="btn-group btn-group-sm">
+                        <button type="button" class="btn btn-default btn-line"
+                                ng-class="{'btn-info':active=='agreed'}" ng-click="setActive('agreed')">已采纳</button>
+                    </div>
+                    <div class="btn-group btn-group-sm">
+                        <button type="button" class="btn btn-default btn-line"
+                                ng-class="{'btn-info':active=='refused'}" ng-click="setActive('refused')">未采纳</button>
+                    </div>
+                    <!--<div class="btn-group btn-group-sm">
+                        <button type="button" class="btn btn-default btn-line"
+                                ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已过期</button>
+                    </div>
+                    <div class="btn-group btn-group-sm">
+                        <button type="button" class="btn btn-default btn-line"
+                                ng-class="{'btn-info':active=='invalid'}" ng-click="setActive('invalid')">已作废</button>
+                    </div>-->
+                    <div class="btn-group btn-group-sm">
+                        <button type="button" class="btn btn-default btn-line"
+                                ng-class="{'btn-info':active=='invalid'}" ng-click="setActive('invalid')">已失效</button>
+                    </div>
+                </div>
+            </div>
+            <!--<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>
+            </div>-->
+        </div>
+    </div>
     <div class="block main-content">
         <!--<div class="loading in" ng-class="{'in': loading}">-->
         <!--<i></i>-->
         <!--</div>-->
         <!-- 选项菜单和新增按钮 -->
         <div class="block">
-            <div class="row div-menu">
+            <!--<div class="row div-menu">
                 <div class="col-xs-8"
                      style="width: 766px; height: 40px; font-size: 16px; font-weight: 600; font-family: 'Microsoft Yahei Regular'; color: #000000;">
                     <div class="btn-group menu-status">
@@ -219,20 +284,20 @@
                             </button>
                         </div>
                     </div>
-                    <!-- <div class="col-xs-1 pull-right" style="padding-top: 5px;">
+                    &lt;!&ndash; <div class="col-xs-1 pull-right" style="padding-top: 5px;">
                          共<span class="text-num">{{tableParams.total()}}</span>
-                     </div>-->
+                     </div>&ndash;&gt;
                 </div>
-                <!--<div class="col-xs-2 toggle">
+                &lt;!&ndash;<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 class="col-xs-2 pull-right" style="padding-left: 0;padding-right: 15px; border-left: 16px solid #f5f5f5;">
+                </div>&ndash;&gt;
+                &lt;!&ndash;<div class="col-xs-2 pull-right" style="padding-left: 0;padding-right: 15px; border-left: 16px solid #f5f5f5;">
                     <a ui-sref="purc.tender" type="button" title="新增投标单" class="btn btn-tender">
                         <img src="static/img/tender/zhaobiao.png">
                         <span class="f16" style="color: #327EBE;">投标单</span>
                     </a>
-                </div>-->
-            </div>
+                </div>&ndash;&gt;
+            </div>-->
             <div class="condition block">
                 <div class="search-bg condition block" style="padding: 10px 15px;">
                     <div class="row">