审批退回 增加 退回上一人 和 原报；调整审批结果显示

biangeng-new2.html

@@ -104,12 +104,15 @@
                 </div>
                 <div>
                   <a href="#sub-ap" data-toggle="modal" class="btn btn-sm btn-success pull-right">保存修改</a>
-                  <a href="#sub-ap" data-toggle="modal" data-target="#sub-ap" class="btn btn-sm btn-primary pull-right">上报审批</a>
-                  <!-- <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批中</a>
-                  <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-muted">审批退回</a> -->
-                  <!--审批-->
-                  <!-- <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm pull-right">审批通过</a>
-                  <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm pull-right">审批退回</a> -->
+                  <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>
+                  <a href="#sub-sp2" data-toggle="modal" data-target="#sub-sp2" 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>
+                  <!--审批操作-->
+                  <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm pull-right">审批通过</a>
+                  <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm pull-right">审批退回</a>
                   <a href="#" class="btn btn-outline-danger btn-sm pull-right text-truncate" style="max-width: 100px;" title="删除 LZTJ-1标项目部发变更(2015)001号">删除 LZTJ-1标项目部发变更(2015)001号</a>
                 </div>
               </div>
@@ -385,6 +388,7 @@
   		    </div>
   		  </div>
   		</div>
+
       <!--上报审批-->
       <div class="modal fade" id="sub-ap" data-backdrop="static">
           <div class="modal-dialog" role="document">
@@ -419,47 +423,139 @@
                         审批流程
                       </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>
+                        <li class="list-group-item"><i class="fa fa fa-play-circle fa-rotate-90"></i> 布尔  <small class="text-muted">施工</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a><i class="fa fa-chevron-circle-down"></i> 张三  <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a><i class="fa fa-chevron-circle-down"></i> 王五 <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a><i class="fa fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></li>
                       </ul>
                     </div>
                   </div>
                   <div class="modal-footer">
-                    <button type="button" class="btn btn-primary">确认上报</button>
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <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 fade" id="sub-sp2" data-backdrop="static">
           <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">
+                    <!--显示上次退回意见-->
                     <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                           <p class="card-text">2017-11-25</p>
+                        </li>
+                        <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>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2017-11-25</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>
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 王五 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批通过。2017-11-26</p>
                         </li>
                         <li class="list-group-item">
-                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                          <span class="text-warning pull-right">审批退回</span>
+                           <h5 class="card-title"><i class="fa fa-stop-circle text-warning"></i> 李四 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批退回，审批意见文本。2017-11-27</p>
                         </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 modal-lg" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">审批流程</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="row">
+                      <div class="col-4">
+                        <div class="card mt-3">
+                          <ul class="list-group list-group-flush">
+                            <li class="list-group-item"><i class="fa fa fa-play-circle fa-rotate-90"></i> 布尔  <small class="text-muted">施工</small></li>
+                            <li class="list-group-item"><i class="fa fa-chevron-circle-down"></i> 张三  <small class="text-muted">监理</small></li>
+                            <li class="list-group-item"><i class="fa fa-chevron-circle-down"></i> 王五 <small class="text-muted">监理</small></li>
+                            <li class="list-group-item"><i class="fa fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></li>
+                          </ul>
+                        </div>
+                      </div>
+                      <div class="col-8 modal-height-500" style="overflow: auto">
+                        <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                               <p class="card-text">2017-11-25</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-success pull-right">审批通过</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批意见。2017-11-25</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-success pull-right">审批通过</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 王五 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批通过。2017-11-26</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-warning pull-right">审批退回 布尔</span>
+                               <h5 class="card-title"><i class="fa fa-stop-circle text-warning"></i> 李四 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批退回，审批意见文本。2017-11-27</p>
+                            </li>
+                          </ul>
+                        </div>
+                        <!--退回原报重新上报-->
+                        <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                               <p class="card-text">2017-12-01</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-success pull-right">审批通过</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批通过 2017-12-02</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-warning pull-right">审批退回 张三</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down text-warning"></i> 王五 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批退回 2017-12-02</p>
+                            </li>
+                            <!--王五退回上一审批人 张三，张三重新审批-->
+                            <li class="list-group-item">
+                              <span class="pull-right">审批中</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down"></i> 张三 <small class="text-muted">监理</small></h5>
+                               <p class="card-text"></p>
+                            </li>
+                            <li class="list-group-item">
+                               <h5 class="card-title"><i class="fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></h5>
+                            </li>
+                          </ul>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                   </div>
               </div>
           </div>
