ソースを参照

新增中间计量审批页面;台帐审批页面重新编写;工具栏btn-group替换d-inline-block

Chente 7 年 前
コミット
6f900c2d27

+ 7 - 5
biangeng-new2.html

@@ -103,11 +103,13 @@
     				<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="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>
-									</ul>
+                  <div class="d-inline-block">
+                    <ul class="nav nav-pills m-0">
+  										<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>
+  									</ul>
+                  </div>
                 </div>
                 <div>
                   <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">上报审批</a>

+ 7 - 5
biangeng-new3.html

@@ -103,11 +103,13 @@
     				<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 active" href="biangeng-new3.html">变更清单</a></li>
-										<li class="nav-item"><a class="nav-link" href="biangeng-new4.html">附件</a></li>
-									</ul>
+                  <div class="d-inline-block">
+                    <ul class="nav nav-pills m-0">
+  										<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>
+  									</ul>
+                  </div>
                 </div>
                 <div>
                   <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">上报审批</a>

+ 7 - 5
biangeng-new4.html

@@ -103,11 +103,13 @@
     				<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 active" href="biangeng-new4.html">附件</a></li>
-									</ul>
+                  <div class="d-inline-block">
+                    <ul class="nav nav-pills m-0">
+  										<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>
+  									</ul>
+                  </div>
                 </div>
                 <div>
                   <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">上报审批</a>

+ 11 - 9
biangeng.html

@@ -104,15 +104,17 @@
     				<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="#">待处理 <span class="badge badge-secondary">4</span></a>
-										</li>
-										<li class="nav-item"><a class="nav-link active" href="#">待上报 <span class="badge badge-light">4</span></a></li>
-										<li class="nav-item"><a class="nav-link" href="#">进行中 <span class="badge badge-secondary">4</span></a></li>
-										<li class="nav-item"><a class="nav-link" href="#">已完成 <span class="badge badge-secondary">4</span></a></li>
-										<li class="nav-item"><a class="nav-link" href="#">不通过 <span class="badge badge-secondary">4</span></a></li>
-									</ul>
+                  <div class="d-inline-block">
+                    <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>
+  										<li class="nav-item"><a class="nav-link" href="#">不通过 <span class="badge badge-secondary">4</span></a></li>
+  									</ul>
+                  </div>
                 </div>
                 <div>
                   <a href="#add-bj" data-toggle="modal" data-target="#add-bj" class="btn btn-sm btn-primary pull-right">新建变更令</a>

+ 3 - 3
biaoduan.html

@@ -91,13 +91,13 @@
 				<div class="panel-title fluid">
 					<div class="title-main  d-flex justify-content-between">
             <div>
-              <div class="btn-group mr-2">
+              <div class="d-inline-block mr-2">
                   <select class="form-control form-control-sm m-0">
                     <option>标段类型筛选</option>
                     <option>土建标</option>
                   </select>
               </div>
-              <div class="btn-group">
+              <div class="d-inline-block">
                 <div class="form-check-inline">
                   <label class="form-check-label">
                     <input class="form-check-input" type="checkbox">
@@ -105,7 +105,7 @@
                   </label>
                 </div>
               </div>
-              <div class="btn-group">
+              <div class="d-inline-block">
                 <div class="form-check-inline">
                   <label class="form-check-label">
                     <input class="form-check-input" type="checkbox">

+ 589 - 0
jiliang-approval.html

