清单规则 与 定额库 新增搜索窗体；CSS修改包含侧栏部分高度问题 和 底部窗体

css/main.css

@@ -1,7 +1,8 @@
 /*building SAAS 0.1*/
 /*bootstrap 初始化*/
 body {
-    font-size: 0.9rem
+    font-size: 0.9rem;
+    overflow: hidden;
 }
 .dropdown-menu {
     font-size: 0.9rem
@@ -80,7 +81,7 @@ body {
 .main-side {
     border-top: 1px solid #ccc;
     border-left: 1px solid #ccc;
-    overflow-y: auto;
+    overflow-y: hidden;
 }
 .sidebar-bottom,.sidebar-bottom .col-lg-6,.sidebar-bottom .col-lg-12 {
   height:200px
@@ -214,6 +215,9 @@ body {
     height: 200px;
     overflow: auto;
 }
+.bottom-content .tab-content .ovf-hidden{
+    overflow: hidden;
+}
 .form-signin {
     max-width: 500px;
     margin: 150px auto;
@@ -268,3 +272,17 @@ body {
   height: 400px;
   overflow-y: auto;
 }
+.sidebar-tools-bar {
+  background:#fff
+}
+.side-search-box{
+  position: absolute;
+  background:#fff;
+  top:33px;
+  left:0;
+  border-bottom:1px solid #ddd
+}
+.side-search-box .result-box{
+  height:300px;
+  overflow: auto;
+}

zaojiashu.html

@@ -1941,7 +1941,7 @@
                             <!-- Tab panes -->
                             <div class="tab-content">
                                 <div class="tab-pane active" id="gl" role="tabpanel">
-                                    <div class="main-data-bottom">
+                                    <div class="main-data-bottom ovf-hidden">
                                         <table class="table table-sm table-bordered m-0">
                                             <thead>
                                                 <th>编号</th>
@@ -2296,8 +2296,14 @@
                                       <option>5</option>
                                     </select>
                                     <div class="input-group col-6">
-                                      <div class="input-group-addon form-control-sm"><i class="fa fa-search" aria-hidden="true"></i></div>
-                                      <input type="text" class="form-control form-control-sm" placeholder="搜索清单">
+                                      <input type="text" class="form-control form-control-sm" placeholder="搜索清单" value="1-1-2">
+                                      <span class="input-group-btn">
+                                        <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
+                                      </span>
+                                    </div>
+                                    <!--搜索结果窗体-->
+                                    <div class="side-search-box col-12 p-2">
+                                      <div><span class="pr-3">搜索结果：5</span><a class="btn btn-secondary btn-sm" href="#">查找下一条</a><a title="关闭搜索" class="btn btn-link btn-sm pull-right" href="#"><i class="fa fa-remove" aria-hidden="true"></i></a></div>
                                     </div>
                                   </div>
                                 </div>
@@ -2305,12 +2311,15 @@
                                   12
                                 </div>
                                 <div class="sidebar-bottom container-fluid">
-                                  <div class="row">
+                                  <div class="row d-none">
                                     <div class="col-lg-6"> 6 L </div>
                                     <div class="col-lg-6"> 6 R </div>
                                   </div>
-                                  <div class="row hide">
-                                    <div class="col-lg-12"> 12 only </div>
+                                  <div class="row">
+                                    <div class="col-lg-12">
+                                      <textarea class="form-control" id="exampleTextarea" rows="8" readonly="">
+                                      asdsadsd</textarea>
+                                    </div>
                                   </div>
                                 </div>
                             </div>
@@ -2326,8 +2335,23 @@
                                     <option>5</option>
                                   </select>
                                   <div class="input-group col-6">
-                                    <div class="input-group-addon form-control-sm"><i class="fa fa-search" aria-hidden="true"></i></div>
-                                    <input type="text" class="form-control form-control-sm" placeholder="搜索定额">
+                                    <input type="text" class="form-control form-control-sm" placeholder="搜索定额" value="石">
+                                    <span class="input-group-btn">
+                                      <button class="btn btn-secondary btn-sm" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
+                                    </span>
+                                  </div>
+                                  <!--搜索结果窗体-->
+                                  <div class="side-search-box col-12 p-2">
+                                    <div><span class="pr-3">搜索结果：5</span><a title="关闭搜索" class="btn btn-link btn-sm pull-right" href="#"><i class="fa fa-remove" aria-hidden="true"></i></a></div>
+                                    <div class="result-box w-100">
+                                      <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>