Bootstrap 更新4.0正式版；右键 计取安装费用 弹窗，指定具体位置 弹窗；造价书下半部分增加 安装增加费，费用规则 查询安装费 弹窗

baobiao.html

@@ -110,11 +110,11 @@
                         <div class="panel-body">
                           <button class="btn btn-secondary btn-sm" type="button">
                             <i class="fa fa-print"></i><br>
-                            打印 <span id="checkCount" class="badge badge-primary">5</span>
+                            打印 <span id="checkCount" class="badge badge-light">5</span>
                           </button>
                           <button class="btn btn-secondary btn-sm" type="button"  href="#export" data-toggle="modal" data-target="#export">
                             <i class="fa fa-share-square-o"></i><br>
-                            导出 <span id="checkCount" class="badge badge-primary">5</span>
+                            导出 <span id="checkCount" class="badge badge-light">5</span>
                           </button>
                         </div>
                       </div>
@@ -169,14 +169,14 @@
                       </div>
                       <div class="panel">
                         <div class="panel-body">
-                          <div class="input-group input-group-sm" role="group">
-                            <span class="input-group-btn">
+                          <div class="input-group input-group-sm">
+                            <div class="input-group-prepend">
                               <button type="button" class="btn btn-secondary btn-sm" disabled data-toggle="tooltip" data-placement="bottom" title="上一页"><i class="fa fa-chevron-left"></i></button>
-                            </span>
+                            </div>
                             <input class="form-control" value="1/10" style="width:60px"  data-toggle="tooltip" data-placement="bottom" title="输入页码按回车键，快速跳转">
-                            <span class="input-group-btn">
+                            <div class="input-group-append">
                               <button type="button" class="btn btn-secondary btn-sm" data-toggle="tooltip" data-placement="bottom" title="下一页"><i class="fa fa-chevron-right"></i></button>
-                            </span>
+                            </div>
                           </div>
                         </div>
                         <div class="panel-foot text-muted">
@@ -223,7 +223,7 @@
                         <div class="d-flex justify-content-center">
                             <button class="btn btn-secondary btn-sm" type="button">
                               <i class="fa fa-share"></i>
-                              移除 <span id="checkCount2" class="badge badge-primary">0</span>
+                              移除 <span id="checkCount2" class="badge badge-light">0</span>
                             </button>
                         </div>
                         <ul id="treeDemo2" class="ztree"></ul>
@@ -233,7 +233,7 @@
                         <div class="d-flex justify-content-center">
                             <button class="btn btn-secondary btn-sm" type="button">
                               <i class="fa fa-reply"></i>
-                              添加 <span id="checkCount2" class="badge badge-primary">0</span>
+                              添加 <span id="checkCount2" class="badge badge-light">0</span>
                             </button>
                         </div>
                         <ul id="treeDemo3" class="ztree"></ul>
@@ -438,50 +438,64 @@
                     </div>
                     <div class="row mb-1">
                       <div class="col-4">
-                        <label class="form-check-label">
-                          <input type="checkbox" class="form-check-input">
-                          报表边框横线
-                        </label>
+                        <div class="form-check">
+                          <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input">
+                            报表边框横线
+                          </label>
+                        </div>
                       </div>
                       <div class="col-4">
-                        <label class="form-check-label">
-                          <input type="checkbox" class="form-check-input">
-                          报表边框竖线
-                        </label>
+                        <div class="form-check">
+                          <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input">
+                            报表边框竖线
+                          </label>
+                        </div>
                       </div>
                     </div>
                     <div class="row mb-1">
                       <div class="col-4">
-                        <label class="form-check-label">
-                          <input type="checkbox" class="form-check-input">
-                          报表表格横线
-                        </label>
+                        <div class="form-check">
+                          <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input">
+                            报表表格横线
+                          </label>
+                        </div>
                       </div>
                       <div class="col-4">
-                        <label class="form-check-label">
-                          <input type="checkbox" class="form-check-input">
-                          报表表格竖线
-                        </label>
+                        <div class="form-check">
+                          <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input">
+                            报表表格竖线
+                          </label>
+                        </div>
                       </div>
                     </div>
                     <div class="row mb-1">
                       <div class="col-4">
-                        <label class="form-check-label">
-                          <input type="checkbox" class="form-check-input">
-                          自动换行打印
-                        </label>
+                        <div class="form-check">
+                          <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input">
+                            自动换行打印
+                          </label>
+                        </div>
                       </div>
                       <div class="col-4">
-                        <label class="form-check-label">
-                          <input type="checkbox" class="form-check-input">
-                          内容窄体输出
-                        </label>
+                        <div class="form-check">
+                          <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input">
+                            内容窄体输出
+                          </label>
+                        </div>
                       </div>
                       <div class="col-4">
-                        <label class="form-check-label">
-                          <input type="checkbox" class="form-check-input">
-                          小数补0
-                        </label>
+                        <div class="form-check">
+                          <label class="form-check-label">
+                            <input type="checkbox" class="form-check-input">
+                            小数补0
+                          </label>
+                        </div>
                       </div>
                     </div>
                   </div>