@@ -0,0 +1,589 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <title>计量管理-计量支付</title>
+    <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
+    <link rel="stylesheet" href="css/main.css">
+    <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
+  	<link href="css/datepicker/datepicker.min.css" rel="stylesheet" type="text/css">
+</head>
+
+<body>
+  <div class="header">
+		<h1 class="logo"><a>计量管理-纵横变更管理系统</a></h1>
+    <div class="poj-name">
+      <span class="name">项目A</span>
+      <div class="btn-group">
+        <a class=" btn" data-toggle="dropdown" >
+          <span class="fa fa-caret-down" data-toggle="tooltip" data-placement="bottom" title="切换项目"></span>
+        </a>
+        <div class="dropdown-menu">
+         <a href="#" class="dropdown-item">项目B</a>
+         <a href="#" class="dropdown-item">项目C</a>
+         <a href="#" class="dropdown-item">项目D</a>
+       </div>
+     </div><a href="settings-poj.html" class="btn" data-toggle="tooltip" data-placement="bottom" title="项目设置"><i class="fa fa-cogs"></i></a>
+    </div>
+    <div class="poj-name">
+      <span class="name">WWUJ-1</span>
+      <div class="btn-group">
+        <a class=" btn" data-toggle="dropdown" >
+          <span class="fa fa-caret-down" data-toggle="tooltip" data-placement="bottom" title="切换项目"></span>
+        </a>
+        <div class="dropdown-menu">
+         <a href="#" class="dropdown-item">WWUJ-2</a>
+         <a href="#" class="dropdown-item">WWUJ-3</a>
+         <a href="#" class="dropdown-item">WWUJ-4</a>
+       </div>
+     </div>
+    </div>
+    <div class="poj-name">
+      <span class="name">中间计量</span>
+    </div>
+		<div class="header-box">
+			<div class="header-nav"></div>
+			<div class="header-user pull-right">
+				<div class="avatar btn-group">
+					<a class="dropdown-toggle" data-toggle="dropdown">
+						<span class="pic"><img src="img/avatar.png"></span>
+						<span>张三</span>
+						<span class="caret"></span>
+					</a>
+					<div class="dropdown-menu">
+					 <a href="account-info.html"  class="dropdown-item">账号资料</a>
+					 <a href="#"  class="dropdown-item">账号安全</a>
+					 <div class="dropdown-divider"></div>
+ 					 <a href="#"  class="dropdown-item">新手引导</a>
+					 <a href="#"  class="dropdown-item">帮助中心</a>
+					 <a href="#" class="dropdown-item">退出登录</a>
+				 </div>
+				</div>
+				<div class="msg">
+					<a>
+					<i class="fa fa-bell"></i><sup >0</sup>
+					</a>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="main">
+		<div class="main-nav">
+			<div class="nav-top">
+				<ul class="nav nav-pills flex-column bg-nav">
+					<li class="nav-item"><a href="dashboard.html"title="代办事项"><i class="fa fa-dashboard"></i> 代办事项</a></li>
+					<li class="nav-item"><a href="biaoduan.html"title="标段管理"><i class="fa fa-list-ul"></i> 标段管理</a></li>
+					<li class="nav-item"><a href="javascript:void(0);"title="台帐管理"><i class="fa fa-list-alt"></i> 台帐管理 <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+            <ul class="sub-menu">
+              <li><a href="taizhang.html">台帐分解</a></li>
+            </ul>
+            <ul class="sub-menu">
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
+            </ul>
+            <ul class="sub-menu">
+              <li><a href="taizhang-jl.html">计量台帐</a></li>
+            </ul>
+          </li>
+          <li class="nav-item active"><a href="javascript:void(0);"title="计量管理"><i class="fa fa-calendar-check-o"></i> 中间计量  <i class="fa fa-angle-down pull-right menu-arrow"></i></a>
+            <ul class="sub-menu">
+              <li><a href="jiliang.html">计量编制</a></li>
+            </ul>
+            <ul class="sub-menu">
+              <li><a href="jiliang-list.html">计量审批</a></li>
+            </ul>
+          </li>
+          <li class="nav-item"><a href="jiliang-qi.html"title="期计量"><i class="fa fa-calendar-check-o"></i> 期计量</a></li>
+          <li class="nav-item"><a href="biangeng.html"title="变更管理"><i class="fa fa-retweet"></i> 变更管理</a></li>
+					<li class="nav-item"><a href="hetong.html"title="合同管理"><i class="fa fa-handshake-o"></i> 合同管理</a></li>
+				</ul>
+			</div>
+		</div>
+    <div class="main-panel">
+    			<div class="panel-content">
+    				<div class="panel-title fluid">
+    					<div class="title-main d-flex justify-content-between">
+                <div>
+                  <div class="d-inline-block">
+                    <ul class="nav nav-pills m-0">
+  										<li class="nav-item">
+  											<a class="nav-link" href="jiliang-qi.html">返回</a>
+  										</li>
+  										<li class="nav-item">
+  											<a class="nav-link active" href="jiliang-qi-detail.html">计量数据</a>
+  										</li>
+                      <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail2.html">报表</a></li>
+  									</ul>
+                  </div>
+                  <div class="d-inline-block">
+                    <div class="form-check-inline">
+                      <label class="form-check-label">
+                        <input class="form-check-input" type="checkbox">
+                        审批过程
+                      </label>
+                    </div>
+                    <div class="form-check-inline">
+                      <label class="form-check-label">
+                        <input class="form-check-input" type="checkbox">
+                        变更令
+                      </label>
+                    </div>
+                  </div>
+                </div>
+                <div>
+                  <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批完成</a>
+                    <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批中</a>
+                  <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-muted">审批退回</a>
+                  <!--审批-->
+                  <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm pull-right">审批通过</a>
+                  <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm pull-right">审批退回</a>
+                </div>
+              </div>
+    				</div>
+    				<div class="content-wrap row pr-46">
+              <div class="c-header p-0 col-12"></div>
+              <div class="row w-100 sub-content">
+                <div class="c-body col-8">
+                  <div class="sjs-height-1">
+                    <table class="table table-bordered">
+                      <thead>
+                        <tr>
+                          <th rowspan="2">1</th>
+                          <th rowspan="2">项目节编号</th>
+                          <th rowspan="2">清单编号</th>
+                          <th rowspan="2">名称</th>
+                          <th rowspan="2">单位</th>
+                          <th rowspan="2">单价</th>
+                          <th colspan="2">0号台帐合同</th>
+                          <th colspan="2">本次合同计量</th>
+                          <th colspan="3">本次数量变更计量</th>
+                          <th colspan="2">本次完成计量</th>
+                          <th colspan="2">截止本次合同计量</th>
+                          <th colspan="2">截止本次数量变更</th>
+                          <th colspan="2">截止本次完成计量</th>
+                          <th rowspan="2">图(册)号</th>
+                          <th rowspan="2">累计完成率(%)</th>
+                          <th rowspan="2">备注</th>
+                        </tr>
+                        <tr>
+                          <th>数量</th>
+                          <th>金额</th>
+                          <th>数量</th>
+                          <th>金额</th>
+                          <th>数量</th>
+                          <th>金额</th>
+                          <th>数量</th>
+                          <th>金额</th>
+                          <th>变更令</th>
+                          <th>数量</th>
+                          <th>金额</th>
+                          <th>数量</th>
+                          <th>金额</th>
+                          <th>数量</th>
+                          <th>金额</th>
+                        </tr>
+                      </thead>
+                    </table>
+                  </div>
+      					</div>
+                <div class="c-body col">
+                  <div class="tab-content">
+                    <div id="biangeng" class="tab-pane active">
+                      <div class="sjs-bar row">
+                        <div class="col-auto">
+                          <select class="form-control form-control-sm">
+                            <option>全部</option>
+                            <option>可用变更令</option>
+                            <option>本次计量已用</option>
+                          </select>
+                        </div>
+  										</div>
+                      <div class="sjs-height-3">
+                        <table class="table table-bordered">
+                          <tr><th></th><th>批复编号</th><th>名称</th><th>金额</th><th>已执行(%)</th></tr>
+            						</table>
+                      </div>
+                      <div 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>
+              <div class="side-menu">
+                <!--右侧菜单-->
+                <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>
+      </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-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-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>
+    <script src="js/bootstrap/bootstrap.min.js"></script>
+    <script src="js/global.js"></script>
+  	<script src="js/datepicker/datepicker.min.js"></script>
+  	<script src="js/datepicker/datepicker.zh.js"></script>
+    <script type="text/javascript">
+        autoFlashHeight();
+    </script>
+    <script>
+        $( function() {
+            $( "#draggable" ).draggable();
+        } );
+    </script>
+</body>
+
+</html>

