Browse Source

大量更新

Chente 7 years ago
parent
commit
af485003da

+ 4 - 1
account-info.html

@@ -70,11 +70,14 @@
               <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 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>
+            <ul class="sub-menu">
               <li><a href="jiliang-qi.html">期计量</a></li>
             </ul>
           </li>

+ 148 - 0
biangeng-new.html

@@ -0,0 +1,148 @@
+<!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">
+</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="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"><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>
+            <ul class="sub-menu">
+              <li><a href="jiliang-qi.html">期计量</a></li>
+            </ul>
+          </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>
+			</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>
+                  <ul class="nav nav-pills">
+										<li class="nav-item"><a class="nav-link active" href="#">变更信息</a></li>
+										<li class="nav-item"><a class="nav-link disabled" href="#">变更清单</a></li>
+										<li class="nav-item"><a class="nav-link disabled" href="#">附件</a></li>
+										<li class="nav-item"><a class="nav-link disabled" href="#">审批流程</a></li>
+									</ul>
+                </div>
+                <div>
+                  <a href="biangeng-new2.html" class="btn btn-sm btn-primary pull-right">确定,下一步</a>
+                  <a href="biangeng-new.html" class="btn btn-sm btn-secondary pull-right">返回</a>
+                </div>
+              </div>
+    				</div>
+    				<div class="content-wrap">
+    					<div class="c-body">
+                <!--添加变更令-->
+  							<legend><span class="glyphicon glyphicon-info-sign"></span> 变更信息</legend>
+  							<div class="row">
+  								<div class="col-md-4">
+  									<form>
+  									  <div class="form-group">
+  									    <label><b class="text-danger">*&nbsp;</b>申请编号</label>
+  											<a href="#" class="pull-right" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="自动编号"><i class="fa fa-repeat"></i></a>
+  									    <input class="form-control" value="LZTJ-1标项目部发变更(2015)001号" type="text">
+  									  </div>
+  									  <div class="form-group">
+  									    <label><b class="text-danger">*&nbsp;</b>工程名称</label>
+  									    <input class="form-control" value="收费站出口右侧加宽段及K0+532基底换填" type="text">
+  									  </div>
+  									</form>
+  								</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>
+</body>
+
+</html>

+ 236 - 0
biangeng-new2.html

@@ -0,0 +1,236 @@
+<!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">
+</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="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"><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>
+            <ul class="sub-menu">
+              <li><a href="jiliang-qi.html">期计量</a></li>
+            </ul>
+          </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>
+			</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>
+                  <ul class="nav nav-pills">
+										<li class="nav-item"><a class="nav-link active" href="#">变更信息</a></li>
+										<li class="nav-item"><a class="nav-link" href="#">变更清单</a></li>
+										<li class="nav-item"><a class="nav-link" href="#">附件</a></li>
+										<li class="nav-item"><a class="nav-link" href="#">审批流程</a></li>
+									</ul>
+                </div>
+                <div>
+                  <a href="biangeng-new.html" class="btn btn-sm btn-primary pull-right">提交审批</a>
+                  <a href="biangeng-new.html" class="btn btn-sm btn-success pull-right">保存</a>
+                </div>
+              </div>
+    				</div>
+    				<div class="content-wrap">
+    					<div class="c-body">
+                <!--变更信息-->
+  							<legend><span class="glyphicon glyphicon-info-sign"></span> 变更信息</legend>
+  							<div class="row">
+  								<div class="col-md-4">
+  									<form>
+  									  <div class="form-group">
+  									    <label><b class="text-danger">*&nbsp;</b>申请编号</label>
+                        <a href="#" class="pull-right" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="自动编号"><i class="fa fa-repeat"></i></a>
+  									    <input class="form-control" value="LZTJ-1标项目部发变更(2015)001号" type="text">
+  									  </div>
+  									  <div class="form-group">
+  									    <label><b class="text-danger">*&nbsp;</b>工程名称</label>
+  									    <input class="form-control" value="收费站出口右侧加宽段及K0+532基底换填" type="text">
+  									  </div>
+  									  <div class="form-group">
+  									    <label>桩号</label>
+  									    <input class="form-control" value="K0+532" type="text">
+  									  </div>
+  									  <div class="form-group">
+  									    <label>原设计图名称</label>
+  									    <input class="form-control" placeholder="" type="text">
+  									  </div>
+  									  <div class="form-group">
+  									    <label>原图号</label>
+  									    <input class="form-control" placeholder="" type="text">
+  									  </div>
+  									  <div class="form-group">
+  									    <label>变更设计图名称</label>
+  									    <input class="form-control" placeholder="" type="text">
+  									  </div>
+  									  <div class="form-group">
+  									    <label>变更图号</label>
+  									    <input class="form-control" placeholder="" type="text">
+  									  </div>
+  									</form>
+  								</div>
+  								<div class="col-md-4" style="z-index:999">
+  									<form>
+  										  <div class="form-group">
+  										    <label><b class="text-danger">*&nbsp;</b>工程变更理由及内容</label>
+  										    <textarea class="form-control" rows="6">由于K0+532涵洞基底土质天然含水率为25%、收费站出口右侧加宽段K0+120-K0+190段基底土质天然含水率为28.8%。含水率较大形成过湿土,地基松软,无法满足承载力要求。经处项目办、设计、监理、施工单位四方勘察,采用抛石挤淤、砂砾换填以达到地基承载力。
+  												</textarea>
+  										  </div>
+  										  <div class="form-group">
+  										    <label>工程变更合同依据</label>
+  										    <textarea class="form-control" rows="6"></textarea>
+  										  </div>
+  										  <div class="form-group">
+  										    <label>备注</label>
+  										    <textarea class="form-control" rows="3"></textarea>
+  										  </div>
+  										</form>
+  								</div>
+  								<div class="col-md-4">
+  									<form>
+  									  <div class="form-group">
+  									    <label>变更类型</label>
+  											<div class="checkbox">
+  												<label class="checkbox-inline">
+  												  <input id="inlineCheckbox1" value="option1" checked="" type="checkbox">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 class="form-group">
+  									    <label>变更类别 </label>
+  									    <select class="form-control"><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"><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"><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"> 业主
+  												</label>
+  												<label class="radio-inline">
+  												  <input id="inlineCheckbox2" value="option2" type="radio"> 承包人
+  												</label>
+  											</div>
+  									  </div>
+  									</form>
+  								</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>
+</body>
+
+</html>

