Chente 7 лет назад
Родитель
Сommit
ee25680a09
8 измененных файлов с 797 добавлено и 53 удалено
  1. 287 21
      jiliang-approval.html
  2. 235 0
      jiliang-approval2.html
  3. 0 2
      jiliang-list.html
  4. 1 1
      jiliang-qi-detail.html
  5. 2 2
      jiliang-qi-detail2.html
  6. 1 1
      jiliang-qi-detail3.html
  7. 1 1
      jiliang-qi-detail4.html
  8. 270 25
      jiliang.html

+ 287 - 21
jiliang-approval.html

@@ -50,7 +50,7 @@
 				<div class="avatar btn-group">
 					<a class="dropdown-toggle" data-toggle="dropdown">
 						<span class="pic"><img src="img/avatar.png"></span>
-						<span>张三</span>
+						<span>李四</span>
 						<span class="caret"></span>
 					</a>
 					<div class="dropdown-menu">
@@ -112,18 +112,13 @@
   											<a class="nav-link" href="jiliang-qi.html">返回</a>
   										</li>
   										<li class="nav-item">
-  											<a class="nav-link active" href="jiliang-qi-detail.html">计量数据</a>
+  											<a class="nav-link active" href="jiliang-approval.html">审批计量</a>
   										</li>
+                      <li class="nav-item">
+                        <a class="nav-link" href="jiliang-approval2.html">审批对比</a>
+                      </li>
   									</ul>
                   </div>
-                  <div class="d-inline-block">
-                    <div class="form-check-inline">
-                      <label class="form-check-label">
-                        <input class="form-check-input" type="checkbox">
-                        变更令
-                      </label>
-                    </div>
-                  </div>
                 </div>
                 <div>
                   <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批完成</a>
@@ -151,11 +146,9 @@
                           <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 colspan="2">截止本次完成计量</th>
+                          <th rowspan="2">审批意见</th>
                           <th rowspan="2">图(册)号</th>
                           <th rowspan="2">累计完成率(%)</th>
                           <th rowspan="2">备注</th>
@@ -169,15 +162,270 @@
                           <th>金额</th>
                           <th>数量</th>
                           <th>金额</th>
-                          <th>变更令</th>
-                          <th>数量</th>
-                          <th>金额</th>
-                          <th>数量</th>
-                          <th>金额</th>
-                          <th>数量</th>
-                          <th>金额</th>
                         </tr>
                       </thead>
+                      <tbody>
+                        <tr>
+                          <td>2</td>
+                          <td>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>
+                        </tr>
+                        <tr>
+                          <td>3</td>
+                          <td>1-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>
+                        </tr>
+                        <tr>
+                          <td>4</td>
+                          <td>1-1-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>
+                        </tr>
+                        <tr>
+                          <td>5</td>
+                          <td>1-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>
+                        </tr>
+                        <tr>
+                          <td>6</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>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>7</td>
+                          <td>1-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>
+                        </tr>
+                        <tr>
+                          <td>8</td>
+                          <td>1-2-1-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>
+                        </tr>
+                        <tr>
+                          <td>9</td>
+                          <td>1-2-1-1-1</td>
+                          <td></td>
+                          <td>k0+000-k1+000</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 class="bg-primary">
+                          <td>10</td>
+                          <td></td>
+                          <td>201-1</td>
+                          <td>清理现场</td>
+                          <td>m3</td>
+                          <td>7.53</td>
+                          <td>100</td>
+                          <td>753</td>
+                          <td><input value="20"></td>
+                          <td>150.6</td>
+                          <td></td>
+                          <td></td>
+                          <td>10</td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>11</td>
+                          <td>1-2-1-1-2</td>
+                          <td></td>
+                          <td>k0+000-k1+000</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>12</td>
+                          <td></td>
+                          <td>201-1</td>
+                          <td>清理现场</td>
+                          <td>m3</td>
+                          <td>7.53</td>
+                          <td>100</td>
+                          <td>753</td>
+                          <td><input value="10"></td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td>10</td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>13</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>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>14</td>
+                          <td>1-4-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>
+                        </tr>
+                      </tbody>
                     </table>
                   </div>
       					</div>