+ 4 - 4
jiliang-list.html

@@ -123,10 +123,10 @@
                       <tr><th>计量编号</th><th>计量金额</th><th>计量月份</th><th>所属计量期</th><th>状态</th><th>当前处理人</th></tr>
                     </thead>
                     <tbody>
-                      <tr><td><a href="jiliang.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><span class="text-muted">待上报</span></td><td>监理-张三</td></tr>
-                      <tr><td><a href="jiliang.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>
+                      <tr><td><a href="jiliang-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><span class="text-muted">待上报</span></td><td>监理-张三</td></tr>
+                      <tr><td><a href="jiliang-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><span class="text-warning">审批中</span></td><td>监理-张三</td></tr>
+                      <tr><td><a href="jiliang-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><a href="jiliang-approval.html" class="btn-primary btn-sm">审批</a></td><td>监理-张三</td></tr>
+                      <tr><td><a href="jiliang-approval.html">WWUJ-2-201709</a></td><td>34234234.00</td><td>201710</td><td>第 14 期</td><td><span class="text-success">审批完成</span></td><td>业主-王五</td></tr>
                     </tobody>
                   </table>
                 </div>

+ 13 - 11
jiliang-qi-detail.html

@@ -106,16 +106,18 @@
     				<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="jiliang-qi.html">返回</a>
