增加 清单精灵

js/global.js

@@ -13,7 +13,7 @@ function autoFlashHeight(){
     $(".main-data-top").height($(window).height()-headerHeight-toolsBar-bottomContentHeight-2);
     $(".main-data").height($(window).height()-headerHeight-toolsBar);
     $(".main-data-full").height($(window).height()-headerHeight);
-    $(".main-data-side-q").height($(window).height()-headerHeight-toolsBarHeightQ-2);
+    $(".main-data-side-q").height($(window).height()-headerHeight-toolsBar-toolsBarHeightQ-302);
 
 };
 $(window).resize(autoFlashHeight);

main.html

@@ -33,11 +33,11 @@
                   <div class="col-md-8">
                     <div class="warp-p2 mt-3">
                       <table class="table table-hover table-bordered">
-                        <thead><tr><th>清单指引名称</th><th>编办</th><th>清单规则</th><th width="160">添加时间</th><th width="90">操作</th></tr></thead>
+                        <thead><tr><th>清单指引名称</th><th>编办</th><th>清单规则</th><th>类型</th><th width="160">添加时间</th><th width="90">操作</th></tr></thead>
                         <tbody>
-                          <tr><td><a href="zhiyin.html">XX工料机库</a></td><td>重庆2018</td><td>重庆清单规则-2013</td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
-                          <tr><td><a href="zhiyin.html">XX工料机库</a></td><td>重庆2018</td><td>重庆清单规则-2013</td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
-                          <tr><td><a href="zhiyin.html">XX工料机库</a></td><td>重庆2018</td><td>重庆清单规则-2013</td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
+                          <tr><td><a href="zhiyin.html">XX工料机库</a></td><td>重庆2018</td><td>重庆清单规则-2013</td><td>清单指引</td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
+                          <tr><td><a href="zhiyin.html">XX工料机库</a></td><td>重庆2018</td><td>重庆清单规则-2013</td><td>清单指引</td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
+                          <tr><td><a href="zhiyin.html">XX工料机库</a></td><td>重庆2018</td><td>重庆清单规则-2013</td><td>清单精灵</td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
                         </tbody>
                       </table>
                     </div>
@@ -70,6 +70,21 @@
                       <label>清单规则</label>
                       <select class="form-control"><option>重庆清单规则-2013</option></select>
                     </div>
+                    <div class="form-group">
+                      <label>类型</label>
+                      <div>
+                        <div class="form-check form-check-inline">
+                          <label class="form-check-label">
+                            <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1"> 清单指引
+                          </label>
+                        </div>
+                        <div class="form-check form-check-inline">
+                          <label class="form-check-label">
+                            <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2"> 清单精灵
+                          </label>
+                        </div>
+                      </div>
+                    </div>
                   </form>
                 </div>
                 <div class="modal-footer">
@@ -103,6 +118,21 @@
                       <label>清单规则</label>
                       <select class="form-control" disabled><option>重庆清单规则-2013</option></select>
                     </div>
+                    <div class="form-group">
+                      <label>类型</label>
+                      <div>
+                        <div class="form-check form-check-inline">
+                          <label class="form-check-label">
+                            <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1"> 清单指引
+                          </label>
+                        </div>
+                        <div class="form-check form-check-inline">
+                          <label class="form-check-label">
+                            <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2"> 清单精灵
+                          </label>
+                        </div>
+                      </div>
+                    </div>
                   </form>
                 </div>
                 <div class="modal-footer">

zhiyin.html

@@ -62,7 +62,7 @@
                   <div class="main-side col-lg-4 p-">
                     <div class="sidebar-tools-bar container-fluid tools-bar-height-q">
                       <div class="p-1 row">
-                        <div class="col-10 p-0">
+                        <div class="col-5 p-0">
                           <select class="form-control form-control-sm" id="exampleSelect1">
                             <option>重庆市房屋建筑与装饰工程工程量计算规则(2013)</option>
                             <option>2</option>
@@ -71,6 +71,14 @@
                             <option>5</option>
                           </select>
                         </div>
+                        <div class="col-5 p-0">
+                          <div class="input-group input-group-sm">
+                            <input type="text" class="form-control" placeholder="搜索定额">
+                            <span class="input-group-btn">
+                              <button class="btn btn-secondary" type="button"><i class="fa fa-search"></i></button>
+                            </span>
+                          </div>
+                        </div>
                         <div class="col-2 ">
                           <button class="btn btn-primary btn-sm" type="button">插入定额</button>
                         </div>
@@ -79,10 +87,23 @@
                     <div class="main-data-side-q">
                       <table class="table table-sm table-bordered m-0">
                         <thead>
-                          <tr><th></th><th>选择</th><th>编码</th><th>名称</th><th>单位</th></tr>
+                          <tr><th>名称</th></tr>
+                        </thead>
+                        <tbody>
+                          <tr><td>市政工程</td></tr>
+                          <tr><td>第一章 土石方工程</td></tr>
+                          <tr><td>一、人工土石方</td></tr>
+                        </tbody>
+                      </table>
+                    </div>
+                    <div class="sidebar-bottom container-fluid">
+                       <table class="table table-sm table-bordered m-0">
+                        <thead>
+                          <tr><th></th><th>编码</th><th>名称</th><th>单位</th><th>基价</th></tr>
                         </thead>
                         <tbody>
-                          <tr><td>1</td><td><input type="checkbox"></td><td>AA0001</td><td>人工挖土方</td><td>100m3</td></tr>
+                          <tr><td>1</td><td>DA0011</td><td>人工运土方 运距20m以内</td><td>100m3</td><td>546.7</td></tr>
+                          <tr><td>2</td><td>DA0012</td><td>人工运土方 每增加20m</td><td>100m3</td><td>162.8</td></tr>
 
                         </tbody>
                       </table>