소스 검색

归档功能修改/签约清单侧栏

chente 5 년 전
부모
커밋
8991707af7
4개의 변경된 파일71개의 추가작업 그리고 332개의 파일을 삭제
  1. 40 329
      baobiao.html
  2. 3 0
      css/main.css
  3. 27 2
      taizhang-qianyue.html
  4. 1 1
      taizhang.html

+ 40 - 329
baobiao.html

@@ -27,10 +27,10 @@
       </div>
       <div class="nav-bottom mt-auto">
         <ul class="nav nav-pills nav-stacked bg-nav">
-          <li><a href="settings-poj.html" data-toggle="tooltip" data-placement="right" title="" data-original-title="项目设置"><i class="fa fa-cogs"></i><span>项目设置</span></a></li>
+          <li><a href="settings-system.html" data-toggle="tooltip" data-placement="right" title="" data-original-title="平台设置"><i class="fa fa-cogs"></i><span>平台设置</span></a></li>
         </ul>
         <div class="dropright my-1 ml-1">
-          <a href="" class="btn btn-sm btn-light p-1" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">张三三</a>
+          <a href="" class="avatar bg-1" data-toggle="dropdown" aria-haspopup="false" aria-expanded="false">张匡胤</a>
           <div class="dropdown-menu">
            <a href="account-info.html" class="dropdown-item">账号资料</a>
            <a href="#" class="dropdown-item">账号安全</a>
@@ -56,17 +56,16 @@
             </ul>
           </div>
           <div class="nav-box">
-            <h3><i class="fa fa-list-alt"></i> 0号台</h3>
+            <h3><i class="fa fa-list-alt"></i> 0号台</h3>
             <ul class="nav-list list-unstyled sub-list">
-              <li><a href="taizhang-qianyue.html"><span>签约清单</span></a></li>
-              <li><a href="taizhang.html"><span>台账分解</span></a></li>
-              <li><a href="taizhang-shenpi.html"><span>台账分解</span></a></li>
-              <li><a href="taizhang-duibi.html"><span>台账对比</span></a></li>
-              <li><a href="taizhang-bg.html"><span>台账修订</span></a></li>
+              <li><a href="taizhang.html"><span>台帐分解</span></a></li>
+              <li><a href="taizhang-shenpi.html"><span>台帐审批</span></a></li>
+              <li><a href="taizhang-duibi.html"><span>台帐对比</span></a></li>
+              <li><a href="taizhang-bg.html"><span>台帐修订</span></a></li>
             </ul>
           </div>
           <div class="nav-box">
-            <h3><i class="fa fa-calendar-check-o"></i> 计量台</h3>
+            <h3><i class="fa fa-calendar-check-o"></i> 计量台</h3>
             <ul class="nav-list list-unstyled sub-list">
               <li><a href="jiliang-qi.html"><span>计量期</span></a></li>
               <li><a href="jiliang-bj.html"><span>多期比较</span></a></li>
@@ -85,6 +84,7 @@
           <div class="nav-box">
             <ul class="nav-list list-unstyled">
               <li class="active"><a href="baobiao.html"><i class="fa fa-file-text-o"></i> <span>报表</span></a></li>
+              <li><a href="baobiao-archive.html"><i class="fa fa-archive"></i> <span>归档报表</span></a></li>
             </ul>
           </div>
         </div>
@@ -94,6 +94,10 @@
 					<div class="title-main d-flex justify-content-between">
             <div>
               <div class="d-inline-block">
+                <a href="#guidang" data-toggle="modal" data-target="#guidang" class=" btn btn-success btn-sm"><i class="fa fa-archive"></i> 归档本期报表</a>
+                <a href="#unguidang" data-toggle="modal" data-target="#unguidang" class=" btn btn-outline-danger btn-sm"><i class="fa fa-archive"></i> 重新归档本期</a>
+              </div>
+              <div class="d-inline-block">
                 <div class="dropdown">
                   <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                     第5期
@@ -112,26 +116,6 @@
 									<li class="nav-item"><a href="#add-c" data-toggle="modal" data-target="#add-c" class=" btn btn-light btn-sm  text-primary"><i class="fa fa-plus"></i> 定制报表</a></li>
                 </ul>
               </div>