@@ -376,6 +624,21 @@
             					  </div>
                       </div>
                     </div>
+                    <div id="spjilu" class="tab-pane">
+                      <div class="sjs-bar">
+                        <table class="table table-bordered">
+                          <tr><th>清单编号</th><th>清单名称</th><th>上报数量</th></tr>
+                          <tr><td>201-1</td><td>清理现场</td><td>10</td></tr>
+                        </table>
+                      </div>
+                      <div class="sjs-height-2">
+                        <table class="table table-bordered">
+                          <tr><th>审批人</th><th>审批数量</th><th>审批意见</th></tr>
+                          <tr><td>张三</td><td>15</td><td>审批意见文本</td></tr>
+                          <tr><td>王五</td><td>20</td><td>审批意见文本</td></tr>
+                        </table>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -388,6 +651,9 @@
                   <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#jlbiao" role="tab">中间计量表</a>
                   </li>
+                  <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#spjilu" role="tab">中间审批记录</a>
+                  </li>
                 </ul>
               </div>
     				</div>

+ 235 - 0
jiliang-approval2.html

@@ -0,0 +1,235 @@
+<!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 href="css/datepicker/datepicker.min.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+  <div class="header">
+		<h1 class="logo"><a>计量管理-纵横变更管理系统</a></h1>
+    <div class="poj-name">
+      <span class="name">项目A</span>
+      <div class="btn-group">
+        <a class=" btn" data-toggle="dropdown" >
+          <span class="fa fa-caret-down" data-toggle="tooltip" data-placement="bottom" title="切换项目"></span>
+        </a>
+        <div class="dropdown-menu">
+         <a href="#" class="dropdown-item">项目B</a>
+         <a href="#" class="dropdown-item">项目C</a>
+         <a href="#" class="dropdown-item">项目D</a>
+       </div>
+     </div><a href="settings-poj.html" class="btn" data-toggle="tooltip" data-placement="bottom" title="项目设置"><i class="fa fa-cogs"></i></a>
+    </div>
+    <div class="poj-name">
+      <span class="name">WWUJ-1</span>
+      <div class="btn-group">
+        <a class=" btn" data-toggle="dropdown" >
+          <span class="fa fa-caret-down" data-toggle="tooltip" data-placement="bottom" title="切换项目"></span>
+        </a>
+        <div class="dropdown-menu">
+         <a href="#" class="dropdown-item">WWUJ-2</a>
+         <a href="#" class="dropdown-item">WWUJ-3</a>
+         <a href="#" class="dropdown-item">WWUJ-4</a>
+       </div>
+     </div>
+    </div>
+    <div class="poj-name">
+      <span class="name">中间计量</span>
+    </div>
+		<div class="header-box">
+			<div class="header-nav"></div>
+			<div class="header-user pull-right">
+				<div class="avatar btn-group">
+					<a class="dropdown-toggle" data-toggle="dropdown">
+						<span class="pic"><img src="img/avatar.png"></span>
+						<span>张三</span>
+						<span class="caret"></span>
+					</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>
+					 <a href="#" class="dropdown-item">退出登录</a>
+				 </div>
+				</div>
+				<div class="msg">
+					<a>
+					<i class="fa fa-bell"></i><sup >0</sup>
+					</a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="main">
+		<div class="main-nav">
+			<div class="nav-top">
+				<ul class="nav nav-pills flex-column bg-nav">
+					<li class="nav-item"><a href="dashboard.html"title="代办事项"><i class="fa fa-dashboard"></i> 代办事项</a></li>
+					<li class="nav-item"><a href="biaoduan.html"title="标段管理"><i class="fa fa-list-ul"></i> 标段管理</a></li>
+					<li class="nav-item"><a href="javascript:void(0);"title="台帐管理"><i class="fa fa-list-alt"></i> 台帐管理 <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+            <ul class="sub-menu">
+              <li><a href="taizhang.html">台帐分解</a></li>
+            </ul>
+            <ul class="sub-menu">
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
+            </ul>
+            <ul class="sub-menu">
+              <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>
+            <ul class="sub-menu">
+              <li><a href="jiliang.html">计量编制</a></li>
+            </ul>
+            <ul class="sub-menu">
+              <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>
+			</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="d-inline-block mr-3">
+                    <ul class="nav nav-pills m-0">
+  										<li class="nav-item">
+  											<a class="nav-link" href="jiliang-qi.html">返回</a>
+  										</li>
+  										<li class="nav-item">
+  											<a class="nav-link" href="jiliang-approval.html">审批计量</a>
+  										</li>
+                      <li class="nav-item">
+                        <a class="nav-link active" href="jiliang-approval2.html">审批对比</a>
+                      </li>
+  									</ul>
+                  </div>
+                </div>
+                <div>
+                  <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-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>
+                  <!--审批-->
+                  <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>
+                </div>
+              </div>
+    				</div>
+    				<div class="content-wrap row">
+              <div class="c-header p-0 col-12">
+                <div class="dropdown">
+                  <button class="btn btn-primary btn-sm dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    选择显示审批人
+                  </button>
+                  <div class="dropdown-menu">
+                    <form>
+                    <div class="px-3 mb-1">
+                      <div class="form-check">
+                        <input class="form-check-input" type="checkbox" checked disabled id="defaultCheck1">
+                        <label class="form-check-label" for="defaultCheck1">
+                          布尔(上报)
+                        </label>
+                      </div>
+                    </div>
+                    <div class="px-3 mb-1">
+                      <div class="form-check">
+                        <input class="form-check-input" type="checkbox" value="" id="defaultCheck2">
+                        <label class="form-check-label" for="defaultCheck2">
+                          张三
+                        </label>
+                      </div>
+                    </div>
+                    <div class="px-3 mb-1">
+                      <div class="form-check">
+                        <input class="form-check-input" type="checkbox" value="" id="defaultCheck3">
+                        <label class="form-check-label" for="defaultCheck3">
+                          王五
+                        </label>
+                      </div>
+                    </div>
+                    <div class="px-3 mb-1">
+                      <div class="form-check">
+                        <input class="form-check-input" type="checkbox"  checked disabled  value="" id="defaultCheck4">
+                        <label class="form-check-label" for="defaultCheck4">
+                          李四
+                        </label>
+                      </div>
+                    </div>
+                    <div class="dropdown-divider"></div>
+                    <div class="px-3 mb-1">
+                      <button type="submit" class="btn btn-primary btn-sm">确定</button>
+                    </div>
+                  </form>
+                  </div>
+                </div>
+              </div>
+              <div class="row w-100 sub-content">
+                <div class="c-body col-12">
+                  <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">原报</th>
+                          <th colspan="2">张三</th>
+                          <th colspan="2">王五</th>
+                          <th colspan="2">李四</th>
+                        </tr>
+                        <tr>
+                          <th>数量</th>
+                          <th>金额</th>
+                          <th>数量</th>
+                          <th>金额</th>
+                          <th>数量</th>
+                          <th>金额</th>
+                          <th>数量</th>
+                          <th>金额</th>
+                        </tr>
+                      </thead>
+                    </table>
+                  </div>
+      					</div>
+              </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/datepicker/datepicker.min.js"></script>
+  	<script src="js/datepicker/datepicker.zh.js"></script>
+    <script type="text/javascript">
+        autoFlashHeight();
+    </script>
+    <script>
+        $( function() {
+            $( "#draggable" ).draggable();
+        } );
+    </script>
+</body>
+
+</html>

