Chente vor 7 Jahren
Ursprung
Commit
1ee1a81cfc
20 geänderte Dateien mit 1622 neuen und 736 gelöschten Zeilen
  1. 0 156
      biangeng-new.html
  2. 267 5
      biangeng-new2.html
  3. 4 2
      biangeng-new3.html
  4. 4 2
      biangeng-new4.html
  5. 0 265
      biangeng-new5.html
  6. 140 3
      biangeng.html
  7. 75 0
      css/main.css
  8. 242 0
      hetong-pay.html
  9. 230 14
      hetong.html
  10. BIN
      img/sketch/1.png
  11. BIN
      img/sketch/2.png
  12. 0 256
      jiliang-detail.html
  13. 6 3
      jiliang-list.html
  14. 11 5
      jiliang-qi-detail.html
  15. 7 4
      jiliang-qi-detail2.html
  16. 6 3
      jiliang-qi-detail3.html
  17. 3 0
      jiliang-qi.html
  18. 538 14
      jiliang.html
  19. 2 0
      js/global.js
  20. 87 4
      taizhang.html

+ 0 - 156
biangeng-new.html

@@ -1,156 +0,0 @@
-<!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>
-    											<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 is-invalid" value="LZTJ-1标项目部发变更(2015)001号" type="text">
-                          <div class="invalid-feedback">
-                           您填写的编号已存在。
-                          </div>
-                        </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>

+ 267 - 5
biangeng-new2.html

@@ -39,6 +39,9 @@
        </div>
      </div>
     </div>
+    <div class="poj-name">
+      <span class="name">变更管理</span>
+    </div>
 			<div class="header-nav"></div>
 			<div class="header-user pull-right">
 				<div class="avatar btn-group">
@@ -106,12 +109,17 @@
 										<li class="nav-item"><a class="nav-link active" href="biangeng-new2.html">变更信息</a></li>
 										<li class="nav-item"><a class="nav-link" href="biangeng-new3.html">变更清单</a></li>
 										<li class="nav-item"><a class="nav-link" href="biangeng-new4.html">附件</a></li>
-										<li class="nav-item"><a class="nav-link" href="biangeng-new5.html">审批流程</a></li>
 									</ul>
                 </div>
                 <div>
-                  <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">提交审批</a>
-                  <a href="" class="btn btn-sm btn-success pull-right">保存</a>
+                  <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary 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>
+                  <a href="#" class="btn btn-outline-danger btn-sm pull-right text-truncate" style="max-width: 100px;" title="删除 LZTJ-1标项目部发变更(2015)001号">删除 LZTJ-1标项目部发变更(2015)001号</a>
                 </div>
               </div>
     				</div>
@@ -222,6 +230,109 @@
   									</form>
   								</div>
   							</div>
+                <!--详情 / 审批时 数据-->
+                <div class="row">
+  								<div class="col-md-4">
+  									<form>
+  									  <div class="form-group">
+  									    <label><b class="text-danger">*&nbsp;</b>申请编号</label>
+  									    <input class="form-control" value="LZTJ-1标项目部发变更(2015)001号" type="text" readonly>
+  									  </div>
+  									  <div class="form-group">
+  									    <label><b class="text-danger">*&nbsp;</b>工程名称</label>
+  									    <input class="form-control" value="收费站出口右侧加宽段及K0+532基底换填" type="text" readonly>
+  									  </div>
+  									  <div class="form-group">
+  									    <label>桩号</label>
+  									    <input class="form-control" value="K0+532" type="text" readonly>
+  									  </div>
+  									  <div class="form-group">
+  									    <label>原设计图名称</label>
+  									    <input class="form-control" placeholder="" type="text" readonly>
+  									  </div>
+  									  <div class="form-group">
+  									    <label>原图号</label>
+  									    <input class="form-control" placeholder="" type="text" readonly>
+  									  </div>
+  									  <div class="form-group">
+  									    <label>变更设计图名称</label>
+  									    <input class="form-control" placeholder="" type="text" readonly>
+  									  </div>
+  									  <div class="form-group">
+  									    <label>变更图号</label>
+  									    <input class="form-control" placeholder="" type="text" readonly>
+  									  </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" readonly>由于K0+532涵洞基底土质天然含水率为25%、收费站出口右侧加宽段K0+120-K0+190段基底土质天然含水率为28.8%。含水率较大形成过湿土,地基松软,无法满足承载力要求。经处项目办、设计、监理、施工单位四方勘察,采用抛石挤淤、砂砾换填以达到地基承载力。
+  												</textarea>
+  										  </div>
+  										  <div class="form-group">
+  										    <label>工程变更合同依据</label>
+  										    <textarea class="form-control" rows="6" readonly></textarea>
+  										  </div>
+  										  <div class="form-group">
+  										    <label>备注</label>
+  										    <textarea class="form-control" rows="3" readonly></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" disabled>A.位置
+  												</label>
+  												<!-- <label class="checkbox-inline">
+  												  <input id="inlineCheckbox2" value="option2" type="checkbox">B.数量
+  												</label>
+  												<label class="checkbox-inline">
+  												  <input id="inlineCheckbox3" value="option3" type="checkbox">C.结构
+  												</label>
+  												<label class="checkbox-inline">
+  												  <input id="inlineCheckbox3" value="option3" checked="" type="checkbox">D.新增
+  												</label>
+  												<label class="checkbox-inline">
+  												  <input id="inlineCheckbox3" value="option3" type="checkbox">E.取消
+  												</label>
+  												<label class="checkbox-inline">
+  												  <input id="inlineCheckbox3" value="option3" type="checkbox">F.纠错
+  												</label> -->
+  											</div>
+  									  </div>
+  									  <div class="form-group">
+  									    <label>变更类别 </label>
+  									    <select class="form-control" disabled><option>A类变更(设计变更)</option><option>B类变更(施工措施变)</option><option>C类变更(计划变更)</option><option>D类变更(条件变更)</option><option>E类变更(新增工程)</option></select>
+  									  </div>
+  									  <div class="form-group">
+  									    <label>变更性质 </label>
+  									    <select class="form-control" disabled><option>一般设计变更</option><option>较大设计变更</option><option>重大设计变更</option></select>
+  									  </div>
+  									  <div class="form-group">
+  									    <label>变更提出单位</label>
+  									    <!-- <a href="#editcompany" style="float:right;" class="" data-toggle="modal">编辑</a> -->
+  									    <select class="form-control" disabled><option>AA公司</option><option>BB公司</option></select>
+  									  </div>
+  									  <div class="form-group">
+  									    <label>费用承担方</label>
+  											<div class="radio">
+  												<label class="radio-inline">
+  												  <input id="inlineCheckbox1" value="option1" checked="" type="radio" disabled> 业主
+  												</label>
+  												<!-- <label class="radio-inline">
+  												  <input id="inlineCheckbox2" value="option2" type="radio"> 承包人
+  												</label> -->
+  											</div>
+  									  </div>
+  									</form>
+  								</div>
+  							</div>
     					</div>
     				</div>
     			</div>
@@ -259,7 +370,7 @@
   		  </div>
   		</div>
       <!--提交审批-->
-  		<div class="modal fade" id="sub-ap" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+  		<div class="modal fade" id="sub-ap2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
   		  <div class="modal-dialog" role="document">
   		    <div class="modal-content">
   		      <div class="modal-header">
@@ -283,7 +394,158 @@
   		    </div>
   		  </div>
   		</div>
-
+      <!--上报审批-->
+      <div class="modal fade" id="sub-ap" 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>还没添加任何变更清单,无法提交。</h5>
+                    <!--可以提交审批 但需要设置审批流程-->
+                    <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>

+ 4 - 2
biangeng-new3.html

@@ -39,6 +39,9 @@
        </div>
      </div>
     </div>