-              <div class="d-inline-block">
-                <!-- <div class="btn-group btn-group-sm">
-                  <button type="button" class="btn btn-success">归档本张报表</button>
-                  <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="sr-only">Toggle Dropdown</span>
-                  </button>
-                  <div class="dropdown-menu">
-                    <a class="dropdown-item" href="#">归档本期部分报表</a>
-                    <a class="dropdown-item" href="#">归档本期所有报表</a>
-                  </div>
-                </div> -->
-              </div>
-              <div class="d-inline-block">
-                <a class="btn btn-sm btn-light">
-                  <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="customCheckDisabled" checked="">
-                    <label class="custom-control-label text-primary" for="customCheckDisabled">优先查看归档报表</label>
-                  </div>
-                </a>
-              </div>
             </div>
             <div>
             </div>
@@ -182,18 +166,6 @@
                       <div class="panel">
                           <div class="panel-body">
                             <div class="btn-group" role="group">
-                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#guidang"><i class="fa fa-lock"></i> 归档本张报表</button>
-                              <button type="button" class="btn btn-outline-primary btn-sm"  disabled=""><i class="fa fa-lock"></i> 已归档</button>
-                              <button type="button" class="btn btn-outline-primary btn-sm" data-toggle="modal" data-target="#unguidang"><i class="fa fa-unlock"></i> 撤销归档</button>
-                            </div>
-                          </div>
-                          <div class="panel-foot text-muted">
-                            报表归档
-                          </div>
-                      </div>
-                      <div class="panel">
-                          <div class="panel-body">
-                            <div class="btn-group" role="group">
                               <div class="btn-group" role="group">
                                 <button id="btnGroupDrop1" type="button" class="btn btn-outline-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                   纵向
@@ -289,24 +261,6 @@
                         </div>
                       </div>
                       <div class="panel">
-                        <div class="panel-body">
-                          <div class="btn-group" role="group">
-                            <button class="btn btn-primary btn-sm" type="button" data-toggle="modal" data-target="#select-qi2">
-                            选择标段2<br><!--已选择标段数量--><span class="badge badge-light">5</span>
-                          </button>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="panel">
-                        <div class="panel-body">
-                          <div class="btn-group" role="group">
-                            <button class="btn btn-primary btn-sm" type="button" data-toggle="modal" data-target="#select-qi3">
-                            选择标段3<br><!--已选择标段数量--><span class="badge badge-light">5</span>
-                          </button>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="panel">
                           <div class="panel-body">
                             <div class="btn-group" role="group">
                               <div class="btn-group" role="group">
@@ -600,18 +554,18 @@
           <div class="modal-dialog" role="document">
               <div class="modal-content">
                   <div class="modal-header">
-                    <h5 class="modal-title">归档本报表</h5>
+                    <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">
-                    <h6>归档后,本期报表将自动导出PDF格式,不再受新一期数据影响;</h6>
-                    <h6>请确认报表数据无误(正确添加电子签名、设置页面格式等),继续归档操作。</h6>
+                    <h6>归档后,本期报表将封存,不再受新一期数据影响;</h6>
+                    <h6>请确认报表数据无误,确定归档后,即可「新建一期」。</h6>
                   </div>
                   <div class="modal-footer">
-                      <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
-                      <a href="" class="btn btn-sm btn-primary">确定归档</a>
+                      <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                      <a href="" class="btn btn-primary">确定归档</a>
                   </div>
               </div>
           </div>
@@ -621,17 +575,18 @@
           <div class="modal-dialog" role="document">
               <div class="modal-content">
                   <div class="modal-header">
-                    <h5 class="modal-title">撤销本报表归档</h5>
+                    <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">
-                    <h6>撤销归档后,你可以重新处理报表。</h6>
+                    <h6>撤销归档后,你可以重新处理报表;</h6>
+                    <h6>「新建一期」之前,你都可以重复归档与撤销归档。</h6>
                   </div>
                   <div class="modal-footer">
