Przeglądaj źródła

中间计量,计量编制列表

Chente 7 lat temu
rodzic
commit
7cf4ab4ab4
4 zmienionych plików z 1059 dodań i 859 usunięć
  1. 3 3
      jiliang-approval2.html
  2. 829 0
      jiliang-detail.html
  3. 52 1
      jiliang-list.html
  4. 175 855
      jiliang.html

+ 3 - 3
jiliang-approval2.html

@@ -131,9 +131,9 @@
               </div>
     				</div>
     				<div class="content-wrap row">
-              <div class="c-header p-0 col-12">
+              <div class="c-header col-12">
                 <div class="dropdown">
-                  <button class="btn btn-primary btn-sm dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                  <button class="btn btn-light btn-sm dropdown-toggle" type="button" data-toggle="dropdown" >
                     选择显示审批人
                   </button>
                   <div class="dropdown-menu">
@@ -174,7 +174,7 @@
                     <div class="px-3 mb-1">
                       <button type="submit" class="btn btn-primary btn-sm">确定</button>
                     </div>
-                  </form>
+                    </form>
                   </div>
                 </div>
               </div>

+ 829 - 0
jiliang-detail.html

@@ -0,0 +1,829 @@
+<!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>
+                  <a href="jiliang.html" class="btn btn-link btn-sm">返回</a>
+                  <div class="btn-group">
+                    <a href="#add-qd" data-toggle="modal" data-target="#add-qd" class="btn btn-success btn-sm">添加计量清单</a>
+                    <a href="#add-qd2" data-toggle="modal" data-target="#add-qd2" class="btn btn-success btn-sm">添加计量清单2</a>
+                  </div>
+                </div>
+                <div>
+                  <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>
+                  <a href="#" data-toggle="modal" data-target="#" class="btn btn-primary btn-sm pull-right">重新上报</a>
+                  <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-success btn-sm pull-right">审批完成</a>
+                  <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批中</a>
+                  <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-muted">审批退回</a>
+                </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="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>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr>
+                          <td>2</td>
+                          <td>1</td>
+                          <td></td>
+                          <td>第一部分建筑安装工程费</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>3</td>
+                          <td>1-1</td>
+                          <td></td>
+                          <td>临时工程</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>4</td>
+                          <td>1-1-1</td>
+                          <td></td>
+                          <td>临时道路</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>5</td>
+                          <td>1-1-2</td>
+                          <td></td>
+                          <td>临时便桥</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>6</td>
+                          <td>1-2</td>
+                          <td></td>
+                          <td>路基工程</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>7</td>
+                          <td>1-2-1</td>
+                          <td></td>
+                          <td>场地清理</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>8</td>
+                          <td>1-2-1-1</td>
+                          <td></td>
+                          <td>清理与挖除</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>9</td>
+                          <td>1-2-1-1-1</td>
+                          <td></td>
+                          <td>k0+000-k1+000</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr class="bg-primary">
+                          <td>10</td>
+                          <td></td>
+                          <td>201-1</td>
+                          <td>清理现场</td>
+                          <td>m3</td>
+                          <td>7.53</td>
+                          <td>100</td>
+                          <td>753</td>
+                          <td><input value="10"></td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td>10</td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>11</td>
+                          <td>1-2-1-1-2</td>
+                          <td></td>
+                          <td>k0+000-k1+000</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>12</td>
+                          <td></td>
+                          <td>201-1</td>
+                          <td>清理现场</td>
+                          <td>m3</td>
+                          <td>7.53</td>
+                          <td>100</td>
+                          <td>753</td>
+                          <td><input value="10"></td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td>10</td>
+                          <td>75.3</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>13</td>
+                          <td>1-4</td>
+                          <td></td>
+                          <td>桥梁涵洞工程</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                        <tr>
+                          <td>14</td>
+                          <td>1-4-1</td>
+                          <td></td>
+                          <td>特大桥工程</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                        </tr>
+                      </tbody>
+                    </table>
+                  </div>
+      					</div>
+                <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 id="spjilu" class="tab-pane">
+                      <div class="sjs-bar">
+                        <table class="table table-bordered">
+                          <tr><th>清单编号</th><th>清单名称</th><th>上报数量</th></tr>
+                          <tr><td>201-1</td><td>清理现场</td><td>10</td></tr>
+                        </table>
+                      </div>
+                      <div class="sjs-height-2">
+                        <table class="table table-bordered">
+                          <tr><th>审批人</th><th>审批数量</th><th>审批意见</th></tr>
+                          <tr><td>张三</td><td>15</td><td>审批意见文本</td></tr>
+                          <tr><td>王五</td><td>20</td><td>审批意见文本</td></tr>
+                        </table>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+
+              <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>
+                  <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#spjilu" role="tab">中间审批记录</a>
+                  </li>
+                </ul>
+              </div>
+    				</div>
+    			</div>
+    		</div>
+      </div>
+      <!--弹出添加计量清单-->
+      <div class="modal fade" id="add-qd2" 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="input-group mb-3">
+                      <input type="text" class="form-control" placeholder="输入清单编号/名称 检索">
+                      <div class="input-group-append">
+                        <button class="btn btn-primary" type="button">检索</button>
+                      </div>
+                    </div>
+                    <!--检索结果-->
+                    <table class="table table-sm table-bordered">
+                      <legend>检索结果</legend>
+                      <tr><th>清单编号</th><th>名称</th><th>单位</th><th>单价</th><th width="90">选择</th></tr>
+                      <tr><td>203-1-1</td><td><a href="#">挖土方</a></td><td>m3</td><td>7.54</td><td><input type="checkbox" checked> 已选择</td></tr>
+                      <tr><td colspan="5"><span>└</span> 1-2-5 排水沟工程</td></tr>
+                      <tr><td>203-1-1</td><td>挖土方</td><td>m3</td><td>7.54</td><td><input type="checkbox"></td></tr>
+                    </table>
+                  </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="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>
+      </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="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 type="text/javascript">$('#first').modal('show')</script>
+    <script>
+        $( function() {
+            $( "#draggable" ).draggable();
+        } );
+    </script>
+</body>
+
+</html>