+ 0 - 2
jiliang-list.html

@@ -107,7 +107,6 @@
                 <div>
                   <div class="btn-group" role="group" aria-label="Basic example">
                     <button type="button" class="btn btn-secondary btn-sm">全部</button>
-                    <button type="button" class="btn btn-outline-secondary btn-sm">待上报</button>
                     <button type="button" class="btn btn-outline-secondary btn-sm">审批中</button>
                     <button type="button" class="btn btn-outline-secondary btn-sm">待审批</button>
                     <button type="button" class="btn btn-outline-secondary btn-sm">审批完成</button>
@@ -123,7 +122,6 @@
                       <tr><th>计量编号</th><th>计量金额</th><th>计量月份</th><th>所属计量期</th><th>状态</th><th>当前处理人</th></tr>
                     </thead>
                     <tbody>
-                      <tr><td><a href="jiliang-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><span class="text-muted">待上报</span></td><td>监理-张三</td></tr>
                       <tr><td><a href="jiliang-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><span class="text-warning">审批中</span></td><td>监理-张三</td></tr>
                       <tr><td><a href="jiliang-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><a href="jiliang-approval.html" class="btn-primary btn-sm">审批</a></td><td>监理-张三</td></tr>
                       <tr><td><a href="jiliang-approval.html">WWUJ-2-201709</a></td><td>34234234.00</td><td>201710</td><td>第 14 期</td><td><span class="text-success">审批完成</span></td><td>业主-王五</td></tr>