-                      <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
-                      <a href="" class="btn btn-sm btn-outline-danger">确定撤销</a>
+                      <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                      <a href="" class="btn btn-outline-danger">确定撤销</a>
                   </div>
               </div>
           </div>
@@ -677,8 +632,8 @@
                     </div>
                   </div>
                   <div class="modal-footer">
-                      <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
-                      <a href="" class="btn btn-sm btn-primary">确定导出</a>
+                      <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                      <a href="" class="btn btn-primary">确定导出</a>
                   </div>
               </div>
           </div>
@@ -702,9 +657,9 @@
                   </div>
                   </div>
                   <div class="modal-footer">
-                    <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                     <!--有结果出现添加-->
-                    <button type="button" class="btn btn-sm btn-primary" >确认</button>
+                    <button type="button" class="btn btn-primary" >确认</button>
                   </div>
               </div>
           </div>
@@ -731,9 +686,9 @@
                     </table>
                   </div>
                   <div class="modal-footer">
-                    <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                     <!--有结果出现添加-->
-                    <button type="button" class="btn btn-sm btn-primary" >确认</button>
+                    <button type="button" class="btn btn-primary" >确认</button>
                   </div>
               </div>
           </div>
@@ -861,163 +816,8 @@
                     </div>
                   </div>
                   <div class="modal-footer">