+    <div class="poj-name">
+      <span class="name">变更管理</span>
+    </div>
 			<div class="header-nav"></div>
 			<div class="header-user pull-right">
 				<div class="avatar btn-group">
@@ -106,11 +109,10 @@
 										<li class="nav-item"><a class="nav-link" href="biangeng-new2.html">变更信息</a></li>
 										<li class="nav-item"><a class="nav-link active" href="biangeng-new3.html">变更清单</a></li>
 										<li class="nav-item"><a class="nav-link" href="biangeng-new4.html">附件</a></li>
-										<li class="nav-item"><a class="nav-link" href="biangeng-new5.html">审批流程</a></li>
 									</ul>
                 </div>
                 <div>
-                  <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">提交审批</a>
+                  <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">上报审批</a>
                 </div>
               </div>
     				</div>

+ 4 - 2
biangeng-new4.html

@@ -39,6 +39,9 @@
        </div>
      </div>
     </div>
+    <div class="poj-name">
+      <span class="name">变更管理</span>
+    </div>
 			<div class="header-nav"></div>
 			<div class="header-user pull-right">
 				<div class="avatar btn-group">
@@ -106,11 +109,10 @@
 										<li class="nav-item"><a class="nav-link" href="biangeng-new2.html">变更信息</a></li>
 										<li class="nav-item"><a class="nav-link" href="biangeng-new3.html">变更清单</a></li>
 										<li class="nav-item"><a class="nav-link active" href="biangeng-new4.html">附件</a></li>
-										<li class="nav-item"><a class="nav-link" href="biangeng-new5.html">审批流程</a></li>
 									</ul>
                 </div>
                 <div>
-                  <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">提交审批</a>
+                  <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">上报审批</a>
                 </div>
               </div>
     				</div>

+ 0 - 265
biangeng-new5.html

@@ -1,265 +0,0 @@
-<!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" href="biangeng-new2.html">变更信息</a></li>
-										<li class="nav-item"><a class="nav-link" href="biangeng-new3.html">变更清单</a></li>
-										<li class="nav-item"><a class="nav-link" href="biangeng-new4.html">附件</a></li>
-										<li class="nav-item"><a class="nav-link active" href="biangeng-new5.html">审批流程</a></li>
-									</ul>
-                </div>
-                <div>
-                  <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">提交审批</a>
-                </div>
-              </div>
-    				</div>
-    				<div class="content-wrap">
-    					<div class="c-body">
-                <legend>审批流程<a href="#addshenpi" class="btn btn-outline-primary btn-sm pull-right" data-toggle="modal"><span class="glyphicon glyphicon-plus"></span> 添加审批人</a></legend>
-                <ul class="list-unstyled w-50">
-                  <li class="media mb-4">
-                    <span class="badge badge-pill badge-secondary position-absolute"><i class="fa fa-flag-o"></i></span>
-                    <img class="mr-3" src="img/avatar.png">
-                    <div class="media-body">
-                      <h5 class="mt-0 mb-1">张一 <small class="text-muted">施工</small> </h5>
-                    </div>
-                  </li>
-                  <li class="media mb-4">
-                    <span class="badge badge-pill badge-secondary position-absolute">2</span>
-                    <img class="mr-3" src="img/avatar.png">
-                    <div class="media-body">
-                      <h5 class="mt-0 mb-1">赵二 <small class="text-muted">承包人</small> </h5>
-                      <a href="" class="btn btn-outline-danger btn-sm">移除</a>
-                    </div>
-                  </li>
-                  <li class="media mb-4">
-                    <span class="badge badge-pill badge-secondary position-absolute">2</span>
-                    <img class="mr-3" src="img/avatar.png">
-                    <div class="media-body">
-                      <h5 class="mt-0 mb-1">李四 <small class="text-muted">项目经理</small> </h5>
-                      <a href="" class="btn btn-outline-danger btn-sm">移除</a>
-                    </div>
-                  </li>
-                  <li class="media mb-4">
-                    <span class="badge badge-pill badge-secondary position-absolute"><i class="fa fa-flag-checkered"></i></span>
-                    <img class="mr-3" src="img/avatar.png">
-                    <div class="media-body">
-                      <h5 class="mt-0 mb-1">王五 <small class="text-muted">总监理工程师</small> </h5>
-                      <a href="" class="btn btn-outline-danger btn-sm">移除</a>
-                    </div>
-                  </li>
-                </ul>
-                <!--审批过程-->
-                <ul class="list-unstyled w-50">
-                  <li class="media mb-4">
-                    <span class="badge badge-pill badge-success position-absolute"><i class="fa fa-flag-o"></i></span>
-                    <img class="mr-3" src="img/avatar.png">
-                    <div class="media-body">
-                      <h5 class="mt-0 mb-1">张一 <small class="text-muted">施工</small> </h5>
-                      <p>2018-01-08 <b class="text-success">上报审批</b></p>
-                    </div>
-                  </li>
-                  <li class="media mb-4">
-                    <span class="badge badge-pill badge-success position-absolute">2</span>
-                    <img class="mr-3" src="img/avatar.png">
-                    <div class="media-body">
-                      <h5 class="mt-0 mb-1">赵二 <small class="text-muted">承包人</small> </h5>
-                      <p>2018-01-08 <b class="text-success">审批通过</b> 审批意见内容</p>
-                    </div>
-                  </li>
-                  <li class="media mb-4">
-                    <span class="badge badge-pill badge-secondary position-absolute">3</span>
-                    <img class="mr-3" src="img/avatar.png">
-                    <div class="media-body">
-                      <h5 class="mt-0 mb-1">李四 <small class="text-muted">项目经理</small> </h5>
-                      <p><b class="text-warning">审批中</b></p>
-                    </div>
-                  </li>
-                  <li class="media mb-4">
-                    <span class="badge badge-pill badge-secondary position-absolute"><i class="fa fa-flag-checkered"></i></span>
-                    <img class="mr-3" src="img/avatar.png">
-                    <div class="media-body">
-                      <h5 class="mt-0 mb-1">王五 <small class="text-muted">总监理工程师</small> </h5>
-                    </div>
-                  </li>
-                </ul>
-
-    					</div>
-    				</div>
-    			</div>
-    		</div>
-      </div>
-      <!--添加审批人-->
-  		<div class="modal fade" id="addshenpi" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-  		  <div class="modal-dialog" role="document">
-  		    <div class="modal-content">
-  		      <div class="modal-header">
-  		        <h5 class="modal-title" >添加审批人</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-  		      </div>
-  		      <div class="modal-body">
-  		      	<div class="input-group">
-  						  <input type="text" class="form-control" placeholder="请输入审批人名称">
-                <div class="input-group-append">
-                  <button class="btn btn-outline-secondary" type="button">搜索</button>
-                </div>
-  						</div>
-  						<div class="row" style="margin-top:25px;">
-  		        	<div class="col-md-4 alert alert-pnone"><div class="radio"><label><input type="radio" name="inlineRadioOptions1" value="option1"> 赵七</label><div>承包人经办人</div></div></div>
-  		        	<div class="col-md-4 alert alert-success alert-pnone"><div class="radio"><label><input type="radio" name="inlineRadioOptions1" value="option2" checked>钱八</label><div>承包人项目经理</div></div></div>
-  		        	<div class="col-md-4 alert alert-pnone"></div>
-  		        </div>
-  		        <h5>常用审批人</h5>
-  		        <div class="row">
-  		        	<div class="col-md-4 alert alert-pnone"><div class="radio"><label><input type="radio" name="inlineRadioOptions" value="option1"> 张三</label><div>承包人经办人</div></div></div>
-  		        	<div class="col-md-4 alert alert-success alert-pnone"><div class="radio"><label><input type="radio" name="inlineRadioOptions" value="option2" checked>李四</label><div>承包人项目经理</div></div></div>
-  		        	<div class="col-md-4 alert alert-pnone"><div class="radio"><label><input type="radio" name="inlineRadioOptions" value="option3"> 王五</label><div>总监理工程师</div></div></div>
-  		        </div>
-  		        <div class="row">
-  		        	<div class="col-md-4 alert alert-pnone"><div class="radio"><label><input type="radio" name="inlineRadioOptions" value="option4"> 郑六</label><div>总监理工程师</div></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>
-      <!--提交审批-->
-  		<div class="modal fade" id="sub-ap" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-  		  <div class="modal-dialog" role="document">
-  		    <div class="modal-content">
-  		      <div class="modal-header">
-  		        <h5 class="modal-title" id="myModalLabel">提交审批</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                <span aria-hidden="true">&times;</span>
-              </button>
-  		      </div>
-  		      <div class="modal-body">
-  		      	<h5>还没添加任何变更清单,无法提交。</h5>
-  		      	<h5>还没设置审批流程,无法提交。</h5>
-  		      	<h5>确认提交审批?</h5>
-  		      </div>
-  		      <div class="modal-footer">
-              <!--无法提交-->
-  		        <button type="button" class="btn btn-secondary" data-dismiss="modal">好的</button>
-              <!--确认提交-->
-  		        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-              <button type="button" class="btn btn-primary" 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>
-</body>
-
-</html>

