修改项目属性；新增 计算基础选择 和 费率(%)选择；对弹窗内容滚动条class优化

css/main.css

@@ -290,10 +290,14 @@ body {
   width:inherit;
   height: inherit;
 }
-.modal-fixed-height {
+.modal-auto-height {
   height: 400px;
   overflow-y: auto;
 }
+.modal-fixed-height {
+  height: 400px;
+  overflow-y: hidden;
+}
 .sidebar-tools-bar {
   background:#fff
 }

zaojiashu.html

@@ -115,7 +115,9 @@
                     <div class="main-content col-lg-8 p-0">
                         <div class="top-content">
                             <div class="main-data-top">
-                                <table class="table table-sm table-bordered m-0">
+                              <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#qd-jsjs">计算基数 窗口</a>
+                              <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#qd-fl">费率(%) 窗口</a>
+                                <!-- <table class="table table-sm table-bordered m-0">
                                     <thead>
                                         <th>序号</th>
                                         <th>项目编码</th>
@@ -1916,7 +1918,7 @@
                                             <td></td>
                                         </tr>
                                     </tbody>
-                                </table>
+                                </table> -->
                             </div>
                         </div>
                         <div class="bottom-content">
@@ -2452,50 +2454,33 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                  <ul class="nav nav-tabs" id="myTab" role="tablist">
-                    <li class="nav-item">
-                      <a class="nav-link active"  data-toggle="tab" href="#tab1" role="tab">关于计算</a>
-                    </li>
-                    <li class="nav-item">
-                      <a class="nav-link" data-toggle="tab" href="#tab2" role="tab" >清单工程量精度</a>
-                    </li>
-                    <li class="nav-item">
-                      <a class="nav-link" data-toggle="tab" href="#tab3" role="tab" >人工单价调整</a>
-                    </li>
-                  </ul>
-                  <div class="tab-content" id="myTabContent">
-                    <div class="tab-pane fade show active" id="tab1" role="tabpanel">
-                      <fieldset class="form-group">
-                        <legend>取费方式</legend>
-                        <div class="form-check">
-                          <label class="form-check-label">
-                            <input class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked="" type="radio">
-                            子目含量取费
-                          </label>
-                        </div>
-                        <div class="form-check">
-                        <label class="form-check-label">
-                            <input class="form-check-input" name="optionsRadios" id="optionsRadios2" value="option2" type="radio">
-                            子目单价取费（反算）：清单综合合价=清单综合单价*清单工程量
-                          </label>
-                        </div>
-                        <div class="form-check">
+                  <fieldset class="form-group">
+                      <h6><b>取费方式</b></h6>
+                      <div class="form-check">
                         <label class="form-check-label">
-                            <input class="form-check-input" name="optionsRadios" id="optionsRadios3" value="option3" type="radio">
-                            子目单价取费（正算）：清单综合合价=∑子目综合合价
-                          </label>
-                        </div>
-                        <div class="form-check">
-                        <label class="form-check-label">
-                            <input class="form-check-input" name="optionsRadios" id="optionsRadios4" value="option4" type="radio">
-                            清单单价取费
-                          </label>
-                        </div>
-                      </fieldset>
-                    </div>
-                    <div class="tab-pane fade" id="tab2" role="tabpanel" >2...</div>
-                    <div class="tab-pane fade" id="tab3" role="tabpanel" >3...</div>
-                  </div>
+                          <input class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked="" type="radio">
+                          子目含量取费
+                        </label>
+                      </div>
+                      <div class="form-check">
+                      <label class="form-check-label">
+                          <input class="form-check-input" name="optionsRadios" id="optionsRadios2" value="option2" type="radio">
+                          子目单价取费（反算）：清单综合合价=清单综合单价*清单工程量
+                        </label>
+                      </div>
+                      <div class="form-check">
+                      <label class="form-check-label">
+                          <input class="form-check-input" name="optionsRadios" id="optionsRadios3" value="option3" type="radio">
+                          子目单价取费（正算）：清单综合合价=∑子目综合合价
+                        </label>
+                      </div>
+                      <div class="form-check">
+                      <label class="form-check-label">
+                          <input class="form-check-input" name="optionsRadios" id="optionsRadios4" value="option4" type="radio">
+                          清单单价取费
+                        </label>
+                      </div>
+                    </fieldset>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
@@ -2514,7 +2499,7 @@
                     <span aria-hidden="true">&times;</span>
                   </button>
                 </div>
-                <div class="modal-body modal-fixed-height">
+                <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>
@@ -2538,6 +2523,90 @@
             </div>
         </div>
     </div>
+    <!--弹出 清单 计算基数-->
+    <div class="modal fade" id="qd-jsjs" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">计算基础选择</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <div class="form-group">
+                    <input class="form-control" value="分部分项工程费+100">
+                    <p class="form-text">
+                      <button class="btn btn-secondary btn-sm">+</button>
+                      <button class="btn btn-secondary btn-sm">-</button>
+                      <button class="btn btn-secondary btn-sm">*</button>
+                      <button class="btn btn-secondary btn-sm">/</button>
+                      <button class="btn btn-secondary btn-sm">(</button>
+                      <button class="btn btn-secondary btn-sm">)</button>
+                    </p>
+                  </div>
+                  <div class=" modal-auto-height">
+                    <table class="table table-sm table-bordered">
+                      <thead>
+                        <tr><th></th><th>计算基础名称</th><th>金额</th></tr>
+                      </thead>
+                      <tbody>
+                        <tr>
+                          <td>1</td><td><button class="btn btn-secondary btn-sm">分部分项工程费</button></td><td>1000.16</td>
+                        </tr>
+                        <tr>
+                          <td>2</td><td><button class="btn btn-secondary btn-sm">分部分项基价直接工程费</button></td><td>600.16</td>
+                        </tr>
+                        <tr>
+                          <td>3</td><td><button class="btn btn-secondary btn-sm">分部分项基价人工费</button></td><td>100.16</td>
+                        </tr>
+                        <tr>
+                          <td>4</td><td><button class="btn btn-secondary btn-sm">分部分项基价材料费</button></td><td>200.16</td>
+                        </tr>
+                        <tr>
+                          <td>5</td><td><button class="btn btn-secondary btn-sm">分部分项基价机械费</button></td><td>300.16</td>
+                        </tr>
+                        <tr>
+                          <td>6</td><td><button class="btn btn-secondary btn-sm">分部分项调整人工费</button></td><td>100.16</td>
+                        </tr>
+                        <tr>
+                          <td>7</td><td><button class="btn btn-secondary btn-sm">分部分项调整机人工费</button></td><td>50.16</td>
+                        </tr>
+                      </tbody>
+                    </table>
+                    <p></p>
+                      <p></p>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <a href="" class="btn btn-primary">确定</a>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--弹出 清单 费率(%)-->
+    <div class="modal fade" id="qd-fl" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">费率选择</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <div class="modal-fixed-height">
+                    spreadjs
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <a href="" class="btn btn-primary">确定</a>
+                </div>
+            </div>
+        </div>
+    </div>
     <!-- JS. -->
     <script src="js/jquery/jquery.min.js"></script>
     <script src="js/tether/tether.min.js"></script>