+ 99 - 14
biangeng.html

@@ -76,7 +76,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -87,9 +87,13 @@
               <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="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
+          </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>
 			</div>
@@ -97,21 +101,102 @@
     <div class="main-panel">
     			<div class="panel-content">
     				<div class="panel-title fluid">
-    					<div class="title-main">
-    						<h2>
-                    WWUJ-2 变更
-						        <a href="#" class="btn btn-primary btn-sm pull-right">按钮</a>
-                </h2>
-    					</div>
+    					<div class="title-main d-flex justify-content-between">
+    						<div>
+                  <ul class="nav nav-pills">
+										<li class="nav-item">
+											<a class="nav-link" href="#">待处理 <span class="badge badge-secondary">4</span></a>
+										</li>
+										<li class="nav-item"><a class="nav-link active" href="#">待上报 <span class="badge badge-light">4</span></a></li>
+										<li class="nav-item"><a class="nav-link" href="#">进行中 <span class="badge badge-secondary">4</span></a></li>
+										<li class="nav-item"><a class="nav-link" href="#">已完成 <span class="badge badge-secondary">4</span></a></li>
+										<li class="nav-item"><a class="nav-link" href="#">不通过 <span class="badge badge-secondary">4</span></a></li>
+									</ul>
+                </div>
+                <div><a href="biangeng-new.html" class="btn btn-sm btn-primary pull-right">新建变更令</a></div>
+              </div>
     				</div>
     				<div class="content-wrap">
-    					<div class="c-header">
-    						<a href="" class="btn btn-primary  btn-sm"><i class="glyphicon glyphicon-plus"></i>按钮</a>
-    					</div>
     					<div class="c-body">