@@ -475,27 +571,37 @@
                     <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                               <p class="card-text">2017-11-25</p>
+                            </li>
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">上报</span>
+                           <h5 class="card-title"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                           <p class="card-text">2017-11-25</p>
+                        </li>
+                        <li class="list-group-item">
                           <span class="text-success pull-right">审批通过</span>
-                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <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>
+                          <span class="pull-right">审批中</span>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down"></i> 王五 <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>
+                           <h5 class="card-title"><i class="fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></h5>
                         </li>
                       </ul>
                     </div>
                   </div>
                   <div class="modal-footer">
-                    <button type="button" class="btn btn-success" >确认通过</button>
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-success" >确认通过</button>
                   </div>
               </div>
           </div>
@@ -511,28 +617,40 @@
                     <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                               <p class="card-text">2017-11-25</p>
+                        </li>
+                        <li class="list-group-item">
                           <span class="text-success pull-right">审批通过</span>
-                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <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>
+                          <span class="pull-right">审批中</span>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down"></i> 王五 <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>
+                           <div class="alert alert-warning"><div class="form-check form-check-inline">
+                              <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1">
+                              <label class="form-check-label" for="inlineRadio1">退回上报 布尔</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                              <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2">
+                              <label class="form-check-label" for="inlineRadio2">退回上一审批人 张三</label>
+                            </div></data-min-view>
                         </li>
                         <li class="list-group-item">
-                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                           <h5 class="card-title"><i class="fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></h5>
                         </li>
                       </ul>
                     </div>
                   </div>
                   <div class="modal-footer">
-                    <button type="button" class="btn btn-warning" >确认退回</button>
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-warning" >确认退回</button>
                   </div>
               </div>
           </div>

jiliang-qi-detail-1.html

@@ -104,19 +104,23 @@
   										</li>
   										<li class="nav-item"><a class="nav-link active" href="jiliang-qi-detail-1.html">本期计量台帐</a></li>
                       <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail-2.html">合同支付</a></li>
-                      <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail-4.html">报表</a></li>
+                      <li class="nav-item"><a class="nav-link" href="jiliang-qi-detail-3.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>
-                  <!-- <a href="#sub-sp2" data-toggle="modal" data-target="#sub-sp2" class="btn btn-primary btn-sm pull-right">重新上报</a> -->
-                  <!-- 
+                  <a href="#sub-sp2" data-toggle="modal" data-target="#sub-sp2" 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>
+                  <!--审批操作-->
                   <a href="#sp-done" data-toggle="modal" data-target="#sp-done" class="btn btn-success btn-sm pull-right">审批通过</a>
-                  <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm pull-right">审批退回</a> -->
+                  <a href="#sp-back" data-toggle="modal" data-target="#sp-back" class="btn btn-warning btn-sm pull-right">审批退回</a>
+                  <!--常用-->
                   <a href="#add-qd3" data-toggle="modal" data-target="#add-qd3" class="btn btn-success btn-sm pull-right">添加计量清单</a>
                 </div>
       				</div>
@@ -504,7 +508,7 @@
                       </div>
                       <div class="sjs-height-3">
                         <table class="table table-bordered">
-                          <tr><th>编号</th><th>中间计量表号</th><th>交工证书/凭证表</th></tr>
+                          <tr><th>编号</th><th>中间计量表号</th><th>交工证书/凭证表</th><th>分部分项工程</th></tr>
                         </table>
                       </div>
                       <div class="sjs-bottom">
@@ -597,7 +601,7 @@
                     <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>
+                    <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>
@@ -695,9 +699,10 @@
                         审批流程
                       </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>
+                        <li class="list-group-item"><i class="fa fa fa-play-circle fa-rotate-90"></i> 布尔  <small class="text-muted">施工</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a><i class="fa fa-chevron-circle-down"></i> 张三  <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a><i class="fa fa-chevron-circle-down"></i> 王五 <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a><i class="fa fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></li>
                       </ul>
                     </div>
                   </div>
@@ -708,34 +713,125 @@
               </div>
           </div>
       </div>
-      <!--审批流程/结果-->
-      <div class="modal fade" id="sp-list" data-backdrop="static">
+      <!--重新上报-->
+      <div class="modal fade" id="sub-sp2" data-backdrop="static">
           <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">
+                    <!--显示上次退回意见-->
                     <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                           <p class="card-text">2017-11-25</p>
+                        </li>
+                        <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>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2017-11-25</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>
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 王五 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批通过。2017-11-26</p>
                         </li>
                         <li class="list-group-item">