-										</li>
-										<li class="nav-item">
-											<a class="nav-link active" href="jiliang-qi-detail.html">中间计量表</a>
-										</li>
-                    <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail2.html">本期计量台帐</a></li>
-                    <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail3.html">合同支付</a></li>
-									</ul>
+                  <div class="d-inline-block">
+                    <ul class="nav nav-pills m-0">
+  										<li class="nav-item">
+  											<a class="nav-link" href="jiliang-qi.html">返回</a>
+  										</li>
+  										<li class="nav-item">
+  											<a class="nav-link active" href="jiliang-qi-detail.html">中间计量表</a>
+  										</li>
+                      <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail2.html">本期计量台帐</a></li>
+                      <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail3.html">合同支付</a></li>
+  									</ul>
+                  </div>
                 </div>
                 <div>
                   <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>
@@ -257,7 +259,7 @@
                   </div>
               </div>
           </div>
-      </div>      
+      </div>
       <!--审批流程/结果-->
       <div class="modal fade" id="sp-list" data-backdrop="static">
           <div class="modal-dialog" role="document">

+ 12 - 10
jiliang-qi-detail2.html

@@ -106,16 +106,18 @@
     				<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="jiliang-qi.html">返回</a>
-										</li>
-										<li class="nav-item">
-											<a class="nav-link" href="jiliang-qi-detail.html">中间计量表</a>
-										</li>
-										<li class="nav-item"><a class="nav-link active" href="jiliang-qi-detail2.html">本期计量台帐</a></li>
-                    <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail3.html">合同支付</a></li>
-                  </ul>
+                  <div class="d-inline-block">
+                    <ul class="nav nav-pills m-0">
+  										<li class="nav-item">
+  											<a class="nav-link" href="jiliang-qi.html">返回</a>
+  										</li>
+  										<li class="nav-item">
+  											<a class="nav-link" href="jiliang-qi-detail.html">中间计量表</a>
+  										</li>
+  										<li class="nav-item"><a class="nav-link active" href="jiliang-qi-detail2.html">本期计量台帐</a></li>
+                      <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail3.html">合同支付</a></li>
+                    </ul>
+                  </div>
                 </div>
                 <div>
                   <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>

+ 12 - 10
jiliang-qi-detail3.html

@@ -105,16 +105,18 @@
     				<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="jiliang-qi.html">返回</a>
-										</li>
-										<li class="nav-item">
-											<a class="nav-link" href="jiliang-qi-detail.html">中间计量表</a>
-										</li>
-										<li class="nav-item"><a class="nav-link" href="jiliang-qi-detail2.html">本期计量台帐</a></li>
-                    <li class="nav-item"><a class="nav-link active" href="jiliang-qi-detail3.html">合同支付</a></li>
-                  </ul>
+                  <div class="d-inline-block">
+                    <ul class="nav nav-pills m-0">
+  										<li class="nav-item">
+  											<a class="nav-link" href="jiliang-qi.html">返回</a>
+  										</li>
+  										<li class="nav-item">
+  											<a class="nav-link" href="jiliang-qi-detail.html">中间计量表</a>
+  										</li>
+  										<li class="nav-item"><a class="nav-link" href="jiliang-qi-detail2.html">本期计量台帐</a></li>
+                      <li class="nav-item"><a class="nav-link active" href="jiliang-qi-detail3.html">合同支付</a></li>
+                    </ul>
+                  </div>
                 </div>
                 <div>
                   <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>