-    						<table class="table table-bordered">
-
-    						</table>
+                <table class="table">
+									<thead>
+									<tr><th width="10%">标段</th><th width="20%">变更令号</th><th width="30%">工程名称</th><th width="10%">变更类别</th><th width="10%">变更金额</th><th width="10%">操作</th></tr>
+									</thead>
+									<tbody>
+										<tr><td>LZTJ-1</td><td><a href="biangeng-detail.html">LZTJ-1标项目部发变更(2015)001号 (点我)</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更(设计变更)</td><td>101112.23</td><td><a href="biangeng-approval.html" class="btn btn-warning btn-sm">审批(点我)</a></td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)002号</a></td><td>路基基底换填</td><td>A类变更(设计变更)</td><td>191991.32</td><td><a href="" class="btn btn-warning btn-sm">审批</a></td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)004号</a></td><td>土方运距</td><td>B类变更(施工措施变)</td><td>432664.96</td><td><a href="" class="btn btn-warning btn-sm">审批</a></td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)005号</a></td><td>K0+440通道台背回填</td><td>C类变更(计划变更)</td><td>136515.46</td><td><a href="biangeng-new.html" class="btn btn-primary btn-sm">重新上报</a></td></tr>
+									</tbody>
+								</table>
+								<!--待上报-->
+								<table class="table">
+									<thead>
+									<tr><th width="10%">标段</th><th width="20%">变更令号</th><th width="30%">工程名称</th><th width="10%">变更类别</th><th width="10%">变更金额</th><th width="10%">操作</th></tr>
+									</thead>
+									<tbody>
+										<tr><td>LZTJ-1</td><td><a href="biangeng-list-detail.html">LZTJ-1标项目部发变更(2015)001号 (点我)</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更(设计变更)</td><td>101112.23</td><td><a href="" class="btn btn-primary btn-sm">上报</a></td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)002号</a></td><td>路基基底换填</td><td>A类变更(设计变更)</td><td>191991.32</td><td><a href="" class="btn btn-primary btn-sm">上报</a></td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)004号</a></td><td>土方运距</td><td>B类变更(施工措施变)</td><td>432664.96</td><td><a href="" class="btn btn-primary btn-sm">上报</a></td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)005号</a></td><td>K0+440通道台背回填</td><td>C类变更(计划变更)</td><td>136515.46</td><td><a href="" class="btn btn-primary btn-sm">上报</a></td></tr>
+									</tbody>
+								</table>
+								<!--进行中-->
+								<table class="table">
+									<thead>
+									<tr><th width="10%">标段</th><th width="20%">变更令号</th><th width="30%">工程名称</th><th width="10%">变更类别</th><th width="10%">变更金额</th><th width="10%">审批流程</th></tr>
+									</thead>
+									<tbody>
+										<tr><td>LZTJ-1</td><td><a href="biangeng-list-detail.html">LZTJ-1标项目部发变更(2015)001号 (点我)</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更(设计变更)</td><td>101112.23</td><td>陈特 <span class="colOrange">审批中</span></td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)002号</a></td><td>路基基底换填</td><td>A类变更(设计变更)</td><td>191991.32</td><td>陈特 <span class="colOrange">审批中</span></td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)004号</a></td><td>土方运距</td><td>B类变更(施工措施变)</td><td>432664.96</td><td>陈特 <span class="colOrange">审批中</span></td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)005号</a></td><td>K0+440通道台背回填</td><td>C类变更(计划变更)</td><td>136515.46</td><td>陈特 <span class="colOrange">审批中</span></td></tr>
+									</tbody>
+								</table>
+								<!--已完成-->
+								<table class="table">
+									<thead>
+									<tr><th width="10%">标段</th><th width="20%">变更令号</th><th width="30%">工程名称</th><th width="10%">变更类别</th><th width="10%">变更金额</th></tr>
+									</thead>
+									<tbody>
+										<tr><td>LZTJ-1</td><td><a href="biangeng-list-detail.html">LZTJ-1标项目部发变更(2015)001号 (点我)</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更(设计变更)</td><td>101112.23</td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)002号</a></td><td>路基基底换填</td><td>A类变更(设计变更)</td><td>191991.32</td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)004号</a></td><td>土方运距</td><td>B类变更(施工措施变)</td><td>432664.96</td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)005号</a></td><td>K0+440通道台背回填</td><td>C类变更(计划变更)</td><td>136515.46</td></tr>
+									</tbody>
+								</table>
+								<!--不通过-->
+								<table class="table">
+									<thead>
+									<tr><th width="10%">标段</th><th width="20%">变更令号</th><th width="30%">工程名称</th><th width="10%">变更类别</th><th width="10%">变更金额</th></tr>
+									</thead>
+									<tbody>
+										<tr><td>LZTJ-1</td><td><a href="biangeng-list-detail.html">LZTJ-1标项目部发变更(2015)001号 (点我)</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更(设计变更)</td><td>101112.23</td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)002号</a></td><td>路基基底换填</td><td>A类变更(设计变更)</td><td>191991.32</td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)004号</a></td><td>土方运距</td><td>B类变更(施工措施变)</td><td>432664.96</td></tr>
+										<tr><td>LZTJ-1</td><td><a href="">LZTJ-1标项目部发变更(2015)005号</a></td><td>K0+440通道台背回填</td><td>C类变更(计划变更)</td><td>136515.46</td></tr>
+									</tbody>
+								</table>
+								<!--翻页-->
+								<nav aria-label="Page navigation">
+									<ul class="pagination">
+										<li>
+											<a href="#" aria-label="Previous">
+												<span aria-hidden="true">«</span>
+											</a>
+										</li>
+										<li><a href="#">1</a></li>
+										<li><a href="#">2</a></li>
+										<li><a href="#">3</a></li>
+										<li><a href="#">4</a></li>
+										<li><a href="#">5</a></li>
+										<li>
+											<a href="#" aria-label="Next">
+												<span aria-hidden="true">»</span>
+											</a>
+										</li>
+									</ul>
+								</nav>
     					</div>
     				</div>
     			</div>

+ 4 - 1
biaoduan-detail.html

@@ -67,7 +67,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -78,6 +78,9 @@
               <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>
             </ul>
           </li>					<li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>

+ 4 - 1
biaoduan.html

@@ -67,7 +67,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -78,6 +78,9 @@
               <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>

File diff suppressed because it is too large
+ 1 - 0
css/datepicker/datepicker.min.css


