项目属性 新增 小数位数设置；报表 纸张设置 页边距 input group修复

baobiao.html

@@ -263,21 +263,25 @@
                       <div class="col-3">
                         页边距
                       </div>
-                      <div class="form-group col-md-2">
-                       <label class="col-form-label">上</label>
-                       <input type="number" class="form-control form-control-sm" value="12">
+                      <div class="input-group input-group-sm col-md-4">
+                       <label class="input-group-addon">上</label>
+                       <input type="number" class="form-control" value="12">
                       </div>
-                      <div class="form-group col-md-2">
-                       <label class="col-form-label">下</label>
-                       <input type="number" class="form-control form-control-sm" value="12">
+                      <div class="input-group input-group-sm col-md-4">
+                       <label class="input-group-addon">下</label>
+                       <input type="number" class="form-control" value="12">
                       </div>
-                      <div class="form-group col-md-2">
-                       <label class="col-form-label">左</label>
-                       <input type="number" class="form-control form-control-sm" value="12">
+                    </div>
+                    <div class="row mb-1">
+                      <div class="col-3">
+                      </div>
+                      <div class="input-group input-group-sm col-md-4">
+                       <label class="input-group-addon">左</label>
+                       <input type="number" class="form-control" value="12">
                       </div>
-                      <div class="form-group col-md-2">
-                       <label class="col-form-label">右</label>
-                       <input type="number" class="form-control form-control-sm" value="12">
+                      <div class="input-group input-group-sm col-md-4">
+                       <label class="input-group-addon">右</label>
+                       <input type="number" class="form-control" value="12">
                       </div>
                     </div>
                   </div>

zaojiashu.html

@@ -2503,7 +2503,8 @@
                         <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-3" role="tab">指标信息</a></li>
                         <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-4" role="tab">关于计算</a></li>
                         <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-5" role="tab">清单工程精度</a></li>
-                        <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-6" role="tab">人工单价调整</a></li>
+                        <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-6" role="tab">小数位数</a></li>
+                        <li class="nav-item"><a class="nav-link" data-toggle="pill" href="#poj-settings-7" role="tab">人工单价调整</a></li>
                       </ul>
                     </div>
                     <div class="col-9">
@@ -2590,8 +2591,81 @@
                             </table>
                           </div>
                         </div>
-                        <!--人工单价调整-->
+                        <!--小数位数-->
                         <div class="tab-pane fade" id="poj-settings-6" role="tabpanel">
+                          <div class="modal-auto-height">
+                            <fieldset class="form-group">
+                                <h5>清单</h5>
+                                <div class="row m-0">
+                                  <div class="col-sm-3">
+                                    <div class="input-group input-group-sm mb-2">
+                                      <div class="input-group-addon">单价</div>
+                                      <input type="number" class="form-control" value="2" step="1" max="6" min="0">
+                                    </div>
+                                  </div>
+                                  <div class="col-sm-3">
+                                    <div class="input-group input-group-sm mb-2">
+                                      <div class="input-group-addon">合价</div>
+                                      <input type="number" class="form-control" value="2" step="1" max="6" min="0">
+                                    </div>
+                                  </div>
+                                </div>
+                                <h5 class="mt-3">定额</h5>
+                                <div class="row m-0">
+                                  <div class="col-sm-3">
+                                    <div class="input-group input-group-sm mb-2">
+                                      <div class="input-group-addon">工程量</div>
+                                      <input type="number" class="form-control" value="2" step="1" max="6" min="0">
+                                    </div>
+                                  </div>
+                                  <div class="col-sm-3">
+                                    <div class="input-group input-group-sm mb-2">
+                                      <div class="input-group-addon">单价</div>
+                                      <input type="number" class="form-control" value="2" step="1" max="6" min="0">
+                                    </div>
+                                  </div>
+                                  <div class="col-sm-3">
+                                    <div class="input-group input-group-sm mb-2">
+                                      <div class="input-group-addon">合价</div>
+                                      <input type="number" class="form-control" value="2" step="1" max="6" min="0">
+                                    </div>
+                                  </div>
+                                </div>
+                                <h5 class="mt-3">工料机</h5>
+                                <div class="row m-0">
+                                  <div class="col-sm-3">
+                                    <div class="input-group input-group-sm mb-2">
+                                      <div class="input-group-addon">工程量</div>
+                                      <input type="number" class="form-control" value="2" step="1" max="6" min="0">
+                                    </div>
+                                  </div>
+                                  <div class="col-sm-3">
+                                    <div class="input-group input-group-sm mb-2">
+                                      <div class="input-group-addon">单价</div>
+                                      <input type="number" class="form-control" value="2" step="1" max="6" min="0">
+                                    </div>
+                                  </div>
+                                  <div class="col-sm-3">
+                                    <div class="input-group input-group-sm mb-2">
+                                      <div class="input-group-addon">合价</div>
+                                      <input type="number" class="form-control" value="2" step="1" max="6" min="0">
+                                    </div>
+                                  </div>
+                                </div>
+                                <h5 class="mt-3">费率</h5>
+                                <div class="row m-0">
+                                  <div class="col-sm-3">
+                                    <div class="input-group input-group-sm mb-2">
+                                      <div class="input-group-addon">费率</div>
+                                      <input type="number" class="form-control" value="2" step="1" max="6" min="0">
+                                    </div>
+                                  </div>
+                                </div>
+                            </fieldset>
+                          </div>
+                        </div>
+                        <!--人工单价调整-->
+                        <div class="tab-pane fade" id="poj-settings-7" role="tabpanel">
                           <div class="row px-3">
                             <select class="col-4 form-control form-control-sm"><option>渝建[2016]71号</option><option>渝建[2017]78号</option></select>
                           </div>