+ 3 - 78
jiliang.html

@@ -142,11 +142,9 @@
                 </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-success btn-sm pull-right">审批完成</a>
+                  <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批中</a>
                   <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-muted">审批退回</a>
-                  <!--审批-->
-                  <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>
@@ -565,7 +563,7 @@
           <div class="modal-dialog" role="document">
               <div class="modal-content">
                   <div class="modal-header">
-                      <h5 class="modal-title">变更令设置</h5>
+                      <h5 class="modal-title">中间计量设置</h5>
                   </div>
                   <div class="modal-body">
                     <ul class="nav nav-tabs mb-3" role="tablist">
@@ -715,79 +713,6 @@
               </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">

+ 13 - 1
taizhang-bg-detail.html

@@ -105,6 +105,17 @@
     					<div class="title-main  d-flex justify-content-between"><!--工具-->
                 <div>
                   <div class="btn-group">
+                    <select class="form-control form-control-sm mt-0">
+                      <option>编写错漏6</option>
+                      <option>编写错漏5</option>
+                      <option>编写错漏4</option>
+                      <option>编写错漏3</option>
+                      <option>编写错漏2</option>
+                      <option>编写错漏1</option>
+                    </select>
+                  </div>
+                  <!--编制人工具-->
+                  <div class="btn-group">
                     <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="复制"><i class="fa fa-files-o" aria-hidden="true"></i></a>
                     <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
                     <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>
@@ -125,7 +136,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-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="#sub-sp" data-toggle="modal" data-target="#sub-sp2" class="btn btn-primary btn-sm pull-right">重新上报</a>
                  <!--审批-->
                  <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm pull-right">审批通过</a>

+ 11 - 9
taizhang-bg.html

@@ -104,10 +104,10 @@
 				<div class="panel-title fluid">
 					<div class="title-main  d-flex justify-content-between"><!--工具-->
             <div>
-              <div class="btn-group">
+              <div class="d-inline-block">
                 <input type="month" class="form-control form-control-sm mt-0">
               </div>
-              <div class="btn-group">
+              <div class="d-inline-block">
                 <select class="form-control form-control-sm mt-0">
                   <option>全部</option>
                   <option>草稿</option>
@@ -119,7 +119,9 @@
               </div>
             </div>
             <div>
-              <a href="#add-bg" data-toggle="modal" data-target="#add-bg" class="btn btn-primary btn-sm">新建修订</a>
+              <div class="d-inline-block">
+                <a href="#add-bg" data-toggle="modal" data-target="#add-bg" class="btn btn-primary btn-sm pull-right">新建修订</a>
+              </div>
             </div>
 					</div>
 				</div>
@@ -139,7 +141,7 @@
               </thead>
               <tr>
                 <td>0001</td>
-                <td><a href="taizhang-bg-detail.html">编写错漏1</a></td>
+                <td><a href="taizhang-bg-detail.html">编写错漏6</a></td>
                 <td>2017-11-23</td>
                 <td>张三</td>
                 <td>完成</td>
@@ -148,7 +150,7 @@
               </tr>
               <tr>
                 <td>0002</td>
-                <td><a href="taizhang-bg-detail.html">编写错漏2</a></td>
+                <td><a href="taizhang-bg-detail.html">编写错漏5</a></td>
                 <td>2017-11-23</td>
                 <td>张三</td>
                 <td>王五 审批中</td>
@@ -157,7 +159,7 @@
               </tr>
               <tr>
                 <td>0003</td>
-                <td><a href="taizhang-bg-detail.html">编写错漏3</a></td>
+                <td><a href="taizhang-bg-detail.html">编写错漏4</a></td>
                 <td>2017-11-23</td>
                 <td>张三</td>
                 <td>退回</td>
@@ -166,7 +168,7 @@
               </tr>
               <tr>
                 <td>0004</td>
