最新开发分支在线审批

global/css/style.css

@@ -3,9 +3,9 @@
     font-family: 'icomoon';
     src:url('fonts/icomoon.eot');
     src:url('fonts/icomoon.eot?#iefix') format('embedded-opentype'),
-	url('fonts/icomoon.woff') format('woff'),
-	url('fonts/icomoon.ttf') format('truetype'),
-	url('fonts/icomoon.svg#icomoon') format('svg');
+    url('fonts/icomoon.woff') format('woff'),
+    url('fonts/icomoon.ttf') format('truetype'),
+    url('fonts/icomoon.svg#icomoon') format('svg');
     font-weight: normal;
     font-style: normal;
 }
@@ -37,8 +37,8 @@ body{
     font: 12px/1.5 tahoma,arial,'Hiragino Sans GB',"微软雅黑",sans-serif;
     overflow:hidden;
 }a {
-    outline:none;
-}
+     outline:none;
+ }
 
 a {
     color: #0088cc;
@@ -63,121 +63,6 @@ a:focus {
 .colGreen{color:#17ab0c}
 .colGray{color:#999}
 .colBlue{color:#3172d9}
-.indexNav {
-    height:45px;
-    background:#CFD37A;
-    position:fixed;
-    top:0;
-    width:100%;
-    padding:10px 0;
-    z-index: 99
-}
-.indexNav .inav {
-    margin:0 0 0 20px;
-}
-.indexNav .inav li {
-    float:left;
-    margin:0 20px 0 0;
-    line-height: 40px
-}
-.indexNav .inav li a{
-    color:#fff;
-    border:1px solid #CFD37A;
-    padding:2px 6px;
-}
-.indexNav .inav li a:hover{
-    color:#f5f5f5;
-    text-decoration: none;
-}
-.indexNav .inav li.active a{
-    border:1px solid #fff;
-    border-radius: 3px;
-}
-.indexNav .inav li.mlogo a{
-    padding:0;
-}
-.indexNav .inav li.mlogo.active a{
-    border:1px solid #CFD37A;
-    padding:0;
-}
-.indexNav .menBtn {
-    text-align: right;
-}
-.indexNav .menBtn li{
-    display: inline-block;
-}
-.indexNav .menBtn a{
-    background: transparent;
-    color: #fff;
-    border: 1px solid #fff;
-    padding: 3px 12px;
-    border-radius: 5px;
-}
-.indexNav .menBtn a:hover{
-    text-decoration: none;
-    background:none repeat scroll 0 0 rgba(255, 255, 255, 0.1);
-}
-.indexNav .menBtn a.login{
-    color:#bdc15f;
-    background:#fff;
-}
-.indexNav .menBtn a.login:hover{
-    background: none repeat scroll 0 0 #f5f6e4
-}
-.warpIndex .topBanner{
-    background:#CFD37A;
-    text-align: center;
-    margin-top:65px;
-    position: relative;
-    vertical-align: middle;
-}
-.topBanner img{
-    position: absolute;
-    bottom:0;
-    left:50%;
-    margin:0 0 0 -480px;
-    z-index: 0
-}
-.warpIndex .topBanner .width960{
-    padding:15% 0 0 0;
-    z-index:0
-}
-.warpIndex .topBanner h1{
-    z-index: 1;
-    position: relative;
-    color:#fff;
-    font-weight: normal;
-    font-size:52px;
-    margin-bottom:20px;
-}
-.warpIndex .topBanner p{
-    z-index: 1;
-    position: relative;
-    color:#fff;
-    font-size:22px;
-    margin:0 0 30px 0;
-    line-height: 34px;
-    display: block
-}
-.warpIndex .topBanner p a{
-    color:#fff;
-    padding:12px 24px;
-    border:1px solid #fff;
-    border-radius: 5px;
-    font-size:16px;
-    margin:10px;
-}
-.warpIndex .topBanner p a:hover{
-    text-decoration: none;
-    background:none repeat scroll 0 0 rgba(255, 255, 255, 0.1);
-}
-.warpIndex .topBanner p a.login{
-    background: #fff;
-    color:#bdc15f;
-}
-.warpIndex .topBanner p a.login:hover{
-    background: none repeat scroll 0 0 #f5f6e4
-}
 .wrapHeader{
     height:48px;
     background:url(headerBg.jpg) repeat-x 0 0;
@@ -455,6 +340,9 @@ div.userInfo .btn-group .dropdown-menu{
     height:60px;
     overflow:hidden;
 }
+.reportList {
+    margin:5px 0;
+}
 .tableTypeList {
     float:left;
     width:140px;
@@ -643,8 +531,8 @@ div.userInfo .btn-group .dropdown-menu{
     border-color:#fff
 }
 .periodBar{.
-	   height:28px;
-	   overflow: hidden
+height:28px;
+    overflow: hidden
 }
 .periodBar .addPeriod{
     margin:0 0 0 10px;
@@ -715,6 +603,39 @@ div.userInfo .btn-group .dropdown-menu{
 .avatar li.add span:hover{
     color:#333
 }
+.avatar li.num {
+    font-size:36px;
+    color:#ccc;
+    border:none;
+    background:none;
+    padding:0 15px;
+    height:54px;
+    line-height:54px;
+    margin-right:5px;
+}
+.avatar li.name {
+    font-size:18px;
+    border:none;
+    background:none;
+    padding:0 10px;
+    height:54px;
+    line-height:54px;
+    min-width:100px;
+}
+.avatar li.con {
+    font-size:12px;
+    border:none;
+    background:none;
+    padding:0 10px;
+    height:54px;
+    line-height:54px;
+    color:#666;
+    max-width:500px
+}
+.avatar li.con p{
+    line-height: 18px;
+    margin-top:15px
+}
 .missionPeriod .mpPass{
     width:60px;
     height:60px;
@@ -787,7 +708,7 @@ div.userInfo .btn-group .dropdown-menu{
     height:60px;
 }
 .avatarBar .avatar{
-    margin:2px 0 0 10px
+    margin:2px 0 0 5px
 }
 .avatarBar .fR{
     margin:15px 20px 0 0
@@ -1031,36 +952,43 @@ div.userInfo .btn-group .dropdown-menu{
 .copyRight a{
     color:#666
 }
-.bolangbanner{
-    height:100px;
-    position: absolute;
-    bottom:0;
-    width:100%;
-    z-index: 999
+.filesWrap {
+    position: relative;
+    overflow: hidden;
 }
-#banner_bolang_bg_1{
-    position: absolute;
-    height:85px;
-    background: url(wave1.png) repeat-x;
-    width:300%;
-    bottom:0;
+.filesWrap .filesList{
+    overflow-y:auto;
+    width:70%;
 }
-#banner_bolang_bg_2{
+.filesWrap .filesDetail{
     position: absolute;
-    height:100px;
-    background: url(wave2.png) repeat-x;
-    width:300%;
+    right:0;
     top:0;
+    width:29%;
+    border:1px solid #ccc;
 }
-.taCble{
-    cursor:pointer;
-    background-image: url(small.gif);
-    background-repeat: no-repeat;
-    background-position: 150px 18px;
+.fileico {
+    display: inline-block;
+    width: 26px;
+    height: 22px;
+    background: url(fileico.gif) no-repeat 0 0;
+    vertical-align: middle;
+}
+.fileico.ico-jpg{
+    background-position:0 -80px
+}
+.fileico.ico-pdf{
+    background-position:-64px -80px
+}
+.fileico.ico-doc{
+    background-position:-96px -80px
+}
+.fileico.ico-xls{
+    background-position:-128px -80px
 }
-.taCble.headerSortUp {
-    background-image: url(small_asc.gif);
+.fileico.ico-txt{
+    background-position:-160px -80px
 }
-.taCble.headerSortDown {
-    background-image: url(small_desc.gif);
+.fileico.ico-zip{
+    background-position:-352px -80px
 }

protected/class/measureauditact.php

@@ -124,6 +124,10 @@ class MeasureauditAct {
         return $this->__measureaudit->getOne(array('where' => 'pmid=? AND numpname=? AND auditoruid=?', 'param' => array($pmid, $numpname, $creatoruid), 'asArray' => TRUE));
     }
 
+    public function getMyAuditStatus($pmid, $numpname, $times, $uid) {
+        return $this->__measureaudit->getOne(array('where' => 'pmid=? AND numpname=? AND times=? AND auditoruid=?', 'param' => array($pmid, $numpname, $times,$uid), 'asArray' => TRUE));
+    }
+
     public function getFirstAuditor($pmid, $numpname, $times = 0) {
         return $this->__measureaudit->getOne(array('where' => 'maid =(select min(maid) from jl_measure_audit where `pmid`=? and `numpname` =? and times=? and last=2)', 'param' => array($pmid, $numpname, $times), 'asArray' => TRUE));
     }

protected/config/routes.conf.php

@@ -21,6 +21,7 @@ $route['*']['/rproject/:pid/section'] = array('RProjectController', 'proSection'
 $route['*']['/rproject/:pid/section/:mpid/measure'] = array('RProjectController', 'proSectionMeasure');
 $route['*']['/rproject/:pid/section/:pmid/detail'] = array('RProjectController', 'proDetail');
 $route['*']['/rproject/:pmid/measure/detail'] = array('RProjectController', 'proMeasure');
+$route['*']['/rproject/:pid/section/:pmid/report'] = array('RProjectController', 'proReport');
 // S
 $route['get']['/sproject/index'] = array('SProjectController', 'index');
 $route['get']['/sproject/:pid/section'] = array('SProjectController', 'proSection');

protected/controller/RProjectController.php

@@ -128,18 +128,24 @@ class RProjectController extends DooController
                         if (!isset($numStatusArray['currstatus'])) {
                             $numStatusArray['currstatus'] = 'uncheck';
                         }
+                        $datatmp = $this->measureauditact->getMyAuditStatus($numStatusArray['pmid'],$numStatusArray['numpname'],$numStatusArray['times'],$this->auth->getUid());
+                        if($datatmp&&($datatmp['mastatus']=='checking')){
+                            $buttonhtml = '<a class="btn btn-warning btn-small" href="/rproject/'.$this->params['pid'].'/section/'.$v['pmid'].'/report">开始审批</a>';
+                        }else{
+                            $buttonhtml = '（<span class="colOrange">' . $this->statusArray[$numStatusArray['currstatus']] . '</span>）';
+                        }
                         $html .= '<tr>
-		<td><a href="/rproject/' . $this->params['pid'] . '/section/' . $v['pmid'] . '/detail">' . $v['pmname'] . '</a></td>
-		<td class="">第 ' . $countNum . ' 期（<span class="colOrange">' . $this->statusArray[$numStatusArray['currstatus']] . '</span>）</td>
-		<td class="taR">￥' . number_format($v['contracttotal'], 2, '.', ',') . '</td>
-		<td>
-		    <div class="progress">
-			<div class="bar bar-success" style="width: ' . $dispstopnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nstopnowtotal . '">' . $dispstopnowtotal . '</div>
-			<div class="bar" style="width:' . $dispcurrdone . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrdone . '">' . $dispcurrdone . '</div>
-			<div class="bar bar-gary" style="width:' . $dispnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nnowtotal . '">' . $dispnowtotal . '</div>
-		    </div>
-		</td>
-		</tr>';
+                                    <td><a href="/rproject/' . $this->params['pid'] . '/section/' . $v['pmid'] . '/detail">' . $v['pmname'] . '</a></td>
+                                    <td class="">第 ' . $countNum . ' 期 '.$buttonhtml.'</td>
+                                    <td class="taR">￥' . number_format($v['contracttotal'], 2, '.', ',') . '</td>
+                                    <td>
+                                        <div class="progress">
+                                        <div class="bar bar-success" style="width: ' . $dispstopnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="截止上期完成：￥' . $nstopnowtotal . '">' . $dispstopnowtotal . '</div>
+                                        <div class="bar" style="width:' . $dispcurrdone . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="本期完成：￥' . $ncurrdone . '">' . $dispcurrdone . '</div>
+                                        <div class="bar bar-gary" style="width:' . $dispnowtotal . ';" data-placement="bottom" data-toggle="tooltip" data-original-title="未完成：￥' . $nnowtotal . '">' . $dispnowtotal . '</div>
+                                        </div>
+                                    </td>
+                                    </tr>';
                         $hetongTotal += $v['contracttotal'];
                     }
                 }
@@ -259,6 +265,11 @@ class RProjectController extends DooController
         $this->render('r-project-section-detail', $this->data, TRUE);
     }
 
+    public function proReport()
+    {
+
+        $this->render('r-project-section-report', $this->data, TRUE);
+    }
 }
 
 ?>

protected/view/r-project-section-report.html

@@ -0,0 +1,210 @@
+<!DOCTYPE html>
+<html lang=zh-cn>
+<head>
+  <meta charset=utf-8>
+  <title>纵横计量支付系统</title>
+  <meta name=description content=计量支付>
+  <meta name=copyright content=smartcost.com.cn>
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <link rel=stylesheet href="{{rootUrl}}global/css/bootstrap.css">
+  <link rel=stylesheet href="{{rootUrl}}global/css/style.css">
+  <script src="{{rootUrl}}global/js/jquery-1.9.1.min.js"></script>
+  <script src="{{rootUrl}}global/js/bootstrap.js"></script>
+  <script src="{{rootUrl}}global/js/jl.js"></script>
+  <script src="http://s1.bdstatic.com/r/www/cache/ecom/esl/1-6-10/esl.js"></script>
+</head>
+<body>
+<!-- include "top" -->
+<div class="wrapContent">
+  <!-- include "left" -->
+    	<div class="mainContainer">
+    		<!--内容-->
+         <div class="mainContent">
+      <div class="title clearfix">
+        <ul class="nav nav-pills">
+          <li class="dropdown"><a title="返回" href="r-project-section.html"><span class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
+          <li class="dropdown">
+            <a href="#" data-toggle="dropdown" class="dropdown-toggle">
+              黄金大桥项目<b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+              <li><a href="#">重庆XX至XX公路</a></li>
+              <li><a href="#">重庆XX至XX公路</a></li>
+              <li><a href="#">重庆XX至XX公路</a></li>
+              <li><a href="#">重庆XX至XX公路</a></li>
+            </ul>
+          </li>
+          <li class="dropdown">
+            <a href="#" data-toggle="dropdown" class="dropdown-toggle">
+              土建合同<b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+              <li><a href="#">监理合同</a></li>
+              <li><a href="#">设计合同</a></li>
+              <li><a href="#">机电合同</a></li>
+            </ul>
+          </li>
+          <li class="dropdown">
+            <a href="#" data-toggle="dropdown" class="dropdown-toggle">
+              GZ-HJDQ-JL-001<b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+              <li><a href="#">GZ-HJDQ-JL-010</a>
+              </li><li><a href="#">GZ-HJDQ-JL-009</a></li>
+              <li><a href="#">GZ-HJDQ-JL-008</a></li>
+              <li><a href="#">GZ-HJDQ-JL-007</a></li>
+              <li><a href="#">GZ-HJDQ-JL-006</a></li>
+              <li><a href="#">GZ-HJDQ-JL-005</a></li>
+              <li><a href="#">GZ-HJDQ-JL-004</a></li>
+              <li><a href="#">GZ-HJDQ-JL-003</a></li>
+              <li><a href="#">GZ-HJDQ-JL-002</a></li>
+              <li><a href="#">GZ-HJDQ-JL-001</a></li>
+              <li class="divider"></li>
+              <li><a href="#">共18标段，查看更多</a></li>
+            </ul>
+          </li>
+          <li class="dropdown">
+            <a href="#" data-toggle="dropdown" class="dropdown-toggle">
+              第七期<b class="caret"></b>
+            </a>
+            <ul class="dropdown-menu">
+              <li><a href="#">第六期</a></li>
+              <li><a href="#">第六期</a></li>
+              <li><a href="#">第六期</a></li>
+              <li><a href="#">第六期</a></li>
+            </ul>
+          </li>
+        </ul>
+      </div>
+      <!--本期数据-->
+      <div >
+          <table class="table table-striped">
+            <thead>
+              <tr>
+                <th width="8%">期数</th><th class="taC" width="16%">本期合同计量</th><th class="taC" width="16%">本期数量变更计量</th><th class="taC" width="16%">截止上期累计完成</th><th class="taC" width="16%">本期完成计量</th><th class="taC" width="16%">累计完成计量</th><th class="taC">状态</th>
+              </tr>
+              <tr>
+                <td>第七期&nbsp;<span data-toggle="tooltip" data-placement="bottom" title="上报：2015-09-09；通过：2015-09-13" class="icon-time"></span></td><td class="taR">0</td><td class="taR">0</td><td class="taR">0</td><td class="taR">0</td><td class="taR">0</td><td class="taR"><b class="colOrange">审批中</b></td>
+                </tr>
+              </tbody>
+            </table>
+        </div>
+      <!--审批操作栏-->
+      <div class="bottomToolsbar">
+        <div class="avatarBar clearfix">
+          <div class="fR">
+            <h4 class="colGray">待审</h4>
+          </div>
+          <div class="fR">
+            <h4 class="colGreen">审批通过</h4>
+          </div>
+          <div class="fR">
+            <h4 class="colRed">审批不通过</h4>
+          </div>
+          <div class="fR">
+              <div class="btn-group dropup">
+                <a class="btn btn-success" data-toggle="modal" href="#reportPass"><span aria-hidden="true" data-icon="d"></span>&nbsp;审批通过</a>
+              </div>
+              <a type="button" class="btn btn-danger" data-toggle="modal" href="#reportNopass"><span aria-hidden="true" data-icon="e"></span>&nbsp;审批不通过</a>
+          </div>
+          <ul class="avatar clearfix">
+            <li class="name">我</li>
+          </ul>
+        </div>
+      </div>
+      <!--审批操作栏-->
+      <!--审批列表-->
+      <div class="reportList">
+        <div class="avatarBar clearfix">
+          <div class="fR">
+            <h4 class="colGreen">审批完成（2015-02-02）</h4>
+          </div>
+          <ul class="avatar clearfix">
+            <li class="num">1</li>
+            <li title="审批通过" class="pass"><span data-icon="d" aria-hidden="true"></span><img src="{{rootUrl}}global/images/avtra.png"></li>
+            <li class="name colGreen">王三</li>
+            <li class="con"><p>审批意见审批意见审批意见审批意见审批意见,萨大声的,审批意见审批意见审批意见审批意见审批意见,萨大声的审批意见审批意见审批意见审批意见审批意见,萨大声的</p></li>
+          </ul>
+        </div>
+      </div>
+      <div class="reportList">
+        <div class="avatarBar clearfix">
+          <div class="fR">
+            <h4 class="colOrange">审批中</h4>
+          </div>
+          <ul class="avatar clearfix">
+            <li class="num">2</li>
+            <li title="审批中" class="wait"><span data-icon="k" aria-hidden="true"></span><img src="{{rootUrl}}global/images/avtra.png"></li>
+            <li class="name colOrange">张三（我）</li>
+          </ul>
+        </div>
+      </div>
+      <div class="reportList">
+        <div class="avatarBar clearfix">
+          <ul class="avatar clearfix">
+            <li class="num">3</li>
+            <li title="" class=""><img src="{{rootUrl}}global/images/avtra.png"></li>
+            <li class="name">李雷</li>
+          </ul>
+        </div>
+      </div>
+      <div class="reportList">
+        <div class="avatarBar clearfix">
+          <div class="fR">
+            <h4 class="colRed">审批不通过（2015-02-02）</h4>
+          </div>
+          <ul class="avatar clearfix">
+            <li class="num">3</li>
+            <li title="审批不通过" class="notpass"><span data-icon="e" aria-hidden="true"></span><img src="{{rootUrl}}global/images/avtra.png"></li>
+            <li class="name colRed">王五</li>
+          </ul>
+        </div>
+      </div>
+      <!--审批列表-->
+    </div>
+
+        <!--内容-->
+    	</div>
+    </div>  
+      <!-- 审批通过 -->
+    <div id="reportPass" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <h3 id="myModalLabel">审批通过</h3>
+      </div>
+      <div class="modal-body">
+        
+      <div class="form">
+        <form>
+        <textarea class="form-control" rows="3" placeholder="填写审批通过的意见" style="width:510px"></textarea>
+        </form>
+      </div>
+      </div>
+      <div class="modal-footer">
+        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+        <button class="btn btn-success">确认审批通过</button>
+      </div>
+    </div>
+    <!-- 审批通过 -->  
+      <!-- 审批不通过 -->
+    <div id="reportNopass" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <h3 id="myModalLabel">审批不通过</h3>
+      </div>
+      <div class="modal-body">
+        
+      <div class="form">
+        <form>
+        <textarea class="form-control" rows="3" placeholder="填写审批不通过的意见" style="width:510px"></textarea>
+        </form>
+      </div>
+      </div>
+      <div class="modal-footer">
+        <button class="btn" data-dismiss="modal" aria-hidden="true">关闭</button>
+        <button class="btn btn-danger">确认审批不通过</button>
+      </div>
+    </div>
+    <!-- 审批不通过 -->      
+<script type="text/javascript">autoFlashHeight();</script>
+</body>