css/main.css

@@ -2,7 +2,7 @@
 /*bootstrap 初始化*/
 body {
     font-size: 0.9rem;
-    overflow: hidden;
+    overflow: hidden
 }
 .dropdown-menu {
     font-size: 0.9rem

user-set.html

@@ -70,19 +70,17 @@
                         <from>
                             <div class="form-group">
                                 <label class="form-control-label">登录时选择版本</label>
-                                <div>
-                                    <label class="custom-control custom-radio">
-                                      <input id="radio1" name="radio" type="radio" class="custom-control-input">
-                                      <span class="custom-control-indicator"></span>
-                                      <span class="custom-control-description">每次询问</span>
-                                    </label>
-                                    <label class="custom-control custom-radio">
-                                      <input id="radio2" name="radio" type="radio" class="custom-control-input">
-                                      <span class="custom-control-indicator"></span>
-                                      <span class="custom-control-description">指定版本</span>
-                                    </label>
+                                <div class="form-control">
+                                <div class="form-check form-check-inline">
+                                  <input class="form-check-input" type="radio" id="inlineCheckbox1" value="option1">
+                                  <label class="form-check-label" for="inlineCheckbox1">每次询问</label>
                                 </div>
-                            </div>
+                                <div class="form-check form-check-inline">
+                                  <input class="form-check-input" type="radio" id="inlineCheckbox2" value="option2">
+                                  <label class="form-check-label" for="inlineCheckbox2">指定版本</label>
+                                </div>
+                              </div>
+                              </div>
                             <div class="form-group">
                                 <label class="form-control-label">指定版本</label>
                                 <select class="form-control">

zaojiashu.html

@@ -253,7 +253,10 @@
                               <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>
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#loading">loading</a>
-                                <!-- <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="#zlfb">右键“整理分部”</a>
+                              <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#jqaz">右键“计取安装费用”</a>
+                                <!--
+                                <table class="table table-sm table-bordered m-0">
                                     <thead>
                                         <th>序号</th>
                                         <th>项目编码</th>
@@ -2069,6 +2072,9 @@
                                     <a class="nav-link" data-toggle="tab" href="#fzd" role="tab">辅助定额</a>
                                 </li>
                                 <li class="nav-item">
+                                    <a class="nav-link" data-toggle="tab" href="#az" role="tab">安装增加费</a>
+                                </li>
+                                <li class="nav-item">
                                     <a class="nav-link" data-toggle="tab" href="#gc" role="tab">工程量明细</a>
                                 </li>
                                 <li class="nav-item">
@@ -2405,6 +2411,53 @@
                                         辅助定额的内容
                                     </div>
                                 </div>
+                                <div class="tab-pane" id="az" role="tabpanel">
+                                    <div class="main-data-bottom">
+                                      <table class="table table-sm table-bordered m-0">
+                                          <thead>
+                                              <th>按统一设置</th>
+                                              <th>费用项</th>
+                                              <th>费用规则</th>
+                                              <th>编码</th>
+                                              <th>基数</th>
+                                              <th>费率(1%)</th>
+                                              <th>其中人工(%)</th>
+                                              <th>其中材料(%)</th>
+                                              <th>其中机械(%)</th>
+                                              <th>费用类型</th>
+                                              <th>记取位置</th>
+                                          </thead>
+                                          <tbody>
+                                            <tr>
+                                              <td><input type="checkbox"></td>
+                                              <td>超高费</td>
+                                              <td>超高费（标高15m以内）（第一册 机械设备安装工程1～6章节）<a href="javacript:void(0);" data-toggle="modal" data-target="#cxazfy">点击</a></td>
+                                              <td>AZFY1</td>
+                                              <td>人材机乘系数</td>
+                                              <td></td>
+                                              <td>25</td>
+                                              <td></td>
+                                              <td>25</td>
+                                              <td>分项费用</td>
+                                              <td>030101001台式及仪表机床</td>
+                                            </tr>
+                                            <tr>
+                                              <td><input type="checkbox"></td>
+                                              <td>有害增加费</td>
+                                              <td>无</td>
+                                              <td></td>
+                                              <td></td>
+                                              <td></td>
+                                              <td></td>
+                                              <td></td>
+                                              <td></td>
+                                              <td></td>
+                                              <td></td>
+                                            </tr>
+                                          </tbody>
+                                      </table>
+                                    </div>
+                                </div>
                                 <div class="tab-pane" id="gc" role="tabpanel">
                                     <div class="main-data-bottom">
                                       <table class="table table-sm table-bordered m-0">
@@ -3107,6 +3160,170 @@
             </div>
         </div>
     </div>
+    <!--弹出 整理分部-->
+    <div class="modal fade" id="zlfb" 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-check">
+                    <input class="form-check-input" type="checkbox" value="" >
+                    <label class="form-check-label">
+                      需要专业分部标题
+                    </label>
+                  </div>
+                  <div class="form-check">
+                    <input class="form-check-input" type="checkbox" value="" >
+                    <label class="form-check-label">
+                      需要章分部标题
+                    </label>
+                  </div>
+                  <div class="form-check">
+                    <input class="form-check-input" type="checkbox" value="" >
+                    <label class="form-check-label">
+                      需要节分部标题
+                    </label>
+                  </div>
+                  <div class="form-check">
+                    <input class="form-check-input" type="checkbox" value="" >
+                    <label class="form-check-label">
+                      删除自定义分部标题
+                    </label>
+                  </div>
+                  <div class="form-check">
+                    <input class="form-check-input" type="checkbox" value="" >
+                    <label class="form-check-label">
+                      清单排序
+                    </label>
+                  </div>
+                  <div class="form-check">
+                    <input class="form-check-input" type="checkbox" value="" >
+                    <label class="form-check-label">
+                      清单重新编码
+                    </label>
+                  </div>
+                  <div class="card mt-3">
+                  <div class="card-body p-2">
+                    <h5 class="card-title">操作说明</h5>
+                    <p class="card-text">执行分部整理将对当前清单列表存在的清单按以上勾选项进行整理；</br>
+                      勾选“需要专业分部标题”，表示分部整理时需要添加清单专业标题；</br>
+                      勾选“需要章分部标题”，表示分部整理时需要添加章标题；</br>
+                      勾选“需要节分部标题”，表示分部整理时需要添加节标题；</br>
+                      勾选“删除自定义分部标题”，将首先删除已有自定义分部标题，然后再执行分部整理；</br>
+                      勾选“清单排序”，表示分部整理后对每个分部下的清单进行排序；</br>
+                      勾选“清单重新编码”，表示分部整理后对每个分部下的清单重新生成水流号；
+                    </p>
+                  </div>
+                </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="jqaz" data-backdrop="static">
+        <div class="modal-dialog modal-lg" 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 style="height:200px"><!--sjs id设置在这个div-->
+                    <table class="table table-sm table-bordered m-0">
+                      <thead><tr><th></th><th>计取</th><th>费用项</th><th>费用类型</th><th>记取位置</th></tr></thead>
+                      <tr><td>1</td><td></td><td>重庆市安装工程计价定额(2008)</td><td></td><td></td></tr>
+                      <tr><td>2</td><td><input type="checkbox"></td><td>-高层增加费</td><td>子目费用</td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#jqaz-wz">点击</a></td></tr>
+                    </table>
+                  </div>
+                  <div style="height:200px"><!--sjs id设置在这个div-->
+                    <table class="table table-sm table-bordered m-0">
+                      <thead><tr><th></th><th>分册章节</th><th>费用规则</th><th>编码</th><th>基数</th><th>费率(%)</th><th>其中人工(%)</th><th>其中材料(%)</th><th>其中机械(%)</th><th>记取位置</th></tr></thead>
+                      <tr><td>1</td><td>第一册 机械设备安装工程1～6、8～16章节</td><td>超高费(标高15m以内(第一册 机械设备安装工程1～6章节))</td><td>AZFY1</td><td>人材机乘系数</td><td></td><td>25</td><td></td><td>25</td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#jqaz-wz">点击</a></td></tr>
+                    </table>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-link" >恢复默认值</button>
+                    <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="jqaz-wz" data-backdrop="static">
+        <div class="modal-dialog modal-lg" 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="row mb-2">
+                    <div class="col-8">
+                      <div class="input-group input-group-sm">
+                        <input type="text" class="form-control" placeholder="输入编码 或 名称 " aria-describedby="basic-addon2">
+                        <div class="input-group-append">
+                          <button class="btn btn-secondary" type="button"><i class="fa fa-search"></i> 过滤</button>
+                          <button class="btn btn-outline-secondary" type="button">取消过滤</button>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div style="height:300px"><!--sjs id设置在这个div-->
+                    <table class="table table-sm table-bordered m-0">
+                      <thead><tr><th></th><th>类别</th><th>编码</th><th>名称</th><th>具体位置</th></tr></thead>
+                      <tr><td>1</td><td>大项</td><td>1</td><td>分部分项工程</td><td></td></tr>
+                      <tr><td>2</td><td>分部</td><td>C</td><td>安装工程</td><td></td></tr>
+                      <tr><td>3</td><td>分部</td><td>030101001</td><td>台式及仪表机床</td><td><input type="checkbox"></td></tr>
+                    </table>
+                  </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="cxazfy" data-backdrop="static">
+        <div class="modal-dialog modal-lg" 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"><!--sjs ID设置此div--->
+                    <table class="table table-sm table-bordered m-0">
+                      <thead><tr><th></th><th>编码</th><th>费用规则</th><th>基数</th><th>费率(%)</th><th>人工(%)</th><th>材料(%)</th><th>机械(%)</th></tr></thead>
+                      <tr><td>1</td><td>AZFY15</td><td>有害增加费（电气设备安装工程）</td><td>人工</td><td>10</td><td>100</td><td>0</td><td>0</td></tr>
+                    </table>
+                  </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-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>