chente 5 лет назад
Родитель
Сommit
4160b53bd8

+ 1 - 1
biangeng-detail-1.html

@@ -673,7 +673,7 @@
                       <h5 class="modal-title">拷贝其他变更令数据</h5>
                   </div>
                   <div class="modal-body">
-                  	<div class="alert alert-warning p-2">选择需要拷贝的变更令,确认后将为您自动生成新的申请编号</div>
+                  	<div class="alert alert-warning p-2">选择需要拷贝的变更令,确认后将为您自动生成变更信息</div>
                     <table class="table table-bordered">
                     	<tr><th>申请编号/变更令号</th><th>工程名称</th><th>变更类别</th><th>变更金额</th><th>审批状态</th><th>选择</th></tr>
                     	<tr><td>LZTJ-1标项目部发变更(2015)001号</td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更</td><td>101112.23</td><td>待上报</td><td><input type="checkbox"></td></tr>

+ 1 - 1
biangeng-detail-2.html

@@ -79,7 +79,7 @@
 					<div class="title-main d-flex justify-content-between">
 						<div>
               <div class="d-inline-block">
-                <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> 添加台清单</a>
+                <a href="#addlist" data-toggle="modal" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加清单"><i class="fa fa-plus" aria-hidden="true"></i> 添加台清单</a>
               </div>
               <div class="d-inline-block">
                 <a href="" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="添加空白清单"><i class="fa fa-plus" aria-hidden="true"></i> 添加空白清单</a>

Разница между файлами не показана из-за своего большого размера
+ 915 - 0
biangeng-detail.html


+ 8 - 8
biangeng.html

@@ -55,16 +55,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.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>
@@ -123,9 +123,9 @@
                   <!--审批退回 审批人看到状态-->
                   <tr><td><a href="">LZTJ-1标项目部发变更(2015)005号</a></td><td>K0+440通道台背回填</td><td>C类变更</td><td>136515.46</td><td><span class="text-warning">退回</span></td><td>张三-监理 <span class="text-warning">审批退回</span></td><td></td></tr>
                   <!--待上报(上报人首次上报)-->
-  								<tr><td><a href="biangeng-list-detail.html">LZTJ-1标项目部发变更(2015)001号 (点我)</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更</td><td>101112.23</td><td><a href="" class="btn btn-primary btn-sm">上报</a></td><td>待上报</td><td></td></tr>
+  								<tr><td><a href="biangeng-detail.html">LZTJ-1标项目部发变更(2015)001号 (点我 新版)</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更</td><td>101112.23</td><td><a href="" class="btn btn-primary btn-sm">上报</a></td><td>待上报</td><td></td></tr>
                   <!--审批中的数据(非当前审批人)-->
-  								<tr><td><a href="biangeng-list-detail.html">LZTJ-1标项目部发变更(2015)001号 (点我)</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更</td><td>101112.23</td><td><span class="text-warning">审批中</span></td><td>王五-监理 <span class="text-warning">审批中</span></td><td></td></tr>
+  								<tr><td><a href="">LZTJ-1标项目部发变更(2015)001号</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更</td><td>101112.23</td><td><span class="text-warning">审批中</span></td><td>王五-监理 <span class="text-warning">审批中</span></td><td></td></tr>
                 <!--审批通过,变更完成-->
   								<tr><td><a href="biangeng-list-detail.html">LZTJ-1标项目部发变更(2015)001号</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更</td><td>101112.23</td><td><span class="text-success">完成</span></td><td>王五-监理 <span class="text-success">审批通过</span></td><td></td></tr>
   							</tbody>

+ 119 - 63
biaoduan-liucheng.html

@@ -117,7 +117,7 @@
                 <div class="col-7">
                   <!--预付款-->
                   <div class="card mb-3">
-                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a>
+                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a><a class="pull-right mr-3" href="#batch2" data-toggle="modal" data-target="#batch2">设置其他流程</a>
                       <h5 class="card-title">预付款审批</h5>
                       <div class="form-group">
                         <div class="form-group form-check">
@@ -142,7 +142,7 @@
                   </div>
                   <!--台账审批-->
                   <div class="card mb-3">
-                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a>
+                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a><a class="pull-right mr-3" href="#batch2" data-toggle="modal" data-target="#batch2">设置其他流程</a>
                       <h5 class="card-title">台账审批</h5>
                       <div class="form-group">
                         <div class="form-group form-check">
@@ -167,7 +167,7 @@
                   </div>
                   <!--台账修订-->
                   <div class="card mb-3">
-                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a>
+                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a><a class="pull-right mr-3" href="#batch2" data-toggle="modal" data-target="#batch2">设置其他流程</a>
                       <h5 class="card-title">台账修订</h5>
                       <div class="form-group">
                         <div class="form-group form-check">
@@ -252,7 +252,7 @@
                   </div>
                   <!--计量期审批-->
                   <div class="card mb-3">
-                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a>
+                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a><a class="pull-right mr-3" href="#batch2" data-toggle="modal" data-target="#batch2">设置其他流程</a>
                       <h5 class="card-title">计量期审批</h5>
                       <div class="form-group">
                         <div class="form-group form-check">
@@ -329,7 +329,7 @@
                   </div>
                   <!--工程变更-->
                   <div class="card mb-3">
-                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a>
+                    <div class="card-body"><a class="pull-right" href="#batch" data-toggle="modal" data-target="#batch">设置其他标段</a><a class="pull-right mr-3" href="#batch2" data-toggle="modal" data-target="#batch2">设置其他流程</a>
                       <h5 class="card-title">工程变更审批</h5>
                       <div class="form-group">
                         <div class="form-group form-check">
@@ -385,66 +385,122 @@
 			</div>
 		</div>
 	</div>
-      <!--设置其他标段-->
-      <div class="modal fade" id="batch" data-backdrop="static">
-          <div class="modal-dialog" role="document">
-              <div class="modal-content">
-                  <div class="modal-header">
-                      <h5 class="modal-title">设置其他标段</h5>
-                  </div>
-                  <div class="modal-body">
-                    <div class="alert alert-warning">将「预付款审批」设置至其他标段</div>
-                    <div class="modal-height-300">
-                      <table class="table table-hover table-bordered">
-                  <thead>
-                    <th>名称</th>
-                    <th width="100">审批流程</th>
-                    <th width="40">选择</th>
-                  </thead>
-                  <tr>
-                    <td class="in-1"><i class="fa fa-folder-o"></i>&nbsp;2019</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>
-                  </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">WWUJ-1</a></td>
-                    <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
-                    <td><input type="checkbox"></td>
-                  </tr>
-                  <tr>
-                  <td class="in-3"><span class="text-muted mr-2">├</span><a href="biaoduan-panel.html">WWUJ-2</a></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>
-                  </tr>
-                  <tr>
-                  <td class="in-3"><span class="text-muted mr-2">└</span><a href="biaoduan-panel.html">WWUJ-3</a></td>
-                    <td>授权审批人</td>
-                    <td><input type="checkbox"></td>
-                  </tr>
-              </table>
-                    </div>
+    <!--设置其他标段-->
+    <div class="modal fade" id="batch" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">设置其他标段</h5>
+                </div>
+                <div class="modal-body">
+                  <div class="alert alert-warning">将「预付款审批」设置至其他标段</div>
+                  <div class="modal-height-300">
+                    <table class="table table-hover table-bordered">
+                <thead>
+                  <th>名称</th>
+                  <th width="100">审批流程</th>
+                  <th width="40">选择</th>
+                </thead>
+                <tr>
+                  <td class="in-1"><i class="fa fa-folder-o"></i>&nbsp;2019</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>
+                </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">WWUJ-1</a></td>
+                  <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
+                  <td><input type="checkbox"></td>
+                </tr>
+                <tr>
+                <td class="in-3"><span class="text-muted mr-2">├</span><a href="biaoduan-panel.html">WWUJ-2</a></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>
+                </tr>
+                <tr>
+                <td class="in-3"><span class="text-muted mr-2">└</span><a href="biaoduan-panel.html">WWUJ-3</a></td>
+                  <td>授权审批人</td>
+                  <td><input type="checkbox"></td>
+                </tr>
+            </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-sm btn-primary">确认</button>
+                </div>
+                <div class="modal-footer">
+                  <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+                  <button type="button" class="btn btn-sm btn-primary">确认</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--设置其他流程-->
+    <div class="modal fade" id="batch2" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title">设置其他流程</h5>
+                </div>
+                <div class="modal-body">
+                  <div class="alert alert-warning">将「预付款审批」设置至其他流程</div>
+                  <div class="modal-height-300">
+                    <table class="table table-hover table-bordered">
+                      <thead>
+                        <th>名称</th>
+                        <th width="100">审批流程</th>
+                        <th width="40">选择</th>
+                      </thead>
+                      <tr>
+                      <td>预付款审批</td>
+                        <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
+                        <td></td>
+                      </tr>
+                      <tr>
+                      <td>台账审批</td>
+                        <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
+                        <td><input type="checkbox"></td>
+                      </tr>
+                      <tr>
+                      <td>台账修订</td>
+                        <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
+                        <td><input type="checkbox"></td>
+                      </tr>
+                      <tr>
+                      <td>计量期审批</td>
+                        <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
+                        <td><input type="checkbox"></td>
+                      </tr>
+                      <tr>
+                      <td>工程变更审批</td>
+                        <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
+                        <td><input type="checkbox"></td>
+                      </tr>
+                      <tr>
+                      <td>材料调差审批</td>
+                        <td>固定流程<i class="fa fa-question-circle text-primary" data-container="body" data-toggle="tooltip" data-placement="bottom" data-original-title="王五-张三-李四"></i></td>
+                        <td><input type="checkbox"></td>
+                      </tr>
+                    </table>
                   </div>
-              </div>
-          </div>
-      </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-sm btn-primary">确认</button>
+                </div>
+            </div>
+        </div>
+    </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>

+ 142 - 31
biaoduan-panel.html

@@ -189,9 +189,12 @@
                       <a href="#bd-set-5" data-toggle="modal" data-target="#bd-set-5" class="btn btn-sm btn-outline-primary">显示设置</a>
                       <a href="#bd-set-6" data-toggle="modal" data-target="#bd-set-6" class="btn btn-sm btn-outline-primary">章节设置</a>
                       <a href="#bd-set-7" data-toggle="modal" data-target="#bd-set-7" class="btn btn-sm btn-outline-primary">付款账号</a>
-                      <!-- <a href="biaoduan-xiezuo.html" class="btn btn-sm btn-outline-primary"><i class="fa fa-users"></i> 协作办公</a> -->
-                      <a href="#bd-set-8" data-toggle="modal" data-target="#bd-set-8" class="btn btn-sm btn-outline-primary">形象进度</a>
+                      <a class="btn btn-sm btn-outline-primary" href="#batch" data-toggle="modal" data-target="#batch"><i class="fa fa-clipboard "></i> 拷贝设置</a>
+                      <i class="mx-2">|</i>
                       <a href="biaoduan-liucheng.html" class="btn btn-sm btn-outline-primary">审批流程</a>
+                      <a href="#bd-set-8" data-toggle="modal" data-target="#bd-set-8" class="btn btn-sm btn-outline-primary">形象进度 <span class="badge badge-secondary">1</span></a>
+                      <a href="#bd-set-9" data-toggle="modal" data-target="#bd-set-9"  class="btn btn-sm btn-outline-primary">游客账号 <span class="badge badge-secondary">4</span></a>
+                      <!-- <a href="biaoduan-xiezuo.html" class="btn btn-sm btn-outline-primary"><i class="fa fa-users"></i> 协作办公</a> -->
                     </div>
                   </div>
                 </div>
@@ -927,40 +930,148 @@
           </div>
       </div>
   </div>