-                <td><a href="taizhang-bg-detail.html">编写错漏4</a></td>
+                <td><a href="taizhang-bg-detail.html">编写错漏3</a></td>
                 <td>2017-11-23</td>
                 <td>张三</td>
                 <td>草稿</td>
@@ -175,7 +177,7 @@
               </tr>
               <tr>
                 <td>0005</td>
-                <td><a href="taizhang-bg-detail.html">编写错漏5</a></td>
+                <td><a href="taizhang-bg-detail.html">编写错漏2</a></td>
                 <td>2017-11-23</td>
                 <td>张三</td>
                 <td>张三 作废</td>
@@ -184,7 +186,7 @@
               </tr>
               <tr>
                 <td>0005</td>
-                <td><a href="taizhang-bg-detail.html">编写错漏6</a></td>
+                <td><a href="taizhang-bg-detail.html">编写错漏1</a></td>
                 <td>2017-11-23</td>
                 <td>张三</td>
                 <td></td>

+ 3 - 3
taizhang-jl.html

@@ -104,7 +104,7 @@
     				<div class="panel-title fluid">
     					<div class="title-main  d-flex justify-content-between"><!--工具-->
                 <div>
-                  <div class="btn-group">
+                  <div class="d-inline-block">
                     <select class="form-control form-control-sm mt-0">
                         <option>第 15 期</option>
                         <option>第 14 期</option>
@@ -113,14 +113,14 @@
                         <option>第 11 期</option>
                       </select>
                     </div>
-                    <div class="btn-group">
+                    <div class="d-inline-block">
                       <select class="form-control form-control-sm mt-0">
                         <option>终审 王五</option>
                         <option>2审 赵四</option>
                         <option>1审 张三</option>
                       </select>
                     </div>
-                    <div class="btn-group">
+                    <div class="d-inline-block">
                       <div class="form-check-inline">
                         <label class="form-check-label">
                           <input class="form-check-input" type="checkbox">

+ 145 - 48
taizhang-shenpi.html

@@ -76,7 +76,7 @@
               <li><a href="taizhang.html">台帐分解</a></li>
             </ul>
             <ul class="sub-menu">
-              <li><a href="taizhang-bg.html">台帐变更</a></li>
+              <li><a href="taizhang-bg.html">台帐修订</a></li>
             </ul>
             <ul class="sub-menu">
               <li><a href="taizhang-jl.html">计量台帐</a></li>
@@ -97,31 +97,24 @@
 			</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-success btn-sm pull-right">审批通过</a>
-    						<a href="#" class="btn btn-outline-warning btn-sm pull-right">退回</a>
-    					</div>
-    				</div>
-    				<div class="content-wrap row">
-    					<div class="c-header p-0 col-12 d-flex justify-content-between">
-                <!--工具-->
-                <div>
-                </div>
-                <!--标准清单-->
-                <ul class="nav nav-tabs">
-                  <li class="nav-item">
-                    <a class="nav-link" data-toggle="tab" href="#xiangmujie" role="tab">项目节</a>
-                  </li>
-                  <li class="nav-item">
-                    <a class="nav-link" data-toggle="tab" href="#qingdan" role="tab">工程量清单</a>
-                  </li>
-                </ul>
-    					</div>
-    					<div class="c-body col-12">
-    						<table class="table table-bordered">
+			<div class="panel-content">
+				<div class="panel-title fluid">
+					<div class="title-main d-flex justify-content-between">
+						<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>
+            </div>
+					</div>
+				</div>
+        <div class="content-wrap row pr-46">
+          <div class="c-header p-0 col-12"></div>
+          <!--核心内容(两栏)-->
+          <div class="row w-100 sub-content">
+            <!--左栏-->
+            <div class="c-body col-8">
+              <div class="sjs-height-1">
+                <table class="table table-bordered">
                   <thead>
                     <tr><th rowspan="2">1</th><th rowspan="2">项目节编号</th><th rowspan="2">清单编号</th><th rowspan="2">名称</th><th rowspan="2">单位</th><th rowspan="2">单价</th><th colspan="2">上报</th><th colspan="3">一审王五</th><th colspan="3">二审张三</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></tr>