BIN
css/logo.png


+ 14 - 1
css/main.css

@@ -352,7 +352,20 @@ body {
   font-size:18px;
   color:#f90000
 }
-
 .bg-gray {
  background-color:#bbb!important;
 }
+.datepickers-container {
+  z-index: 9999
+}
+.modal-height-500{
+  height:500px;
+  overflow: hidden
+}
+.modal-lgx {
+  max-width:1000px
+}
+.title-main .nav{
+  line-height: 16px;
+  margin-top:8px
+}

+ 41 - 6
dashboard.html

@@ -14,7 +14,7 @@
 <body>
   <div class="header">
 		<h1 class="logo"><a>主页-纵横变更管理系统</a></h1>
-    <!-- <div class="poj-name">
+    <div class="poj-name">
       <span class="name">项目A</span>
       <div class="btn-group">
         <a class=" btn" data-toggle="dropdown" >
@@ -25,8 +25,9 @@
          <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>
+     <a href="settings-poj.html" class="btn" data-toggle="tooltip" data-placement="bottom" title="项目设置"><i class="fa fa-cogs"></i></a>
+    </div>
 		<div class="header-box">
 			<div class="header-nav"></div>
 			<div class="header-user pull-right">
@@ -63,7 +64,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -92,13 +93,47 @@
 						<h4>需要你处理</h4>
 					</div>
 					<div class="c-body">
-						内容
+            <ul class="list-unstyled m-0">
+              <li class="media">
+                <img class="mr-3" src="img/avatar.png">
+                <div class="media-body">
+                  <span class="pull-right text-muted">02-28 13:23</span>
+                  <h5 class="mt-0">张三<small class="ml-3 text-muted">监理</small></h5>
+                  <p><a href="taizhang.html">WWUJ-1</a> 台帐 需要您 <a href="taizhang.html">审批</a>。</p>
+                </div>
+              </li>
+              <li class="media">
+                <img class="mr-3" src="img/avatar.png">
+                <div class="media-body">
+                  <span class="pull-right text-muted">02-28 13:23</span>
+                  <h5 class="mt-0">张三<small class="ml-3 text-muted">监理</small></h5>
+                  <p><a href="taizhang.html">WWUJ-2</a> 台帐 需要您 <a href="taizhang.html">审批</a>。</p>
+                </div>
+              </li>
+            </ul>
 					</div>
 					<div class="c-header mt-4">
 						<h4>需要你关注</h4>
 					</div>
 					<div class="c-body">
-						内容
+            <ul class="list-unstyled m-0">
+              <li class="media">
+                <img class="mr-3" src="img/avatar.png">
+                <div class="media-body">
+                  <span class="pull-right text-muted">02-28 13:23</span>
+                  <h5 class="mt-0">张三<small class="ml-3 text-muted">监理</small></h5>
+                  <p><a href="taizhang.html">WWUJ-1</a> 台帐 审批完成。</p>
+                </div>
+              </li>
+              <li class="media">
+                <img class="mr-3" src="img/avatar.png">
+                <div class="media-body">
+                  <span class="pull-right text-muted">02-28 13:23</span>
+                  <h5 class="mt-0">张三<small class="ml-3 text-muted">监理</small></h5>
+                  <p><a href="taizhang.html">WWUJ-2</a> 台帐 审批完成。</p>
+                </div>
+              </li>
+            </ul>
 					</div>
 				</div>
 			</div>

+ 5 - 4
hetong.html

@@ -77,10 +77,10 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="">计量台帐</a></li>
+              <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>
@@ -88,9 +88,10 @@
               <li><a href="jiliang.html">中间计量</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="">期计量</a></li>
+              <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="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
           <li class="nav-item active"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
         </ul>
 			</div>

+ 146 - 66
jiliang-detail.html

@@ -9,6 +9,7 @@
     <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>
@@ -77,10 +78,10 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="">计量台帐</a></li>
+              <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>
@@ -88,89 +89,168 @@
               <li><a href="jiliang.html">中间计量</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="">计量</a></li>
+              <li><a href="jiliang-list.html">计量审批</a></li>
             </ul>
-          </li>					<li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
+            <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 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-sidebar">
-    				<div class="panel-title">
-    					<div class="title-bar">
-    						<h2>WWUJ-2-201710</h2>
-    					</div>
-    				</div>
-    				<div class="scrollbar-auto">
-    					<div class="nav-box">
-    						<ul class="nav-list list-unstyled">
-    							<li><a href="qingdan-detail.html"><span>中间计量清单</span></a></li>
-    							<li><a href="#"><span>中间计量单</span></a></li>
-    							<li><a href="#"><span>计量进度</span></a></li>
-    							<li><a href="#"><span>计量报表</span></a></li>
-    							<li class="active"><a href="qingdan-detail.html"><span>计量信息</span></a></li>
-    						</ul>
-    					</div>
-    				</div>
-    			</div>
     			<div class="panel-content">