-    <!--上报审批-->
-    <div class="modal fade" id="add" data-backdrop="static">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h5 class="modal-title">添加协作人</h5>
-                </div>
-                <div class="modal-body">
-                  <div class="form-group">
-                    <label>搜索</label>
-                    <div class="input-group">
-                      <input class="form-control" placeholder="请输入姓名进行检索" type="text">
-                      <div class="input-group-append">
-                        <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
+  <!--游客账号-->
+  <div class="modal fade" id="bd-set-9" data-backdrop="static">
+      <div class="modal-dialog" role="document">
+          <div class="modal-content">
+              <div class="modal-header">
+                  <h5 class="modal-title">游客账号</h5>
+              </div>
+              <div class="modal-body">
+                <div class="dropdown text-right">
+                        <button class="btn btn-outline-primary btn-sm dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                          添加游客
+                        </button>
+                        <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton" style="width:220px">
+                            <div class="mb-2 p-2"><input class="form-control form-control-sm" placeholder="姓名/手机 检索"></div>
+                            <dl class="list-unstyled book-list">
+                              <dt><a href=""><i class="fa fa-minus-square-o"></i></a> 建设单位</dt>
+                              <dd class="border-bottom p-2 mb-0">
+                                <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span class="ml-auto">15800000003</span></p>
+                                 <span class="text-muted">职称</span>
+                              </dd>
+                              <dd class="border-bottom p-2 mb-0">
+                                <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span class="ml-auto">15800000003</span></p>
+                                 <span class="text-muted">职称</span>
+                              </dd>
+                              <dd class="border-bottom p-2 mb-0">
+                                <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span class="ml-auto">15800000003</span></p>
+                                 <span class="text-muted">职称</span>
+                              </dd>
+                              <dd class="border-bottom p-2 mb-0">
+                                <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span class="ml-auto">15800000003</span></p>
+                                 <span class="text-muted">职称</span>
+                              </dd>
+                              <dt><a href=""><i class="fa fa-minus-square-o"></i></a> 监理单位</dt>
+                              <dd class="border-bottom p-2 mb-0">
+                                <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span class="ml-auto">15800000003</span></p>
+                                 <span class="text-muted">职称</span>
+                              </dd>
+                              <dd class="border-bottom p-2 mb-0">
+                                <p class="mb-0 d-flex"><span class="text-primary">李旭</span><span class="ml-auto">15800000003</span></p>
+                                 <span class="text-muted">职称</span>
+                              </dd>
+                              <dt><a href=""><i class="fa fa-plus-square"></i></a> 施工单位</dt>
+                              <dt><a href=""><i class="fa fa-plus-square"></i></a> 设计单位</dt>
+                            </dl>
+                        </div>
                       </div>
-                    </div>
+                <div class="card mt-3">
+                  <div class="card-header">
+                    游客列表
                   </div>
-                  <div class="card border-primary">
-                    <div class="card-body">
-                      <h5 class="card-title">
-                        <a href="#" class="btn btn-primary btn-sm pull-right">添加</a>张三
-                      </h5>
-                      <h6 class="card-subtitle mb-2 text-muted">监理</h6>
-                      <p class="card-text">XXXXX公司</p>
-                    </div>
+                  <div class="modal-height-300">
+                    <ul class="list-group list-group-flush">
+                      <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>1 张三  <small class="text-muted">监理</small><p class="m-0 ml-2"><small class="text-muted">中交第一公路工程局有限公司国道311线满别公路施工一分部</small></p></li>
+                      <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>2 王五 <small class="text-muted">监理</small><p class="m-0 ml-2"><small class="text-muted">XXX单位</small></p></li>
+                      <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>3 李四 <small class="text-muted">监理</small><p class="m-0 ml-2"><small class="text-muted">XXX单位</small></p></li>
+                    </ul>
                   </div>
                 </div>
-                <div class="modal-footer">
-                  <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                  <button type="button" class="btn btn-primary">确认上报</button>
+              </div>
+              <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-sm btn-primary">确认上报</button>
+              </div>
+          </div>
+      </div>
+  </div>
+  <!--批量设置-->
+  <div class="modal fade" id="batch" data-backdrop="static">
+      <div class="modal-dialog" role="document">
+          <div class="modal-content">
+              <div class="modal-header">
+                  <h5 class="modal-title">从其他标段拷贝设置</h5>
+              </div>
+              <div class="modal-body">
+                <div class="alert alert-warning mb-1">从以下标段拷贝设置</div>
+                <div class=" mb-1">
+                  <a class="btn btn-sm btn-light">
+                    <div class="custom-control custom-checkbox">
+                      <input type="checkbox" class="custom-control-input" id="customCheckDisabld" checked="">
+                      <label class="custom-control-label text-primary" for="customCheckDisabld">标段属性</label>
+                    </div>
+                  </a>
+                  <a class="btn btn-sm btn-light">
+                    <div class="custom-control custom-checkbox">
+                      <input type="checkbox" class="custom-control-input" id="customCheckDisabld2" checked="">
+                      <label class="custom-control-label text-primary" for="customCheckDisabld2">章节设置</label>
+                    </div>
+                  </a>
+                  <a class="btn btn-sm btn-light">
+                    <div class="custom-control custom-checkbox">
+                      <input type="checkbox" class="custom-control-input" id="customCheckDisabld3" checked="">
+                      <label class="custom-control-label text-primary" for="customCheckDisabld3">付款账号</label>
+                    </div>
+                  </a>
                 </div>
-            </div>
-        </div>
-    </div>
+                <div class="modal-height-500">
+                  <table class="table table-hover table-bordered">
+              <thead>
+                <th>名称</th>
+                <th width="40">选择</th>
+              </thead>
+              <tr>
+                <td class="in-1"><i class="fa fa-folder-o"></i>&nbsp;2019</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td class="in-1"><i class="fa fa-folder-o"></i>&nbsp;2018</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td class="in-2"><i class="fa fa-folder-o"></i>&nbsp;土建</td>
+                <td></td>
+              </tr>
+              <tr>
+              <td class="in-3"><span class="text-muted mr-2">└</span><a href="biaoduan-panel.html">WWUJ-1</a></td>
+              <td><input type="radio" name="shez1"></td>
+              </tr>
+              <tr>
+              <td class="in-3"><span class="text-muted mr-2">├</span><a href="biaoduan-panel.html">WWUJ-2</a></td>
+              <td><input type="radio" name="shez1"></td>
+              <tr>
+              <td class="in-3"><span class="text-muted mr-2">└</span><a href="biaoduan-panel.html">WWUJ-4</a></td>
+              <td><input type="radio" name="shez1"></td>
+              </tr>
+              <tr>
+                <td class="in-2"><i class="fa fa-folder-o"></i>&nbsp;绿化</td>
+                <td></td>
+              </tr>
+              <tr>
+              <td class="in-3"><span class="text-muted mr-2">└</span><a href="biaoduan-panel.html">WWUJ-3</a></td>
+              <td><input type="radio" name="shez1"></td>
+              </tr>
+          </table>
+                </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-sm btn-primary">确认</button>
+              </div>
+          </div>
+      </div>
+  </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>

+ 49 - 14
css/main.css

@@ -65,7 +65,21 @@ font-size: .875rem;
 }
 .bs-popover-auto[x-placement^="bottom"] .arrow::after, .bs-popover-bottom .arrow::after{
   border-bottom-color:#000;
-}/*
+}
+.custom-control-warning-input:checked ~ .custom-control-warning-label::before{
+  border-color:#da9500 ;
+  background-color:#da9500 
+}
+.custom-control-warning-label{
+  color:#da9500;
+}
+.custom-control-label::before{
+  top:.15rem;
+}
+.custom-control-label::after{
+  top:.15rem;
+}
+/*
 .btn.disabled, .btn:disabled {
   opacity:.4
 }*/
@@ -94,28 +108,55 @@ font-size: .875rem;
   color: #bee5eb;
 }
 .text-danger-50{
-  color: #f5c6cb;
+  color: #ed969e;
 }
 .text-success-50{
   color: #c3e6cb;
 }
+.text-primary-50{
+  color: #cce5ff;
+}
+.text-warning-50{
+  color: #ffddc5;
+}
+.text-secondary-50{
+  color: #dcdcdc;
+}
 .bg-info-50{
-  background-color: #bee5eb;
+  background-color: #d0f6fd;
 }
 .bg-danger-50{
-  background-color: #f5c6cb;
+  background-color: #f8d7da;
 }
 .bg-success-50{
-  background-color: #c3e6cb;
+  background-color: #d4edda;
+}
+.bg-primary-50{
+  background-color: #cce5ff;
+}
+.bg-warning-50{
+  background-color: #ffddc5;
+}
+.bg-secondary-50{
+  background-color: #dcdcdc;
 }
 .border-info-50{
-  border:1px solid #86cfda;
+  border:1px solid #9be6f4;
 }
 .border-danger-50{
-  border:1px solid #ed969e;
+  border:1px solid #f5c6cb;
 }
 .border-success-50{
-  border:1px solid #8fd19e;
+  border:1px solid #c3e6cb;
+}
+.border-primary-50{
+  border:1px solid #b8daff;
+}
+.border-warning-50{
+  border:1px solid #fbc7a3;
+}
+.border-secondary-50{
+  border:1px solid #ccc;
 }
 /*在谷歌下移除input[number]的上下箭头*/
 input.nospin[type='number']::-webkit-outer-spin-button,
@@ -994,12 +1035,6 @@ legend {
     right:0;
     top:35px;
   }
-.custom-control-label::before{
-  top:.1rem;
-}
-.custom-control-label::after{
-  top:.1rem;
-}
 .form-control-sm{
   height:calc(1.4125rem + 2px);
 }

+ 23 - 14
jiliang-qi-detail-1.html

@@ -314,11 +314,11 @@
                       <a class="btn btn-sm btn-outline-secondary" id="dropdownMenuButton1" data-toggle="dropdown" title="优先显示"><i class="fa fa-list-ol"></i></a>
                       <div class="dropdown-menu" aria-labelledby="dropdownMenuButton1" style="min-width:60px">
                         <a class="dropdown-item" href="#"><i class="fa fa-list-ol"></i></a>
-                        <a class="dropdown-item text-primary" href="#"><i class="fa fa-tag"></i></a>
-                        <a class="dropdown-item text-success " href="#"><i class="fa fa-tag"></i></a>
-                        <a class="dropdown-item text-danger " href="#"><i class="fa fa-tag"></i></a>
-                        <a class="dropdown-item text-warning " href="#"><i class="fa fa-tag"></i></a>
-                        <a class="dropdown-item text-info " href="#"><i class="fa fa-tag"></i></a>
+                        <a class="dropdown-item text-primary" href="#"><i class="fa fa-circle"></i></a>
+                        <a class="dropdown-item text-success " href="#"><i class="fa fa-circle"></i></a>
+                        <a class="dropdown-item text-danger " href="#"><i class="fa fa-circle"></i></a>
+                        <a class="dropdown-item text-warning " href="#"><i class="fa fa-circle"></i></a>
+                        <a class="dropdown-item text-info " href="#"><i class="fa fa-circle"></i></a>
                       </div>
                     </div>
                     <div class="input-group input-group-sm">
@@ -333,7 +333,7 @@
                     <div class="card border-primary my-2">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-primary" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle  text-primary" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -347,13 +347,22 @@
                         <p class="card-text">
                           <textarea name="" class="form-control"></textarea>
                         </p>
-                          <div class="d-flex justify-content-end"><button type="button" class="btn btn-sm btn-outline-danger mr-5"><i class="fa fa-close"></i>  删除书签</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-success"><i class="fa fa-check"></i> 确定</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-secondary">取消</button></div>
+                          <div class="d-flex justify-content-between">
+                      <!-- <div class="custom-control custom-switch mr-2">
+                              <input type="checkbox" class="custom-control-input" id="customSwitch1">
+                              <label class="custom-control-label" for="customSwitch1" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="这条书签近自己(添加人)可见"><i class="fa fa-users"></i> 仅自己可见</label>
+                            </div> --><div class="custom-control custom-switch mr-2">
+                              <input type="checkbox" class="custom-control-input custom-control-warning-input" id="customSwitch1">
+                              <label class="custom-control-label custom-control-warning-label" for="customSwitch1" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="所有参与计量审批管理的用户都可以看到这条书签"><i class="fa fa-users"></i> 参与者可见</label>
+                              </div>
+                            <div>
+                            <button type="button" class="btn btn-sm btn-outline-danger mr-3"><i class="fa fa-close"></i>  删除书签</button><button type="button" class="btn btn-sm btn-outline-success"><i class="fa fa-check"></i> 确定</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-secondary">取消</button></div></div>
                       </div>
                     </div>
                     <div class="card border-primary my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-primary" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-primary" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -361,7 +370,7 @@
                             <a class="dropdown-item text-warning " href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-info " href="#"><i class="fa fa-tint"></i></a>
                           </div>