-                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                          <span class="text-warning pull-right">审批退回</span>
+                           <h5 class="card-title"><i class="fa fa-stop-circle text-warning"></i> 李四 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批退回，审批意见文本。2017-11-27</p>
                         </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 modal-lg" role="document">
+              <div class="modal-content">
+                  <div class="modal-header">
+                      <h5 class="modal-title">审批流程</h5>
+                  </div>
+                  <div class="modal-body">
+                    <div class="row">
+                      <div class="col-4">
+                        <div class="card mt-3">
+                          <ul class="list-group list-group-flush">
+                            <li class="list-group-item"><i class="fa fa fa-play-circle fa-rotate-90"></i> 布尔  <small class="text-muted">施工</small></li>
+                            <li class="list-group-item"><i class="fa fa-chevron-circle-down"></i> 张三  <small class="text-muted">监理</small></li>
+                            <li class="list-group-item"><i class="fa fa-chevron-circle-down"></i> 王五 <small class="text-muted">监理</small></li>
+                            <li class="list-group-item"><i class="fa fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></li>
+                          </ul>
+                        </div>
+                      </div>
+                      <div class="col-8 modal-height-500" style="overflow: auto">
+                        <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                               <p class="card-text">2017-11-25</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-success pull-right">审批通过</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批意见。2017-11-25</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-success pull-right">审批通过</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 王五 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批通过。2017-11-26</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-warning pull-right">审批退回 布尔</span>
+                               <h5 class="card-title"><i class="fa fa-stop-circle text-warning"></i> 李四 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批退回，审批意见文本。2017-11-27</p>
+                            </li>
+                          </ul>
+                        </div>
+                        <!--退回原报重新上报-->
+                        <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                               <p class="card-text">2017-12-01</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-success pull-right">审批通过</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批通过 2017-12-02</p>
+                            </li>
+                            <li class="list-group-item">
+                              <span class="text-warning pull-right">审批退回 张三</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down text-warning"></i> 王五 <small class="text-muted">监理</small></h5>
+                               <p class="card-text">审批退回 2017-12-02</p>
+                            </li>
+                            <!--王五退回上一审批人 张三，张三重新审批-->
+                            <li class="list-group-item">
+                              <span class="pull-right">审批中</span>
+                               <h5 class="card-title"><i class="fa fa-chevron-circle-down"></i> 张三 <small class="text-muted">监理</small></h5>
+                               <p class="card-text"></p>
+                            </li>
+                            <li class="list-group-item">
+                               <h5 class="card-title"><i class="fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></h5>
+                            </li>
+                          </ul>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
                   </div>
               </div>
           </div>
@@ -751,20 +847,35 @@
                     <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                           <p class="card-text">2017-11-25</p>
+                        </li>
+                        <li class="list-group-item">
                           <span class="text-success pull-right">审批通过</span>
-                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <small class="text-muted">监理</small></h5>
+                           <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                          <span class="text-success pull-right">审批通过</span>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 王五 <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"><i class="fa fa-stop-circle text-warning"></i> 李四 <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>
+                          <span class="pull-right">审批中</span>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down"></i> 王五 <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>
+                           <h5 class="card-title"><i class="fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></h5>
                         </li>
                       </ul>
                     </div>
@@ -787,21 +898,33 @@
                     <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"><i class="fa fa-play-circle fa-rotate-90 text-success"></i> 布尔 <small class="text-muted">施工</small></h5>
+                               <p class="card-text">2017-11-25</p>
+                        </li>
+                        <li class="list-group-item">
                           <span class="text-success pull-right">审批通过</span>
-                           <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down text-success"></i> 张三 <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>
+                          <span class="pull-right">审批中</span>
+                           <h5 class="card-title"><i class="fa fa-chevron-circle-down"></i> 王五 <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>
+                           <div class="alert alert-warning"><div class="form-check form-check-inline">
+                              <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio1" value="option1">
+                              <label class="form-check-label" for="inlineRadio1">退回上报 布尔</label>
+                            </div>
+                            <div class="form-check form-check-inline">
+                              <input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio2" value="option2">
+                              <label class="form-check-label" for="inlineRadio2">退回上一审批人 张三</label>
+                            </div></data-min-view>
                         </li>
                         <li class="list-group-item">
-                           <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                           <h5 class="card-title"><i class="fa fa-stop-circle"></i> 李四 <small class="text-muted">监理</small></h5>
                         </li>
                       </ul>
                     </div>