-                      <button type="button" class="btn btn-sm btn-link float-left" data-dismiss="modal" data-toggle="modal" data-target="#batch-sign">批量设置其他标段</button>
-                      <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
-                      <a href="" class="btn btn-sm btn-primary">确定</a>
-                  </div>
-              </div>
-          </div>
-      </div>
-      <!--弹出批量电子签名-->
-      <div class="modal fade" id="batch-sign" 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">
-                      <div class="col-6">
-                        <div class="modal-height-300">
-                          <table class="table table-hover table-bordered">
-                            <thead>
-                              <tr><th>名称</th>
-                              <th width="50">计量期</th>
-                              <th width="40">签名</th>
-                              <th width="40">选择</th>
-                            </tr></thead>
-                            <tbody><tr>
-                              <td class="in-1"><i class="fa fa-folder-o"></i>&nbsp;2019</td>
-                              <td></td>
-                              <td></td>
-                              <td></td>
-                            </tr>
-                            <tr>
-                              <td class="in-1"><i class="fa fa-folder-o"></i>&nbsp;2018</td>
-                              <td></td>
-                              <td></td>
-                              <td></td>
-                            </tr>
-                            <tr>
-                              <td class="in-2"><i class="fa fa-folder-o"></i>&nbsp;土建</td>
-                              <td></td>
-                              <td></td>
-                              <td></td>
-                            </tr>
-                            <tr>
-                            <td class="in-3"><span class="text-muted mr-2">└</span><a href="biaoduan-panel.html" target="_blank">WWUJ-1</a></td>
-                              <td>第5期</td>
-                              <td><i class="fa fa-exclamation-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="项目经理(张三)、总监(王五)、业主代表(李四)、业主工程部负责人(张三)、业主主管领导(李四)"></i></a></td>
-                              <td><input type="checkbox"></td>
-                            </tr>
-                            <tr>
-                            <td class="in-3"><span class="text-muted mr-2">├</span><a href="biaoduan-panel.html" target="_blank">WWUJ-2</a></td>
-                              <td>第4期</td>
-                              <td></td>
-                              <td><input type="checkbox"></td>
-                            </tr>
-                            <tr>
-                              <td class="in-2"><i class="fa fa-folder-o"></i>&nbsp;绿化</td>
-                              <td></td>
-                              <td></td>
-                            </tr>
-                            <tr>
-                            <td class="in-3"><span class="text-muted mr-2">└</span><a href="biaoduan-panel.html" target="_blank">WWUJ-3</a></td>
-                              <td>第2期</td>
-                              <td></td>
-                              <td><input type="checkbox"></td>
-                            </tr>
-                            </tbody>
-                          </table>
-                        </div>
-                      </div>
-                      <div class="col-6">
-                        <div class="form-group row">
-                          <label for="staticEmail" class="col-sm-3 col-form-label pr-0">项目经理</label>
-                          <div class="col-sm-9">
-                            <ul class="list-group">
-                              <li class="list-group-item"><a href="#add-sign" data-toggle="modal" data-target="#add-sign"><i class="fa fa-plus"></i> 添加签名</a></li>
-                            </ul>
-                          </div>
-                        </div>
-                        <div class="form-group row">
-                          <label for="staticEmail" class="col-sm-3 col-form-label pr-0">总监</label>
-                          <div class="col-sm-9">
-                            <ul class="list-group">
-                              <li class="list-group-item">
-                                <p class=" d-flex justify-content-between m-0"><span>张三-<small class="text-muted">监理</small></span><a href="" class="text-danger"><i class="fa fa-remove" title="移除签名"></i></a></p>
-                                <div class="dropdown">
-                                  <a href="" data-toggle="dropdown"><i class="fa fa-calendar" title="添加签名日期"></i></a>
-                                  <form class="dropdown-menu p-2">
-                                    <div class="form-group">
-                                      <label for="exampleDropdownFormEmail2">签名日期</label>
-                                      <input class="datepicker-here form-control form-control-sm mt-0" placeholder="选择签名日期" data-language="zh" type="text">
-                                    </div>
-                                    <button type="submit" class="btn btn-sm btn-primary">确认</button>
-                                  </form>
-                                </div>
-                              </li>
-                            </ul>
-                          </div>
-                        </div>
-                        <div class="form-group row">
-                          <label for="staticEmail" class="col-sm-3 col-form-label pr-0">业主代表</label>
-                          <div class="col-sm-9">
-                            <ul class="list-group">
-                              <li class="list-group-item">
-                                <p class=" d-flex justify-content-between m-0"><span><i class="fa fa-user" title="角色"> 业主代表</i>-<small class="text-muted">李四</small></span><a href="" class="text-danger"><i class="fa fa-remove" title="移除签名"></i></a></p>
-                                <div class="dropdown">
-                                  <a href="" data-toggle="dropdown"><!-- <i class="fa fa-calendar" title="添加签名日期"></i> -->2019-08-13</a>
-                                  <form class="dropdown-menu p-2">
-                                    <div class="form-group">
-                                      <label for="exampleDropdownFormEmail2">签名日期</label>
-                                      <input class="datepicker-here form-control form-control-sm mt-0" placeholder="选择签名日期" data-language="zh" type="text" value="2019-08-13">
-                                    </div>
-                                    <button type="submit" class="btn btn-sm btn-outline-danger">移除日期</button> <button type="submit" class="btn btn-sm btn-primary">确认</button>
-                                  </form>
-                                </div>
-                              </li>
-                            </ul>
-                          </div>
-                        </div>
-                        <div class="form-group row">
-                          <label for="staticEmail" class="col-sm-3 col-form-label pr-0">业主工程部负责人</label>
-                          <div class="col-sm-9">
-                            <ul class="list-group">
-                              <li class="list-group-item">
-                                <p class=" d-flex justify-content-between m-0"><span>王五-<small class="text-muted">工程师</small></span><a href="" class="text-danger"><i class="fa fa-remove" title="移除签名"></i></a></p>
-                                <div class="dropdown">
-                                  <a href="" data-toggle="dropdown"><i class="fa fa-calendar" title="添加签名日期"></i></a>
-                                  <form class="dropdown-menu p-2">
-                                    <div class="form-group">
-                                      <label for="exampleDropdownFormEmail2">签名日期</label>
-                                      <input class="datepicker-here form-control form-control-sm mt-0" placeholder="选择签名日期" data-language="zh" type="text">
-                                    </div>
-                                    <button type="submit" class="btn btn-sm btn-primary">确认</button>
-                                  </form>
-                                </div>
-                              </li>
-                            </ul>
-                          </div>
-                        </div>
-                        <div class="form-group row">
-                          <label for="staticEmail" class="col-sm-3 col-form-label pr-0">业主主管领导</label>
-                          <div class="col-sm-9">
-                            <ul class="list-group">
-                              <li class="list-group-item"><a href="#add-sign" data-toggle="modal" data-target="#add-sign"><i class="fa fa-plus"></i> 添加签名</a></li>
-                            </ul>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div class="alert alert-warning">批量操作会覆盖已设置好的电子签名,请谨慎操作。</div>
-                  </div>
-                  <div class="modal-footer">
-                      <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
-                      <a href="" class="btn btn-sm btn-primary">确定</a>
+                      <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                      <a href="" class="btn btn-primary">确定</a>
                   </div>
               </div>
           </div>