-    				<div class="panel-title">
-    					<div class="title-main">
-    						<h2>
-                    计量信息
-                </h2>
-    					</div>
+    				<div class="panel-title fluid">
+    					<div class="title-main d-flex justify-content-between">
+                <div>
+                  <div class="btn-group">
+                    <select class="form-control form-control-sm mt-0">
+                      <option>WJQR1-201710</option>
+                      <option>WJQR1-201709</option>
+                      <option>WJQR1-201708(第14期)</option>
+                      <option>WJQR1-201707(第14期)</option>
+                      <option>WJQR1-201706(第13期)</option>
+                      <option>WJQR1-201705(第12期)</option>
+                    </select>
+                  </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>
+                <div>
+		              <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>
+                  <a class="btn btn-outline-secondary btn-sm pull-right disabled">审批完成</a>
+                  <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn  btn-sm pull-right">审批流程</a>
+                </div>
+              </div>
     				</div>
     				<div class="content-wrap">
+              <div class="c-header p-0"></div>
     					<div class="c-body">
-                <table class="table table-bordered table-sm">
-                    <tr>
-                      <th width="120">标段</th><td><input type="text" class="form-control form-control-sm" value="WWUJ-2" readonly></td>
-                      <th width="120">计量编号</th><td><input type="text" class="form-control form-control-sm" value="WWUJ-2-201710" readonly></td>
-                      <th width="120">开始日期</th><td><input type="text" class="form-control form-control-sm" value="2017-11-16" readonly></td>
-                      <th width="120">截止日期</th><td><input type="text" class="form-control form-control-sm" value="2017-12-15" readonly></td></tr>
-                    <tr>
-                      <th>本次完成(元)</th><td><input type="text" class="form-control form-control-sm" value="11030783" readonly></td>
-                      <th>累计完成(元)</th><td><input type="text" class="form-control form-control-sm" value="152194795" readonly></td>
-                      <th>创建人</th><td><input type="text" class="form-control form-control-sm" value="张三" readonly></td>
-                      <th>创建日期</th><td><input type="text" class="form-control form-control-sm" value="2017-12-01" readonly></td>
-                    </tr>
-                </table>
-                <div class="row">
-                  <div class="col-4">
-                    <table class="table table-bordered table-sm table-hover">
-                      <thead><th>项目名称</th><th class="text-right">本期完成(元)</th></thead>
-                      <tbody>
-                        <tr><th width="200">100章至900章合计</th><td class="text-right">12643455</td></tr>
-                        <tr><th>1. 计量款</th><td class="text-right">12643455</td></tr>
-                        <tr><th>2. 材料调差</th><td class="text-right">5213</td></tr>
-                        <tr><th>3. 优质优价价款</th><td class="text-right">180000</td></tr>
-                        <tr><th>4. 开工预付款</th><td class="text-right">0</td></tr>
-                        <tr><th>5. 材料预付款</th><td class="text-right">0</td></tr>
-                        <tr><th>6. 其它付款</th><td class="text-right">0</td></tr>
-                        <tr class="table-success"><th>一 应付款合计</th><td class="text-right">12828668</td></tr>
-                        <tr><th>1. 扣开工预付款</th><td class="text-right">0</td></tr>
-                        <tr><th>2. 扣材料预付款</th><td class="text-right">0</td></tr>
-                        <tr><th>3. 扣材料款</th><td class="text-right">1165712</td></tr>
-                        <tr><th>4. 保留金</th><td class="text-right">632173</td></tr>
-                        <tr><th>5. 罚金</th><td class="text-right">0</td></tr>
-                        <tr><th>6. 其它扣款</th><td class="text-right">0</td></tr>
-                        <tr class="table-danger"><th>二 应扣款合计</th><td class="text-right">1797885</td></tr>
-                        <tr class="table-primary"><th>三 本期支付</th><td class="text-right">11030783</td></tr>
-                      </tbody>
-                    </table>
-                  </div>
+                <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>
     			</div>