-                        </div>1-2-2-1-1-1 / K3+005-K4+021
+                        </div>1-2-2-1-1-1 / K3+005-K4+021<i class="fa fa-users pull-right text-warning"data-toggle="tooltip" data-placement="bottom" title="" data-original-title="所有参与计量审批管理的用户都可以看到这条书签"></i>
                         <div class="pull-right edit-tag-btn"><a class="mr-1" href="#"><i class="fa fa-crosshairs"></i> 定位</a><a class="" href="#"><i class="fa fa-edit"></i> 编辑</a></div>
                       </div>
                       <div class="card-body p-2">
@@ -371,7 +380,7 @@
                     <div class="card border-primary my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-primary" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-primary" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -389,7 +398,7 @@
                     <div class="card border-success my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-success" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-success" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -407,7 +416,7 @@
                     <div class="card border-danger my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-danger" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-danger" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -425,7 +434,7 @@
                     <div class="card border-warning my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-warning" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-warning" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -443,7 +452,7 @@
                     <div class="card border-info my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-info" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-info" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>

+ 39 - 21
schedule-actual1.html

@@ -61,16 +61,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.html"><span>台分解</span></a></li>
-              <li><a href="taizhang-shenpi.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-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>
@@ -107,6 +107,16 @@
 					<div class="title-main d-flex">
             <div>
               <div class="d-inline-block">
+                <div class="btn-group group-tab">
+                  <a class="btn btn-sm btn-light active" href="schedule-actual1.html">
+                    金额模式
+                  </a>
+                  <a class="btn btn-sm btn-light" href="schedule-actual2.html">
+                    工程量模式
+                  </a>
+                </div>
+              </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">
                     2020年3月(第3期)
@@ -116,19 +126,12 @@
                   </div>
                 </div>
               </div>
-              <div class="d-inline-block">
-                <div class="btn-group group-tab">
-                  <a class="btn btn-sm btn-light active" href="schedule-actual1.html">
-                    金额模式
-                  </a>
-                  <a class="btn btn-sm btn-light" href="schedule-actual2.html">
-                    工程量模式
-                  </a>
-                </div>
+              <div class="d-inline-flex">
+                <a href="#delete" data-toggle="modal" data-target="#delete" class="btn btn-sm btn-outline-danger">删除本期进度</a>
               </div>
             </div>
             <div class="ml-auto">
-              <a href="" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#first">创建新计量进度</a>
+              <a href="" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#add">创建新计量进度</a>
               <a href="" class="btn btn-sm btn-warning" data-toggle="modal" data-target="#re-build">重新生成本月进度</a>
             </div>
           </div>
@@ -153,7 +156,7 @@
 		</div>
 	</div>
   <!--创建新计量进度数据-->
-  <div class="modal fade" id="first" data-backdrop="static">
+  <div class="modal fade" id="add" data-backdrop="static">
       <div class="modal-dialog" role="document">
           <div class="modal-content">
               <div class="modal-header">
@@ -161,7 +164,7 @@
               </div>
               <div class="modal-body">
                 <div class="form-group">
-                  <label>计进度月</label>
+                  <label>计进度月</label>
                   <select class="form-control">
                     <option>2020年1月</option>
                     <option>2020年2月</option>
@@ -191,7 +194,7 @@
               </div>
               <div class="modal-body">
                 <div class="form-group">
-                  <label>计进度月:2020年3月</label>
+                  <label>计进度月:2020年3月</label>
                 </div>
                 <div class="form-group">
                   <label>计量期</label>
@@ -207,6 +210,24 @@
           </div>
       </div>
   </div>
+     <!--删除期-->
+  <div class="modal fade" id="delete" data-backdrop="static">
+      <div class="modal-dialog" role="document">
+          <div class="modal-content">
+              <div class="modal-header">
+                  <h5 class="modal-title">删除本期计量进度</h5>
+              </div>
+              <div class="modal-body">
+                <h6>确认删除「2020年3月(第3期)」计量进度?</h6>
+                <h6>删除后,数据无法恢复,请谨慎操作。</h6>
+              </div>
+              <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-sm btn-danger">确定删除</button>
+              </div>
+          </div>
+      </div>
+  </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>
@@ -219,9 +240,6 @@
     <script src="js/datepicker/datepicker.min.js"></script>
     <script src="js/datepicker/datepicker.zh.js"></script>
     <script type="text/javascript">  autoFlashHeight();</script>
-    <script type="text/javascript">
-        $('#first').modal('show')
-    </script>
 </body>
 
 </html>

+ 102 - 27
schedule-actual2.html

@@ -61,16 +61,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.html"><span>台分解</span></a></li>
-              <li><a href="taizhang-shenpi.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-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>
@@ -107,60 +107,135 @@
 					<div class="title-main d-flex">
             <div>
               <div class="d-inline-block">
-                <div class="btn-group">
+                <div class="btn-group group-tab">
                   <a class="btn btn-sm btn-light" href="schedule-actual1.html">
-                    模式1
+                    金额模式
                   </a>
                   <a class="btn btn-sm btn-light active" href="schedule-actual2.html">
-                    模式2
+                    工程量模式
                   </a>
                 </div>
               </div>
             </div>
             <div class="ml-auto">
-              
+              <a href="#edit-计量" data-toggle="modal" data-target="#edit-plan" class="btn btn-sm btn-outline-primary">管理计量</a>
+              <a href="" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#add">创建实际计量</a>
             </div>
           </div>
 				</div>
 				<div class="content-wrap">
 					<div class="c-body">
-            <div class="sjs-height-0">
+            <div class="sjs-height-1">
               <table class="table table-bordered table-sm">
                 <thead>
-                  <tr class="text-center"><th rowspan="2">项目节编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th><th rowspan="2">经济指标</th><th colspan="2">总设计</th><th colspan="2">2020年1月</th><th colspan="2">2020年2月</th><th colspan="2">2020年3月</th></tr>
-                  <tr class="text-center"><th>工程量</th><th>金额(万元)</th><th>计量工程量</th><th>计量金额(万元)</th><th>计量工程量</th><th>计量金额(万元)</th><th>计量工程量</th><th>计量金额(万元)</th></tr>
+                  <tr class="text-center"><th rowspan="2">项目节编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th><th rowspan="2">经济指标</th><th colspan="2">总设计</th><th colspan="4">2020年1月</th><th colspan="4">2020年2月</th><th colspan="4">2020年3月</th></tr>
+                  <tr class="text-center"><th>工程量</th><th>金额(万元)</th><th>计划金额(万元)</th><th>计划工程量</th><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-2</td><td>路基工程</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-2-2</td><td>挖方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td><td></td><td></td><td><input></td><td></td><td><input></td><td></td><td><input></td><td></td></tr>
-                <tr><td>1-2-3</td><td>填方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-2-3-1</td><td>路基填方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-2-3-1-2</td><td>利用方填筑</td><td></td><td></td><td></td><td></td><td><input></td><td></td><td><input></td><td></td><td><input></td><td></td></tr>
-                <tr><td>1-2-3-1-2</td><td>借方填筑</td><td></td><td></td><td></td><td></td><td><input></td><td></td><td><input></td><td></td><td><input></td><td></td></tr>
+                <tr><td>1-2</td><td>路基工程</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                <tr><td>1-2-2</td><td>挖方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td><input></td><td></td><td></td><td></td><td><input></td><td></td><td></td><td></td><td><input></td><td></td></tr>
+                <tr><td>1-2-3</td><td>填方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                <tr><td>1-2-3-1</td><td>路基填方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                <tr><td>1-2-3-1-2</td><td>利用方填筑</td><td></td><td></td><td></td><td></td><td></td><td></td><td><input></td><td></td><td></td><td></td><td><input></td><td></td><td></td><td></td><td><input></td><td></td></tr>
+                <tr><td>1-2-3-1-2</td><td>借方填筑</td><td></td><td></td><td></td><td></td><td></td><td></td><td><input></td><td></td><td></td><td></td><td><input></td><td></td><td></td><td></td><td><input></td><td></td></tr>
               </table>
             </div>
+            <div class="bcontent-wrap">
+              <div class="bc-bar mb-1">
+                <ul class="nav nav-tabs">
+                  <li class="nav-item">
+                    <a class="nav-link active" data-toggle="tab" href="#huizong" role="tab">汇总</a>
+                  </li>
+                  <li class="nav-item">
+                    <div class="d-inline-block ml-2">
+                      <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">
+                          2020年
+                        </button>
+                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start">
+                          <a class="dropdown-item" href="#">2019年</a>
+                        </div>
+                      </div>
+                    </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">
+                          1月
+                        </button>
+                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start">
+                          <a class="dropdown-item" href="#">2月</a>
+                          <a class="dropdown-item" href="#">3月</a>
+                          <a class="dropdown-item" href="#">4月</a>
+                        </div>
+                      </div>
+                    </div>
+                  </li>
+                </ul>
+              </div>
+              <div class="tab-content">
+                <div class="tab-pane active" id="huizong">
+                  <table class="table table-bordered table-sm">
+                <thead>
+                  <tr class="text-center"><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="2">本年计划完成</th><th colspan="2">本年累计完成</th><th colspan="2">本月计划完成</th><th colspan="2">本月完成计量</th><th colspan="2">下月计划</th></tr>
+                  <tr class="text-center"><th>工程量</th><th>金额(万元)</th><th>工程量</th><th>金额(万元)</th><th>工程量</th><th>金额(万元)</th><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-2</td><td>路基工程</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                <tr><td>1-2-2</td><td>挖方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td><td></td><td></td><td>11111</td><td>11111</td><td>22222</td><td>22222</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+              </table>
+                </div>
+              </div>
+            </div>
           </div>
 				</div>
 			</div>
 		</div>
 	</div>
-  <!--新增计划-->
-  <div class="modal fade" id="add-plan" data-backdrop="static">
+  <!--创建新计量进度数据-->
+  <div class="modal fade" id="add" data-backdrop="static">
       <div class="modal-dialog" role="document">
           <div class="modal-content">
               <div class="modal-header">
-                  <h5 class="modal-title">新增计划</h5>
+                  <h5 class="modal-title">创建实际计量</h5>
               </div>
               <div class="modal-body">
                 <div class="form-group">
-                      <label>计划周期</label>
-                      <input class="datepicker-here form-control" placeholder="点击选择时间" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text">
-                    </div>
+                  <label>计划进度月</label>
+                  <select class="form-control">
+                    <option>2020年1月</option>
+                    <option>2020年2月</option>
+                    <option>2020年3月</option>
+                  </select>
+                </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-sm btn-primary" >确认创建</button>
+              </div>
+          </div>
+      </div>
+  </div>
+  <!--管理计量-->
+  <div class="modal fade" id="edit-plan" data-backdrop="static">
+      <div class="modal-dialog" role="document">
+          <div class="modal-content">
+              <div class="modal-header">
+                  <h5 class="modal-title">管理计量</h5>
+              </div>
+              <div class="modal-body">
+                <table class="table table-bordered table-hover">
+                  <tr><th>计量月</th><th width="100">删除</th></tr>
+                  <tr><td>2020-1</td><td></td></tr>
+                  <tr><td>2020-2</td><td><label><input type="checkbox"></label></td></tr>
+                  <tr><td>2020-3</td><td><label><input type="checkbox"></label></td></tr>
+                </table>
+                <div class="alert alert-danger">确认删除「2020-2」「2020-3」计量进度?删除后,数据无法恢复,请谨慎操作。</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-sm btn-primary" >确认新增</button>
+                <button type="button" class="btn btn-sm btn-danger" >确认删除</button>
               </div>
           </div>
       </div>