@@ -1158,7 +958,7 @@
           <div class="modal-dialog modal-lg" role="document">
               <div class="modal-content">
                   <div class="modal-header">
-                    <h5 class="modal-title">选择汇总的标段</h5>
+                    <h5 class="modal-title">选择标段</h5>
                       <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true">&times;</span>
                       </button>
@@ -1180,14 +980,18 @@
                             <tr><th>名称</th><th>批准概(预)算</th></tr>
                           </table>
                         </div>
+                      </div>
+                      <div class="col-4 offset-4">
                         <div class="input-group input-group-sm">
                           <div class="input-group-prepend">
                             <span class="input-group-text">汇总周期</span>
                           </div>
-                          <input class="datepicker-here form-control mt-0"placeholder="点击选择周期" data-range="true" data-multiple-dates-separator=" - " data-min-view="months" data-view="months" data-date-format="yyyy-MM" data-language="zh" data-position="top left">
+                          <input class="datepicker-here form-control mt-0" placeholder="请选择" data-min-view="months" data-view="months" data-language="zh" type="text" data-date-format="yyyy MM" data-position="top left">
+                          -
+                          <input class="datepicker-here form-control mt-0" placeholder="请选择" data-min-view="months" data-view="months" data-language="zh" type="text" data-date-format="yyyy MM" data-position="top left">
                         </div>
+                        <p class="text-danger text-center">请选择汇总周期</p>
                       </div>
-                      <div class="text-danger text-center ml-3">请至少选择1个普通汇总项目</div>
                     </div>
                   </div>
                   <div class="modal-footer">
@@ -1197,7 +1001,7 @@
               </div>
           </div>
       </div>
-      <!--弹出选择-->
+      <!--弹出选择标段-->
       <div class="modal fade" id="select-qi" data-backdrop="static">
           <div class="modal-dialog" role="document">
               <div class="modal-content">
@@ -1287,102 +1091,9 @@
               </div>
           </div>
       </div>
-      <!--弹出选择期2-->
-      <div class="modal fade" id="select-qi2" 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">
-                      <div class="col-6">
-                        <h5>所有标段 </h5>
-                        <div class="modal-height-300">
-                          <table class="table table-bordered">
-                            <tr><th></th><th>选择</th><th>名称</th><th>期数</th><th>审批状态</th></tr>
-                          </table>
-                        </div>
-                      </div>
-                      <div class="col-6">
-                        <h5>已选标段 </h5>
-                        <div class="modal-height-300">
-                          <table class="table table-bordered">
-                            <tr><th>名称</th><th>批准概(预)算</th></tr>
-                          </table>
-                        </div>
-                        <div class="input-group input-group-sm">
-                          <div class="input-group-prepend">
-                            <span class="input-group-text">汇总</span>
-                          </div>
-                          <select class="form-control"><option>第1期</option></select>
-                          <div class="input-group-prepend">
-                            <span class="input-group-text">至</span>
-                          </div>
-                          <select class="form-control"><option>第5期</option></select>
-                        </div>
-                      </div>
-                      <div class="text-danger text-center ml-3">请选择汇总周期</div>
-                    </div>
-                  </div>
-                  <div class="modal-footer">
-                      <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
-                      <a href="" class="btn btn-sm btn-primary">确定</a>
-                  </div>
-              </div>
-          </div>
-      </div>
-      <!--弹出选择期3-->
-      <div class="modal fade" id="select-qi3" 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">
-                      <div class="col-6">
-                        <h5>所有标段 </h5>
-                        <div class="modal-height-300">
-                          <table class="table table-bordered">
-                            <tr><th></th><th>选择</th><th>名称</th><th>期数</th><th>审批状态</th></tr>
-                          </table>
-                        </div>
-                      </div>
-                      <div class="col-6">
-                        <h5>已选标段 </h5>
-                        <div class="modal-height-300">
-                          <table class="table table-bordered">
-                            <tr><th>名称</th><th>批准概(预)算</th></tr>
-                          </table>
-                        </div>
-                        <div class="input-group input-group-sm">
-                          <div class="input-group-prepend">
-                            <span class="input-group-text">选择期</span>
-                          </div>
-                          <select class="form-control"><option>第1期</option></select>
-                        </div>
-                      </div>
-                      <div class="text-danger text-center ml-3">请选择汇总期</div>
-                    </div>
-                  </div>
-                  <div class="modal-footer">
-                      <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
-                      <a href="" class="btn btn-sm 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>
-    <script src="js/bootstrap/bootstrap.min.js"></script>
+    <script src="js/bootstrap/bootstrap.bundle.min.js"></script>
     <script src="js/global.js"></script>
     <script type="text/javascript">autoFlashHeight();</script>
     <script src="js/datepicker/datepicker.min.js"></script>