-    		</div>	</div>
+    		</div>
+      </div>
+      <!--弹出添加中间计量-->
+      <div class="modal fade" id="sp-done" 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>
+                      <textarea class="form-control"></textarea>
+                    </div>
+                    <table class="table table-bordered table-sm">
+                      <tr><th width="100">审批人</th><th>审批意见</th></tr>
+                      <tr><td>张三<br><span class="text-muted">监理</span></td><td>审批意见内容<br><span class="text-muted">2017-11-13</span></td></tr>
+                      <tr><td>张三<br><span class="text-muted">监理</span></td><td class="text-danger">退回内容<br><span class="text-muted">2017-11-13</span></td></tr>
+                      <tr><td>张三<br><span class="text-muted">监理</span></td><td>审批意见内容<br><span class="text-muted">2017-11-13</span></td></tr>
+                      <tr><td>张三<br><span class="text-muted">监理</span></td><td>审批意见内容<br><span class="text-muted">2017-11-13</span></td></tr>
+                    </table>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-success">审批通过</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--弹出添加计量清单-->
+      <div class="modal fade" id="add-qd" data-backdrop="static">
+          <div class="modal-dialog modal-lgx" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">添加计量清单</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="row">
+                      <div class="col-3">
+                        <div class="modal-height-500">
+                          侧栏
+                        </div>
+                      </div>
+                      <div class="col-9">
+                        <div class="modal-height-500">
+                          <table class="table table-bordered">
+                            <tr><th>1</th><th>项目节编号</th><th>清单编号</th><th>名称</th><th>单位</th><th>单价</th><th>操作</th></tr>
+                          </table>
+                        </div>
+                      </div>
+                    </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>
     <!-- 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>
 </body>
 
 </html>

+ 142 - 0
jiliang-list.html

@@ -0,0 +1,142 @@
+<!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">
+</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="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>
+            <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 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" 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>
+                  </div>
+                </div>
+    					</div>
+    				</div>
+    				<div class="content-wrap">
+    					<div class="c-body">
+                <div class="tab-content">
+                  <table class="table table-bordered">
+                    <thead>
+                      <tr><th>计量编号</th><th>计量金额</th><th>计量月份</th><th>计量期数</th><th>状态</th><th>当前处理人</th></tr>
+                    </thead>
+                    <tbody>
+                      <tr><td><a href="jiliang.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-detail.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-detail.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>15</td><td><a href="jiliang-detail.html" class="btn-primary btn-sm">审批</a></td><td>监理-张三</td></tr>
+                      <tr><td><a href="jiliang-detail.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>
+                    </tobody>
+                  </table>
+                </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>
+</body>
+
+</html>

+ 6 - 2
jiliang-qi.html

@@ -77,7 +77,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -88,9 +88,13 @@
               <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="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>

+ 161 - 16
jiliang.html

@@ -9,6 +9,7 @@
     <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>
@@ -77,7 +78,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -88,9 +89,13 @@
               <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="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>
@@ -100,39 +105,179 @@
     				<div class="panel-title fluid">
     					<div class="title-main d-flex justify-content-between">
                 <div>
-                  <select class="form-control form-control-sm">
-                    <option>全部</option>
-                    <option>编制中</option>
-                    <option>审批中</option>
-                    <option>审批完成</option>
-                  </select>
+                  <div class="btn-group">
+                    <select class="form-control form-control-sm mt-0">
+                      <option>WJQR1-201710</option>
+                      <option>WJQR1-201709</option>
+                      <option>WJQR1-201708(第14期)</option>
+                      <option>WJQR1-201707(第14期)</option>
+                      <option>WJQR1-201706(第13期)</option>
+                      <option>WJQR1-201705(第12期)</option>
+                    </select>
+                  </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>
+                  </div>
                 </div>
                 <div>
-		              <a href="#" class="btn btn-primary btn-sm pull-right">添加计量</a>
+		              <a href="#add-mj" data-toggle="modal" data-target="#add-mj" class="btn btn-primary btn-sm pull-right">添加中间计量</a>
+                  <a class="btn btn-outline-secondary btn-sm pull-right disabled">已审批</a>
+                  <a href="#add-mj" data-toggle="modal" data-target="#add-mj" class="btn btn-outline-primary btn-sm pull-right"><i class="fa fa-cog"></i></a>
                 </div>
-    					</div>
+              </div>
     				</div>
     				<div class="content-wrap">
+              <div class="c-header p-0"></div>
     					<div class="c-body">
-                <div class="tab-content">
+                <div class="sjs-height-1">
                   <table class="table table-bordered">
                     <thead>
-                      <tr><th>计量编号</th><th>计量金额</th><th>计量月份</th><th>计量期数</th><th>状态</th><th>当前处理人</th></tr>
+                      <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>
-                    <tbody>
-                      <tr><td><a href="jiliang-detail.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>15</td><td>审批中</td><td>监理-张三</td></tr>
-                    </tobody>
                   </table>
                 </div>
     					</div>
     				</div>
     			</div>