+ 140 - 3
biangeng.html

@@ -40,6 +40,9 @@
        </div>
      </div>
     </div>
+    <div class="poj-name">
+      <span class="name">变更管理</span>
+    </div>
 			<div class="header-nav"></div>
 			<div class="header-user pull-right">
 				<div class="avatar btn-group">
@@ -113,7 +116,10 @@
 										<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>
+                  <a href="#add-bj" data-toggle="modal" data-target="#add-bj" class="btn btn-sm btn-primary pull-right">新建变更令</a>
+                  <a href="#setting" data-toggle="modal" data-target="#setting" class="btn btn-sm btn-outline-primary pull-right"><i class="fa fa-cog"></i></a>
+                </div>
               </div>
     				</div>
     				<div class="content-wrap">
@@ -123,7 +129,7 @@
 									<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=".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="biangeng-new2.html">LZTJ-1标项目部发变更(2015)001号 (点我)</a></td><td>收费站出口右侧加宽段及K0+532基底换填</td><td>A类变更(设计变更)</td><td>101112.23</td><td><a href="biangeng-new2.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>
@@ -200,12 +206,143 @@
     					</div>
     				</div>
     			</div>
-    		</div>	</div>
+    		</div>
+      </div>
+      <!--首次使用-->
+      <div class="modal" id="first">
+        <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>当前规则:WWUJ2018030001</h5>
+  		       	<h5>
+                <span class="badge badge-light" title="标段名">WWUJ-1 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                <span class="badge badge-light" title="当前年月">201803 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                <span class="badge badge-light" title="自动编号">0000 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+              </h5>
+  						<h5>添加新规则组件</h5>
+  						<div class="form-group">
+  							<select class="form-control">
+  								<option>请选择组件</option>
+  								<option>标段名</option>
+  								<option>文本</option>
+  								<option>当前年月</option>
+  								<option>自增编号</option>
+  							</select>
+  						</div>
+  						<div class="form-group">
+  					    <label>自动编号位数</label>
+  					    <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+  					  </div>
+  						<div class="form-group">
+  					    <label>起始编号</label>
+  					    <input class="form-control" value="001" type="text">
+  					  </div>
+  						<button class="btn btn-outline-primary">添加组件</button>
+  		      </div>
+  					<div class="modal-footer">
+  						<button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+  						<button type="button" class="btn btn-primary">确定</button>
+  					</div>
+  		    </div>
+  		  </div>
+      </div>
+      <!--弹出添加变更令-->
+      <div class="modal fade" id="add-bj" 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" title="自动编号"><i class="fa fa-repeat"></i></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" title="自动编号"><i class="fa fa-repeat"></i></button>
+                        </div>
+                        <div class="invalid-feedback">您输入的编号已存在</div>
+                      </div>
+                    </div>
+                    <div class="form-group">
+                      <label>工程名称<b class="text-danger">*</b></label>
+                      <input class="form-control" value="收费站出口右侧加宽段及K0+532基底换填" type="text">                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <a href="biangeng-new2.html" class="btn btn-primary">确认添加</a>
+                  </div>
+              </div>
+          </div>
+      </div>、
+      <!--设置-->
+      <div class="modal fade" id="setting" 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">
+                    <ul class="nav nav-tabs mb-3" role="tablist">
+                      <li class="nav-item">
+                        <a class="nav-link active" data-toggle="tab" href="#bianhao" role="tab" aria-controls="home" aria-selected="true">编号规则</a>
+                      </li>
+                    </ul>
+                    <div class="tab-content">
+                      <div class="tab-pane active" id="bianhao">
+                        <h5>当前规则:WWUJ2018030001</h5>
+            		       	<h5>
+                          <span class="badge badge-light" title="标段名">WWUJ-1 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                          <span class="badge badge-light" title="当前年月">201803 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                          <span class="badge badge-light" title="自动编号">0000 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                        </h5>
+            						<h5>添加新规则组件</h5>
+            						<div class="form-group">
+            							<select class="form-control">
+            								<option>请选择组件</option>
+            								<option>标段名</option>
+            								<option>文本</option>
+            								<option>当前年月</option>
+            								<option>自增编号</option>
+            							</select>
+            						</div>
+            						<div class="form-group">
+            					    <label>自动编号位数</label>
+            					    <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+            					  </div>
+            						<div class="form-group">
+            					    <label>起始编号</label>
+            					    <input class="form-control" value="001" type="text">
+            					  </div>
+            						<button class="btn btn-outline-primary">添加组件</button>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary">确定添加</button>
+                  </div>
+              </div>
+          </div>
+      </div>
     <!-- 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 type="text/javascript">$('#first').modal('show')</script>
 </body>
 
 </html>

+ 75 - 0
css/main.css

@@ -12,9 +12,45 @@ body {
   color:#999
 }
 /*自定义css*/
+/*滚动条*/
+/* 滚动条 */
+::-webkit-scrollbar-thumb:horizontal { /*水平滚动条的样式*/
+	width: 5px;
+	background-color: #ddd;
+	-webkit-border-radius: 6px;
+}
+::-webkit-scrollbar-track-piece {
+	background-color: #fff; /*滚动条的背景颜色*/
+	-webkit-border-radius: 0; /*滚动条的圆角宽度*/
+}
+::-webkit-scrollbar {
+	width: 10px; /*滚动条的宽度*/
+	height: 8px; /*滚动条的高度*/
+}
+::-webkit-scrollbar-thumb:vertical { /*垂直滚动条的样式*/
+	height: 50px;
+	background-color: #ddd;
+	-webkit-border-radius: 6px;
+	outline: 1px solid #fff;
+	outline-offset: -1px;
+	border: 1px solid #fff;
+}
+::-webkit-scrollbar-thumb:hover { /*滚动条的hover样式*/
+	height: 50px;
+	background-color: #999;
+	-webkit-border-radius: 6px;
+}
 .sjs-height-1,.sjs-height-2{
   overflow: hidden;
 }