+ 7 - 7
schedule-panel.html

@@ -59,16 +59,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.html"><span>台分解</span></a></li>
-              <li><a href="taizhang-shenpi.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-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>
@@ -105,7 +105,7 @@
 					<div class="title-main d-flex">
             <h2>计划至至 2020年12月</h2>
             <div class="ml-auto">
-              <a href="schedule-taizhang.html" class="btn btn-sm btn-outline-primary">进度台</a>
+              <a href="schedule-taizhang.html" class="btn btn-sm btn-outline-primary">进度台</a>
             </div>
           </div>
 				</div>
@@ -168,7 +168,7 @@
                     <div class="progress-bar bg-success" style="width:24%;" data-placement="bottom" data-toggle="tooltip" data-original-title="计划完成金额:¥300.00">24%</div>
                     <div class="progress-bar bg-gray" style="width:76%;" data-placement="bottom" data-toggle="tooltip" data-original-title="合同未计划:¥930.00">66%</div>
                   </div>
-                  <p class="mt-2 mb-0">实际金额进度(万元)</p>
+                  <p class="mt-2 mb-0">实际金额进度(万元)</p>
                   <div class="progress">
                     <div class="progress-bar bg-success" style="width: 18%;" data-placement="bottom" data-toggle="tooltip" data-original-title="实际完成金额:¥400.00">18%</div>
                     <div class="progress-bar bg-gray" style="width:82%;" data-placement="bottom" data-toggle="tooltip" data-original-title="合同未完成:¥930.00">72%</div>

+ 106 - 8
schedule-plan.html

@@ -61,16 +61,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.html"><span>台分解</span></a></li>
-              <li><a href="taizhang-shenpi.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-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>
@@ -105,9 +105,15 @@
 			<div class="panel-content">
 				<div class="panel-title">
 					<div class="title-main d-flex">
-            <h2>计划至 2020年3月</h2>
+            <div>
+              <div class="d-inline-block">
+                计划至 2020年3月
+              </div>
+            </div>
             <div class="ml-auto">
-              <a href="#add-plan" data-toggle="modal" data-target="#add-plan" class="btn btn-sm btn-primary pull-right">新增计划</a>
+              <a href="#mode" data-toggle="modal" data-target="#mode" class="btn btn-sm btn-outline-primary">计算方式</a>
+              <a href="#edit-plan" data-toggle="modal" data-target="#edit-plan" class="btn btn-sm btn-outline-primary">管理计划</a>
+              <a href="#add-plan" data-toggle="modal" data-target="#add-plan" class="btn btn-sm btn-primary">新增计划</a>
             </div>
           </div>
 				</div>
@@ -134,7 +140,7 @@
 			</div>
 		</div>
 	</div>
-  <!--标段设置-付款账号-->
+  <!--新增计划-->
   <div class="modal fade" id="add-plan" data-backdrop="static">
       <div class="modal-dialog" role="document">
           <div class="modal-content">
@@ -146,6 +152,7 @@
                       <label>计划周期</label>
                       <input class="datepicker-here form-control" placeholder="点击选择时间" data-view="months" data-min-view="months" data-date-format="yyyy-MM" data-range="true" data-multiple-dates-separator=" ~ " data-language="zh" type="text">
                     </div>
+                    <div class="alert alert-danger">2020-05 已创建</div>
               </div>
               <div class="modal-footer">
                 <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">取消</button>
@@ -154,6 +161,94 @@
           </div>
       </div>
   </div>
+  <!--管理计划-->
+  <div class="modal fade" id="edit-plan" data-backdrop="static">
+      <div class="modal-dialog" role="document">
+          <div class="modal-content">
+              <div class="modal-header">
+                  <h5 class="modal-title">管理计划</h5>
+              </div>
+              <div class="modal-body">
+                <table class="table table-bordered table-hover">
+                  <tr><th>计划月</th><th width="100">删除</th></tr>
+                  <tr><td>2020-1</td><td></td></tr>
+                  <tr><td>2020-2</td><td><label><input type="checkbox"></label></td></tr>
+                  <tr><td>2020-3</td><td><label><input type="checkbox"></label></td></tr>
+                </table>
+                <div class="alert alert-danger">确认删除「2020-2」「2020-3」计划进度?删除后,数据无法恢复,请谨慎操作。</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-sm btn-danger" >确认删除</button>
+              </div>
+          </div>
+      </div>
+  </div>
+  <!--选择计算方式-->
+  <div class="modal fade" id="first" data-backdrop="static">
+      <div class="modal-dialog" role="document">
+          <div class="modal-content">
+              <div class="modal-header">
+                  <h5 class="modal-title">选择计划进度计算方式</h5>
+              </div>
+              <div class="modal-body">
+                <div class="row">
+                  <div class="col-6">
+                    <div class="card">
+                      <div class="card-body">
+                        <h5 class="card-title"><i class="fa fa-bookmark"></i> 金额</h5>
+                        <p class="card-text">填写计划金额,通过经济指标反算工程量</p>
+                        <a href="#" class="btn btn-primary btn-sm" data-dismiss="modal">选择</a>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="col-6">
+                    <div class="card">
+                      <div class="card-body">
+                        <h5 class="card-title"><i class="fa fa-bookmark"></i> 工程量</h5>
+                        <p class="card-text">填写工程量,金额=工程量×经济指标</p>
+                        <a href="#" class="btn btn-sm btn-primary" data-dismiss="modal">选择</a>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+          </div>
+      </div>
+  </div>
+  <!--选择计算方式-->
+  <div class="modal fade" id="mode" data-backdrop="static">
+      <div class="modal-dialog" role="document">
+          <div class="modal-content">
+              <div class="modal-header">
+                  <h5 class="modal-title">选择计划进度计算方式</h5>
+              </div>
+              <div class="modal-body">
+                <div class="row mb-2">
+                  <div class="col-6">
+                    <div class="card">
+                      <div class="card-body">
+                        <h5 class="card-title"><i class="fa fa-bookmark"></i> 金额</h5>
+                        <p class="card-text">填写计划金额,通过经济指标反算工程量</p>
+                        <a href="#" class="btn btn-primary btn-sm disabled" >当前</a>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="col-6">
+                    <div class="card">
+                      <div class="card-body">
+                        <h5 class="card-title"><i class="fa fa-bookmark"></i> 工程量</h5>
+                        <p class="card-text">填写工程量,金额=工程量×经济指标</p>
+                        <a href="#" class="btn btn-sm btn-primary" data-dismiss="modal">选择</a>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+                <div class="alert alert-danger">更改计算方式,未使用的计划月数据都将按新计算方式重新计算,请谨慎选择。</div>
+              </div>
+          </div>
+      </div>
+  </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>
@@ -166,6 +261,9 @@
     <script src="js/datepicker/datepicker.min.js"></script>
     <script src="js/datepicker/datepicker.zh.js"></script>
     <script type="text/javascript">  autoFlashHeight();</script>
+    <script type="text/javascript">
+        $('#first').modal('show')
+    </script>
 </body>
 
 </html>

+ 8 - 8
schedule-taizhang.html

@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>进度台-计量支付</title>
+    <title>进度台-计量支付</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
@@ -50,16 +50,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.html"><span>台分解</span></a></li>
-              <li><a href="taizhang-shenpi.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-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>
@@ -750,10 +750,10 @@
       <div class="modal-dialog" role="document">
           <div class="modal-content">
               <div class="modal-header">
-                  <h5 class="modal-title">进度台</h5>
+                  <h5 class="modal-title">进度台</h5>
               </div>
               <div class="modal-body">
-                <h5>首次使用形象进度需要进行进度台初始化设置</h5>
+                <h5>首次使用形象进度需要进行进度台初始化设置</h5>
               </div>
               <div class="modal-footer">
                 <button type="button" class="btn btn-sm btn-primary" data-dismiss="modal">开始设置</button>

+ 2 - 20
settings-user.html

@@ -170,7 +170,7 @@
                               <td>珠海纵横创新软件有限公司</td>
                               <td>产品经理</td>
                               <td></td>
-                              <td>查阅所有标段 <a href="#edit-user2" data-toggle="modal" data-target="#edit-user2" class="btn btn-sm btn-outline-primary pull-right">编辑</a></td>
+                              <td><a href="#edit-user2" data-toggle="modal" data-target="#edit-user2" class="btn btn-sm btn-outline-primary pull-right">编辑</a></td>
                             </tr>
                             <tr>
                               <td>chente4</td>
@@ -348,29 +348,11 @@
                         <label class="form-check-label" for="inlineCheckbox1">创建标段</label>
                       </div>
                       <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="checkbox" id="inlineCheckbox2" value="option2">
-                        <label class="form-check-label" for="inlineCheckbox2">查阅所有标段</label>
-                      </div>
-                      <div class="form-check form-check-inline">
                         <input class="form-check-input" type="checkbox" id="inlineCheckbox3" value="option2">
                         <label class="form-check-label" for="inlineCheckbox3">维护签约清单 <a href=""  data-toggle="tooltip" data-placement="bottom" title="" data-original-title="开启该选项,台账审批通过后,可上传签约清单"><i class="fa fa-question-circle "></i></a></label>
                       </div>
                     </div>
                   </div>
-                  <!--需要勾选  创建标段 ,协作办公才能勾选-->
-                  <div class="form-group">
-                    <label>协作办公 <sup>2</sup></label>
-                    <div>
-                      <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="checkbox" id="inlineCheckbox4" value="option1">
-                        <label class="form-check-label" for="inlineCheckbox4">启用</label>
-                      </div>
-                      <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="checkbox" id="inlineCheckbox5" value="option1">
-                        <label class="form-check-label" for="inlineCheckbox5">关闭</label>
-                      </div>
-                    </div>
-                  </div>
                   <div class="form-group">
                     <label>发布项目通知</label>
                     <div>
@@ -385,7 +367,7 @@
                     </div>
                   </div>
                   <div class="alert alert-secondary">
-                    <p>1.勾选「创建标段」该用户默认具有「新建标段」及标段内「台账分解」「创建台账修订」「创建计量期」「创建工程变更」的权限。</p>2.启用「协作办公」,则该用户可以为他创建的标段添加其他用户进行协作办公。
+                    <p>1.勾选「创建标段」该用户默认具有「新建标段」及标段内「台账分解」「创建台账修订」「创建计量期」「创建工程变更」的权限。</p>
                   </div>
                 </div>
                 <div class="modal-footer">

+ 49 - 34
taizhang-bg-detail-shenpi.html

@@ -105,30 +105,34 @@
               <!--0号台帐模式-->
               <div class="sjs-height-1" style="overflow: auto">
                 <table class="table table-sm table-bordered">
