期计量移动至父级，台帐修订弹窗页面

account-info.html

@@ -70,17 +70,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>

biangeng-new2.html

@@ -84,17 +84,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item active"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>

biangeng-new3.html

@@ -84,17 +84,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item active"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>

biangeng-new4.html

@@ -84,17 +84,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item active"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>

biangeng.html

@@ -85,17 +85,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item active"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>

biaoduan.html

@@ -73,17 +73,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
-          </li>					<li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
+          </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>
 			</div>

css/main.css

@@ -196,7 +196,7 @@ body {
 }
 .side-menu{
   position: fixed;
-  right:43px;
+  right:15px;
   top:116px
 }
 .sub-content{
@@ -396,7 +396,7 @@ body {
   background:#fff;
 }
 .right-nav{
-  width:18px
+  width:46px
 }
 .right-nav .nav-link.active{
   background: #fff;

dashboard.html

@@ -70,14 +70,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
+              <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>

hetong-pay.html

@@ -86,17 +86,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html" title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="javascript:void(0);"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">

hetong.html

@@ -86,17 +86,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html" title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="javascript:void(0);"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">

jiliang-list.html

@@ -86,17 +86,16 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
-          </li>					<li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
+          </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
+          <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>
 			</div>

jiliang-qi-detail.html

@@ -87,17 +87,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item active"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>
@@ -121,6 +119,7 @@
                 </div>
                 <div>
                   <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>
+                    <a href="#sub-sp2" data-toggle="modal" data-target="#sub-sp2" class="btn btn-primary btn-sm pull-right">重新上报</a>
                   <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批中</a>
                   <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-muted">审批退回</a>
                   <!--审批-->
@@ -219,6 +218,46 @@
               </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">

jiliang-qi-detail2.html

@@ -87,17 +87,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>

jiliang-qi-detail3.html

@@ -11,7 +11,6 @@
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
     <script src=js/echarts/echarts.min.js></script>
 </head>
-
 <body>
   <div class="header">
 		<h1 class="logo"><a>计量管理-纵横变更管理系统</a></h1>
@@ -87,17 +86,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item active"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>

jiliang-qi.html

@@ -87,17 +87,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item active"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>
@@ -134,6 +132,16 @@
                   </thead>
                   <tbody>
                     <tr>
+                      <td><a href="jiliang-qi-detail.html">第 5 期</a></td>
+                      <td class="text-center">201710</td>
+                      <td class="text-right">34234234.00</td>
+                      <td class="text-right">34234234.00</td>
+                      <td class="text-right">34234234.00</td>
+                      <td class="text-right">34234234.00</td>
+                      <td class="text-right">34234234.00</td>
+                      <td class="text-cenetr"><a href="" class="btn btn-primary btn-sm">重新上报</a></td>
+                    </tr>
+                    <tr>
                       <td><a href="jiliang-qi-detail.html">第 4 期</a></td>
                       <td class="text-center">201710</td>
                       <td class="text-right">34234234.00</td>
@@ -143,7 +151,7 @@
                       <td class="text-right">34234234.00</td>
                       <td class="text-cenetr">待上报</td>
                     </tr>
-                      <tr>
+                    <tr>
                         <td><a href="jiliang-qi-detail.html">第 3 期</a></td>
                         <td class="text-center">201710</td>
                         <td class="text-right">34234234.00</td>

jiliang.html

@@ -87,17 +87,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>
@@ -152,249 +150,252 @@
                 </div>
               </div>
     				</div>
-    				<div class="content-wrap row">
+    				<div class="content-wrap row pr-46">
               <div class="c-header p-0 col-12"></div>
-              <div class="c-body col-8">
-                <div class="sjs-height-1">
-                  <table class="table table-bordered">
-                    <thead>
-                      <tr>
-                        <th rowspan="2">1</th>
-                        <th rowspan="2">项目节编号</th>
-                        <th rowspan="2">清单编号</th>
-                        <th rowspan="2">名称</th>
-                        <th rowspan="2">单位</th>
-                        <th rowspan="2">单价</th>
-                        <th colspan="2">0号台帐合同</th>
-                        <th colspan="2">本次合同计量</th>
-                        <th colspan="3">本次数量变更计量</th>
-                        <th colspan="2">本次完成计量</th>
-                        <th colspan="2">截止本次合同计量</th>
-                        <th colspan="2">截止本次数量变更</th>
-                        <th colspan="2">截止本次完成计量</th>
-                        <th rowspan="2">图（册）号</th>
-                        <th rowspan="2">累计完成率(%)</th>
-                        <th rowspan="2">备注</th>
-                      </tr>
-                      <tr>
-                        <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>
-                  </table>
-                </div>
-    					</div>
-              <div class="c-body col">
-                <div class="tab-content">
-                  <div id="biangeng" class="tab-pane active">
-                    <div class="sjs-bar row">
-                      <div class="col-auto">
-                        <select class="form-control form-control-sm">
-                          <option>全部</option>
-                          <option>可用变更令</option>
-                          <option>本次计量已用</option>
-                        </select>
+              <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 rowspan="2">1</th>
+                          <th rowspan="2">项目节编号</th>
+                          <th rowspan="2">清单编号</th>
+                          <th rowspan="2">名称</th>
+                          <th rowspan="2">单位</th>
+                          <th rowspan="2">单价</th>
+                          <th colspan="2">0号台帐合同</th>
+                          <th colspan="2">本次合同计量</th>
+                          <th colspan="3">本次数量变更计量</th>
+                          <th colspan="2">本次完成计量</th>
+                          <th colspan="2">截止本次合同计量</th>
+                          <th colspan="2">截止本次数量变更</th>
+                          <th colspan="2">截止本次完成计量</th>
+                          <th rowspan="2">图（册）号</th>
+                          <th rowspan="2">累计完成率(%)</th>
+                          <th rowspan="2">备注</th>
+                        </tr>
+                        <tr>
+                          <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>
+                    </table>
+                  </div>
+      					</div>
+                <div class="c-body col">
+                  <div class="tab-content">
+                    <div id="biangeng" class="tab-pane active">
+                      <div class="sjs-bar row">
+                        <div class="col-auto">
+                          <select class="form-control form-control-sm">
+                            <option>全部</option>
+                            <option>可用变更令</option>
+                            <option>本次计量已用</option>
+                          </select>
+                        </div>
+  										</div>
+                      <div class="sjs-height-3">
+                        <table class="table table-bordered">
+                          <tr><th></th><th>批复编号</th><th>名称</th><th>金额</th><th>已执行(%)</th></tr>
+            						</table>
                       </div>
-										</div>
-                    <div class="sjs-height-3">
-                      <table class="table table-bordered">
-                        <tr><th></th><th>批复编号</th><th>名称</th><th>金额</th><th>已执行(%)</th></tr>
-          						</table>
-                    </div>
-                    <div class="sjs-bottom">
-                      <ul class="nav nav-tabs">
-                        <li class="nav-item">
-                          <a class="nav-link active" data-toggle="tab" href="#qingdan" role="tab">变更清单</a>
-                        </li>
-                        <li class="nav-item">
-                          <a class="nav-link" data-toggle="tab" href="#detail" role="tab">变更信息</a>
-                        </li>
-                        <li class="nav-item">
-                          <a class="nav-link" data-toggle="tab" href="#fujian" role="tab">附件</a>
-                        </li>
-                      </ul>
-                      <div class="tab-content">
-                        <div id="qingdan" class="tab-pane active">
-                          <div class="sjs-bottom-2">
-                            <table class="table table-bordered">
-                              <tr><th>清单编号</th><th>名称</th><th>单位</th><th>单价</th><th>数量</th><th>金额</th><th>已变更</th></tr>
-                            </table>
+                      <div class="sjs-bottom">
+                        <ul class="nav nav-tabs">
+                          <li class="nav-item">
+                            <a class="nav-link active" data-toggle="tab" href="#qingdan" role="tab">变更清单</a>
+                          </li>
+                          <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#detail" role="tab">变更信息</a>
+                          </li>
+                          <li class="nav-item">
+                            <a class="nav-link" data-toggle="tab" href="#fujian" role="tab">附件</a>
+                          </li>
+                        </ul>
+                        <div class="tab-content">
+                          <div id="qingdan" class="tab-pane active">
+                            <div class="sjs-bottom-2">
+                              <table class="table table-bordered">
+                                <tr><th>清单编号</th><th>名称</th><th>单位</th><th>单价</th><th>数量</th><th>金额</th><th>已变更</th></tr>
+                              </table>
+                            </div>
                           </div>
-                        </div>
-                        <div id="detail" class="tab-pane">
-                          <div class="sjs-bottom-2">
-                            <div class="form-group">
-        									    <label>批复编号</label>
-        									    <input class="form-control form-control-sm" value="LZTJ-1标项目部发变更(2015)001号" type="text" readonly>
-        									  </div>
-                            <div class="form-group">
-        									    <label>申请编号</label>
-        									    <input class="form-control form-control-sm" value="LZTJ-1标项目部发变更(2015)001号" type="text" readonly>
-        									  </div>
-        									  <div class="form-group">
-        									    <label>工程名称</label>
-        									    <input class="form-control form-control-sm" value="收费站出口右侧加宽段及K0+532基底换填" type="text" readonly>
-        									  </div>
-        									  <div class="form-group">
-        									    <label>桩号</label>
-        									    <input class="form-control form-control-sm" value="K0+532" type="text" readonly>
-        									  </div>
-        									  <div class="form-group">
-        									    <label>原设计图名称</label>
-        									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
-        									  </div>
-        									  <div class="form-group">
-        									    <label>原图号</label>
-        									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
-        									  </div>
-        									  <div class="form-group">
-        									    <label>变更设计图名称</label>
-        									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
-        									  </div>
-        									  <div class="form-group">
-        									    <label>变更图号</label>
-        									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
-        									  </div>
-                            <div class="form-group">
-      										    <label>工程变更理由及内容</label>
-      										    <textarea class="form-control form-control-sm" rows="6" readonly>由于K0+532涵洞基底土质天然含水率为25%、收费站出口右侧加宽段K0+120-K0+190段基底土质天然含水率为28.8%。含水率较大形成过湿土，地基松软，无法满足承载力要求。经处项目办、设计、监理、施工单位四方勘察，采用抛石挤淤、砂砾换填以达到地基承载力。
-      												</textarea>
-      										  </div>
-      										  <div class="form-group">
-      										    <label>工程变更合同依据</label>
-      										    <textarea class="form-control form-control-sm" rows="6" readonly></textarea>
-      										  </div>
-      										  <div class="form-group">
-      										    <label>备注</label>
-      										    <textarea class="form-control form-control-sm" rows="3" readonly></textarea>
-      										  </div>
-                            <div class="form-group">
-                              <label>变更类型</label>
-                              <div class="checkbox">
-                                <label class="checkbox-inline">
-                                  <input id="inlineCheckbox1" value="option1" checked="" type="checkbox" disabled>A.位置
-                                </label>
-                                <!-- <label class="checkbox-inline">
-                                  <input id="inlineCheckbox2" value="option2" type="checkbox">B.数量
-                                </label>
-                                <label class="checkbox-inline">
-                                  <input id="inlineCheckbox3" value="option3" type="checkbox">C.结构
-                                </label>
-                                <label class="checkbox-inline">
-                                  <input id="inlineCheckbox3" value="option3" checked="" type="checkbox">D.新增
-                                </label>
-                                <label class="checkbox-inline">
-                                  <input id="inlineCheckbox3" value="option3" type="checkbox">E.取消
-                                </label>
-                                <label class="checkbox-inline">
-                                  <input id="inlineCheckbox3" value="option3" type="checkbox">F.纠错
-                                </label> -->
+                          <div id="detail" class="tab-pane">
+                            <div class="sjs-bottom-2">
+                              <div class="form-group">
+          									    <label>批复编号</label>
+          									    <input class="form-control form-control-sm" value="LZTJ-1标项目部发变更(2015)001号" type="text" readonly>
+          									  </div>
+                              <div class="form-group">
+          									    <label>申请编号</label>
+          									    <input class="form-control form-control-sm" value="LZTJ-1标项目部发变更(2015)001号" type="text" readonly>
+          									  </div>
+          									  <div class="form-group">
+          									    <label>工程名称</label>
+          									    <input class="form-control form-control-sm" value="收费站出口右侧加宽段及K0+532基底换填" type="text" readonly>
+          									  </div>
+          									  <div class="form-group">
+          									    <label>桩号</label>
+          									    <input class="form-control form-control-sm" value="K0+532" type="text" readonly>
+          									  </div>
+          									  <div class="form-group">
+          									    <label>原设计图名称</label>
+          									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+          									  </div>
+          									  <div class="form-group">
+          									    <label>原图号</label>
+          									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+          									  </div>
+          									  <div class="form-group">
+          									    <label>变更设计图名称</label>
+          									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+          									  </div>
+          									  <div class="form-group">
+          									    <label>变更图号</label>
+          									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+          									  </div>
+                              <div class="form-group">
+        										    <label>工程变更理由及内容</label>
+        										    <textarea class="form-control form-control-sm" rows="6" readonly>由于K0+532涵洞基底土质天然含水率为25%、收费站出口右侧加宽段K0+120-K0+190段基底土质天然含水率为28.8%。含水率较大形成过湿土，地基松软，无法满足承载力要求。经处项目办、设计、监理、施工单位四方勘察，采用抛石挤淤、砂砾换填以达到地基承载力。
+        												</textarea>
+        										  </div>
+        										  <div class="form-group">
+        										    <label>工程变更合同依据</label>
+        										    <textarea class="form-control form-control-sm" rows="6" readonly></textarea>
+        										  </div>
+        										  <div class="form-group">
+        										    <label>备注</label>
+        										    <textarea class="form-control form-control-sm" rows="3" readonly></textarea>
+        										  </div>
+                              <div class="form-group">
+                                <label>变更类型</label>
+                                <div class="checkbox">
+                                  <label class="checkbox-inline">
+                                    <input id="inlineCheckbox1" value="option1" checked="" type="checkbox" disabled>A.位置
+                                  </label>
+                                  <!-- <label class="checkbox-inline">
+                                    <input id="inlineCheckbox2" value="option2" type="checkbox">B.数量
+                                  </label>
+                                  <label class="checkbox-inline">
+                                    <input id="inlineCheckbox3" value="option3" type="checkbox">C.结构
+                                  </label>
+                                  <label class="checkbox-inline">
+                                    <input id="inlineCheckbox3" value="option3" checked="" type="checkbox">D.新增
+                                  </label>
+                                  <label class="checkbox-inline">
+                                    <input id="inlineCheckbox3" value="option3" type="checkbox">E.取消
+                                  </label>
+                                  <label class="checkbox-inline">
+                                    <input id="inlineCheckbox3" value="option3" type="checkbox">F.纠错
+                                  </label> -->
+                                </div>
                               </div>
-                            </div>
-                            <div class="form-group">
-                              <label>变更类别 </label>
-                              <select class="form-control form-control-sm" disabled><option>A类变更（设计变更）</option><option>B类变更（施工措施变）</option><option>C类变更（计划变更）</option><option>D类变更（条件变更）</option><option>E类变更（新增工程）</option></select>
-                            </div>
-                            <div class="form-group">
-                              <label>变更性质 </label>
-                              <select class="form-control form-control-sm" disabled><option>一般设计变更</option><option>较大设计变更</option><option>重大设计变更</option></select>
-                            </div>
-                            <div class="form-group">
-                              <label>变更提出单位</label>
-                              <!-- <a href="#editcompany" style="float:right;" class="" data-toggle="modal">编辑</a> -->
-                              <select class="form-control form-control-sm" disabled><option>AA公司</option><option>BB公司</option></select>
-                            </div>
-                            <div class="form-group">
-                              <label>费用承担方</label>
-                              <div class="radio">
-                                <label class="radio-inline">
-                                  <input id="inlineCheckbox1" value="option1" checked="" type="radio" disabled> 业主
-                                </label>
-                                <!-- <label class="radio-inline">
-                                  <input id="inlineCheckbox2" value="option2" type="radio"> 承包人
-                                </label> -->
+                              <div class="form-group">
+                                <label>变更类别 </label>
+                                <select class="form-control form-control-sm" disabled><option>A类变更（设计变更）</option><option>B类变更（施工措施变）</option><option>C类变更（计划变更）</option><option>D类变更（条件变更）</option><option>E类变更（新增工程）</option></select>
+                              </div>
+                              <div class="form-group">
+                                <label>变更性质 </label>
+                                <select class="form-control form-control-sm" disabled><option>一般设计变更</option><option>较大设计变更</option><option>重大设计变更</option></select>
+                              </div>
+                              <div class="form-group">
+                                <label>变更提出单位</label>
+                                <!-- <a href="#editcompany" style="float:right;" class="" data-toggle="modal">编辑</a> -->
+                                <select class="form-control form-control-sm" disabled><option>AA公司</option><option>BB公司</option></select>
+                              </div>
+                              <div class="form-group">
+                                <label>费用承担方</label>
+                                <div class="radio">
+                                  <label class="radio-inline">
+                                    <input id="inlineCheckbox1" value="option1" checked="" type="radio" disabled> 业主
+                                  </label>
+                                  <!-- <label class="radio-inline">
+                                    <input id="inlineCheckbox2" value="option2" type="radio"> 承包人
+                                  </label> -->
+                                </div>
                               </div>
                             </div>
                           </div>
-                        </div>
-                        <div id="fujian" class="tab-pane">
-                          <table class="table table-bordered">
-                            <tr><th>名称</th><th>上传者</th></tr>
-                            <tr><td><a href="">合同段工程变更现场办公会议纪要的通知.rar</a></td><th>张三</th></tr>
-                          </table>
+                          <div id="fujian" class="tab-pane">
+                            <table class="table table-bordered">
+                              <tr><th>名称</th><th>上传者</th></tr>
+                              <tr><td><a href="">合同段工程变更现场办公会议纪要的通知.rar</a></td><th>张三</th></tr>
+                            </table>
+                          </div>
                         </div>
                       </div>
                     </div>
-                  </div>
-                  <div id="jlbiao" class="tab-pane">
-                    <div class="sjs-bar row">
-                      <div class="col-auto"><a href="#" class="btn btn-outline-primary btn-sm">自动生成</a></div>
-                      <div class="col">
-                        <div class="input-group input-group-sm">
-                          <div class="input-group-prepend">
-                            <span class="input-group-text" id="basic-addon3">表号前缀</span>
+                    <div id="jlbiao" class="tab-pane">
+                      <div class="sjs-bar row">
+                        <div class="col-auto"><a href="#" class="btn btn-outline-primary btn-sm">自动生成</a></div>
+                        <div class="col">
+                          <div class="input-group input-group-sm">
+                            <div class="input-group-prepend">
+                              <span class="input-group-text" id="basic-addon3">表号前缀</span>
+                            </div>
+                            <input type="text" class="form-control" id="basic-url" aria-describedby="basic-addon3">
                           </div>
-                          <input type="text" class="form-control" id="basic-url" aria-describedby="basic-addon3">
                         </div>
                       </div>
-                    </div>
-                    <div class="sjs-height-3">
-                      <table class="table table-bordered">
-                        <tr><th>编号</th><th>中间计量表号</th><th>交工证书/凭证表</th></tr>
-                      </table>
-                    </div>
-                    <div class="sjs-bottom">
-                      <div class="form-group">
-          					    <label>变更令号：</label>
-          					    <input class="form-control form-control-sm" type="text">
-          					  </div>
-                      <div class="form-group">
-          					    <label>部位：</label>
-          					    <input class="form-control form-control-sm" type="text">
-          					  </div>
-                      <div class="form-group">
-          					    <label>起始桩号：</label>
-          					    <input class="form-control form-control-sm" type="text">
-          					  </div>
-                      <div class="form-group">
-          					    <label>分部分项工程：</label>
-          					    <input class="form-control form-control-sm" type="text">
-          					  </div>
-                      <div class="form-group">
-          					    <label>计量单元：</label>
-          					    <input class="form-control form-control-sm" type="text">
-          					  </div>
-                      <div class="form-group">
-          					    <label>图号：</label>
-          					    <input class="form-control form-control-sm" type="text">
-          					  </div>
-                      <div class="form-group">
-          					    <label>计算式说明：</label>
-          					    <textarea class="form-control"></textarea>
-          					  </div>
-                      <div class="form-group">
-                        <a href="#edit-img" data-toggle="modal" data-target="#edit-img"  class="pull-right">添加草图</a>
-          					    <label>计算草图：</label>
-          					    <p class="form-control"><img src="img/sketch/2.png" class="d-100"></p>
-          					  </div>
+                      <div class="sjs-height-3">
+                        <table class="table table-bordered">
+                          <tr><th>编号</th><th>中间计量表号</th><th>交工证书/凭证表</th></tr>
+                        </table>
+                      </div>
+                      <div class="sjs-bottom">
+                        <div class="form-group">
+            					    <label>变更令号：</label>
+            					    <input class="form-control form-control-sm" type="text">
+            					  </div>
+                        <div class="form-group">
+            					    <label>部位：</label>
+            					    <input class="form-control form-control-sm" type="text">
+            					  </div>
+                        <div class="form-group">
+            					    <label>起始桩号：</label>
+            					    <input class="form-control form-control-sm" type="text">
+            					  </div>
+                        <div class="form-group">
+            					    <label>分部分项工程：</label>
+            					    <input class="form-control form-control-sm" type="text">
+            					  </div>
+                        <div class="form-group">
+            					    <label>计量单元：</label>
+            					    <input class="form-control form-control-sm" type="text">
+            					  </div>
+                        <div class="form-group">
+            					    <label>图号：</label>
+            					    <input class="form-control form-control-sm" type="text">
+            					  </div>
+                        <div class="form-group">
+            					    <label>计算式说明：</label>
+            					    <textarea class="form-control"></textarea>
+            					  </div>
+                        <div class="form-group">
+                          <a href="#edit-img" data-toggle="modal" data-target="#edit-img"  class="pull-right">添加草图</a>
+            					    <label>计算草图：</label>
+            					    <p class="form-control"><img src="img/sketch/2.png" class="d-100"></p>
+            					  </div>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
-              <div class=" col-auto pl-0">
+
+              <div class="side-menu">
                 <!--右侧菜单-->
                 <ul class="nav flex-column right-nav">
                   <li class="nav-item">

settings-poj.html

@@ -70,17 +70,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>

settings-user.html

@@ -70,17 +70,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>

taizhang-bg-detail.html

@@ -85,14 +85,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-					<li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
+              <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
 					<li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>
@@ -117,15 +118,15 @@
                     <div class="form-check-inline">
                       <label class="form-check-label">
                         <input type="checkbox" class="form-check-input">
-                          只看本次变更
+                          只显示本次修订
                         </label>
                     </div>
                   </div>
                 </div>
                 <div>
-					       <a href="#done-sp" data-toggle="modal" data-target="#done-sp" class="btn btn-primary btn-sm pull-right">完成修订</a>
                  <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>
                  <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批中</a>
+                  <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp2" class="btn btn-primary btn-sm pull-right">重新上报</a>
                  <!--审批-->
                  <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm pull-right">审批通过</a>
                  <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm pull-right">审批退回</a>
@@ -227,18 +228,41 @@
               </div>
           </div>
       </div>
-      <!--完成修订-->
-      <div class="modal fade" id="done-sp" data-backdrop="static">
+      <!--重新审批-->
+      <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>
+                      <h5 class="modal-title">重新上报</h5>
                   </div>
                   <div class="modal-body">
-                    <h5>是否确定完成修订 0002 编写错漏2 ？ 确定后不可修改。</h5>
+                    <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-primary">确认上报</button>
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                   </div>
               </div>

taizhang-bg.html

@@ -85,150 +85,171 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-					<li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
 					<li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>
 			</div>
 		</div>
     <div class="main-panel">
-    			<div class="panel-content">
-    				<div class="panel-title fluid">
-    					<div class="title-main  d-flex justify-content-between"><!--工具-->
-                <div>
-                  <div class="btn-group">
-                    <input type="month" class="form-control form-control-sm mt-0">
-                  </div>
-                  <div class="btn-group">
-                    <select class="form-control form-control-sm mt-0">
-                      <option>全部</option>
-                      <option>草稿</option>
-                      <option>审批中</option>
-                      <option>退回</option>
-                      <option>完成</option>
-                      <option>作废</option>
-                    </select>
-                  </div>
-                </div>
-                <div>
-                  <a href="#add-bg" data-toggle="modal" data-target="#add-bg" class="btn btn-primary btn-sm">新建变更</a>
-                </div>
-    					</div>
-    				</div>
-    				<div class="content-wrap">
-    					<div class="c-body">
-                <table class="table table-bordered">
-                  <thead>
-                    <tr>
-                      <th>编号</th>
-                      <th>变更名称</th>
-                      <th>创建时间</th>
-                      <th>提交人</th>
-                      <th>状态</th>
-                      <th>处理时间</th>
-                      <th>操作</th>
-                    </tr>
-                  </thead>
-                  <tr>
-                    <td>0001</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏1</a></td>
-                    <td>2017-11-23</td>
-                    <td>张三</td>
-                    <td>完成</td>
-                    <td>2017-11-25</td>
-                    <td></td>
-                  </tr>
-                  <tr>
-                    <td>0002</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏2</a></td>
-                    <td>2017-11-23</td>
-                    <td>张三</td>
-                    <td>王五 审批中</td>
-                    <td></td>
-                    <td></td>
-                  </tr>
-                  <tr>
-                    <td>0003</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏3</a></td>
-                    <td>2017-11-23</td>
-                    <td>张三</td>
-                    <td>退回</td>
-                    <td>2017-12-06</td>
-                    <td><a href="#" class="btn btn-primary btn-sm">重新上报</a> <a href="#" class="btn btn-secondary btn-sm">作废</a></td>
-                  </tr>
-                  <tr>
-                    <td>0004</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏4</a></td>
-                    <td>2017-11-23</td>
-                    <td>张三</td>
-                    <td>草稿</td>
-                    <td></td>
-                    <td><a href="#" class="btn btn-primary btn-sm">发起审批</a> <a href="#" class="btn btn-primary btn-sm">完成变更</a></td>
-                  </tr>
-                  <tr>
-                    <td>0005</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏5</a></td>
-                    <td>2017-11-23</td>
-                    <td>张三</td>
-                    <td>张三 作废</td>
-                    <td>2017-11-24</td>
-                    <td></td>
-                  </tr>
-                  <tr>
-                    <td>0005</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏6</a></td>
-                    <td>2017-11-23</td>
-                    <td>张三</td>
-                    <td></td>
-                    <td></td>
-                    <td><a href="#" class="btn btn-danger btn-sm">删除</a></td>
-                  </tr>
-                </table>
-    					</div>
-    				</div>
-    			</div>
-    		</div>
+			<div class="panel-content">
+				<div class="panel-title fluid">
+					<div class="title-main  d-flex justify-content-between"><!--工具-->
+            <div>
+              <div class="btn-group">
+                <input type="month" class="form-control form-control-sm mt-0">
+              </div>
+              <div class="btn-group">
+                <select class="form-control form-control-sm mt-0">
+                  <option>全部</option>
+                  <option>草稿</option>
+                  <option>审批中</option>
+                  <option>退回</option>
+                  <option>完成</option>
+                  <option>作废</option>
+                </select>
+              </div>
+            </div>
+            <div>
+              <a href="#add-bg" data-toggle="modal" data-target="#add-bg" class="btn btn-primary btn-sm">新建修订</a>
+            </div>
+					</div>
+				</div>
+				<div class="content-wrap">
+					<div class="c-body">
+            <table class="table table-bordered">
+              <thead>
+                <tr>
+                  <th>编号</th>
+                  <th>变更名称</th>
+                  <th>创建时间</th>
+                  <th>提交人</th>
+                  <th>状态</th>
+                  <th>处理时间</th>
+                  <th>操作</th>
+                </tr>
+              </thead>
+              <tr>
+                <td>0001</td>
+                <td><a href="taizhang-bg-detail.html">编写错漏1</a></td>
+                <td>2017-11-23</td>
+                <td>张三</td>
+                <td>完成</td>
+                <td>2017-11-25</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>0002</td>
+                <td><a href="taizhang-bg-detail.html">编写错漏2</a></td>
+                <td>2017-11-23</td>
+                <td>张三</td>
+                <td>王五 审批中</td>
+                <td></td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>0003</td>
+                <td><a href="taizhang-bg-detail.html">编写错漏3</a></td>
+                <td>2017-11-23</td>
+                <td>张三</td>
+                <td>退回</td>
+                <td>2017-12-06</td>
+                <td><a href="taizhang-bg-detail.html" class="btn btn-primary btn-sm">重新上报</a> <a href="#remove"  data-toggle="modal" data-target="#remove" class="btn btn-secondary btn-sm">作废</a></td>
+              </tr>
+              <tr>
+                <td>0004</td>
+                <td><a href="taizhang-bg-detail.html">编写错漏4</a></td>
+                <td>2017-11-23</td>
+                <td>张三</td>
+                <td>草稿</td>
+                <td></td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>0005</td>
+                <td><a href="taizhang-bg-detail.html">编写错漏5</a></td>
+                <td>2017-11-23</td>
+                <td>张三</td>
+                <td>张三 作废</td>
+                <td>2017-11-24</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>0005</td>
+                <td><a href="taizhang-bg-detail.html">编写错漏6</a></td>
+                <td>2017-11-23</td>
+                <td>张三</td>
+                <td></td>
+                <td></td>
+                <td><a href="#" class="btn btn-danger btn-sm">删除</a></td>
+              </tr>
+            </table>
+					</div>
+				</div>
+			</div>
+		</div>
+  </div>
+  <!--弹出新建台帐变更-->
+  <div class="modal fade" id="add-bg" 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>变更编号<b class="text-danger">*</b></label>
+            <input class="form-control"  value="0006" type="text" readonly>
+          </div>
+          <div class="form-group">
+            <label>变更名称<b class="text-danger">*</b></label>
+            <input class="form-control"  placeholder="输入标段名称" type="text">
+          </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>
-
-      <!--弹出新建台帐变更-->
-      <div class="modal fade" id="add-bg" 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>变更编号<b class="text-danger">*</b></label>
-                      <input class="form-control"  value="0006" type="text" readonly>
-                    </div>
-                    <div class="form-group">
-                      <label>变更名称<b class="text-danger">*</b></label>
-                      <input class="form-control"  placeholder="输入标段名称" type="text">
-                    </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>
+  </div>
+  <!--弹出作废-->
+  <div class="modal fade" id="remove" 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-danger">
+									编写错漏3 已有审批数据，请谨慎操作；
+                  <br>作废后，审批无法恢复，请谨慎操作；
+                  <br>确认作废，请在以下输入框输入"&nbsp;&nbsp;&nbsp;<b>变更作废</b>&nbsp;&nbsp;&nbsp;"，再点击“确认作废”按钮。
+								</div>
+                <div class="form-group">
+                  <input class="form-control"  placeholder="" type="text">
+                </div>
+              </div>
+              <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-danger">确认作废</button>
               </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>
+  </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>
 </body>
 
 </html>

taizhang-jl.html

@@ -85,17 +85,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-					<li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">计量审批</a></li>
-            </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
+              <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
 					<li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>

taizhang-shenpi.html

@@ -82,17 +82,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
           <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>

taizhang.html

@@ -86,17 +86,15 @@
               <li><a href="taizhang-jl.html">计量台帐</a></li>
             </ul>
           </li>
-					<li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 计量管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+          <li class="nav-item"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
             <ul class="sub-menu">
-              <li><a href="jiliang.html">中间计量</a></li>
+              <li><a href="jiliang.html">计量编制</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-            <ul class="sub-menu">
-              <li><a href="jiliang-qi.html">期计量</a></li>
-            </ul>
           </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
 					<li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
 					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
 				</ul>
@@ -147,12 +145,12 @@
               <!--核心内容（两栏）-->
               <div class="row w-100 sub-content">
                 <!--左栏-->
-                <div class="c-body col">
+                <div class="c-body col-8">
                   <div class="sjs-height-1" id="bills-spread">
                   </div>
 				         </div>
                  <!--右栏-->
-                <div class="c-body col" style="display:none">
+                <div class="c-body col">
                   <div class="tab-content">
                     <div id="xiangmujie" class="tab-pane active">
                       <select class="form-control form-control-sm"><option>0号计量台帐部位参考(项目节)</option></select>