定额库搜索 本定额 及 全部定额 筛选

js/global.js

@@ -14,7 +14,7 @@ function autoFlashHeight(){
     $(".main-data-full").height($(window).height()-headerHeight-toolsbarHeight-1);
     $(".main-data-full-fl").height($(window).height()-headerHeight-toolsbarHeight-37);
     $(".main-data-not").height($(window).height()-headerHeight-1);
-    $(".main-data-side-search").height($(window).height()-headerHeight-toolsbarHeight-64);
+    $(".main-data-side-search").height($(window).height()-headerHeight-toolsbarHeight-81);
     $(".side-content").height($(window).height()-headerHeight );
     $(".poj-list").height($(window).height()-headerHeight-toolsbarHeight);
     $(".form-view").height($(window).height()-headerHeight-ftoolsbarHeight);

zaojiashu.html

@@ -266,7 +266,6 @@
                 <!-- <a href="" class="btn btn-light btn-sm"><i class="fa fa-lock" aria-hidden="true"></i> 解锁清单</a> -->
                 <a href="" class="btn btn-light btn-sm"><i class="fa fa-eye" aria-hidden="true"></i> 显示特征内容</a>
                 <!-- <a href="" class="btn btn-light btn-sm" data-toggle="tooltip" data-placement="bottom" title="隐藏特征内容"><i class="fa fa-eye-slash" aria-hidden="true"></i> 隐藏特征内容</a> -->
-
               </div>
               <div class="side-tabs">
                   <ul class="nav nav-tabs" role="tablist">
@@ -848,21 +847,6 @@
                                       <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
                                     </div>
                                   </div>
-                                  <!--搜索结果窗体-->
-                                  <!-- <div class="side-search-box col-12 p-0">
-                                    <div class="d-flex justify-content-between">
-                                      <span>搜索结果：5</span><a title="关闭搜索" class="btn btn-link btn-sm" href="#"><i class="fa fa-remove" aria-hidden="true"></i></a>
-                                    </div>
-                                    <div class="w-100 main-data-side-search">
-                                      <table class="table">
-                                        <thead><tr><th></th><th>编号</th><th>名称</th><th>单位</th><th>基价</th></tr></thead>
-                                        <tbody>
-                                          <tr><td>1</td><td>1-1-8-2</td><td>机动翻斗车运第1个100m石方</td><td>1000m3</td><td>6249</td></tr>
-                                          <tr><td>1</td><td>1-1-8-2</td><td>机动翻斗车运第1个100m石方</td><td>1000m3</td><td>6249</td></tr>
-                                        </tbody>
-                                      </table>
-                                    </div>
-                                  </div> -->
                                 </div>
                               </div>
                                 <div class="main-data-side-q">
@@ -1031,30 +1015,48 @@
                             <div class="tab-pane" id="de" role="tabpanel">
                               <div class="sidebar-tools-bar container-fluid tools-bar-height-d">
                                 <div class="p-1 row">
-                                    <div class="col-5 p-0">
+                                    <div class="col-6 p-0">
                                       <select class="form-control form-control-sm"><option>重庆市市政工程计价定额(2008)</option></select>
                                     </div>
-                                    <div class="col-7 px-1">
-                                      <div class="input-group input-group-sm" id="stdBillsGuidanceSearch">
-                                        <div class="input-group-prepend">
-                                            <a href="#" class="btn btn-outline-secondary"><span data-toggle="tooltip" data-placement="bottom" title="" data-original-title="切换搜索范围">本定额</span></a>
-                                        </div>
-                                        <input type="text" class="form-control form-control-sm" placeholder="搜索定额">
-                                        <span class="input-group-append">
+                                    <div class="input-group col-6">
+                                      <input type="text" class="form-control form-control-sm" placeholder="搜索定额" value="1-1-2">
+                                        <div class="input-group-append">
                                             <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
-                                        </span>
-                                      </div>
+                                        </div>
                                     </div>
                                 </div>
                               </div>
-                              <div class="main-data-side-d">
+                              <!--搜索结果窗体-->
+                              <div class="side-search-box col-12 p-0">
+                                <div class="d-flex justify-content-between">
+                                  <div class="my-1">
+                                    <span class="mx-3">搜索结果：5</span>
+                                    <button type="button" class="btn btn-sm btn-secondary">本定额</button>
+                                    <button type="button" class="btn btn-sm btn-light">全部定额</button>
+                                  </div>
+                                  <a title="关闭搜索" class="btn btn-link btn-sm" href="#"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                                </div>
+                                <div class="w-100 main-data-side-search">
+                                  <table class="table table-sm">
+                                    <thead><tr><th></th><th>编号</th><th>名称</th><th>单位</th><th>基价</th></tr></thead>
+                                    <tbody>
+                                      <tr><td>1</td><td>1-1-8-2</td><td>机动翻斗车运第1个100m石方</td><td>1000m3</td><td>6249</td></tr>
+                                      <tr><td>1</td><td>1-1-8-2</td><td>机动翻斗车运第1个100m石方</td><td>1000m3</td><td>6249</td></tr>
+                                      <tr><td>1</td><td>1-1-8-2</td><td>机动翻斗车运第1个100m石方</td><td>1000m3</td><td>6249</td></tr>
+                                      <tr><td>1</td><td>1-1-8-2</td><td>机动翻斗车运第1个100m石方</td><td>1000m3</td><td>6249</td></tr>
+                                      <tr><td>1</td><td>1-1-8-2</td><td>机动翻斗车运第1个100m石方</td><td>1000m3</td><td>6249</td></tr>
+                                    </tbody>
+                                  </table>
+                                </div>
+                              </div>
+                              <!-- <div class="main-data-side-d">
                                 12
                               </div>
                               <div class="sidebar-bottom container-fluid">
                                 <div class="row">
                                   <div class="col-lg-12"> 12 only </div>
                                 </div>
-                              </div>
+                              </div> -->
                             </div>
                         </div>
                     </div>