+ 1 - 1
jiliang-qi-detail.html

@@ -112,7 +112,7 @@
   											<a class="nav-link" href="jiliang-qi.html">返回</a>
   										</li>
   										<li class="nav-item">
-  											<a class="nav-link active" href="jiliang-qi-detail.html">中间计量</a>
+  											<a class="nav-link active" href="jiliang-qi-detail.html">中间计量</a>
   										</li>
                       <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail2.html">本期计量台帐</a></li>
                       <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail3.html">合同支付</a></li>

+ 2 - 2
jiliang-qi-detail2.html

@@ -87,7 +87,7 @@
               <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>
             </ul>
@@ -95,7 +95,7 @@
               <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 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>

+ 1 - 1
jiliang-qi-detail3.html

@@ -111,7 +111,7 @@
   											<a class="nav-link" href="jiliang-qi.html">返回</a>
   										</li>
   										<li class="nav-item">
-  											<a class="nav-link" href="jiliang-qi-detail.html">中间计量</a>
+  											<a class="nav-link" href="jiliang-qi-detail.html">中间计量</a>
   										</li>
   										<li class="nav-item"><a class="nav-link" href="jiliang-qi-detail2.html">本期计量台帐</a></li>
                       <li class="nav-item"><a class="nav-link active" href="jiliang-qi-detail3.html">合同支付</a></li>

+ 1 - 1
jiliang-qi-detail4.html

@@ -113,7 +113,7 @@
   											<a class="nav-link" href="jiliang-qi.html">返回</a>
   										</li>
   										<li class="nav-item">
-  											<a class="nav-link" href="jiliang-qi-detail.html">中间计量</a>
+  											<a class="nav-link" href="jiliang-qi-detail.html">中间计量</a>
   										</li>
   										<li class="nav-item"><a class="nav-link" href="jiliang-qi-detail2.html">本期计量台帐</a></li>
                       <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail3.html">合同支付</a></li>

+ 270 - 25
jiliang.html

@@ -123,26 +123,13 @@
                     <a href="#setting" data-toggle="modal" data-target="#setting" class="btn btn-outline-primary btn-sm"><i class="fa fa-cog"></i></a>
                   </div>
                   <div class="btn-group">