-    		</div>	</div>
+    		</div>
+      </div>
+      <!--弹出添加中间计量-->
+      <div class="modal fade" id="add-mj" 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>
+                      <div class="input-group">
+                        <input type="text" class="form-control" placeholder="请输入中间计量编号" value="WJQR1-201711">
+                        <div class="input-group-append">
+                          <button class="btn btn-outline-secondary" type="button">自动编号</button>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="form-group">
+                      <label>中间计量编号<b class="text-danger">*</b></label>
+                      <div class="input-group">
+                        <input type="text" class="form-control is-invalid" placeholder="请输入中间计量编号" value="WJQR1-201711">
+                        <div class="input-group-append">
+                          <button class="btn btn-outline-secondary" type="button">自动编号</button>
+                        </div>
+                        <div class="invalid-feedback">您输入的编号已存在</div>
+                      </div>
+                    </div>
+                    <div class="form-group">
+                      <label>计量月份</label>
+                      <input data-view="months" data-min-view="months" class="datepicker-here form-control" placeholder="按时间筛选" type="text" data-date-format="yyyy MM " data-language="zh">
+                    </div>
+                    <div class="form-group">
+                      <label>计量期</label>
+                      <select class="form-control">
+                        <option>选填</option>
+                        <option>15</option>
+                        <option>14</option>
+                      </select>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <!--编辑-->
+                    <button type="button" class="btn btn-outline-danger">删除</button>
+                    <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>
+          </div>
+      </div>
+      <!--弹出添加计量清单-->
+      <div class="modal fade" id="add-qd" data-backdrop="static">
+          <div class="modal-dialog modal-lgx" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">添加计量清单</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="row">
+                      <div class="col-3">
+                        <div class="modal-height-500">
+                          侧栏
+                        </div>
+                      </div>
+                      <div class="col-9">
+                        <div class="modal-height-500">
+                          <table class="table table-bordered">
+                            <tr><th>1</th><th>项目节编号</th><th>清单编号</th><th>名称</th><th>单位</th><th>单价</th><th>操作</th></tr>
+                          </table>
+                        </div>
+                      </div>
+                    </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>
     <!-- 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>
 </body>
 
 </html>

File diff suppressed because it is too large
+ 2 - 0
js/datepicker/datepicker.min.js


+ 12 - 0
js/datepicker/datepicker.zh.js

