计量支付

在线审批 禅道945 增加在线审批标段链接选项

protected/config/routes.conf.php

@@ -19,7 +19,7 @@ $route['*']['/project/:pid/section/:pmid/detail'] = array('ProjectController', '
 $route['*']['/rproject/index'] = array('RProjectController', 'index');
 $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/:pid/section/:pmid/detail/:mpid'] = array('RProjectController', 'proDetail');
 $route['*']['/rproject/:pmid/measure/detail'] = array('RProjectController', 'proMeasure');
 $route['*']['/rproject/:pid/section/:pmid/report/:mpid'] = array('RProjectController', 'proReport');
 // S

protected/controller/RProjectController.php

@@ -135,7 +135,7 @@ class RProjectController extends DooController
                             $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><a href="/rproject/' . $this->params['pid'] . '/section/' . $v['pmid'] . '/detail/'.$numStatusArray['mpid'].'">' . $v['pmname'] . '</a></td>
                                     <td class="">第 ' . $countNum . ' 期 ' . $buttonhtml . '</td>
                                     <td class="taR">￥' . number_format($v['contracttotal'], 2, '.', ',') . '</td>
                                     <td>
@@ -252,6 +252,7 @@ class RProjectController extends DooController
         $this->data['allproArray'] = $this->project->getAll();
         $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
         $this->data['MeasureArray'] = $this->numofperact->getGroupByLastOne($this->params['pmid']);
+        $this->data['MeasureArray'] = $this->numofperact->getGroupByLastOne($this->params['pmid']);
         $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
         foreach ($this->data['MeasureArray'] as $key => $value) {
             if ($measureArray['contracttotal'] > ($value['currdone'] > 0)) {
@@ -262,6 +263,7 @@ class RProjectController extends DooController
         }
         $this->data['pmid'] = $this->params['pmid'];
         $this->data['pid'] = $this->params['pid'];
+        $this->data['mpid'] = $this->params['mpid'];
         $this->render('r-project-section-detail', $this->data, TRUE);
     }
 

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

@@ -69,7 +69,12 @@
 			<li class="active">
 			    <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
 			</li>
-			<!--<li><a href="/rproject/{{pid}}/section/{{pmid}}/measure">计量台帐</a></li>-->
+            <!--<li>-->
+                <!--<a href="/rproject/{{pid}}/section/{{pmid}}/measure">审批</a>-->
+            <!--</li>-->
+			<li>
+                <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
+            </li>
 		    </ul>
 		    <!--导航-->
 		    <div class="project">

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

@@ -35,6 +35,19 @@
           </li>
         </ul>
       </div>
+     <!--导航-->
+     <ul class="nav nav-tabs">
+         <li>
+             <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
+         </li>
+         <!--<li>-->
+         <!--<a href="/rproject/{{pid}}/section/{{pmid}}/measure">审批</a>-->
+         <!--</li>-->
+         <li class="active">
+             <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
+         </li>
+     </ul>
+     <!--导航-->
       <!--本期数据-->
       <div >
           <table class="table table-striped">
@@ -108,7 +121,7 @@
 
         <!--内容-->
     	</div>
-    </div>  
+    </div>
       <!-- 审批通过 -->
     <div id="reportPass" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
       <div class="modal-header">
@@ -116,7 +129,7 @@
         <h3 id="myModalLabel">审批通过</h3>
       </div>
       <div class="modal-body">
-        
+
       <div class="form">
         <form>
         <textarea  name="content" id="content" class="form-control" rows="3" placeholder="填写审批通过的意见" style="width:510px"></textarea>
@@ -128,7 +141,7 @@
         <button class="btn btn-success auditclass" act="p" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}" times="{{times}}"  id="pass">确认审批通过</button>
       </div>
     </div>
-    <!-- 审批通过 -->  
+    <!-- 审批通过 -->
       <!-- 审批不通过 -->
     <div id="reportNopass" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
       <div class="modal-header">
@@ -136,7 +149,7 @@
         <h3 id="myModalLabel">审批不通过</h3>
       </div>
       <div class="modal-body">
-        
+
       <div class="form">
         <form>
         <textarea name="content" id="content" class="form-control" rows="3" placeholder="填写审批不通过的意见" style="width:510px"></textarea>
@@ -148,7 +161,7 @@
         <button class="btn btn-danger auditclass" act="np" maid="{{maid}}" pmid="{{pmid}}" numpname="{{numpname}}" times="{{times}}">确认审批不通过</button>
       </div>
     </div>
-    <!-- 审批不通过 -->      
+    <!-- 审批不通过 -->
 <script type="text/javascript">autoFlashHeight();</script>
 <script type="text/javascript">
   $(document).ready(function(){