-                    <div class="form-check-inline">
-                      <label class="form-check-label">
-                        <input class="form-check-input" type="checkbox">
-                        审批过程
-                      </label>
-                    </div>
-                    <div class="form-check-inline">
-                      <label class="form-check-label">
-                        <input class="form-check-input" type="checkbox">
-                        变更令
-                      </label>
-                    </div>
-                  </div>
-                  <div class="btn-group">
                     <a href="#add-qd" data-toggle="modal" data-target="#add-qd" class="btn btn-success btn-sm">添加计量清单</a>
                     <a href="#add-qd2" data-toggle="modal" data-target="#add-qd2" class="btn btn-success btn-sm">添加计量清单2</a>
                   </div>
                 </div>
                 <div>
                   <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>
+                  <a href="#" data-toggle="modal" data-target="#" class="btn btn-primary btn-sm pull-right">重新上报</a>
                   <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-success 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>
@@ -155,6 +142,7 @@
               <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>
@@ -166,11 +154,8 @@
                           <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 colspan="2">截止本次完成计量</th>
                           <th rowspan="2">图(册)号</th>
                           <th rowspan="2">累计完成率(%)</th>
                           <th rowspan="2">备注</th>
@@ -184,15 +169,257 @@
                           <th>金额</th>
                           <th>数量</th>
                           <th>金额</th>
-                          <th>变更令</th>
-                          <th>数量</th>
-                          <th>金额</th>
-                          <th>数量</th>
-                          <th>金额</th>
-                          <th>数量</th>
-                          <th>金额</th>
                         </tr>
                       </thead>
+                      <tbody>
+                        <tr>
+                          <td>2</td>
+                          <td>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>
+                        </tr>
+                        <tr>
+                          <td>3</td>
+                          <td>1-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>
+                        </tr>
+                        <tr>
+                          <td>4</td>
+                          <td>1-1-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>
+                        </tr>
+                        <tr>
+                          <td>5</td>
+                          <td>1-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>
+                        </tr>
+                        <tr>
+                          <td>6</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>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>7</td>
+                          <td>1-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>
+                        </tr>
+                        <tr>
+                          <td>8</td>
+                          <td>1-2-1-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>
+                        </tr>
+                        <tr>
+                          <td>9</td>
+                          <td>1-2-1-1-1</td>
+                          <td></td>
+                          <td>k0+000-k1+000</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 class="bg-primary">
+                          <td>10</td>
+                          <td></td>
+                          <td>201-1</td>
+                          <td>清理现场</td>
+                          <td>m3</td>
+                          <td>7.53</td>
+                          <td>100</td>
+                          <td>753</td>
+                          <td><input value="10"></td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td>10</td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>11</td>
+                          <td>1-2-1-1-2</td>
+                          <td></td>
+                          <td>k0+000-k1+000</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>12</td>
+                          <td></td>
+                          <td>201-1</td>
+                          <td>清理现场</td>
+                          <td>m3</td>
+                          <td>7.53</td>
+                          <td>100</td>
+                          <td>753</td>
+                          <td><input value="10"></td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td>10</td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>13</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>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>14</td>
+                          <td>1-4-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>
+                        </tr>
+                      </tbody>
                     </table>
                   </div>
       					</div>
@@ -391,6 +618,21 @@
             					  </div>
                       </div>
                     </div>
+                    <div id="spjilu" class="tab-pane">
+                      <div class="sjs-bar">
+                        <table class="table table-bordered">
+                          <tr><th>清单编号</th><th>清单名称</th><th>上报数量</th></tr>
+                          <tr><td>201-1</td><td>清理现场</td><td>10</td></tr>
+                        </table>
+                      </div>
+                      <div class="sjs-height-2">
+                        <table class="table table-bordered">
+                          <tr><th>审批人</th><th>审批数量</th><th>审批意见</th></tr>
+                          <tr><td>张三</td><td>15</td><td>审批意见文本</td></tr>
+                          <tr><td>王五</td><td>20</td><td>审批意见文本</td></tr>
+                        </table>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -404,6 +646,9 @@
                   <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#jlbiao" role="tab">中间计量表</a>
                   </li>
+                  <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#spjilu" role="tab">中间审批记录</a>
+                  </li>
                 </ul>
               </div>
     				</div>