产品导入改—产品库，新增询价（招标）和订单采购搜索结果改——标题（我的材料库/供应商产品库），搜索结果放后面显示。

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

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

@@ -3290,4 +3290,22 @@ input::-webkit-clear{display:none;}
 }
 input[required]:invalid, input:focus:invalid, textarea[required]:invalid, textarea:focus:invalid{
 	-moz-box-shadow: none;
+}
+.search-title{
+	font-size: 14px;
+	line-height: 90px;
+	font-weight: bold;
+	margin:0 30px 0 5px;
+}
+.result-title{
+	font-size: 14px;
+	line-height: 90px;
+	text-align: left;
+}
+.result-title em{
+	color: #5078cb;
+	font-size: 14px;
+}
+.pro-search .search {
+	margin-top: 26px !important;
 }

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

@@ -136,7 +136,7 @@
         <i></i>
     </div>
     <div class="pub-com_head">
-        <span>产品导入</span>
+        <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>

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

@@ -172,13 +172,23 @@
         </form>
        <!-- 搜索结果列表-->
         <div class="pro-add-data02" style="min-height: 500px;" ng-if="order.cust.uu">
-			<div class="pro-search">
+			<!--<div class="pro-search">
                  <div class="search-result fl"><img src="static/img/purc/search01.png"/>搜索“{{tip}}”，为您找到<em>{{total}}</em>个结果</div>
                  <div class="search fr">
                      <input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword" autofocus ng-search="onSearch(keyword)"/>
                      <a class="seek" ng-click="onSearch(keyword)">搜索</a>
                  </div>
-             </div>
+             </div>-->
+            <div class="pro-search">
+                <div class="col-xs-2 search-title fl">供应商产品库</div>
+                <div class="col-xs-8 fr">
+                    <div class="col-xs-9 search" style="margin-right: 0;">
+                        <input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword" ng-search="onSearch(keyword)"/>
+                        <a class="seek" ng-click="onSearch(keyword)" style="right: inherit;">搜索</a>
+                    </div>
+                    <div class="col-xs-3 result-title fr">搜索到<em>{{total}}</em>条</div>
+                </div>
+            </div>
 			<table class="block table table-default table-striped" ng-table="tableParams">
 				<thead>
 					<tr class="header">

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

@@ -1133,13 +1133,16 @@ select.disabled {
         </div>
     </form>
     <div class="pro-add-data02" style="min-height: 500px;" >
-		<div class="pro-search">
-                <div class="search-result fl"><img src="static/img/purc/search01.png"/>搜索“{{tip}}”，为您找到<em>{{total}}</em>个结果</div>
-                <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="pro-search">
+            <div class="col-xs-2 search-title fl">我的材料库</div>
+            <div class="col-xs-8 fr">
+                <div class="col-xs-9 search" style="margin-right: 0;">
+                    <input type="text" placeholder="输入物料关键字查询" ng-model="keyword" ng-search="onSearch(keyword)"/>
+                    <a class="seek" ng-click="onSearch(keyword)" style="right: inherit;">搜索</a>
                 </div>
+                <div class="col-xs-3 result-title fr">搜索到<em>{{total}}</em>条</div>
             </div>
+        </div>
 		<table class="block table table-default table-striped" ng-table="tableParams">
 			<thead>
 				<tr class="header">

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

@@ -1115,13 +1115,23 @@ select.disabled {
         </div>
     </form>
     <div class="pro-add-data02" style="min-height: 500px;" >
-		<div class="pro-search">
+		<!--<div class="pro-search">
                 <div class="search-result fl"><img src="static/img/purc/search01.png"/>搜索“{{tip}}”，为您找到<em>{{total}}</em>个结果</div>
                 <div class="search fr">
                     <input type="text" placeholder="输入物料关键字查询" ng-model="keyword" ng-search="onSearch(keyword)"/>
                     <a class="seek" ng-click="onSearch(keyword)">搜索</a>
                 </div>
+            </div>-->
+        <div class="pro-search">
+            <div class="col-xs-2 search-title fl">我的材料库</div>
+            <div class="col-xs-8 fr">
+                <div class="col-xs-9 search" style="margin-right: 0;">
+                    <input type="text" placeholder="输入物料关键字查询" ng-model="keyword" ng-search="onSearch(keyword)"/>
+                    <a class="seek" ng-click="onSearch(keyword)" style="right: inherit;">搜索</a>
+                </div>
+                <div class="col-xs-3 result-title fr">搜索到<em>{{total}}</em>条</div>
             </div>
+        </div>
 		<table class="block table table-default table-striped" ng-table="tableParams">
 			<thead>
 				<tr class="header">

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

@@ -990,10 +990,13 @@ input[type="radio"], input[type="checkbox"] {
     </form>
     <div class="pro-add-data02" style="min-height: 500px;" >
         <div class="pro-search">
-            <div class="search-result fl"><img src="static/img/purc/search01.png"/>搜索“{{tip}}”，为您找到<em>{{total}}</em>个结果</div>
-            <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="col-xs-2 search-title fl">我的材料库</div>
+            <div class="col-xs-8 fr">
+                <div class="col-xs-9 search" style="margin-right: 0;">
+                    <input type="text" placeholder="输入物料关键字查询" ng-model="keyword" ng-search="onSearch(keyword)"/>
+                    <a class="seek" ng-click="onSearch(keyword)" style="right: inherit;">搜索</a>
+                </div>
+                <div class="col-xs-3 result-title fr">搜索到<em>{{total}}</em>条</div>
             </div>
         </div>
         <table class="block table table-default table-striped" ng-table="tableParams">