增加造价书及工料机 底栏高度调整按钮；造价书 底栏 特征及内容增加 添加规则；bootstrap更新beta2

gongliaoji.html

@@ -151,7 +151,7 @@
                           </div>
                         </div>
                         <div class="bottom-content">
-                            <ul class="nav nav-tabs" role="tablist">
+                            <ul class="nav nav-tabs d-flex" role="tablist">
                                 <li class="nav-item">
                                     <a class="nav-link active" data-toggle="tab" href="#de" role="tab">相关定额</a>
                                 </li>
@@ -161,6 +161,9 @@
                                 <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#jx" role="tab">机械单价</a>
                                 </li>
+                                <li class="nav-item ml-auto mr-4">
+                                    <a class="nav-link position-absolute text-muted" href="#" data-toggle="tooltip" data-placement="bottom" data-original-title="按住，上下拖动调整高度"><i class="fa fa-arrows-v"></i></a>
+                                </li>
                             </ul>
                             <!-- Tab panes -->
                             <div class="tab-content">

zaojiashu.html

@@ -1929,7 +1929,7 @@
                             </div>
                         </div>
                         <div class="bottom-content">
-                            <ul class="nav nav-tabs" role="tablist">
+                            <ul class="nav nav-tabs d-flex" role="tablist">
                                 <li class="nav-item">
                                     <a class="nav-link active" data-toggle="tab" href="#gl" role="tab">工料机</a>
                                 </li>
@@ -1951,6 +1951,9 @@
                                 <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#tenr" role="tab">特征及内容</a>
                                 </li>
+                                <li class="nav-item ml-auto mr-4">
+                                    <a class="nav-link text-muted position-absolute" href="#"  data-toggle="tooltip" data-placement="bottom" data-original-title="按住，上下拖动调整高度"><i class="fa fa-arrows-v"></i></a>
+                                </li>
                             </ul>
                             <!-- Tab panes -->
                             <div class="tab-content">
@@ -2307,16 +2310,66 @@
                                 </div>
                                 <div class="tab-pane" id="tenr" role="tabpanel">
                                   <div class="row">
-                                      <div class="col-6">
+                                      <div class="col-4">
                                         <div class="main-data-bottom">
                                             工作内容
                                         </div>
                                       </div>
-                                      <div class="col-6">
+                                      <div class="col-4">
                                         <div class="main-data-bottom">
                                             项目特征
                                         </div>
                                       </div>
+                                      <div class="col-4">
+                                        <div class="main-data-bottom">
+                                          <div class=" container-fluid my-2">
+                                            <div class="mb-1 row">
+                                             <label class="col-5 px-0 col-form-label text-right">添加位置：</label>
+                                             <div class="col-7">
+                                               <select class="form-control form-control-sm"><option>添加到项目特征列</option></select>
+                                             </div>
+                                            </div>
+                                            <div class="mb-1 row">
+                                             <label class="col-sm-5 px-0 col-form-label text-right">添加内容：</label>
+                                             <div class="col-sm-7">
+                                               <select class="form-control form-control-sm"><option>项目特征+工作内容</option></select>
+                                             </div>
+                                            </div>
+                                            <div class="mb-1 row">
+                                             <label class="col-5 px-0 col-form-label text-right">显示格式：</label>
+                                             <div class="col-7">
+                                               <select class="form-control form-control-sm"><option>换行分隔</option></select>
+                                             </div>
+                                            </div>
+                                            <div class="mb-1 row">
+                                             <label class="col-5 px-0 col-form-label text-right">特征生成方式：</label>
+                                             <div class="col-7">
+                                               <select class="form-control form-control-sm"><option>特征：特征值</option></select>
+                                             </div>
+                                            </div>
+                                            <div class="mb-1 row">
+                                             <label class="col-5 px-0 col-form-label text-right">子目生成方式：</label>
+                                             <div class="col-7">
+                                               <select class="form-control form-control-sm"><option>编号+子目名称</option></select>
+                                             </div>
+                                            </div>
+                                            <div class="mb-1 row">
+                                             <label class="col-5 px-0 col-form-label text-right">序号格式：</label>
+                                             <div class="col-7">
+                                               <select class="form-control form-control-sm"><option>1</option></select>
+                                             </div>
+                                            </div>
+                                            <div class="mb-1 row">
+                                             <div class="col-6">
+                                               <button class="btn btn-primary btn-sm">应用到选中清单</button>
+                                             </div>
+                                             <div class="col-6">
+                                               <button class="btn btn-primary btn-sm">应用到所有清单</button>
+                                             </div>
+                                            </div>
+                                          </div>
+                                        </div>
+                                      </div>
                                   </div>
                                 </div>
                             </div>