瀏覽代碼

增加审批退回功能页面

outaozhen 7 年之前
父節點
當前提交
1a6a65f661
共有 3 個文件被更改,包括 524 次插入83 次删除
  1. 94 2
      css/style.css
  2. 27 2
      js/global.js
  3. 403 79
      r-project-section-detail-APP.html

+ 94 - 2
css/style.css

@@ -388,7 +388,7 @@ a:focus {
 }
 .bottomToolsbar ul li{
   float:left;
-  width:50%;
+  width:33.333%;
   height:5.5rem;
   line-height: 5.5rem;
   text-align: center;
@@ -494,4 +494,96 @@ a:focus {
 }
 .modalCont li:last-child{
   border-bottom: none;
-};
+}
+.slider{
+  min-height:580px;
+  /*display:block;
+  position:relative;
+  background:#fff;
+  overflow:hidden;*/
+}
+.slider ul{
+  list-style:none;
+}
+.slider-content{
+  float:left;
+  width:100%;
+  display:block;
+  overflow:auto;
+  min-height:580px;
+}
+.slider-content ul{
+  float:left;
+  width:100%;
+  display:block;
+  position:relative;
+}
+.slider-content ul li{
+  float:left;
+  width:100%;
+}
+.slider-content ul ul li a{
+  padding:5px 10px;
+  display:block;
+  border-bottom:1px solid #f3f3f3;
+  text-transform:capitalize;
+}
+.slider-content ul ul li a:hover{
+  background:#f3faff;
+  border-color:#d5ebf9;
+}
+.slider-content .title{
+  padding:5px 0;
+  text-indent:10px;
+  background:#bbb;
+  color:#fff;
+  width:100%;
+  float:left;
+  font-weight:bold;
+  text-transform:uppercase;
+}
+.slider-content .selected .title{
+  background:#666;
+}
+
+
+.slider .slider-nav{
+  position:fixed;
+  z-index: 2;
+  right:0;
+  top:0;
+  background:#666;
+  min-height:580px;
+  transition: top .5s;
+  display:none;
+}
+.slider .slider-nav ul{
+  padding:5px 0;
+}
+.slider .slider-nav li a{
+  padding:21px 8px;
+  line-height:13px;
+  text-align:center;
+  color:#fff;
+  font-weight:bold;
+  display:block;
+  text-transform:uppercase;
+  cursor:pointer;
+}
+.slider #debug{
+  position:absolute;
+  bottom:0;
+  left:0;
+  padding:5px;
+  background:#000;
+  color:#fff;
+}
+.slider .arrow{
+  font-size:0px;
+  line-height:0%;
+  width:0px;
+  border-bottom:8px solid #fff;
+  border-left:5px solid #333;
+  border-right:5px solid #333;
+  position:relative;top:5px;
+}

+ 27 - 2
js/global.js

@@ -3,7 +3,7 @@ $(function(){
     $('[data-toggle="tooltip"]').tooltip()
   });
   $('.dropdown-toggle').dropdown();
-  
+
   $(".projectSeList li .openPro").click(function(){
     var projectDetail = $(this).siblings(".projectDetailNot");
     if(projectDetail.css("display")=="none"){
@@ -34,5 +34,30 @@ $(function(){
       $(shareBtn).hide();
     }
   });
-});
 
+  // $(".onSelect").click(function(){
+  //   $(".selectList").slideToggle();
+  // });
+
+    var scrolltop = new Array();  
+    var i = 0;  
+    scrolltop[0] = 0;  
+    $(".slider-content").scroll(function(){  
+        i++;  
+        scrolltop[i] = $(".slider-content").scrollTop();  
+        if (scrolltop[i] > scrolltop[i-1]) {  
+            $(".slider-nav").fadeOut(); 
+        }else{  
+            $(".slider-nav").fadeIn();  
+        };  
+    });
+
+  // $(".slider-content").scroll(function(e) {
+  //   height = $(".slider-content").scrollTop();
+  //     if(height > 600){
+  //       $('.slider-nav').fadeIn();
+  //     }else{
+  //       $('.slider-nav').fadeOut();
+  //     };
+  // });
+});

+ 403 - 79
r-project-section-detail-APP.html

@@ -11,7 +11,13 @@
     <script src=js/jquery-1.9.1.min.js></script>
     <script src=js/bootstrap.js></script> 
     <script src=js/global.js></script>
-    <script src=js/echarts.min.js></script> 
+    <script src=js/echarts.min.js></script>
+    <script type="text/javascript" src="js/slidernav.js"></script>
+    <script type="text/javascript">
+      $(document).ready(function(){
+        $('#slider').sliderNav();
+      });
+    </script>
 </head>
 <body>
     <div class="wrapContent">
@@ -23,85 +29,383 @@
         </div>
         <div class="tab-content">
           <div role="tabpanel" class="tab-pane active" id="home">
-            <div class="project">
-                <div class="proSection">
-                    <!--图表4-->
-                    <div id="chartContainer4" style="height: 350px; width: 100%;">
+            <div class="projectSelectWrap">
+              <div class="slider mT2" id="slider">
+                <div class="slider-content">
+                  <div class="project">
+                        <div class="proSection">
+                            <!--图表4-->
+                            <div id="chartContainer4" style="height: 350px; width: 100%;">
+                            </div>
+                            <!--图表5-->
+                            <div id="chartContainer5" style="height: 300px; width: 100%;">
+                            </div>
+                        </div>
                     </div>
