调整工具栏调整；造价书列设置移至项目属性

tiaojia.html

@@ -94,15 +94,20 @@
             <div class="toolsbar px-1">
               <div class="btn-toolbar py-1">
                 <div class="input-group input-group-sm mr-2" style="width:220px">
+                  <select class="form-control form-control-sm">
+                    <option>根据调整系数计算报价</option>
+                  </select>
+                </div>
+                <div class="input-group input-group-sm mr-2" style="width:220px">
                   <div class="input-group-prepend">
                     <span class="input-group-text" id="inputGroup-sizing-sm">工料机单价调整系数</span>
                   </div>
                   <input type="number" step="0.1" class="form-control" placeholder="请输入系数" value="1">
                 </div>
                 <div class="btn-group mr-2">
-                  <button type="button" class="btn btn-outline-primary btn-sm">反调消耗</button>
-                  <button type="button" class="btn btn-outline-primary btn-sm">反调单价</button>
-                  <button type="button" class="btn btn-outline-primary btn-sm">正向调价</button>
+                  <button type="button" class="btn btn-outline-primary btn-sm">调整人材机消耗</button>
+                  <button type="button" class="btn btn-outline-primary btn-sm">调整子目工程量</button>
+                  <button type="button" class="btn btn-outline-primary btn-sm">调价计算</button>
                 </div>
                 <button type="button" class="btn btn-outline-danger btn-sm">清空调价</button>
               </div>
@@ -114,7 +119,7 @@
                         <table class="table table-sm table-bordered m-0">
                           <thead>
                             <tr>
-                              <th rowspan="2"></th><th rowspan="2">项目编码</th><th rowspan="2">项目名称</th><th rowspan="2">计量单位</th><th rowspan="2">工程量</th><th rowspan="2">不调价</th><th colspan="2">初始报价</th><th colspan="2">反向目标</th><th colspan="2">调整后报价</th><th colspan="5">消耗量调整系数</th>
+                              <th rowspan="2"></th><th rowspan="2">项目编码</th><th rowspan="2">项目名称</th><th rowspan="2">计量单位</th><th rowspan="2">工程量</th><th rowspan="2">不调价</th><th colspan="2">初始报价</th><th colspan="2">反向目标</th><th colspan="2">调整后报价</th><th colspan="5">消耗量调整系数</th><th rowspan="2">子目工程量调整系数</th>
                             </tr>
                             <tr><th>综合单价</th><th>综合合价</th><th>综合单价</th><th>综合合价</th><th>综合单价</th><th>综合合价</th><th>人工</th><th>材料</th><th>机械</th><th>主材</th><th>设备</th></tr>
                           </thead>

zaojiashu.html

@@ -242,9 +242,6 @@
                 <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="解锁清单"><i class="fa fa-unlock-alt" aria-hidden="true"></i> 解锁清单</a>
 
               </div>
-              <div class="tools-btn">
-                <a href="javacript:void(0);" data-toggle="modal" data-target="#column" class="btn btn-sm"><i class="fa fa-table" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title="列设置"></i></a>
-              </div>
               <div class="side-tabs">
                   <ul class="nav nav-tabs" role="tablist">
                     <li class="nav-item">
@@ -1187,10 +1184,34 @@
                               <div class="form-check">
                                 <label class="form-check-label">
                                   <input class="form-check-input" value="option1" checked="" type="checkbox">
+                                  定额子目自动调整行高
+                                </label>
+                              </div>
+                              <div class="form-check">
+                                <label class="form-check-label">
+                                  <input class="form-check-input" value="option1" checked="" type="checkbox">
                                   定额下显示主材、设备
                                 </label>
                               </div>
                             </fieldset>
+                            <div style="height:300px;overflow:hidden">
+                              <table class="table table-bordered">
+                                <tr><th></th><th>列名</th><th>显示</th></tr>
+                                <tr><td>1</td><th>序号</th><td></td></tr>
+                                <tr><td>2</td><th>项目编码</th><td></td></tr>
+                                <tr><td>3</td><th>类别</th><td></td></tr>
+                                <tr><td>4</td><th>项目名称</th><td></td></tr>
+                                <tr><td>5</td><th>计量单位</th><td></td></tr>
+                                <tr><td>6</td><th>项目项目特征</th><td></td></tr>
+                                <tr><td>7</td><th>工作内容</th><td></td></tr>
+                                <tr><td>8</td><th>工程专业</th><td><input type="checkbox" checked></td></tr>
+                                <tr><td>9</td><th>取费专业</th><td><input type="checkbox" checked></td></tr>
+                                <tr><td>10</td><th>工程量计算规则</th><td><input  type="checkbox" checked></td></tr>
+                                <tr><td>11</td><th>工程量</th><td><input type="checkbox" checked></td></tr>
+                                <tr><td>12</td><th>单价</th><td><input  type="checkbox" checked></td></tr>
+                                <tr><td>13</td><th>合价</th><td><input  type="checkbox" checked></td></tr>
+                              </table>
+                            </div>
                           </div>
                         </div>
                       </div>
@@ -1244,40 +1265,6 @@
             </div>
         </div>
     </div>
-    <!--弹出列设置-->
-    <div class="modal fade" id="column" data-backdrop="static">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title"><i class="fa fa-table"></i> 列设置</h5>
-                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">&times;</span>
-                  </button>
-                </div>
-                <div class="modal-body modal-auto-height">
-                  <table class="table table-bordered">
-                    <tr><th></th><th>列名</th><th>显示</th></tr>
-                    <tr><td>1</td><th>序号</th><td></td></tr>
-                    <tr><td>2</td><th>项目编码</th><td></td></tr>
-                    <tr><td>3</td><th>类别</th><td></td></tr>
-                    <tr><td>4</td><th>项目名称</th><td></td></tr>
-                    <tr><td>5</td><th>计量单位</th><td></td></tr>
-                    <tr><td>6</td><th>项目项目特征</th><td></td></tr>
-                    <tr><td>7</td><th>工作内容</th><td></td></tr>
-                    <tr><td>8</td><th>工程专业</th><td><input type="checkbox" checked></td></tr>
-                    <tr><td>9</td><th>取费专业</th><td><input type="checkbox" checked></td></tr>
-                    <tr><td>10</td><th>工程量计算规则</th><td><input  type="checkbox" checked></td></tr>
-                    <tr><td>11</td><th>工程量</th><td><input type="checkbox" checked></td></tr>
-                    <tr><td>12</td><th>单价</th><td><input  type="checkbox" checked></td></tr>
-                    <tr><td>13</td><th>合价</th><td><input  type="checkbox" checked></td></tr>
-                  </table>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                </div>
-            </div>
-        </div>
-    </div>
     <!--弹出 清单 计算基数-->
     <div class="modal fade" id="qd-jsjs" data-backdrop="static">
         <div class="modal-dialog" role="document">