+ 52 - 1
jiliang-list.html

@@ -111,6 +111,57 @@
                     <button type="button" class="btn btn-outline-secondary btn-sm">待审批</button>
                     <button type="button" class="btn btn-outline-secondary btn-sm">审批完成</button>
                   </div>
+                  <div class="btn-group dropdown">
+                    <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-filter"></i> 筛选</button>
+                    <div class="dropdown-menu">
+                      <form class="px-3">
+                        <div class="form-group">
+                          <select class="form-control form-control-sm">
+                            <option>计量年份</option>
+                            <option>2018</option>
+                            <option>2017</option>
+                            <option>2016</option>
+                          </select>
+                        </div>
+                        <div class="form-group">
+                          <select class="form-control form-control-sm">
+                            <option>计量月份</option>
+                            <option>1月</option>
+                            <option>2月</option>
+                            <option>3月</option>
+                            <option>4月</option>
+                            <option>5月</option>
+                            <option>6月</option>
+                            <option>7月</option>
+                            <option>8月</option>
+                            <option>9月</option>
+                            <option>10月</option>
+                            <option>11月</option>
+                            <option>12月</option>
+                          </select>
+                        </div>
+                        <div class="form-group">
+                          <select class="form-control form-control-sm">
+                            <option>计量期</option>
+                            <option>14期</option>
+                            <option>13期</option>
+                            <option>12期</option>
+                            <option>11期</option>
+                            <option>10期</option>
+                            <option>9期</option>
+                            <option>8期</option>
+                            <option>7期</option>
+                            <option>6期</option>
+                            <option>5期</option>
+                            <option>4期</option>
+                            <option>3期</option>
+                            <option>2期</option>
+                            <option>1期</option>
+                          </select>
+                        </div>
+                      </form>
+                    </div>
+                  </div>
                 </div>
     					</div>
     				</div>
@@ -122,7 +173,7 @@
                       <tr><th>计量编号</th><th>计量金额</th><th>计量月份</th><th>所属计量期</th><th>状态</th><th>当前处理人</th></tr>
                     </thead>
                     <tbody>
-                      <tr><td><a href="jiliang-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><span class="text-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></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>

Plik diff jest za duży
+ 175 - 855
jiliang.html