+.sjs-bottom{
+  height:400px;
+  overflow-y: auto;
+}
+.sjs-bottom-2{
+  height:360px;
+  overflow-y: auto;
+}
 .form-signin {
     max-width: 500px;
     margin: 150px auto;
@@ -376,3 +412,42 @@ body {
   line-height: 16px;
   margin-top:8px
 }
+/*草图编辑器*/
+.img-view{
+  height:400px;
+  border:.2rem solid #ccc;
+  position: relative;
+  width:100%;
+  overflow: hidden;
+}
+.img-view::after{
+  content:"草图编辑区";
+  color:#ddd;
+  position: absolute;
+  left:50%;
+  top:50%;
+  margin-left:-80px;
+  margin-top:-24px;
+  font-size:36px
+}
+.img-view .img-item{
+  position: absolute;
+
+}
+.img-view .img-item .img-bar{
+  position:absolute;
+  right:0;
+  top:0;
+  display:none
+}
+.img-item:hover .img-bar{
+  display: block;
+}
+.batch-l-t,.batch-l-b{
+  height: 200px;
+  overflow: hidden
+}
+.batch-r {
+  height:400px;
+  overflow: hidden
+}

+ 242 - 0
hetong-pay.html

@@ -0,0 +1,242 @@
+<!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="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"><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="javascript:void(0);"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+            <ul class="sub-menu">
+              <li><a href="hetong.html">合同审批</a></li>
+            </ul>
+            <ul class="sub-menu">
+              <li><a href="hetong-pay.html">收支管理</a></li>
+            </ul>
+          </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">
+                    <div class="form-check-inline">
+                      <label class="form-check-label">
+                        <input class="form-check-input" type="radio">
+                        简要面板
+                      </label>
+                    </div>
+                    <div class="form-check-inline">
+                      <label class="form-check-label">
+                        <input class="form-check-input" type="radio">
+                        详细信息
+                      </label>
+                    </div>
+                  </div>
+                  <div class="btn-group">
+                    <select class="form-control form-control-sm mt-0">
+                      <option>所有</option>
+                      <option>支付合同</option>
+                      <option>收款合同</option>
+                    </select>
+                  </div>
+                </div>
+              </div>
+    				</div>
+    				<div class="content-wrap">
+    					<div class="c-body">
+                <div class="row">
+                  <div class="col-6">
+                    <legend class="text-center">收款合同</legend>
+                    <table class="table table-bordered">
+                      <tr><th class="text-center">合同名称</th><th class="text-center">合同金额</th><th class="text-center" width="40%">进度</th></tr>
+                      <tr>
+                        <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                        <td class="text-center">10000.00</td>
+                        <td class="text-center">
+                          <div class="progress">
+                            <div class="progress-bar bg-success" role="progressbar" style="width: 30%" aria-valuenow="30" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="已收款:3000.00">30%</div>
+                            <div class="progress-bar bg-gray" role="progressbar" style="width: 70%" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="未收款:7000.00">70%</div>
+                          </div>
+                        </td>
+                      </tr>
+                      <tr>
+                        <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                        <td class="text-center">10000.00</td>
+                        <td class="text-center">
+                          <div class="progress">
+                            <div class="progress-bar bg-success" role="progressbar" style="width: 30%" aria-valuenow="30" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="已收款:3000.00">30%</div>
+                            <div class="progress-bar bg-gray" role="progressbar" style="width: 70%" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="未收款:7000.00">70%</div>
+                          </div>
+                        </td>
+                      </tr>
+                    </table>
+                  </div>
+                  <div class="col-6">
+                    <legend class="text-center">支付合同</legend>
+                    <table class="table table-bordered">
+                      <tr><th class="text-center">合同名称</th><th class="text-center">合同金额</th><th class="text-center" width="40%">进度</th></tr>
+                      <tr>
+                        <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                        <td class="text-center">10000.00</td>
+                        <td class="text-center">
+                          <div class="progress">
+                            <div class="progress-bar" role="progressbar" style="width: 30%" aria-valuenow="30" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="已支付:3000.00">30%</div>
+                            <div class="progress-bar bg-gray" role="progressbar" style="width: 70%" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="待支付:7000.00">70%</div>
+                          </div>
+                        </td>
+                      </tr>
+
+                    </table>
+                  </div>
+                </div>
+                <!--详细信息-->
+                <table class="table table-bordered">
+                  <tr><th class="text-center">合同名称</th><th class="text-center">发起人</th><th class="text-center" width="">甲乙方</th><th class="text-center" width="100">类型</th><th class="text-center">合同金额</th><th class="text-center" width="30%">进度</th></tr>
+                  <tr>
+                    <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                    <td>XXXX公司<br>张三</td>
+                    <td>甲方:XXX公司<br>乙方:XXX公司</td>
+                    <td class="text-center text-success">收款合同</td>
+                    <td class="text-center">10000.00</td>
+                    <td class="text-center">
+                      <div class="progress">
+                        <div class="progress-bar bg-success" role="progressbar" style="width: 30%" aria-valuenow="30" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="已收款:3000.00">30%</div>
+                        <div class="progress-bar bg-gray" role="progressbar" style="width: 70%" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="未收款:7000.00">70%</div>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                    <td>XXXX公司<br>张三</td>
+                    <td>甲方:XXX公司<br>乙方:XXX公司</td>
+                    <td class="text-center text-success">收款合同</td>
+                    <td class="text-center">10000.00</td>
+                    <td class="text-center">
+                      <div class="progress">
+                        <div class="progress-bar bg-success" role="progressbar" style="width: 30%" aria-valuenow="30" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="已收款:3000.00">30%</div>
+                        <div class="progress-bar bg-gray" role="progressbar" style="width: 70%" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="未收款:7000.00">70%</div>
+                      </div>
+                    </td>
+                  </tr>
+                  <tr>
+                    <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                    <td>XXXX公司<br>张三</td>
+                    <td>甲方:XXX公司<br>乙方:XXX公司</td>
+                    <td class="text-center text-warning">支付合同</td>
+                    <td class="text-center">10000.00</td>
+                    <td class="text-center">
+                      <div class="progress">
+                        <div class="progress-bar bg-warning" role="progressbar" style="width: 30%" aria-valuenow="30" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="已支付:3000.00">30%</div>
+                        <div class="progress-bar bg-gray" role="progressbar" style="width: 70%" aria-valuenow="20" aria-valuemin="0" aria-valuemax="100" data-toggle="tooltip" data-placement="top" data-original-title="待支付:7000.00">70%</div>
+                      </div>
+                    </td>
+                  </tr>
+                </table>
+    					</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>

+ 230 - 14
hetong.html

@@ -40,6 +40,9 @@
        </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">
@@ -88,41 +91,254 @@
               <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 active"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
+          <li class="nav-item"><a href="biangeng.html" title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
+          <li class="nav-item"><a href="javascript:void(0);"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+            <ul class="sub-menu">
+              <li><a href="hetong.html">合同审批</a></li>
+            </ul>
+            <ul class="sub-menu">
+              <li><a href="hetong-pay.html">收支管理</a></li>
+            </ul>
+          </li>
         </ul>
 			</div>
 		</div>
     <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>
+                  <div class="btn-group">
+                  <ul class="nav nav-pills m-0">
+										<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>
+									</ul>
+                </div>
+                  <div class="btn-group">
+                    <select class="form-control form-control-sm mt-0">
+                      <option>所有</option>
+                      <option>支付合同</option>
+                      <option>收款合同</option>
+                    </select>
+                  </div>
+                </div>
+                <div>
+                  <a href="#add-ht" data-toggle="modal" data-target="#add-ht" class="btn btn-primary btn-sm pull-right">新建合同</a>
+                  <a href="#setting" data-toggle="modal" data-target="#setting" class="btn btn-sm btn-outline-primary pull-right"><i class="fa fa-cog"></i></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>
+                  <tr><th class="text-center">合同名称</th><th class="text-center">发起人</th><th class="text-center" width="">甲乙方</th><th class="text-center" width="100">类型</th><th class="text-center">合同金额</th><th class="text-center" width="160">状态</th></tr>
+                  <tr>
+                    <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                    <td>XXXX公司<br>张三</td>
+                    <td>甲方:XXX公司<br>乙方:XXX公司</td>
+                    <td class="text-center text-success">收款合同</td>
+                    <td class="text-center">10000.00</td>
+                    <td class="text-center"><a href="" class="btn btn-primary btn-sm">审批</a></td>
+                  </tr>
+                  <tr>
+                    <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                    <td>XXXX公司<br>张三</td>
+                    <td>甲方:XXX公司<br>乙方:XXX公司</td>
+                    <td class="text-center text-success">收款合同</td>
+                    <td class="text-center">10000.00</td>
+                    <td class="text-center"><a href="" class="btn btn-primary btn-sm">重新上报</a> <a href="" class="btn btn-outline-danger btn-sm">删除</a></td>
+                  </tr>
+                  <tr>
+                    <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                    <td>XXXX公司<br>张三</td>
+                    <td>甲方:XXX公司<br>乙方:XXX公司</td>
+                    <td class="text-center text-warning">支付合同</td>
+                    <td class="text-center">10000.00</td>
+                    <td class="text-center">审批中</td>
+                  </tr>
+                  <tr>
+                    <td><a href="#">XXX合同</a><br><span class="text-muted">20173876</span></td>
+                    <td>XXXX公司<br>张三</td>
+                    <td>甲方:XXX公司<br>乙方:XXX公司</td>
+                    <td class="text-center text-warning">支付合同</td>
+                    <td class="text-center">10000.00</td>
+                    <td class="text-center">待上报</td>
+                  </tr>
+                </table>
     					</div>
     				</div>
     			</div>
-    		</div>	</div>
+    		</div>
+      </div>
+      <!--首次使用-->
+      <div class="modal" id="first">
+        <div class="modal-dialog" role="document" >
+  		    <div class="modal-content">
+  		      <div class="modal-header">
+  		        <h5 class="modal-title">设置合同编号规则</h5>
+  		      </div>
+  		      <div class="modal-body">
+              <ul class="nav nav-tabs" id="myTab" role="tablist">
+                <li class="nav-item">
+                  <a class="nav-link active" id="pay-tab" data-toggle="tab" href="#pay" role="tab" aria-controls="home" aria-selected="true">支付合同</a>
+                </li>
+                <li class="nav-item">
+                  <a class="nav-link" id="receipt-tab" data-toggle="tab" href="#receipt" role="tab" aria-controls="receipt" aria-selected="false">收款合同</a>
+                </li>
+              </ul>
+              <div class="tab-content" id="myTabContent">
+                <div class="tab-pane fade show active" id="pay" role="tabpanel" aria-labelledby="pay-tab">
+                  <h5 class="mt-3">当前规则:WWUJ2018030001</h5>
+                  <h5>
+                    <span class="badge badge-light" title="标段名">WWUJ-1 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                    <span class="badge badge-light" title="当前年月">201803 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                    <span class="badge badge-light" title="自动编号">0000 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                  </h5>
+                  <h5>添加新规则组件</h5>
+                  <div class="form-group">
+                    <select class="form-control">
+                      <option>请选择组件</option>
+                      <option>标段名</option>
+                      <option>文本</option>
+                      <option>当前年月</option>
+                      <option>自增编号</option>
+                    </select>
+                  </div>
+                  <div class="form-group">
+                    <label>自动编号位数</label>
+                    <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+                  </div>
+                  <div class="form-group">
+                    <label>起始编号</label>
+                    <input class="form-control" value="001" type="text">
+                  </div>
+                  <button class="btn btn-outline-primary">添加组件</button>
+                </div>
+                <div class="tab-pane fade" id="receipt" role="tabpanel" aria-labelledby="receipt-tab">
+                  <div class="form-check mt-3">
+                    <input class="form-check-input" type="checkbox" value="" id="defaultCheck1" checked>
+                    <label class="form-check-label" for="defaultCheck1">
+                      与支付合同一致
+                    </label>
+                  </div>
+                </div>
+              </div>
+
+  		      </div>
+  					<div class="modal-footer">
+  						<button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+  						<button type="button" class="btn btn-primary">确定</button>
+  					</div>
+  		    </div>
+  		  </div>
+      </div>
+      <!--添加合同-->
+      <div class="modal" id="add-ht">
+        <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>
+                  <div class="custom-control custom-radio custom-control-inline">
+                    <input type="radio" id="customRadioInline1" name="customRadioInline1" class="custom-control-input">
+                    <label class="custom-control-label" for="customRadioInline1">支付合同</label>
+                  </div>
+                  <div class="custom-control custom-radio custom-control-inline">
+                    <input type="radio" id="customRadioInline2" name="customRadioInline1" class="custom-control-input">
+                    <label class="custom-control-label" for="customRadioInline2">收款合同</label>
+                  </div>
+                </div>
+              </div>
+              <div class="form-group">
+                  <label>合同编号<b class="text-danger">*</b></label>
+                  <div class="input-group">
+                    <input class="form-control" placeholder="请输入中间计量编号" value="WJQR1-201711" type="text">
+                    <div class="input-group-append">
+                      <button class="btn btn-outline-secondary" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
+                    </div>
+                  </div>
+                </div>
+                <div class="form-group">
+                  <label>合同名称<b class="text-danger">*</b></label>
+                  <input class="form-control" value="XXX合同" type="text">
+                </div>
+  		      </div>
+  					<div class="modal-footer">
+  						<button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+  						<a href="hetong-add.html" class="btn btn-primary">确定添加</a>
+  					</div>
+  		    </div>
+  		  </div>
+      </div>
+      <div class="modal fade" id="setting" 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">
+                    <ul class="nav nav-tabs mb-3" role="tablist">
+                      <li class="nav-item">
+                        <a class="nav-link active" data-toggle="tab" href="#bianhao" role="tab" aria-controls="home" aria-selected="true">编号规则</a>
+                      </li>
+                    </ul>
+                    <div class="tab-content">
+                      <div class="tab-pane active" id="bianhao">
+                        <h5>当前规则:WWUJ2018030001</h5>
+            		       	<h5>
+                          <span class="badge badge-light" title="标段名">WWUJ-1 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                          <span class="badge badge-light" title="当前年月">201803 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                          <span class="badge badge-light" title="自动编号">0000 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                        </h5>
+            						<h5>添加新规则组件</h5>
+            						<div class="form-group">
+            							<select class="form-control">
+            								<option>请选择组件</option>
+            								<option>标段名</option>
+            								<option>文本</option>
+            								<option>当前年月</option>
+            								<option>自增编号</option>
+            							</select>
+            						</div>
+            						<div class="form-group">
+            					    <label>自动编号位数</label>
+            					    <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+            					  </div>
+            						<div class="form-group">
+            					    <label>起始编号</label>
+            					    <input class="form-control" value="001" type="text">
+            					  </div>
+            						<button class="btn btn-outline-primary">添加组件</button>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary">确定添加</button>
+                  </div>
+              </div>
+          </div>
+      </div>
     <!-- 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 type="text/javascript">$('#first').modal('show')</script>
 </body>
 
 </html>

BIN
img/sketch/1.png


BIN
img/sketch/2.png


+ 0 - 256
jiliang-detail.html

@@ -1,256 +0,0 @@
-<!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="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">
-                    <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">
-                <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 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>

+ 6 - 3
jiliang-list.html

@@ -40,6 +40,9 @@
        </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">
@@ -122,9 +125,9 @@
                     </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>
+                      <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-warning">审批中</span></td><td>监理-张三</td></tr>
+                      <tr><td><a href="jiliang.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.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>

+ 11 - 5
jiliang-qi-detail.html

@@ -41,6 +41,9 @@
        </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">
@@ -119,9 +122,12 @@
                 <div>
                   <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-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>
+                  <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm pull-right">审批退回</a>
+                  <a href="#" class="btn btn-outline-danger btn-sm pull-right text-truncate" style="max-width: 100px;">删除 第5期</a>
+                </div>
     					</div>
     				</div>
     				<div class="content-wrap">
@@ -207,8 +213,8 @@
                     </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>
+                    <button type="button" class="btn btn-primary">确认上报</button>
                   </div>
               </div>
           </div>
@@ -275,8 +281,8 @@
                     </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>
+                    <button type="button" class="btn btn-success" >确认通过</button>
                   </div>
               </div>
           </div>
@@ -312,8 +318,8 @@
                     </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>
+                    <button type="button" class="btn btn-warning" >确认退回</button>
                   </div>
               </div>
           </div>
@@ -349,8 +355,8 @@
   		          </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>
+                    <button type="button" class="btn btn-primary" >确认添加</button>
                   </div>
               </div>
           </div>

+ 7 - 4
jiliang-qi-detail2.html

@@ -41,6 +41,9 @@
        </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">
@@ -211,8 +214,8 @@
                     </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>
+                    <button type="button" class="btn btn-primary">确认上报</button>
                   </div>
               </div>
           </div>
@@ -279,8 +282,8 @@
                     </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>
+                    <button type="button" class="btn btn-success" >确认通过</button>
                   </div>
               </div>
           </div>
@@ -316,8 +319,8 @@
                     </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>
+                    <button type="button" class="btn btn-warning" >确认退回</button>
                   </div>
               </div>
           </div>
@@ -353,8 +356,8 @@
   		          </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>
+                    <button type="button" class="btn btn-primary" >确认添加</button>
                   </div>
               </div>
           </div>

+ 6 - 3
jiliang-qi-detail3.html

@@ -41,6 +41,9 @@
        </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">
@@ -204,8 +207,8 @@
                     </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>
+                    <button type="button" class="btn btn-primary">确认上报</button>
                   </div>
               </div>
           </div>
@@ -272,8 +275,8 @@
                     </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>
+                    <button type="button" class="btn btn-success" >确认通过</button>
                   </div>
               </div>
           </div>
@@ -309,8 +312,8 @@
                     </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>
+                    <button type="button" class="btn btn-warning" >确认退回</button>
                   </div>
               </div>
           </div>

+ 3 - 0
jiliang-qi.html

@@ -41,6 +41,9 @@
        </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">

+ 538 - 14
jiliang.html

@@ -41,6 +41,9 @@
        </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">
@@ -106,6 +109,9 @@
     					<div class="title-main d-flex justify-content-between">
                 <div>
                   <div class="btn-group">
+                    <a href="#add-mj" data-toggle="modal" data-target="#add-mj" class="btn btn-primary btn-sm">添加中间计量</a>
+                  </div>
+                  <div class="btn-group">
                     <select class="form-control form-control-sm mt-0">
                       <option>WJQR1-201710</option>
                       <option>WJQR1-201709</option>
@@ -116,6 +122,9 @@
                     </select>
                   </div>
                   <div class="btn-group">
+                    <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">
@@ -134,15 +143,18 @@
                   </div>
                 </div>
                 <div>
-		              <a href="#add-mj" data-toggle="modal" data-target="#add-mj" 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="#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>
+                  <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-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">
-              <div class="c-header p-0"></div>
-    					<div class="c-body">
+    				<div class="content-wrap row">
+              <div class="c-header p-0 col-12"></div>
+              <div class="c-body col-8">
                 <div class="sjs-height-1">
                   <table class="table table-bordered">
                     <thead>
@@ -185,6 +197,214 @@
                   </table>
                 </div>
     					</div>
+              <div class="c-body col">
+                <div class="tab-content">
+                  <div id="biangeng" class="tab-pane active">
+                    <div class="sjs-bar row">
+                      <div class="col-auto">
+                        <select class="form-control form-control-sm">
+                          <option>全部</option>
+                          <option>可用变更令</option>
+                          <option>本次计量已用</option>
+                        </select>
+                      </div>
+										</div>
+                    <div class="sjs-height-3">
+                      <table class="table table-bordered">
+                        <tr><th></th><th>批复编号</th><th>名称</th><th>金额</th><th>已执行(%)</th></tr>
+          						</table>
+                    </div>
+                    <div class="sjs-bottom">
+                      <ul class="nav nav-tabs">
+                        <li class="nav-item">
+                          <a class="nav-link active" data-toggle="tab" href="#qingdan" role="tab">变更清单</a>
+                        </li>
+                        <li class="nav-item">
+                          <a class="nav-link" data-toggle="tab" href="#detail" role="tab">变更信息</a>
+                        </li>
+                        <li class="nav-item">
+                          <a class="nav-link" data-toggle="tab" href="#fujian" role="tab">附件</a>
+                        </li>
+                      </ul>
+                      <div class="tab-content">
+                        <div id="qingdan" class="tab-pane active">
+                          <div class="sjs-bottom-2">
+                            <table class="table table-bordered">
+                              <tr><th>清单编号</th><th>名称</th><th>单位</th><th>单价</th><th>数量</th><th>金额</th><th>已变更</th></tr>
+                            </table>
+                          </div>
+                        </div>
+                        <div id="detail" class="tab-pane">
+                          <div class="sjs-bottom-2">
+                            <div class="form-group">
+        									    <label>批复编号</label>
+        									    <input class="form-control form-control-sm" value="LZTJ-1标项目部发变更(2015)001号" type="text" readonly>
+        									  </div>
+                            <div class="form-group">
+        									    <label>申请编号</label>
+        									    <input class="form-control form-control-sm" value="LZTJ-1标项目部发变更(2015)001号" type="text" readonly>
+        									  </div>
+        									  <div class="form-group">
+        									    <label>工程名称</label>
+        									    <input class="form-control form-control-sm" value="收费站出口右侧加宽段及K0+532基底换填" type="text" readonly>
+        									  </div>
+        									  <div class="form-group">
+        									    <label>桩号</label>
+        									    <input class="form-control form-control-sm" value="K0+532" type="text" readonly>
+        									  </div>
+        									  <div class="form-group">
+        									    <label>原设计图名称</label>
+        									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+        									  </div>
+        									  <div class="form-group">
+        									    <label>原图号</label>
+        									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+        									  </div>
+        									  <div class="form-group">
+        									    <label>变更设计图名称</label>
+        									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+        									  </div>
+        									  <div class="form-group">
+        									    <label>变更图号</label>
+        									    <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+        									  </div>
+                            <div class="form-group">
+      										    <label>工程变更理由及内容</label>
+      										    <textarea class="form-control form-control-sm" rows="6" readonly>由于K0+532涵洞基底土质天然含水率为25%、收费站出口右侧加宽段K0+120-K0+190段基底土质天然含水率为28.8%。含水率较大形成过湿土,地基松软,无法满足承载力要求。经处项目办、设计、监理、施工单位四方勘察,采用抛石挤淤、砂砾换填以达到地基承载力。
+      												</textarea>
+      										  </div>
+      										  <div class="form-group">
+      										    <label>工程变更合同依据</label>
+      										    <textarea class="form-control form-control-sm" rows="6" readonly></textarea>
+      										  </div>
+      										  <div class="form-group">
+      										    <label>备注</label>
+      										    <textarea class="form-control form-control-sm" rows="3" readonly></textarea>
+      										  </div>
+                            <div class="form-group">
+                              <label>变更类型</label>
+                              <div class="checkbox">
+                                <label class="checkbox-inline">
+                                  <input id="inlineCheckbox1" value="option1" checked="" type="checkbox" disabled>A.位置
+                                </label>
+                                <!-- <label class="checkbox-inline">
+                                  <input id="inlineCheckbox2" value="option2" type="checkbox">B.数量
+                                </label>
+                                <label class="checkbox-inline">
+                                  <input id="inlineCheckbox3" value="option3" type="checkbox">C.结构
+                                </label>
+                                <label class="checkbox-inline">
+                                  <input id="inlineCheckbox3" value="option3" checked="" type="checkbox">D.新增
+                                </label>
+                                <label class="checkbox-inline">
+                                  <input id="inlineCheckbox3" value="option3" type="checkbox">E.取消
+                                </label>
+                                <label class="checkbox-inline">
+                                  <input id="inlineCheckbox3" value="option3" type="checkbox">F.纠错
+                                </label> -->
+                              </div>
+                            </div>
+                            <div class="form-group">
+                              <label>变更类别 </label>
+                              <select class="form-control form-control-sm" disabled><option>A类变更(设计变更)</option><option>B类变更(施工措施变)</option><option>C类变更(计划变更)</option><option>D类变更(条件变更)</option><option>E类变更(新增工程)</option></select>
+                            </div>
+                            <div class="form-group">
+                              <label>变更性质 </label>
+                              <select class="form-control form-control-sm" disabled><option>一般设计变更</option><option>较大设计变更</option><option>重大设计变更</option></select>
+                            </div>
+                            <div class="form-group">
+                              <label>变更提出单位</label>
+                              <!-- <a href="#editcompany" style="float:right;" class="" data-toggle="modal">编辑</a> -->
+                              <select class="form-control form-control-sm" disabled><option>AA公司</option><option>BB公司</option></select>
+                            </div>
+                            <div class="form-group">
+                              <label>费用承担方</label>
+                              <div class="radio">
+                                <label class="radio-inline">
+                                  <input id="inlineCheckbox1" value="option1" checked="" type="radio" disabled> 业主
+                                </label>
+                                <!-- <label class="radio-inline">
+                                  <input id="inlineCheckbox2" value="option2" type="radio"> 承包人
+                                </label> -->
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                        <div id="fujian" class="tab-pane">
+                          <table class="table table-bordered">
+                            <tr><th>名称</th><th>上传者</th></tr>
+                            <tr><td><a href="">合同段工程变更现场办公会议纪要的通知.rar</a></td><th>张三</th></tr>
+                          </table>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div id="jlbiao" class="tab-pane">
+                    <div class="sjs-bar row">
+                      <div class="col-auto"><a href="#" class="btn btn-outline-primary btn-sm">自动生成</a></div>
+                      <div class="col">
+                        <div class="input-group input-group-sm">
+                          <div class="input-group-prepend">
+                            <span class="input-group-text" id="basic-addon3">表号前缀</span>
+                          </div>
+                          <input type="text" class="form-control" id="basic-url" aria-describedby="basic-addon3">
+                        </div>
+                      </div>
+                    </div>
+                    <div class="sjs-height-3">
+                      <table class="table table-bordered">
+                        <tr><th>编号</th><th>中间计量表号</th><th>交工证书/凭证表</th></tr>
+                      </table>
+                    </div>
+                    <div class="sjs-bottom">
+                      <div class="form-group">
+          					    <label>变更令号:</label>
+          					    <input class="form-control form-control-sm" type="text">
+          					  </div>
+                      <div class="form-group">
+          					    <label>部位:</label>
+          					    <input class="form-control form-control-sm" type="text">
+          					  </div>
+                      <div class="form-group">
+          					    <label>起始桩号:</label>
+          					    <input class="form-control form-control-sm" type="text">
+          					  </div>
+                      <div class="form-group">
+          					    <label>分部分项工程:</label>
+          					    <input class="form-control form-control-sm" type="text">
+          					  </div>
+                      <div class="form-group">
+          					    <label>计量单元:</label>
+          					    <input class="form-control form-control-sm" type="text">
+          					  </div>
+                      <div class="form-group">
+          					    <label>图号:</label>
+          					    <input class="form-control form-control-sm" type="text">
+          					  </div>
+                      <div class="form-group">
+          					    <label>计算式说明:</label>
+          					    <textarea class="form-control"></textarea>
+          					  </div>
+                      <div class="form-group">
+                        <a href="#edit-img" data-toggle="modal" data-target="#edit-img"  class="pull-right">添加草图</a>
+          					    <label>计算草图:</label>
+          					    <p class="form-control"><img src="img/sketch/2.png" class="d-100"></p>
+          					  </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class=" col-auto pl-0">
+                <!--右侧菜单-->
+                <ul class="nav flex-column right-nav">
+                  <li class="nav-item">
+                    <a class="nav-link active" data-toggle="tab" href="#biangeng" role="tab">变更令</a>
+                  </li>
+                  <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#jlbiao" role="tab">中间计量表</a>
+                  </li>
+                </ul>
+              </div>
     				</div>
     			</div>
     		</div>
@@ -202,7 +422,7 @@
                       <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>
+                          <button class="btn btn-outline-secondary" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
                         </div>
                       </div>
                     </div>
@@ -211,7 +431,7 @@
                       <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>
+                          <button class="btn btn-outline-secondary" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
                         </div>
                         <div class="invalid-feedback">您输入的编号已存在</div>
                       </div>
@@ -230,13 +450,8 @@
                     </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>
+                    <button type="button" class="btn btn-primary">添加</button>
                   </div>
               </div>
           </div>
@@ -265,8 +480,204 @@
                     </div>
                   </div>
                   <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                     <button type="button" class="btn btn-primary">添加</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--审批流程/结果-->
+      <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" id="first">
+        <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>当前规则:WWUJ2018030001</h5>
+  		       	<h5>
+                <span class="badge badge-light" title="标段名">WWUJ-1 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                <span class="badge badge-light" title="当前年月">201803 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                <span class="badge badge-light" title="自动编号">0000 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+              </h5>
+  						<h5>添加新规则组件</h5>
+  						<div class="form-group">
+  							<select class="form-control">
+  								<option>请选择组件</option>
+  								<option>标段名</option>
+  								<option>文本</option>
+  								<option>当前年月</option>
+  								<option>自增编号</option>
+  							</select>
+  						</div>
+  						<div class="form-group">
+  					    <label>自动编号位数</label>
+  					    <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+  					  </div>
+  						<div class="form-group">
+  					    <label>起始编号</label>
+  					    <input class="form-control" value="001" type="text">
+  					  </div>
+  						<button class="btn btn-primary">添加组件</button>
+  		      </div>
+  					<div class="modal-footer">
+  						<button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+  						<button type="button" class="btn btn-primary">确定</button>
+  					</div>
+  		    </div>
+  		  </div>
+      </div>
+      <!--设置-->
+      <div class="modal fade" id="setting" 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">
+                    <ul class="nav nav-tabs mb-3" role="tablist">
+                      <li class="nav-item">
+                        <a class="nav-link active" data-toggle="tab" href="#profile" role="tab">信息设置</a>
+                      </li>
+                      <li class="nav-item">
+                        <a class="nav-link" data-toggle="tab" href="#rule" role="tab">编号规则</a>
+                      </li>
+                    </ul>
+                    <div class="tab-content" >
+                      <div class="tab-pane fade show active" id="profile" role="tabpanel">
+                        <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" title="自动编号"><i class="fa fa-repeat"></i></button>
+                            </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="tab-pane fade" id="rule" role="tabpanel">
+                        <h5>当前规则:WWUJ2018030001</h5>
+                        <h5>
+                          <span class="badge badge-light" title="标段名">WWUJ-1 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                          <span class="badge badge-light" title="当前年月">201803 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                          <span class="badge badge-light" title="自动编号">0000 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                        </h5>
+                        <h5>添加新规则组件</h5>
+                        <div class="form-group">
+                          <select class="form-control">
+                            <option>请选择组件</option>
+                            <option>标段名</option>
+                            <option>文本</option>
+                            <option>当前年月</option>
+                            <option>自增编号</option>
+                          </select>
+                        </div>
+                        <div class="form-group">
+                          <label>自动编号位数</label>
+                          <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+                        </div>
+                        <div class="form-group">
+                          <label>起始编号</label>
+                          <input class="form-control" value="001" type="text">
+                        </div>
+                        <button class="btn btn-primary">添加组件</button>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="modal-footer d-flex justify-content-between">
+                    <button type="button" class="btn btn-outline-danger text-truncate" style="max-width: 200px;" title="删除 WJQR1-201710">删除 WJQR1-201710</button>
+                    <div>
+                      <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                      <button type="button" class="btn btn-primary">确定</button>
+                    </div>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--上报审批-->
+      <div class="modal fade" id="sub-sp" data-backdrop="static">
+          <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">上报审批</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="form-group">
+                      <label>搜索审批人</label>
+                      <div class="input-group">
+                        <input class="form-control" placeholder="请输入姓名进行检索" type="text">
+                        <div class="input-group-append">
+                          <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="card border-primary">
+                      <div class="card-body">
+                        <h5 class="card-title">
+                          <a href="#" class="btn btn-primary btn-sm pull-right">添加</a>张三
+                        </h5>
+                        <h6 class="card-subtitle mb-2 text-muted">监理</h6>
+                        <p class="card-text">XXXXX公司</p>
+                      </div>
+                    </div>
+                    <div class="card mt-3">
+                      <div class="card-header">
+                        审批流程
+                      </div>
+                      <ul class="list-group list-group-flush">
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>1 张三  <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>2 王五 <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>3 李四 <small class="text-muted">监理</small></li>
+                      </ul>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary">确认上报</button>
                   </div>
               </div>
           </div>
@@ -303,6 +714,110 @@
               </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-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-success" >确认通过</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-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-warning" >确认退回</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--添加草图-->
+      <div class="modal fade" id="edit-img" 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">
+                    <p><a href="" class="btn btn-outline-primary btn-sm">上传图片</a></p>
+                    <div class="img-view">
+                      <div class="img-item">
+                        <div class="img-bar">
+                          <a href="" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>
+                        </div>
+                        <img src="img/sketch/1.png" id="draggable">
+                      </div>
+                      <div class="img-item" style="left:300px;">
+                        <div class="img-bar">
+                          <a href="" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>
+                        </div>
+                        <img src="img/sketch/2.png" id="draggable">
+                      </div>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary" >确认</button>
+                  </div>
+              </div>
+          </div>
+      </div>
     <!-- JS. -->
     <script src="js/jquery/jquery-3.2.1.min.js"></script>
     <script src="js/popper/popper.min.js"></script>
@@ -310,6 +825,15 @@
     <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 type="text/javascript">$('#first').modal('show')</script>
+    <script>
+        $( function() {
+            $( "#draggable" ).draggable();
+        } );
+    </script>
 </body>
 
 </html>

+ 2 - 0
js/global.js

@@ -1,8 +1,10 @@
 /*全局自适应高度*/
 function autoFlashHeight(){
     var cHeader = $(".c-header").height();
+    var sBar = $(".sjs-bar").height();
     $(".sjs-height-1").height($(window).height()-cHeader-160);
     $(".sjs-height-2").height($(window).height()-cHeader-191);
+    $(".sjs-height-3").height($(window).height()-cHeader-sBar-560);
 };
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/

+ 87 - 4
taizhang.html

@@ -133,8 +133,8 @@
                 </div>
                 <div>
 					        <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-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-dark">报审退回</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>
@@ -168,6 +168,7 @@
                       <tr class="table-warning"><td>2</td><td></td><td>203-1-1</td><td>挖土方</td><td>m3</td><td>7.54</td><td>699949</td><td></td><td></td><td></td><td></td><td><a href="#tz-bg" data-toggle="modal" data-target="#tz-bg">tzbg-0003</a></td></tr>
                     </tbody>
                   </table>
+                  <a href="#batch" data-toggle="modal" data-target="#batch" class="btn btn-primary">批量添加子项 弹窗</a>
                 </div>
     					</div>
               <div class="c-body col">
@@ -188,6 +189,14 @@
           						</table>
                     </div>
                   </div>
+                  <div id="qianyue" class="tab-pane">
+                    <a href="#upload-qianyue" data-toggle="modal" data-target="#upload-qianyue"  class="btn btn-sm btn-primary">上传签约清单</a>
+                    <div class="sjs-height-2">
+                    	<table class="table table-bordered">
+                        <tr><th></th><th>清单编号</th><th>清单名称</th><th>单位</th><th>单价</th></tr>
+          						</table>
+                    </div>
+                  </div>
                 </div>
               </div>
               <div class=" col-auto pl-0">
@@ -199,6 +208,9 @@
                   <li class="nav-item">
                     <a class="nav-link" data-toggle="tab" href="#qingdan" role="tab">工程量清单</a>
                   </li>
+                  <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#qianyue" role="tab">签约清单</a>
+                  </li>
                 </ul>
               </div>
     				</div>
@@ -266,8 +278,8 @@
                     </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>
+                    <button type="button" class="btn btn-primary">确认上报</button>
                   </div>
               </div>
           </div>
@@ -334,8 +346,8 @@
                     </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>
+                    <button type="button" class="btn btn-success" >确认通过</button>
                   </div>
               </div>
           </div>
@@ -371,8 +383,79 @@
                     </div>
                   </div>
                   <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                     <button type="button" class="btn btn-warning" >确认退回</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--上传签约清单-->
+      <div class="modal fade" id="upload-qianyue" 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 for="exampleFormControlFile1">Excel模板</label>
+                      <div class="form-control"><a href="" class="btn btn-sm btn-link">下载</a></div>
+                    </div>
+                    <div class="form-group">
+                      <label for="exampleFormControlFile1">上传签约清单Excel文件</label>
+                      <div class="form-control"><input type="file" class="form-control-file" id="exampleFormControlFile1"></div>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary" >确认上传</button>
+                  </div>
+              </div>
+          </div>
+      </div>
+      <!--批量添加子项弹窗-->
+      <div class="modal fade" id="batch" data-backdrop="static">
+          <div class="modal-dialog modal-lg" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">批量插入子项</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="row">
+                      <div class="col-6">
+                        <h6 class="row"><span class="col">部位数量复合表</span>
+                        <div class="input-group input-group-sm col-5 align-self-end">
+                          <div class="input-group-prepend">
+                            <span class="input-group-text" id="basic-addon1">起始编号</span>
+                          </div>
+                          <input type="num" class="form-control form-control-sm"  step="1" value="1">
+                        </div></h6>
+                        <div class="batch-l-t">
+                          <table class="table table-bordered">
+                            <tr><th></th><th>部位</th><th>图(册)号</th><th>清单1</th><th>清单2</th><th>清单3</th><th>清单4</th></tr>
+                          </table>
+                        </div>
+                        <h6>清单编号</h6>
+                        <div class="batch-l-b">
+                          <table class="table table-bordered">
+                            <tr><th></th><th>编号</th><th>名称</th><th>单位</th><th>单价</th><th>图(册)号</th></tr>
+                            <tr><th>清单1</th><td></td><td></td><td></td><td></td><td></td></tr>
+                          </table>
+                        </div>
+                      </div>
+                      <div class="col-6">
+                        <h6>签约清单</h6>
+                        <div class="batch-r">
+                          <table class="table table-bordered">
+                            <tr><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-secondary" data-dismiss="modal">取消</button>
+                    <button type="button" class="btn btn-primary" >确定</button>
                   </div>
               </div>
           </div>