-                  <tr>
-                    <th rowspan="2">修订</th><th rowspan="2">项目节编号</th><th rowspan="2">清单编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th rowspan="2"><th>单价</th><th colspan="2">签约</th><th colspan="2">施工图复核</th><th rowspan="2">图册号</th><th rowspan="2">备注</th>
-                  </tr>
-                  <tr>
-                    <th>数量</th><th>金额</th><th>数量</th><th>金额</th>
-                  </tr>
-                  <tr><td></td><td>1</td><td></td><td>第一部分 建筑安装工程费</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-2</td><td></td><td>路基工程</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-2-2</td><td></td><td>挖方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-2-2-1</td><td></td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-2-2-1-1</td><td></td><td>挖路基土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="text-info"><td>增</td><td></td><td>203-1-a</td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td></td><td>203-1-a</td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-4</td><td></td><td>桥梁涵洞工程</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-4-5</td><td></td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-4-5-1</td><td></td><td>K66+258马坑渭河大桥</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-4-5-1-1</td><td></td><td>桥台(台高××m)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-4-5-1-1-1</td><td></td><td>桥台基础</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>1-4-5-1-1-1-1</td><td></td><td>桥台桩基础</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="text-danger"><td><del>删</del></td><td></td><td><del>403-1-a</del></td><td><del>I级钢筋(包括基础、承台、支撑梁等)</del></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="text-danger"><td>部删</td><td></td><td>403-1-a</td><td>I级钢筋(包括基础、承台、支撑梁等)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="text-success"><td>改</td><td></td><td>403-1-b</td><td>II级钢筋(包括基础、承台、支撑梁等)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="text-success"><td>改,部改</td><td></td><td>403-1-b</td><td>II级钢筋(包括基础、承台、支撑梁等)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td></td><td>403-1-c</td><td>桩径1.5m</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <thead>
+                    <tr>
+                      <th rowspan="2">项目节编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th><th colspan="2">项目节数量</th><th rowspan="2">经济指标</th><th rowspan="2">台帐金额</th><th rowspan="2">图册号</th><th rowspan="2">备注</th>
+                    </tr>
+                    <tr>
+                      <th>数量1</th><th>数量2</th>
+                    </tr>
+                  </thead>
+                  <tr><td>1</td><td>第一部分 建筑安装工程费</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1</td><td>临时工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-6</td><td>临时道路修建、养护与拆除(包括原道路的养护费)</td><td></td><td></td></td><td></td><td></td><td></td><td></td></td><td></td></tr>
+                  <tr><td>1-1-8</td><td>临时占地</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-9</td><td>临时供电设施</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-10</td><td>电讯设施的提供、维修与拆除</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-11</td><td>承包人驻地建设</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2</td><td>路基工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2</td><td>挖方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5</td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1</td><td>×××(特)大桥(××结构类型)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1</td><td>桥台(台高××m)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1</td><td>桥台基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-2</td><td>桥台承台</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-2</td><td>桥台台身</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-3</td><td>桥台耳背墙</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-4</td><td>桥台台帽</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
                 </table>
               </div>
               <div class="bcontent-wrap">
@@ -159,16 +163,27 @@
                   </ul>
                 </div>
                 <div class="sp-wrap">
-                  <table class="table table-bordered table-sm ">
-                    <tr><th width="80">修订</th><th>名称</th><th>数量</th><th>图册号</th></tr>
-                    <tr class="text-info"><td>增</td><td>0#桥台1#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr class="text-danger"><td><del>删</del></td><td><del>0#桥台1#桩</del></td><td><del>126</del></td><td><del>第四册</del></td></tr>
-                    <tr class="text-success"><td>改</td><td>0#桥台3#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td></td><td>0#桥台4#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td></td><td>8#桥台1#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td></td><td>8#桥台1#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td></td><td>8#桥台3#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td></td><td>8#桥台4#桩</td><td>126</td><td>第四册</td></tr>
+                  <table class="table table-sm table-bordered">
+                    <thead>
+                      <tr>
+                        <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 rowspan="2">图册号</th><th rowspan="2">备注</th>
+                      </tr>
+                      <tr>
+                        <th>数量</th><th>金额</th>
+                      </tr>
+                    </thead>
+                    <tr><td>1-4-5-1-1-1-1-1</td><td></td><td>0#桥台1#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-2</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-3</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
                   </table>
                 </div>
               </div>

+ 60 - 59
taizhang-bg-detail.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>台管理-计量支付</title>
+    <title>台管理-计量支付</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
@@ -41,41 +41,26 @@
     </div>
     <div class="main-panel">
       <div class="panel-sidebar">
-        <div class="panel-title">
-          <div class="title-bar">
-            <h2>WWUJ-1</h2>
-          </div>
-        </div>
+        <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="中交第一公路工程局有限公司国道311线满别公路施工一分部">中交第一公路工程局有限公司国道...</div>
         <div class="scrollbar-auto">
           <div class="nav-box">
             <ul class="nav-list list-unstyled">
-              <li><a href="biaoduan-panel.html"><i class="fa fa-pie-chart"></i> <span>标段概况</span></a></li>
-            </ul>
-          </div>
-          <div class="nav-box">
-            <h3><i class="fa fa-list-alt"></i> 0号台帐</h3>
-            <ul class="nav-list list-unstyled sub-list">
-              <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 class="active"><a href="taizhang-bg.html"><span>台帐修订</span></a></li>
+              <li class=""><a href="taizhang-bg.html" class="text-primary"><i class="fa fa-chevron-left "></i> <span>返回</span></a></li>
             </ul>
           </div>
           <div class="nav-box">
-            <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>
+            <ul class="nav-list list-unstyled">
+              <li class="active"><a href="taizhang-bg-detail.html"><span class="ml-3">台账修订</span></a></li>
             </ul>
           </div>
           <div class="nav-box">
             <ul class="nav-list list-unstyled">
-              <li><a href="biangeng.html"><i class="fa fa-retweet"></i> <span>工程变更</span></a></li>
+              <li><a href="taizhang-bg-detail3.html"><span class="ml-3">台账对比</span></a></li>
             </ul>
           </div>
           <div class="nav-box">
             <ul class="nav-list list-unstyled">
-              <li><a href="baobiao.html"><i class="fa fa-file-text-o"></i> <span>报表</span></a></li>
+              <li><a href="taizhang-bg-detail4.html"><span class="ml-3">清单对比</span></a></li>
             </ul>
           </div>
         </div>
@@ -140,33 +125,37 @@
           <div class="row w-100 sub-content">
             <!--左栏-->
             <div class="c-body col-8">
-              <!--0号台模式-->
+              <!--0号台模式-->
               <div class="sjs-height-1" style="overflow: auto">
                 <table class="table table-sm table-bordered">
-                  <tr>
-                    <th rowspan="2">项目节编号</th><th rowspan="2">清单编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th rowspan="2"><th>单价</th><th colspan="2">签约</th><th colspan="2">施工图复核</th><th rowspan="2">图册号</th><th rowspan="2">备注</th>
-                  </tr>
-                  <tr>
-                    <th>数量</th><th>金额</th><th>数量</th><th>金额</th>
-                  </tr>
-                  <tr><td>1</td><td></td><td>第一部分 建筑安装工程费</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-2</td><td></td><td>路基工程</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-2-2</td><td></td><td>挖方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-2-2-1</td><td></td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-2-2-1-1</td><td></td><td>挖路基土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="table-info"><td></td><td>203-1-a</td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>203-1-a</td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-4</td><td></td><td>桥梁涵洞工程</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-4-5</td><td></td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-4-5-1</td><td></td><td>K66+258马坑渭河大桥</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-4-5-1-1</td><td></td><td>桥台(台高××m)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-4-5-1-1-1</td><td></td><td>桥台基础</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td>1-4-5-1-1-1-1</td><td></td><td>桥台桩基础</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="table-danger"><td></td><td>403-1-a</td><td>I级钢筋(包括基础、承台、支撑梁等)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="table-danger"><td></td><td>403-1-a</td><td>I级钢筋(包括基础、承台、支撑梁等)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="table-success"><td></td><td>403-1-b</td><td>II级钢筋(包括基础、承台、支撑梁等)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr class="table-info"><td></td><td>403-1-b</td><td>II级钢筋(包括基础、承台、支撑梁等)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                  <tr><td></td><td>403-1-c</td><td>桩径1.5m</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <thead>
+                    <tr>
+                      <th rowspan="2">项目节编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th><th colspan="2">项目节数量</th><th rowspan="2">经济指标</th><th rowspan="2">台帐金额</th><th rowspan="2">图册号</th><th rowspan="2">备注</th>
+                    </tr>
+                    <tr>
+                      <th>数量1</th><th>数量2</th>
+                    </tr>
+                  </thead>
+                  <tr><td>1</td><td>第一部分 建筑安装工程费</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1</td><td>临时工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-6</td><td>临时道路修建、养护与拆除(包括原道路的养护费)</td><td></td><td></td></td><td></td><td></td><td></td><td></td></td><td></td></tr>
+                  <tr><td>1-1-8</td><td>临时占地</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-9</td><td>临时供电设施</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-10</td><td>电讯设施的提供、维修与拆除</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-11</td><td>承包人驻地建设</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2</td><td>路基工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2</td><td>挖方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5</td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1</td><td>×××(特)大桥(××结构类型)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1</td><td>桥台(台高××m)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1</td><td>桥台基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-2</td><td>桥台承台</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-2</td><td>桥台台身</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-3</td><td>桥台耳背墙</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-4</td><td>桥台台帽</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
                 </table>
               </div>
               <div class="bcontent-wrap">
@@ -198,16 +187,28 @@
                   </ul>
                 </div>
                 <div class="sp-wrap">
-                  <table class="table table-bordered table-sm ">
-                    <tr><th>名称</th><th>数量</th><th>图册号</th></tr>
-                    <tr class="table-info"><td>0#桥台1#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr class="table-danger"><td>0#桥台1#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr class="table-success"><td>0#桥台3#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td>0#桥台4#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td>8#桥台1#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td>8#桥台1#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td>8#桥台3#桩</td><td>126</td><td>第四册</td></tr>
-                    <tr><td>8#桥台4#桩</td><td>126</td><td>第四册</td></tr>
+                  
+                  <table class="table table-sm table-bordered">
+                    <thead>
+                      <tr>
+                        <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 rowspan="2">图册号</th><th rowspan="2">备注</th>
+                      </tr>
+                      <tr>
+                        <th>数量</th><th>金额</th>
+                      </tr>
+                    </thead>
+                    <tr><td>1-4-5-1-1-1-1-1</td><td></td><td>0#桥台1#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr class="table-info"><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr class="table-danger"><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr class="table-success"><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-2</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-3</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
                   </table>
                 </div>
               </div>
@@ -237,7 +238,7 @@
                 </div>
                 <div id="xiangmujie" class="tab-pane">
                   <div class="sjs-bar-2">
-                    <select class="form-control form-control-sm"><option>0号计量台部位参考(项目节)</option></select>
+                    <select class="form-control form-control-sm"><option>0号计量台部位参考(项目节)</option></select>
                   </div>
                   <div class="sjs-sh-2">
                     <table class="table table-bordered">
@@ -247,7 +248,7 @@
                 </div>
                 <div id="qingdan" class="tab-pane">
                   <div class="sjs-bar-3">
-                  <select class="form-control form-control-sm"><option>0号计量台部位参考(项目节)</option></select>
+                  <select class="form-control form-control-sm"><option>0号计量台部位参考(项目节)</option></select>
                   </div>
                   <div class="sjs-sh-3">
                     <table class="table table-bordered">

+ 10 - 14
taizhang-bg-detail2.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>台管理-计量支付</title>
+    <title>台管理-计量支付</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
@@ -41,11 +41,7 @@
     </div>
     <div class="main-panel">
       <div class="panel-sidebar">
-        <div class="panel-title">
-          <div class="title-bar">
-            <h2>WWUJ-1</h2>
-          </div>
-        </div>
+        <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="中交第一公路工程局有限公司国道311线满别公路施工一分部">中交第一公路工程局有限公司国道...</div>
         <div class="scrollbar-auto">
           <div class="nav-box">
             <ul class="nav-list list-unstyled">
@@ -53,16 +49,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.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 class="active"><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 class="active"><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>
@@ -172,7 +168,7 @@
                   </div>
                 </div>
                 <div id="xiangmujie" class="tab-pane">
-                  <select class="form-control form-control-sm"><option>0号计量台部位参考(项目节)</option></select>
+                  <select class="form-control form-control-sm"><option>0号计量台部位参考(项目节)</option></select>
                   <div class="sjs-height-2">
                     <table class="table table-bordered">
                       <tr><th></th><th>项目节编号</th><th>名称</th><th>单位</th></tr>
@@ -180,7 +176,7 @@
                   </div>
                 </div>
                 <div id="qingdan" class="tab-pane">