+ 3 - 0
css/main.css

@@ -889,6 +889,9 @@ input.nospin[type="number"]{-moz-appearance:textfield;}
   vertical-align:top;
   background:#f7f7f9
 }
+.print-toolsbar .panel .panel-body{
+  height: 22px
+}
 .print-toolsbar .panel .panel-foot{
   text-align: center;
   font-size: 12px

+ 27 - 2
taizhang-qianyue.html

@@ -114,9 +114,8 @@
 				<div class="content-wrap">
           <div class="c-header p-0"></div>
           <div class="w-100 sub-content row">
-            <div class="c-body col-12">
+            <div class="c-body col-8">
               <div class="sjs-height-0" style="overflow: auto;">
-                <!--甲供材料-->
                 <table class="table table-bordered table-sm">
                     <tbody>
                       <thead>
@@ -126,6 +125,32 @@
                 </table>
               </div>
             </div>
+            <div class="c-body col-4">
+              <div class="sjs-height-0">
+                <table class="table table-sm table-bordered">
+                  <thead>
+                    <tr><th>章节</th><th>章节名称</th><th>签约金额</th></tr>
+                  </thead>
+                  <tr><td>100</td><td>总则</td><td></td></tr>
+                  <tr><td>200</td><td>路基</td><td></td></tr>
+                  <tr><td>300</td><td>路面</td><td></td></tr>
+                  <tr><td>400</td><td>桥梁、涵洞</td><td></td></tr>
+                  <tr><td>500</td><td>隧道</td><td></td></tr>
+                  <tr><td>600</td><td>安全设施及预埋管线</td><td></td></tr>
+                  <tr><td>700</td><td>绿化及环境保护</td><td></td></tr>
+                  <tr><td>800</td><td>机电工程</td><td></td></tr>
+                  <tr><td>900</td><td>房建工程</td><td></td></tr>
+                  <tr><td colspan="2">未计入章节清单合计</td><td></td></tr>
+                  <tr><td colspan="2">合计(A)</td><td></td></tr>
+                  <tr><td colspan="2">暂列金额(B)</td><td></td></tr>
+                  <tr><td colspan="2">暂估价(C)</td><td></td></tr>
+                  <tr><td colspan="2">其他费用(D)</td><td></td></tr>
+                  <tr><td colspan="2">计日工合计(E)</td><td></td></tr>
+                  <tr><td colspan="2">签约合同价(F=A+B+C+D)</td><td></td></tr>
+                  <tr><td colspan="2">签约合同价修正</td><td></td></tr>
+                </table>
+              </div>
+            </div>
           </div>
 				</div>
 			</div>

+ 1 - 1
taizhang.html

@@ -574,7 +574,7 @@
             <!--右侧菜单-->
             <ul class="nav flex-column right-nav">
               <li class="nav-item">
-                <a class="nav-link " data-toggle="tab" href="#search" role="tab">查找定位</a>
+                <a class="nav-link active" data-toggle="tab" href="#search" role="tab">查找定位</a>
               </li>
               <li class="nav-item">
                 <a class="nav-link" data-toggle="tab" href="#xiangmujie" role="tab">项目节</a>