-                    <!--图表5-->
-                    <div id="chartContainer5" style="height: 300px; width: 100%;">
-                    </div>
-                </div>
-                <div class="projectSeList">
-                    <dl class="projectTable">
-                      <dt>第七期(上报:2015-09-09;通过:2015-09-13</dt>
-                      <dd>
-                        <table class="table table-hover">
-                          <tr>
-                            <td>
-                              <p>本期合同计量</p>
-                              <b>¥5,000,000.00</b>
-                            </td>
-                            <td>
-                              <p>本期数量变更计量</p>
-                              <b>¥233,453,000.00</b>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td>
-                              <p>截止上期累计完成</p>
-                              <b>¥5,000,000.00</b>
-                            </td>
-                            <td>
-                              <p>本期完成计量</p>
-                              <b>¥233,453,000.00</b>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td>
-                              <p>累计完成计量</p>
-                              <b>¥233,453,000.00</b>
-                            </td>
-                            <td></td>
-                          </tr>
-                        </table>
-                      </dd>
-                    </dl>
-                    <dl class="projectTable">
-                      <dt>第六期(上报:2015-09-09;通过:2015-09-13</dt>
-                      <dd>
-                        <table class="table table-hover">
-                          <tr>
-                            <td>
-                              <p>本期合同计量</p>
-                              <b>¥5,000,000.00</b>
-                            </td>
-                            <td>
-                              <p>本期数量变更计量</p>
-                              <b>¥233,453,000.00</b>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td>
-                              <p>截止上期累计完成</p>
-                              <b>¥5,000,000.00</b>
-                            </td>
-                            <td>
-                              <p>本期完成计量</p>
-                              <b>¥233,453,000.00</b>
-                            </td>
-                          </tr>
-                          <tr>
-                            <td>
-                              <p>累计完成计量</p>
-                              <b>¥233,453,000.00</b>
-                            </td>
-                            <td></td>
-                          </tr>
-                        </table>
-                      </dd>
-                    </dl>
+                  <ul>
+                    <li id="1"><!-- <a name="1~10" class="title">1~10</a> -->
+                      <dl class="projectTable">
+                          <dt>第1期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                    <li id="2"><!-- <a name="1~10" class="title">1~10</a> -->
+                        <dl class="projectTable">
+                          <dt>第2期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                    <li id="3"><!-- <a name="1~10" class="title">1~10</a> -->
+                        <dl class="projectTable">
+                          <dt>第3期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                    <li id="4"><!-- <a name="1~10" class="title">1~10</a> -->
+                        <dl class="projectTable">
+                          <dt>第4期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                    <li id="5"><!-- <a name="1~10" class="title">1~10</a> -->
+                      <dl class="projectTable">
+                          <dt>第5期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                    <li id="6"><!-- <a name="1~10" class="title">1~10</a> -->
+                        <dl class="projectTable">
+                          <dt>第6期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                    <li id="7"><!-- <a name="1~10" class="title">1~10</a> -->
+                        <dl class="projectTable">
+                          <dt>第7期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                    <li id="8"><!-- <a name="1~10" class="title">1~10</a> -->
+                        <dl class="projectTable">
+                          <dt>第8期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                    <li id="9"><!-- <a name="1~10" class="title">1~10</a> -->
+                        <dl class="projectTable">
+                          <dt>第9期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                    <li id="10"><!-- <a name="1~10" class="title">1~10</a> -->
+                        <dl class="projectTable">
+                          <dt>第10期(上报:2015-09-09;通过:2015-09-13)</dt>
+                          <dd>
+                            <table class="table table-hover">
+                              <tr>
+                                <td>
+                                  <p>本期合同计量</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期数量变更计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>截止上期累计完成</p>
+                                  <b>¥5,000,000.00</b>
+                                </td>
+                                <td>
+                                  <p>本期完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                              </tr>
+                              <tr>
+                                <td>
+                                  <p>累计完成计量</p>
+                                  <b>¥233,453,000.00</b>
+                                </td>
+                                <td></td>
+                              </tr>
+                            </table>
+                          </dd>
+                        </dl>
+                    </li>
+                  </ul>
                 </div>
+              </div>
             </div>
           </div>
           <div role="tabpanel" class="tab-pane" id="profile">
@@ -173,8 +477,9 @@
                 </form> 
               </div>
               <ul>
-                <li><button type="button" class="submit btn-danger" data-toggle="modal" data-target="#myModalUnpass">审批不通过</button></li>
                 <li><button type="button" class="submit btn-success" data-toggle="modal" data-target="#myModalPass">审批通过</button></li>
+                <li><button type="button" class="submit btn-warning" data-toggle="modal" data-target="#myModalreturn">退回</button></li>
+                <li><button type="button" class="submit btn-danger" data-toggle="modal" data-target="#myModalUnpass">审批不通过</button></li>
               </ul>
             </div>
 
@@ -214,6 +519,25 @@
                 </div>
               </div>
             </div>
+            <div class="modal fade modalWrap" id="myModalreturn" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+              <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                  <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">退回</h4>
+                  </div>
+                  <div class="modal-body">
+                    <h4>是否退回上一个审批人“张三”审批</h4>
+                  </div>
+                  <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+                    <button type="button" class="btn btn-warning">确认退回</button>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+
           </div>
         </div>
     </div>