@@ -131,27 +124,56 @@
                     <tr class="table-success"><td>2</td><td></td><td>203-1-1</td><td>挖土方</td><td>m3</td><td>7.54</td><td>92954.75</td><td>699949</td><td>92954.75</td><td>699949</td><td>审批意见</td><td><input></td><td>0</td><td><input></td><td></td><td></td><td>一审王五</td></tr>
                   </tbody>
                 </table>
-    					</div>
-              <!-- <div class="c-body col-4">
-                <div class="tab-content">
-                  <div id="xiangmujie" class="tab-pane active">
-                    <select class="form-control form-control-sm"><option>0号计量台帐部位参考(项目节)</option></select>
-        						<table class="table table-bordered">
+              </div>
+             </div>
+             <!--右栏-->
+            <div class="c-body col">
+              <div class="tab-content">
+                <div id="xiangmujie" class="tab-pane active">
+                  <select class="form-control form-control-sm"><option>0号计量台帐部位参考(项目节)</option></select>
+                  <div class="sjs-height-2">
+                    <table class="table table-bordered">
                       <tr><th></th><th>项目节编号</th><th>名称</th><th>单位</th></tr>
-        						</table>
+                    </table>
                   </div>
-                  <div id="qingdan" class="tab-pane">
-                    <select class="form-control form-control-sm"><option>0号计量台帐部位参考(项目节)</option></select>
-        						<table class="table table-bordered">
+                </div>
+                <div id="qingdan" class="tab-pane">
+                  <select class="form-control form-control-sm"><option>0号计量台帐部位参考(项目节)</option></select>
+                  <div class="sjs-height-2">
+                    <table class="table table-bordered">
                       <tr><th></th><th>清单编号</th><th>名称</th><th>单位</th></tr>
-        						</table>
+                    </table>
                   </div>
                 </div>
-              </div> -->
-    				</div>
-    			</div>
-    		</div>
-      </div>
+                <div id="qianyue" class="tab-pane">
+                  <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>
+          <!--右侧菜单-->
+          <div class="side-menu">
+            <!--右侧菜单-->
+            <ul class="nav flex-column right-nav">
+              <li class="nav-item">
+                <a class="nav-link" data-toggle="tab" href="#xiangmujie" role="tab">项目节</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" data-toggle="tab" href="#qingdan" role="tab">工程量清单</a>
+              </li>
+              <li class="nav-item">
+                <a class="nav-link" data-toggle="tab" href="#qianyue" role="tab">签约清单</a>
+              </li>
+            </ul>
+          </div>
+        </div>
+			</div>
+		</div>
+  </div>
       <!--弹出添加新标段-->
       <div class="modal fade" id="add-bd" data-backdrop="static">
           <div class="modal-dialog" role="document">
@@ -172,12 +194,87 @@
               </div>
           </div>
       </div>
-
-    <!-- JS. -->
-    <script src="js/jquery/jquery-3.2.1.min.js"></script>
-    <script src="js/popper/popper.min.js"></script>
-    <script src="js/bootstrap/bootstrap.min.js"></script>
-    <script src="js/global.js"></script>
+      <!--审批通过-->
+      <div 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>
+      <!-- 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">
+          autoFlashHeight();
+      </script>
 </body>
 
 </html>

+ 3 - 78
taizhang.html

@@ -105,7 +105,7 @@
     				<div class="panel-title fluid">
     					<div class="title-main  d-flex justify-content-between"><!--工具-->
                 <div>
-                  <div class="btn-group">
+                  <div class="d-inline-block">
                     <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="复制"><i class="fa fa-files-o" aria-hidden="true"></i></a>
                     <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
                     <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>
@@ -115,7 +115,7 @@
                     <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                     <a href="" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                   </div>
-                  <div class="btn-group">
+                  <div class="d-inline-block">
                     <div class="form-check-inline">
                       <label class="form-check-label">
                         <input type="checkbox" class="form-check-input">
@@ -133,10 +133,8 @@
                 <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-dark">审批中</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>
                 </div>
     					</div>
     				</div>
@@ -297,79 +295,6 @@
               </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="upload-qianyue" data-backdrop="static">
           <div class="modal-dialog" role="document">