-                  <select class="form-control form-control-sm"><option>0号计量台部位参考(项目节)</option></select>
+                  <select class="form-control form-control-sm"><option>0号计量台部位参考(项目节)</option></select>
                   <div class="sjs-height-2">
                   	<table class="table table-bordered">
                       <tr><th></th><th>清单编号</th><th>名称</th><th>单位</th></tr>

+ 517 - 0
taizhang-bg-detail3.html

@@ -0,0 +1,517 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>台账管理-计量支付</title>
+    <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
+    <link rel="stylesheet" href="css/main.css">
+    <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
+    <link rel="stylesheet" href="css/spreadjs/sheets/gc.spread.sheets.excelsmartcost.css">
+</head>
+<body>
+	<div class="main">
+    <div class="main-nav d-flex align-items-start flex-column">
+      <div class="logo"><img src="img/logo.png"></div>
+      <div class="nav-top">
+        <ul class="nav nav-pills nav-stacked bg-nav">
+          <li><a href="dashboard.html" data-toggle="tooltip" data-placement="right" title="" data-original-title="代办事项"><i class="fa fa-check-square-o"></i><span>待办</span></a></li>
+          <li class="active"><a href="biaoduan.html" data-toggle="tooltip" data-placement="right" title="" data-original-title="项目"><i class="fa fa-list-ul"></i><span>项目</span></a></li>
+          <li><a href="fenbao.html" data-toggle="tooltip" data-placement="right" title="" data-original-title="总分包"><i class="fa fa-sitemap"></i><span>总分包</span></a></li>
+        </ul>
+      </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>
+        </ul>
+        <div class="dropright my-1 ml-1">
+          <a href="" class="btn btn-sm btn-light" 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>
+           <div class="dropdown-divider"></div>
+           <a href="#" class="dropdown-item">帮助中心</a>
+           <a href="#" class="dropdown-item">退出登录</a>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="main-panel">
+      <div class="panel-sidebar">
+        <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="中交第一公路工程局有限公司国道311线满别公路施工一分部">中交第一公路工程局有限公司国道...</div>
+        <div class="scrollbar-auto">
+          <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li class=""><a href="taizhang-bg.html" class="text-primary"><i class="fa fa-chevron-left "></i> <span>返回</span></a></li>
+            </ul>
+          </div>
+          <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li><a href="taizhang-bg-detail.html"><span class="ml-3">台账修订</span></a></li>
+            </ul>
+          </div>
+          <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li class="active"><a href="taizhang-bg-detail3.html"><span class="ml-3">台账对比</span></a></li>
+            </ul>
+          </div>
+          <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li class=""><a href="taizhang-bg-detail4.html"><span class="ml-3">清单对比</span></a></li>
+            </ul>
+          </div>
+        </div>
+      </div>
+			<div class="panel-content">
+				<div class="panel-title">
+					<div class="title-main  d-flex justify-content-between">
+            <!--工具-->
+            <div>
+              <!--图示-->
+              <div class="d-inline-block">
+                <span class=""><i class="fa fa-stop text-warning-50 border-warning-50 bg-warning-50"></i> 新增</span>
+                <span class="ml-2"><i class="fa fa-stop text-secondary-50 border-secondary-50 bg-secondary-50"></i> 删除</span>
+                <span class="ml-2"><i class="fa fa-stop text-info-50 border-info-50 bg-info-50"></i> 结构调整</span>
+                <span class="ml-2"><i class="fa fa-stop text-danger-50 border-danger-50 bg-danger-50"></i> 计算项修改</span>
+                <span class="ml-2"><i class="fa fa-stop text-success-50 border-success-50 bg-success-50"></i> 文字修改</span>
+              </div>
+            </div>
+            <div>
+             
+            </div>
+					</div>
+				</div>
+				<div class="content-wrap row pr-46">
+					<div class="c-header p-0 col-12"></div>
+          <!--核心内容(两栏)-->
+          <div class="row w-100 sub-content">
+            <!--左栏-->
+            <div class="c-body col-8">
+              <!--工程清单模式-->
+              <div class="sjs-height-1">
+                <table class="table table-sm table-bordered">
+                  <tr>
+                    <th rowspan="2">修订</th><th rowspan="2">项目节编号</th><th rowspan="2">清单编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th rowspan="2"><th>单价</th><th colspan="2">签约</th><th colspan="2">施工图复核</th><th rowspan="2">图册号</th><th rowspan="2">备注</th>
+                  </tr>
+                  <tr>
+                    <th>数量</th><th>金额</th><th>数量</th><th>金额</th>
+                  </tr>
+                  <tr><td></td><td>1</td><td></td><td>第一部分 建筑安装工程费</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td></td><td>1-2</td><td></td><td>路基工程</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr class="bg-warning-50"><td>增</td><td>1-2-2</td><td></td><td>挖方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td></td><td>1-2-2-1</td><td></td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr class="bg-danger-50"><td>改</td><td>1-2-2-1-1</td><td></td><td>挖路基土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td></td><td></td><td>203-1-a</td><td>挖土方</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr class="bg-info-50"><td>改</td><td>1-4</td><td></td><td>桥梁涵洞工程</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td></td><td>1-4-5</td><td></td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td></td><td>1-4-5-1</td><td></td><td>K66+258马坑渭河大桥</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td></td><td>1-4-5-1-1</td><td></td><td>桥台(台高××m)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td></td><td>1-4-5-1-1-1</td><td></td><td>桥台基础</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td></td><td>1-4-5-1-1-1-1</td><td></td><td>桥台桩基础</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr class="bg-success-50"><td>改</td><td></td><td>403-1-a</td><td>I级钢筋(包括基础、承台、支撑梁等)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td></td><td></td><td>403-1-b</td><td>II级钢筋(包括基础、承台、支撑梁等)</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr class="bg-secondary-50"><td>删除</td><td></td><td>403-1-c</td><td>桩径1.5m</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                </table>
+              </div>
+           </div>
+            <!--右栏-->
+            <div class="c-body col">
+              <div class="tab-content">
+                <div id="xdcontent" class="tab-pane active">
+                  <div class="side-bar">
+                    <div class="d-flex"><a href="#" class="btn btn-sm btn-outline-success mb-1 ml-auto">保存</a></div>
+                    <input type="" class="form-control" value="0005" disabled></div>
+                  <div class="sjs-height-2" style="overflow:auto">
+                    <div class="form-group mt-2">
+                      <label >修订名称<b class="text-danger">*</b></label>
+                      <input type="email" class="form-control" value="编写错漏5">
+                    </div>
+                    <div class="form-group">
+                      <label>修订名称<b class="text-danger">*</b></label>
+                      <input class="form-control is-invalid"  placeholder="输入修订名称" type="text" value="名称超过100个字">
+                      <div class="invalid-feedback">
+                        名称超过100个字,请缩减名称。
+                      </div>
+                    </div>
+                    <div class="form-group">
+                      <label >修订内容<b class="text-danger">*</b></label>
+                      <textarea class="form-control" value="编写错漏5" rows="12">103-3-b 设施维修 数量修改为1
+                      </textarea>
+                    </div>
+                  </div>
+                </div>
+                <div id="xiangmujie" class="tab-pane">
+                  <select class="form-control form-control-sm"><option>0号计量台账部位参考(项目节)</option></select>
+                  <div class="sjs-height-2">
+                    <table class="table table-bordered">
+                      <tr><th></th><th>项目节编号</th><th>名称</th><th>单位</th></tr>
+        						</table>
+                  </div>
+                </div>
+                <div id="qingdan" class="tab-pane">
+                  <select class="form-control form-control-sm"><option>0号计量台账部位参考(项目节)</option></select>
+                  <div class="sjs-height-2">
+                  	<table class="table table-bordered">
+                      <tr><th></th><th>清单编号</th><th>名称</th><th>单位</th></tr>
+        						</table>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <!--右侧菜单-->
+          <div class="side-menu">
+            <!--右侧菜单-->
+            <ul class="nav flex-column right-nav">
+              <li class="nav-item">
+                <a class="nav-link active" data-toggle="tab" href="#xdcontent" role="tab">修订详情</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" data-toggle="tab" href="#xiangmujie" role="tab">项目节</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" data-toggle="tab" href="#qingdan" role="tab">工程量清单</a>
+              </li>
+            </ul>
+          </div>
+				</div>
+			</div>
+		</div>
+  </div>
+      <!--上报审批-->
+      <div class="modal fade" id="sub-sp" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">上报审批</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="form-group">
+                      <label>搜索审批人</label>
+                      <div class="input-group">
+                        <input class="form-control" placeholder="请输入姓名进行检索" type="text">
+                        <div class="input-group-append">
+                          <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="card border-primary">
+                      <div class="card-body">
+                        <h5 class="card-title">
+                          <a href="#" class="btn btn-primary btn-sm pull-right">添加</a>张三
+                        </h5>
+                        <h6 class="card-subtitle mb-2 text-muted">监理</h6>
+                        <p class="card-text">XXXXX公司</p>
+                      </div>
+                    </div>
+                    <div class="card mt-3">
+                      <div class="card-header">
+                        审批流程
+                      </div>
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>1 张三  <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>2 王五 <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>3 李四 <small class="text-muted">监理</small></li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-primary">确认上报</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--重新审批-->
+      <div class="modal fade" id="sub-sp2" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">重新上报</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="alert alert-primary" role="alert">
+                      重新上报后,将由 王五 继续审批
+                    </div>
+                    <div class="card mt-3">
+                      <div class="card-header">
+                        审批流程
+                      </div>
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                          <span class="text-warning pull-right">退回</span>
+                           <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                           <p class="card-text"></p>
+                        </li>
+                        <li class="list-group-item">
+                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                           <p class="card-text"></p>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-primary">确认上报</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--审批流程/结果-->
+      <div class="modal fade" id="sp-list" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">审批流程</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="card mt-3">
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                          <span class="text-warning pull-right">审批中</span>
+                           <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                           <p class="card-text"></p>
+                        </li>
+                        <li class="list-group-item">
+                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </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/global.js"></script>
+    <script src="js/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
+</body>
+<script type="text/javascript">
+    autoFlashHeight();
+</script>
+    <!--sjs-->
+    <script>
+      $(document).ready(function () {
+      const data = [
+          {
+              名称:'0#桥台1#桩',
+              数量:126,
+              图册号: '第四册',
+          },{
+              名称:'0#桥台2#桩',
+              数量:126,
+              图册号: '第四册',
+          },{
+              名称:'0#桥台3#桩',
+              数量:126,
+              图册号: '第四册',
+          },{
+              名称:'0#桥台4#桩',
+              数量:126,
+              图册号: '第四册',
+          },{
+              名称:'8#桥台1#桩',
+              数量:126,
+              图册号: '第四册',
+          },{
+              名称:'8#桥台2#桩',
+              数量:126,
+              图册号: '第四册',
+          },{
+              名称:'8#桥台3#桩',
+              数量:126,
+              图册号: '第四册',
+          },{
+              名称:'8#桥台4#桩',
+              数量:126,
+              图册号: '第四册',
+          }
+        ];
+        const spread = new GC.Spread.Sheets.Workbook($('#bills-spread2')[0], {
+            sheetCount: 1
+        });
+        spread.getActiveSheet().setDataSource(data);
+         spread.options.tabStripVisible = false;
+      })
+    </script>
+    <script>
+      $(document).ready(function () {
+      const data = [
+          {
+              项目节编号: '1',
+              清单编号: '',
+              名称:'第一部分 建筑安装工程费',
+              单位:'公路公里',
+              单价: '',
+              数量: '',
+              金额: '23682034',
+              图册号: '',
+              备注: '',
+          }, {
+              项目节编号: '1-2',
+              清单编号: '',
+              名称:'路基工程',
+              单位:'km',
+              单价: '',
+              数量: '',
+              金额: '3947329',
+              图册号: '',
+              备注: '',
+          }, {
+              项目节编号: '1-2-2',
+              清单编号: '',
+              名称:'挖方',
+              单位:'m3',
+              单价: '',
+              数量: '',
+              金额: '3947329',
+              图册号: '',
+              备注: '',
+          }, {
+              项目节编号: '1-2-2-1',
+              清单编号: '',
+              名称:'挖土方',
+              单位:'m3',
+              单价: '',
+              数量: '',
+              金额: '3947329',
+              图册号: '',
+              备注: '',
+          }, {
+              项目节编号: '1-2-2-1-1',
+              清单编号: '',
+              名称:'挖路基土方',
+              单位:'m3',
+              单价: '',
+              数量: '',
+              金额: '3947329',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '',
+              清单编号: '203-1-a',
+              名称:'挖土方',
+              单位:'m3',
+              单价: '7.53',
+              数量: '524213.67',
+              金额: '3947329',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '1-4',
+              清单编号: '',
+              名称:'桥梁涵洞工程',
+              单位:'km',
+              单价: '',
+              数量: '',
+              金额: '19734705',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '1-4-5',
+              清单编号: '',
+              名称:'特、大桥工程(100≤L,40≤Lk)',
+              单位:'m/座',
+              单价: '',
+              数量: '',
+              金额: '19734705',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '1-4-5-1',
+              清单编号: '',
+              名称:'K66+258马坑渭河大桥',
+              单位:'m2/m',
+              单价: '',
+              数量: '',
+              金额: '7965713',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '1-4-5-1-1',
+              清单编号: '',
+              名称:'桥台(台高××m)',
+              单位:'m2/m',
+              单价: '',
+              数量: '',
+              金额: '848909',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '1-4-5-1-1-1',
+              清单编号: '',
+              名称:'桥台基础',
+              单位:'',
+              单价: '',
+              数量: '',
+              金额: '848909',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '1-4-5-1-1-1-1',
+              清单编号: '',
+              名称:'桥台桩基础',
+              单位:'m3/处',
+              单价: '',
+              数量: '',
+              金额: '678444',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '',
+              清单编号: '403-1-a',
+              名称:'I级钢筋(包括基础、承台、支撑梁等)',
+              单位:'kg',
+              单价: '5.18',
+              数量: '1008',
+              金额: '5221',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '',
+              清单编号: '403-1-b',
+              名称:'II级钢筋(包括基础、承台、支撑梁等)',
+              单位:'kg',
+              单价: '5.18',
+              数量: '28589.6',
+              金额: '148094',
+              图册号: '',
+              备注: '',
+          },{
+              项目节编号: '',
+              清单编号: '403-1-c',
+              名称:'桩径1.5m',
+              单位:'m',
+              单价: '2983.69',
+              数量: '176',
+              金额: '525129',
+              图册号: '',
+              备注: '',
+          },
+        ];
+        const spread = new GC.Spread.Sheets.Workbook($('#bills-spread')[0], {
+            sheetCount: 1
+        });
+        spread.getActiveSheet().setDataSource(data);
+         spread.options.tabStripVisible = false;
+      })
+    </script>
+</html>

