一键匹配移至导航切换处。

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

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

@@ -175,17 +175,20 @@
 							<button type="button" class="btn btn-default btn-line"
 									ng-class="{'btn-info':active=='nonstandard'}" ng-click="setActive('nonstandard')">非标准</button>
 						</div>
+                        <div class="btn-group btn-group-sm">
+                            <button type="button" class="btn btn-default btn-line" ng-click="matchall()">一键匹配</button>
+                        </div>
 					</div>
 				</div>
 			</div>
 		</div>
-        <div class="search-bg condition block"  style="padding: 10px 15px;">
+        <div class="search-bg condition block"  style="padding: 20px 15px 0 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="col-xs-6" style="float: right;">
                     <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="输入物料名称、编号或规格搜索" />
@@ -193,13 +196,13 @@
                         </div>
                     </div>
                 </div>
-                 <div class="edit col-xs-1">
+                <!-- <div class="edit col-xs-1">
                      <a ng-click="matchall()" class="btn btn-default btn-sm" ng-if="active == 'nonstandard'">一键匹配</a>
-                </div>
+                </div>-->
             </div>
         </div>
     </div>
-    <div class="condition block">
+    <div class="condition block" style="padding-top: 0;">
         <table class="order-table block " ng-table="tableParams">
             <thead>
             <tr class="header">

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

@@ -194,7 +194,7 @@
             <a ui-sref="sale.uploadByBatch" title="批量导入">批量导入</a>
             <a ng-click="toggle('off')">一键关闭</a>
             <a ng-click="toggle('on')">一键开启</a>
-            <a ng-click="matchall()">一键匹配</a>
+           <!-- <a ng-click="matchall()">一键匹配</a>-->
         </div>
     </div>
     <div class="condition block" style="padding: 10px 15px;">
@@ -214,11 +214,14 @@
 							<button type="button" class="btn btn-default btn-line"
 									ng-class="{'btn-info':active=='nonstandard'}" ng-click="setActive('nonstandard')">非标准</button>
 						</div>
+                        <div class="btn-group btn-group-sm">
+                            <button type="button" class="btn btn-default btn-line" ng-click="matchall()">一键匹配</button>
+                        </div>
 					</div>
 				</div>
 			</div>
 		</div>
-        <div class="search-bg condition block"  style="padding: 10px 15px;">
+        <div class="search-bg condition block"  style="padding: 20px 15px 0 15px;">
             <div class="row">
                 <div id="topSearch"  class="col-xs-6" style="float: left;width: 35%;">
                     <span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>

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

@@ -175,7 +175,7 @@
             <a ui-sref="purc.uploadProduct" title="批量导入">批量导入</a>
             <a ng-click="toggle('off')">一键关闭</a>
             <a ng-click="toggle('on')">一键开启</a>
-            <a ng-click="matchall()">一键匹配</a>
+            <!--<a ng-click="matchall()">一键匹配</a>-->
         </div>
     </div>
     <div class="condition block" style="padding: 10px 15px;">
@@ -195,11 +195,14 @@
 							<button type="button" class="btn btn-default btn-line"
 									ng-class="{'btn-info':active=='nonstandard'}" ng-click="setActive('nonstandard')">非标准</button>
 						</div>
+                        <div class="btn-group btn-group-sm">
+                            <button type="button" class="btn btn-default btn-line" ng-click="matchall()">一键匹配</button>
+                        </div>
 					</div>
 				</div>
 			</div>
 		</div>
-        <div class="search-bg condition block"  style="padding: 10px 15px;">
+        <div class="search-bg condition block"  style="padding: 20px 15px 0 15px;">
             <div class="row">
                 <div id="topSearch" class="col-xs-6" style="float: left;width: 35%;">
                     <span class="text-muted"><i class="fa fa-search fa-lg"></i> 搜索"{{tip}}",为您找到结果:</span>
@@ -223,7 +226,7 @@
             </div>
         </div>
     </div>
-    <div class="condition block">
+    <div class="condition block" style="padding-top: 0;">
         <table class="order-table block " ng-table="tableParams">
             <thead>
             <tr class="header">