@@ -0,0 +1,12 @@
+;(function (jQuery) { jQuery.fn.datepicker.language['zh'] = {
+    days: ['周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+    daysShort: ['日', '一', '二', '三', '四', '五', '六'],
+    daysMin: ['日', '一', '二', '三', '四', '五', '六'],
+    months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+    monthsShort: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+    today: '今天',
+    clear: '清除',
+    dateFormat: 'yyyy-mm-dd',
+    timeFormat: 'hh:ii',
+    firstDay: 0
+}; })(jQuery);

+ 4 - 1
settings-poj.html

@@ -64,7 +64,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -75,6 +75,9 @@
               <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>

+ 4 - 1
settings-user.html

@@ -64,7 +64,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -75,6 +75,9 @@
               <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>

+ 176 - 5
taizhang-bg-detail.html

@@ -40,7 +40,7 @@
      </div>
     </div>
     <div class="poj-name">
-      <span class="name">台帐变更</span>
+      <span class="name">台帐修订</span>
     </div>
 		<div class="header-box">
 			<div class="header-nav"></div>
@@ -79,7 +79,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -123,7 +123,13 @@
                   </div>
                 </div>
                 <div>
-					       <a href="#" class="btn btn-primary btn-sm pull-right">完成变更</a> <a href="#" class="btn btn-primary btn-sm pull-right">上报审批</a>
+					       <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="#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>
@@ -143,7 +149,7 @@
     					<div class="c-body col-8">
                 <div class="sjs-height-1">
       						<table class="table table-bordered">
-                    <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></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></tr>
       						</table>
                 </div>
     					</div>
@@ -171,7 +177,172 @@
     			</div>
     		</div>
       </div>
-
+      <!--上报审批-->
+      <div class="modal fade" id="sub-sp" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">上报审批</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="form-group">
+                      <label>搜索审批人</label>
+                      <div class="input-group">
+                        <input class="form-control" placeholder="请输入姓名进行检索" type="text">
+                        <div class="input-group-append">
+                          <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="card border-primary">
+                      <div class="card-body">
+                        <h5 class="card-title">
+                          <a href="#" class="btn btn-primary btn-sm pull-right">添加</a>张三
+                        </h5>
+                        <h6 class="card-subtitle mb-2 text-muted">监理</h6>
+                        <p class="card-text">XXXXX公司</p>
+                      </div>
+                    </div>
+                    <div class="card mt-3">
+                      <div class="card-header">
+                        审批流程
+                      </div>
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>1 张三  <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>2 王五 <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>3 李四 <small class="text-muted">监理</small></li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-primary">确认上报</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--完成修订-->
+      <div class="modal fade" id="done-sp" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">完成修订</h5>
+                  </div>
+                  <div class="modal-body">
+                    <h5>是否确定完成修订 0002 编写错漏2 ? 确定后不可修改。</h5>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-primary">确认完成</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--审批流程/结果-->
+      <div class="modal fade" id="sp-list" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">审批流程</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="card mt-3">
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                          <span class="text-warning pull-right">审批中</span>
+                           <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                           <p class="card-text"></p>
+                        </li>
+                        <li class="list-group-item">
+                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--审批通过-->
+      <div class="modal fade" id="sp-done" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">审批通过</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="card mt-3">
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                          <span class="text-warning pull-right">审批中</span>
+                           <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                           <div class="form-group">
+                             <label>审批意见<b class="text-danger">*</b></label>
+                             <textarea class="form-control" ></textarea>
+                           </div>
+                        </li>
+                        <li class="list-group-item">
+                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-success" >确认通过</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--审批退回-->
+      <div class="modal fade" id="sp-back" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">审批退回</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="card mt-3">
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                          <span class="text-warning pull-right">审批中</span>
+                           <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                           <div class="form-group">
+                             <label>审批意见<b class="text-danger">*</b></label>
+                             <textarea class="form-control" ></textarea>
+                           </div>
+                           <div class="alert alert-warning">审批退回,将直接退回给上报人。</data-min-view>
+                        </li>
+                        <li class="list-group-item">
+                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-warning" >确认退回</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>

+ 5 - 2
taizhang-bg.html

@@ -40,7 +40,7 @@
      </div>
     </div>
     <div class="poj-name">
-      <span class="name">台帐变更</span>
+      <span class="name">台帐修订</span>
     </div>
 		<div class="header-box">
 			<div class="header-nav"></div>
@@ -79,7 +79,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -90,6 +90,9 @@
               <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>

+ 4 - 1
taizhang-jl.html

@@ -79,7 +79,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -90,6 +90,9 @@
               <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>
             </ul>
           </li>

+ 5 - 1
taizhang-shenpi.html

@@ -87,9 +87,13 @@
               <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="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>

+ 161 - 5
taizhang.html

@@ -79,7 +79,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -90,6 +90,9 @@
               <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>
@@ -123,14 +126,18 @@
                     <div class="form-check-inline">
                       <label class="form-check-label">
                         <input type="checkbox" class="form-check-input">
-                        台帐变更
+                        台帐修订
                       </label>
                     </div>
                   </div>
                 </div>
                 <div>
-					        <a href="#" class="btn btn-primary btn-sm pull-right">上报审批</a>
-						      <a href="#" class="btn btn-outline-secondary btn-sm pull-right disabled">报审完成</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="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-danger 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>
                 </div>
     					</div>
     				</div>
@@ -203,7 +210,7 @@
           <div class="modal-dialog modal-lg" role="document">
               <div class="modal-content">
                   <div class="modal-header">
-                      <h5 class="modal-title">台帐变更信息</h5>
+                      <h5 class="modal-title">台帐修订信息</h5>
                   </div>
                   <div class="modal-body">
                     <table class="table table-bordered table-sm">
@@ -221,6 +228,155 @@
               </div>
           </div>
       </div>
+      <!--上报审批-->
+      <div class="modal fade" id="sub-sp" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">上报审批</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="form-group">
+                      <label>搜索审批人</label>
+                      <div class="input-group">
+                        <input class="form-control" placeholder="请输入姓名进行检索" type="text">
+                        <div class="input-group-append">
+                          <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="card border-primary">
+                      <div class="card-body">
+                        <h5 class="card-title">
+                          <a href="#" class="btn btn-primary btn-sm pull-right">添加</a>张三
+                        </h5>
+                        <h6 class="card-subtitle mb-2 text-muted">监理</h6>
+                        <p class="card-text">XXXXX公司</p>
+                      </div>
+                    </div>
+                    <div class="card mt-3">
+                      <div class="card-header">
+                        审批流程
+                      </div>
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>1 张三  <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>2 王五 <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>3 李四 <small class="text-muted">监理</small></li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-primary">确认上报</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--审批流程/结果-->
+      <div class="modal fade" id="sp-list" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">审批流程</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="card mt-3">
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                          <span class="text-warning pull-right">审批中</span>
+                           <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                           <p class="card-text"></p>
+                        </li>
+                        <li class="list-group-item">
+                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--审批通过-->
+      <div class="modal fade" id="sp-done" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">审批通过</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="card mt-3">
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                          <span class="text-warning pull-right">审批中</span>
+                           <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                           <div class="form-group">
+                             <label>审批意见<b class="text-danger">*</b></label>
+                             <textarea class="form-control" ></textarea>
+                           </div>
+                        </li>
+                        <li class="list-group-item">
+                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-success" >确认通过</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--审批退回-->
+      <div class="modal fade" id="sp-back" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">审批退回</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="card mt-3">
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                          <span class="text-warning pull-right">审批中</span>
+                           <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                           <div class="form-group">
+                             <label>审批意见<b class="text-danger">*</b></label>
+                             <textarea class="form-control" ></textarea>
+                           </div>
+                           <div class="alert alert-warning">审批退回,将直接退回给上报人。</data-min-view>
+                        </li>
+                        <li class="list-group-item">
+                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                        </li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-warning" >确认退回</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                  </div>
+              </div>
+          </div>
+      </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>