+ 205 - 0
taizhang-bg-detail4.html

@@ -0,0 +1,205 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+  <meta http-equiv="x-ua-compatible" content="ie=edge">
+  <title>台账对比-计量支付</title>
+  <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
+  <link rel="stylesheet" href="css/main.css">
+  <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
+  <link rel="stylesheet" href="css/spreadjs/sheets/gc.spread.sheets.excelsmartcost.css">
+  <script src=js/echarts/echarts.min.js></script>
+  <!--zTree-->
+  <link rel="stylesheet" href="css/ztree/zTreeStyle.css" type="text/css">
+</head>
+<body>
+	<div class="main">
+    <div class="main-nav d-flex align-items-start flex-column">
+      <div class="logo"><img src="img/logo.png"></div>
+      <div class="nav-top">
+        <ul class="nav nav-pills nav-stacked bg-nav">
+          <li><a href="dashboard.html" data-toggle="tooltip" data-placement="right" title="" data-original-title="代办事项"><i class="fa fa-check-square-o"></i><span>待办</span></a></li>
+          <li class="active"><a href="biaoduan.html" data-toggle="tooltip" data-placement="right" title="" data-original-title="项目"><i class="fa fa-list-ul"></i><span>项目</span></a></li>
+          <li><a href="fenbao.html" data-toggle="tooltip" data-placement="right" title="" data-original-title="总分包"><i class="fa fa-sitemap"></i><span>总分包</span></a></li>
+        </ul>
+      </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>
+        </ul>
+        <div class="dropright my-1 ml-1">
+          <a href="" class="btn btn-sm btn-light" 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>
+           <div class="dropdown-divider"></div>
+           <a href="#" class="dropdown-item">帮助中心</a>
+           <a href="#" class="dropdown-item">退出登录</a>
+         </div>
+       </div>
+     </div>
+   </div>
+   <div class="main-panel">
+    <div class="panel-sidebar">
+        <div class="sidebar-title" data-toggle="tooltip" data-placement="right" data-original-title="中交第一公路工程局有限公司国道311线满别公路施工一分部">中交第一公路工程局有限公司国道...</div>
+        <div class="scrollbar-auto">
+          <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li class=""><a href="taizhang-bg.html" class="text-primary"><i class="fa fa-chevron-left "></i> <span>返回</span></a></li>
+            </ul>
+          </div>
+          <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li><a href="taizhang-bg-detail.html"><span class="ml-3">台账修订</span></a></li>
+            </ul>
+          </div>
+          <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li><a href="taizhang-bg-detail3.html"><span class="ml-3">台账对比</span></a></li>
+            </ul>
+          </div>
+          <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li class="active"><a href="taizhang-bg-detail4.html"><span class="ml-3">清单对比</span></a></li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    <div class="panel-content">
+      <div class="panel-title">
+       <div class="title-main d-flex">
+        <div>
+          <a class="btn btn-sm btn-light">
+            <div class="custom-control custom-radio">
+              <input type="radio" class="custom-control-input" id="customCheckDisabled" checked="" name="as1">
+              <label class="custom-control-label text-primary" for="customCheckDisabled">修订-签约</label>
+            </div>
+          </a>
+          <a class="btn btn-sm btn-light">
+            <div class="custom-control custom-radio">
+              <input type="radio" class="custom-control-input" id="customCheckDisabled2" name="as1">
+              <label class="custom-control-label text-primary" for="customCheckDisabled2">修订-台账</label>
+            </div>
+          </a>
+        </div>
+        <div class="ml-auto">
+        </div>
+      </div>
+    </div>
+    <div class="content-wrap row pr-46">
+      <div class="c-header p-0 col-12"></div>
+      <!--左侧内容区-->
+      <div class="row w-100 sub-content">
+        <div class="c-body col-8">
+          <div class="sjs-height-1 ">
+            <table class="table table-sm table-bordered">
+                  <thead>
+                    <tr>
+                      <th rowspan="2">项目节编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th><th colspan="2">项目节数量</th><th rowspan="2">经济指标</th><th rowspan="2">台帐金额</th><th rowspan="2">图册号</th><th rowspan="2">备注</th>
+                    </tr>
+                    <tr>
+                      <th>数量1</th><th>数量2</th>
+                    </tr>
+                  </thead>
+                  <tr><td>1</td><td>第一部分 建筑安装工程费</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1</td><td>临时工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-6</td><td>临时道路修建、养护与拆除(包括原道路的养护费)</td><td></td><td></td></td><td></td><td></td><td></td><td></td></td><td></td></tr>
+                  <tr><td>1-1-8</td><td>临时占地</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-9</td><td>临时供电设施</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-10</td><td>电讯设施的提供、维修与拆除</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-11</td><td>承包人驻地建设</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2</td><td>路基工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2</td><td>挖方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5</td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1</td><td>×××(特)大桥(××结构类型)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1</td><td>桥台(台高××m)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1</td><td>桥台基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-2</td><td>桥台承台</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-2</td><td>桥台台身</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-3</td><td>桥台耳背墙</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-4</td><td>桥台台帽</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                </table>
+          </div>
+          <div class="bcontent-wrap">
+            <div class="bc-bar mb-1">
+              <ul class="nav nav-tabs">
+                <li class="nav-item">
+                  <a class="nav-link active" data-toggle="tab" href="#xmujie" role="tab">所属项目节</a>
+                </li>
+              </ul>
+            </div>
+            <div class="tab-content">
+              <div class="tab-pane active" id="xmujie">
+                <table class="table table-sm table-bordered">
+                    <thead>
+                      <tr>
+                        <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 rowspan="2">图册号</th><th rowspan="2">备注</th>
+                      </tr>
+                      <tr>
+                        <th>数量</th><th>金额</th>
+                      </tr>
+                    </thead>
+                    <tr><td>1-4-5-1-1-1-1-1</td><td></td><td>0#桥台1#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-2</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-3</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                  </table>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="c-body col">
+          <div class="tab-content">
+            <div id="qianyue" class="tab-pane active">
+              <div class="side-bar-1"></div>
+              <div class="sjs-sh-1">
+                <table class="table table-bordered">
+                  <tr><th>章节</th><th>章节名称</th><th>签约金额</th><th>台账金额</th><th>签约-台账</th></tr>
+                  <tr><td></td><td></td><td></td><td></td><td></td></tr>
+                </table>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!--右侧菜单-->
+      <div class="side-menu">
+        <!--右侧菜单-->
+        <ul class="nav flex-column right-nav">
+          <li class="nav-item">
+            <a class="nav-link active" data-toggle="tab" href="#zjhj" role="tab">章节合计</a>
+          </li>
+        </ul>
+      </div>
+    </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/global.js"></script>
+<script src="js/spreadjs/sheets/gc.spread.sheets.all.10.0.1.min.js"></script>
+<script type="text/javascript">  autoFlashHeight();</script>
+<!-- zTree -->
+<script type="text/javascript" src="js/ztree/jquery.ztree.core.js"></script>
+<script type="text/javascript" src="js/ztree/jquery.ztree.excheck.js"></script>
+</body>
+
+</html>

+ 52 - 11
taizhang-duibi.html

@@ -108,12 +108,36 @@
       <div class="row w-100 sub-content">
         <div class="c-body col-8">
           <div class="sjs-height-1 ">
-            <table class="table table-bordered">
-              <thead>
-                <tr><th></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></tr>
-                <tr><th>数量</th><th>金额</th><th>数量</th><th>金额</th></tr>
-              </thead>
-            </table>
+            <table class="table table-sm table-bordered">
+                  <thead>
+                    <tr>
+                      <th rowspan="2">项目节编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th><th colspan="2">项目节数量</th><th rowspan="2">经济指标</th><th rowspan="2">台帐金额</th><th rowspan="2">图册号</th><th rowspan="2">备注</th>
+                    </tr>
+                    <tr>
+                      <th>数量1</th><th>数量2</th>
+                    </tr>
+                  </thead>
+                  <tr><td>1</td><td>第一部分 建筑安装工程费</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1</td><td>临时工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-6</td><td>临时道路修建、养护与拆除(包括原道路的养护费)</td><td></td><td></td></td><td></td><td></td><td></td><td></td></td><td></td></tr>
+                  <tr><td>1-1-8</td><td>临时占地</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-9</td><td>临时供电设施</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-10</td><td>电讯设施的提供、维修与拆除</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-11</td><td>承包人驻地建设</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2</td><td>路基工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2</td><td>挖方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5</td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1</td><td>×××(特)大桥(××结构类型)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1</td><td>桥台(台高××m)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1</td><td>桥台基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-2</td><td>桥台承台</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-2</td><td>桥台台身</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-3</td><td>桥台耳背墙</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-4</td><td>桥台台帽</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                </table>
           </div>
           <div class="bcontent-wrap">
             <div class="bc-bar mb-1">
@@ -125,11 +149,28 @@
             </div>
             <div class="tab-content">
               <div class="tab-pane active" id="xmujie">
-                <table class="table table-bordered">
-                  <thead>
-                    <tr><th></th><th>项目节编号</th><th>台帐数量</th><th>图册号</th></tr>
-                  </thead>
-                </table>
+                <table class="table table-sm table-bordered">
+                    <thead>
+                      <tr>
+                        <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 rowspan="2">图册号</th><th rowspan="2">备注</th>
+                      </tr>
+                      <tr>
+                        <th>数量</th><th>金额</th>
+                      </tr>
+                    </thead>
+                    <tr><td>1-4-5-1-1-1-1-1</td><td></td><td>0#桥台1#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-2</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-3</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                  </table>
               </div>
             </div>
           </div>

+ 51 - 7
taizhang-shenpi.html

@@ -132,12 +132,34 @@
               <!--0号台帐模式-->
               <div class="sjs-height-1">
                 <table class="table table-sm table-bordered">
-                  <tr>
-                    <th rowspan="2">项目节编号</th><th rowspan="2">清单编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th rowspan="2"><th>单价</th><th colspan="2">签约</th><th colspan="2">施工图复核</th><th rowspan="2">图册号</th><th rowspan="2">备注</th>
-                  </tr>
-                  <tr>
-                    <th>数量</th><th>金额</th><th>数量</th><th>金额</th>
-                  </tr>
+                  <thead>
+                    <tr>
+                      <th rowspan="2">项目节编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th><th colspan="2">项目节数量</th><th rowspan="2">经济指标</th><th rowspan="2">台帐金额</th><th rowspan="2">图册号</th><th rowspan="2">备注</th>
+                    </tr>
+                    <tr>
+                      <th>数量1</th><th>数量2</th>
+                    </tr>
+                  </thead>
+                  <tr><td>1</td><td>第一部分 建筑安装工程费</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1</td><td>临时工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-6</td><td>临时道路修建、养护与拆除(包括原道路的养护费)</td><td></td><td></td></td><td></td><td></td><td></td><td></td></td><td></td></tr>
+                  <tr><td>1-1-8</td><td>临时占地</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-9</td><td>临时供电设施</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-10</td><td>电讯设施的提供、维修与拆除</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-11</td><td>承包人驻地建设</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2</td><td>路基工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2</td><td>挖方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5</td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1</td><td>×××(特)大桥(××结构类型)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1</td><td>桥台(台高××m)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1</td><td>桥台基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-2</td><td>桥台承台</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-2</td><td>桥台台身</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-3</td><td>桥台耳背墙</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-4</td><td>桥台台帽</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
                 </table>
               </div>
               <div class="bcontent-wrap">
@@ -159,7 +181,29 @@
                     </li>
                   </ul>
                 </div>
-                <div class="sp-wrap" id="bills-spread2">
+                <div class="sp-wrap">
+                  <table class="table table-sm table-bordered">
+                    <thead>
+                      <tr>
+                        <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 rowspan="2">图册号</th><th rowspan="2">备注</th>
+                      </tr>
+                      <tr>
+                        <th>数量</th><th>金额</th>
+                      </tr>
+                    </thead>
+                    <tr><td>1-4-5-1-1-1-1-1</td><td></td><td>0#桥台1#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-2</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-3</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                  </table>
                 </div>
               </div>
              </div>

+ 65 - 56
taizhang.html

@@ -207,7 +207,7 @@
           <!--核心内容(两栏)-->
           <div class="row w-100 sub-content">
             <!--左栏-->
-            <div class="c-body resize-left col-12">
+            <div class="c-body resize-left col-8">
               <!--0号台帐模式-->
               <div class="sjs-height-1" style="overflow-y: scroll;">
                 <table class="table table-sm table-bordered">
@@ -220,25 +220,25 @@
                     </tr>
                   </thead>
                   <tr><td>1</td><td>第一部分 建筑安装工程费</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-1</td><td>临时工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-1-6</td><td>临时道路修建、养护与拆除(包括原道路的养护费)</td><td></td><td></td></td><td></td><td></td><td></td><td></td></td><td></td></tr>
-                <tr><td>1-1-8</td><td>临时占地</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-1-9</td><td>临时供电设施</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-1-10</td><td>电讯设施的提供、维修与拆除</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-1-11</td><td>承包人驻地建设</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-2</td><td>路基工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-2-2</td><td>挖方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5</td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5-1</td><td>×××(特)大桥(××结构类型)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5-1-1</td><td>桥台(台高××m)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5-1-1-1</td><td>桥台基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr class="table-primary"><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5-1-1-1-2</td><td>桥台承台</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5-1-2</td><td>桥台台身</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5-1-3</td><td>桥台耳背墙</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5-1-4</td><td>桥台台帽</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1</td><td>临时工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-6</td><td>临时道路修建、养护与拆除(包括原道路的养护费)</td><td></td><td></td></td><td></td><td></td><td></td><td></td></td><td></td></tr>
+                  <tr><td>1-1-8</td><td>临时占地</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-9</td><td>临时供电设施</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-10</td><td>电讯设施的提供、维修与拆除</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-1-11</td><td>承包人驻地建设</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2</td><td>路基工程</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2</td><td>挖方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1</td><td>挖土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-2-2-1-1</td><td>挖路基土方</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5</td><td>特、大桥工程(100≤L,40≤Lk)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1</td><td>×××(特)大桥(××结构类型)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1</td><td>桥台(台高××m)</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1</td><td>桥台基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-1</td><td>桥台桩基础</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-1-1-2</td><td>桥台承台</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-2</td><td>桥台台身</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-3</td><td>桥台耳背墙</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                  <tr><td>1-4-5-1-4</td><td>桥台台帽</td><td></td><td></td></td><td></td><td></td><td></td><td></td><td></td></tr>
                 </table>
               </div>
               <div class="bcontent-wrap">
@@ -275,32 +275,32 @@
  -->                <!--右键菜单-->
                 <div class="sp-wrap" style="overflow-y: scroll;">
                   <table class="table table-sm table-bordered">
-                  <thead>
-                    <tr>
-                      <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 rowspan="2">图册号</th><th rowspan="2">备注</th>
-                    </tr>
-                    <tr>
-                      <th>数量</th><th>金额</th>
-                    </tr>
-                  </thead>
-                  <tr><td>1-4-5-1-1-1-1-1</td><td></td><td>0#桥台1#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5-1-1-1-1-2</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td>1-4-5-1-1-1-1-3</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
-                <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
-                </table>
+                    <thead>
+                      <tr>
+                        <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 rowspan="2">图册号</th><th rowspan="2">备注</th>
+                      </tr>
+                      <tr>
+                        <th>数量</th><th>金额</th>
+                      </tr>
+                    </thead>
+                    <tr><td>1-4-5-1-1-1-1-1</td><td></td><td>0#桥台1#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-2</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td>1-4-5-1-1-1-1-3</td><td></td><td>0#桥台2#桩</td><td></td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400))</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                    <tr><td></td><td>405-1-a</td><td>桩径150cm</td><td>kg</td><td></td><td></td><td></td><td></td><td></td></tr>
+                  </table>
                 </div>
               </div>
            </div>
              <!--右栏-->
-            <div class="c-body resize-right col " style="display:none">
+            <div class="c-body resize-right col " style="">
               <div class="resize-x" id="top-spr2" r-Type="width" div1=".resize-left" div2=".resize-right" title="调整大小"><!--调整上下高度条--></div>
               <div class="tab-content">
                 <!--查找定位-->
@@ -378,11 +378,11 @@
                       <a class="btn btn-sm btn-outline-secondary" id="dropdownMenuButton1" data-toggle="dropdown" title="优先显示"><i class="fa fa-list-ol"></i></a>
                       <div class="dropdown-menu" aria-labelledby="dropdownMenuButton1" style="min-width:60px">
                         <a class="dropdown-item" href="#"><i class="fa fa-list-ol"></i></a>
-                        <a class="dropdown-item text-primary" href="#"><i class="fa fa-tag"></i></a>
-                        <a class="dropdown-item text-success " href="#"><i class="fa fa-tag"></i></a>
-                        <a class="dropdown-item text-danger " href="#"><i class="fa fa-tag"></i></a>
-                        <a class="dropdown-item text-warning " href="#"><i class="fa fa-tag"></i></a>
-                        <a class="dropdown-item text-info " href="#"><i class="fa fa-tag"></i></a>
+                        <a class="dropdown-item text-primary" href="#"><i class="fa fa-circle"></i></a>
+                        <a class="dropdown-item text-success " href="#"><i class="fa fa-circle"></i></a>
+                        <a class="dropdown-item text-danger " href="#"><i class="fa fa-circle"></i></a>
+                        <a class="dropdown-item text-warning " href="#"><i class="fa fa-circle"></i></a>
+                        <a class="dropdown-item text-info " href="#"><i class="fa fa-circle"></i></a>
                       </div>
                     </div>
                     <div class="input-group input-group-sm">
@@ -397,7 +397,7 @@
                     <div class="card border-primary my-2">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-primary" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle  text-primary" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -411,13 +411,22 @@
                         <p class="card-text">
                           <textarea name="" class="form-control"></textarea>
                         </p>
-                          <div class="d-flex justify-content-end"><button type="button" class="btn btn-sm btn-outline-danger mr-5"><i class="fa fa-close"></i>  删除书签</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-success"><i class="fa fa-check"></i> 确定</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-secondary">取消</button></div>
+                          <div class="d-flex justify-content-between">
+                      <!-- <div class="custom-control custom-switch mr-2">
+                              <input type="checkbox" class="custom-control-input" id="customSwitch1">
+                              <label class="custom-control-label" for="customSwitch1" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="这条书签近自己(添加人)可见"><i class="fa fa-users"></i> 仅自己可见</label>
+                            </div> --><div class="custom-control custom-switch mr-2">
+                              <input type="checkbox" class="custom-control-input custom-control-warning-input" id="customSwitch1">
+                              <label class="custom-control-label custom-control-warning-label" for="customSwitch1" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="所有参与台帐审批管理的用户都可以看到这条书签"><i class="fa fa-users"></i> 参与者可见</label>
+                              </div>
+                            <div>
+                            <button type="button" class="btn btn-sm btn-outline-danger mr-3"><i class="fa fa-close"></i>  删除书签</button><button type="button" class="btn btn-sm btn-outline-success"><i class="fa fa-check"></i> 确定</button>&nbsp;<button type="button" class="btn btn-sm btn-outline-secondary">取消</button></div></div>
                       </div>
                     </div>
                     <div class="card border-primary my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-primary" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-primary" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -425,7 +434,7 @@
                             <a class="dropdown-item text-warning " href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-info " href="#"><i class="fa fa-tint"></i></a>
                           </div>
-                        </div>1-2-2-1-1-1 / K3+005-K4+021
+                        </div>1-2-2-1-1-1 / K3+005-K4+021<i class="fa fa-users pull-right text-warning"data-toggle="tooltip" data-placement="bottom" title="" data-original-title="所有参与台帐审批管理的用户都可以看到这条书签"></i>
                         <div class="pull-right edit-tag-btn"><a class="mr-1" href="#"><i class="fa fa-crosshairs"></i> 定位</a><a class="" href="#"><i class="fa fa-edit"></i> 编辑</a></div>
                       </div>
                       <div class="card-body p-2">
@@ -435,7 +444,7 @@
                     <div class="card border-primary my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-primary" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-primary" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -453,7 +462,7 @@
                     <div class="card border-success my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-success" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-success" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -471,7 +480,7 @@
                     <div class="card border-danger my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-danger" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-danger" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -489,7 +498,7 @@
                     <div class="card border-warning my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-warning" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-warning" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>
@@ -507,7 +516,7 @@
                     <div class="card border-info my-2 tag-item">
                       <div class="card-header p-2">
                         <div class="dropdown">
-                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-tag text-info" title="修改书签颜色"></i></a>
+                          <a class="pull-left mr-2" href="" id="dropdownMenuButton" data-toggle="dropdown"><i class="fa fa-circle text-info" title="修改书签颜色"></i></a>
                           <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="min-width:60px">
                             <a class="dropdown-item text-primary" href="#"><i class="fa fa-tint"></i></a>
                             <a class="dropdown-item text-success " href="#"><i class="fa fa-tint"></i></a>