计量支付

在线审批禅道bug

protected/class/measureauditact.php

@@ -7,15 +7,18 @@ Doo::loadModel('measureaudit');
  *
  * @author zongheng
  */
-class MeasureauditAct {
+class MeasureauditAct
+{
 
     private $__measureaudit;
 
-    function __construct() {
+    function __construct()
+    {
         $this->__measureaudit = new MeasureAudit();
     }
 
-    public function insertMeasureAudit($pid, $creatoruid, $auditoruid, $mpid, $pmid, $stid, $numpname, $status = 'uncheck', $last = 2, $times = 0) {
+    public function insertMeasureAudit($pid, $creatoruid, $auditoruid, $mpid, $pmid, $stid, $numpname, $status = 'uncheck', $last = 2, $times = 0)
+    {
         if (!isset($pid))
             return FALSE;
         $this->__measureaudit->pid = filter_var($pid, FILTER_VALIDATE_INT);
@@ -33,106 +36,129 @@ class MeasureauditAct {
         return $this->__measureaudit->insert();
     }
 
-    public function getUncheckRow($uid, $status) {
+    public function getUncheckRow($uid, $status)
+    {
         return $this->__measureaudit->find(array('where' => 'auditoruid=? and mastatus=?', 'param' => array($uid, $status), 'asArray' => TRUE));
     }
 
-    public function getAllRow($uid) {
+    public function getAllRow($uid)
+    {
         return $this->__measureaudit->find(array('where' => 'auditoruid=?', 'param' => array($uid), 'asArray' => TRUE));
     }
 
-    public function getAuditProject($uid) {
+    public function getAuditProject($uid)
+    {
         return $this->__measureaudit->find(array('where' => 'auditoruid=? and last=2', 'groupby' => 'pid', 'param' => array($uid), 'asArray' => TRUE));
     }
 
-    public function getProject($uid) {
+    public function getProject($uid)
+    {
         return $this->__measureaudit->find(array('where' => 'auditoruid=?', 'groupby' => 'pmid,numpname', 'param' => array($uid), 'asArray' => TRUE));
     }
 
-    public function getUncheckMaxMpid($uid, $pid, $status) {
+    public function getUncheckMaxMpid($uid, $pid, $status)
+    {
         return $this->__measureaudit->getOne(array('select' => 'max(mpid) as mpid', 'where' => 'auditoruid=? and pid=? and mastatus=?', 'param' => array($uid, $pid, $status), 'asArray' => TRUE));
     }
 
-    public function setStatusTrue($mpid) {
+    public function setStatusTrue($mpid)
+    {
         $this->__measureaudit->mastatus = 'checked';
         return $this->__measureaudit->update(array('where' => 'mpid=?', 'param' => array($mpid)));
     }
 
-    public function setStatusFalse($mpid) {
+    public function setStatusFalse($mpid)
+    {
         $this->__measureaudit->mastatus = 'checkno';
         return $this->__measureaudit->update(array('where' => 'mpid=?', 'param' => array($mpid)));
     }
 
-    public function getStatusByMpid($mpid) {
+    public function getStatusByMpid($mpid)
+    {
         return $this->__measureaudit->getOne(array('select' => 'mastatus', 'where' => 'mpid=?', 'param' => array($mpid), 'asArray' => TRUE));
     }
 
-    public function getRowByMpid($mpid) {
+    public function getRowByMpid($mpid)
+    {
         return $this->__measureaudit->find(array('where' => 'mpid=?', 'param' => array($mpid), 'asArray' => TRUE));
     }
 
 // for api
-    public function getAlluserMeasureAudit($bid, $num) {
+    public function getAlluserMeasureAudit($bid, $num)
+    {
         $maxtimesArray = $this->getMaxTimes($bid, $num);
         return $this->__measureaudit->find(array('where' => 'pmid=? and numpname=? and times=? order by last desc,maid asc', 'param' => array($bid, $num, $maxtimesArray['maxtimes']), 'asArray' => TRUE));
     }
 
 // for api
-    public function getAllAudit($bid, $num, $times) {
+    public function getAllAudit($bid, $num, $times)
+    {
         return $this->__measureaudit->find(array('where' => 'pmid=? and numpname=? and times=? order by last desc,maid asc', 'param' => array($bid, $num, $times), 'asArray' => TRUE));
     }
 
-    public function getUserAudit($bid, $num, $times = 0) {
+    public function getUserAudit($bid, $num, $times = 0)
+    {
         return $this->__measureaudit->find(array('where' => 'pmid=? and numpname=? and times=? order by maid asc', 'param' => array($bid, $num, $times), 'asArray' => TRUE));
     }
 
-    public function getUserAuditLast($bid, $num) {
+    public function getUserAuditLast($bid, $num)
+    {
         $maxtimesArray = $this->getMaxTimes($bid, $num);
         return $this->__measureaudit->find(array('where' => 'pmid=? and numpname=? and times=? order by maid asc', 'param' => array($bid, $num, $maxtimesArray['maxtimes']), 'asArray' => TRUE));
     }
 
-    public function getRowbyUID($audituid) {
+    public function getRowbyUID($audituid)
+    {
         return $this->__measureaudit->find(array('where' => 'auditoruid=?', 'param' => array($audituid), 'asArray' => TRUE));
     }
 
-    public function getCheckedRowbyUID($audituid) {
+    public function getCheckedRowbyUID($audituid)
+    {
         return $this->__measureaudit->find(array('where' => 'auditoruid=? and ((mastatus=\'uncheck\' or mastatus=\'checking\') or (mastatus=\'checked\' and DATE_SUB(CURDATE(), INTERVAL 7 DAY) <= audittime))', 'param' => array($audituid), 'asArray' => TRUE));
     }
 
-    public function getCheckedRowbyUID2($audituid) {
+    public function getCheckedRowbyUID2($audituid)
+    {
         return $this->__measureaudit->find(array('where' => '(mastatus=\'checking\') and auditoruid=?', 'groupby' => 'pmid,numpname', 'param' => array($audituid), 'asArray' => TRUE));
     }
 
-    public function getMyRecord($audituid) {
+    public function getMyRecord($audituid)
+    {
         Doo::db()->connect();
         $reArray = Doo::db()->fetchAll('select a.* from jl_measure_audit a inner join (select pmid ,numpname, max(times) times from jl_measure_audit group by pmid,numpname) b on a.pmid = b.pmid and a.numpname = b.numpname and a.times = b.times   and (mastatus=\'uncheck\' or mastatus=\'checking\') and auditoruid=? order by a.pmid', array($audituid));
         Doo::db()->disconnect();
         return $reArray;
     }
 
-    public function getMyRecord2($audituid) {
+    public function getMyRecord2($audituid)
+    {
         $resArray = Doo::db()->fetchAll('select a.* from jl_measure_audit a inner join (select pmid ,numpname, max(times) times from jl_measure_audit group by pmid,numpname) b on a.pmid = b.pmid and a.numpname = b.numpname and a.times = b.times  and auditoruid=? order by a.pmid', array($audituid));
         Doo::db()->disconnect();
         return $resArray;
     }
 
-    public function getMyAllRecord($audituid) {
+    public function getMyAllRecord($audituid)
+    {
         return Doo::db()->query('select a.* from jl_measure_audit a inner join (select pmid ,numpname, max(times) times from jl_measure_audit group by pmid,numpname) b on a.pmid = b.pmid and a.numpname = b.numpname and a.times = b.times   and auditoruid=? order by a.pmid', array($audituid));
     }
 
-    public function getUpUIDStatus($pmid, $numpname, $creatoruid) {
+    public function getUpUIDStatus($pmid, $numpname, $creatoruid)
+    {
         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 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) {
+    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));
     }
 
-    public function updateMastatus($maid) {
+    public function updateMastatus($maid)
+    {
         $this->__measureaudit->mastatus = 'checking';
         $this->__measureaudit->auditcontent = '';
         $this->__measureaudit->audittime = '';
@@ -140,12 +166,14 @@ class MeasureauditAct {
     }
 
     // for api
-    public function updateAuditorMPID($mpid, $tenderid, $phaseno, $times = 0) {
+    public function updateAuditorMPID($mpid, $tenderid, $phaseno, $times = 0)
+    {
         $this->__measureaudit->mpid = $mpid;
         return $this->__measureaudit->update(array('where' => 'pmid=? and numpname=? and times=?', 'param' => array($tenderid, $phaseno, $times)));
     }
 
-    public function setCheckno($maid, $auditcontent = NULL,$isonline=0) {
+    public function setCheckno($maid, $auditcontent = NULL, $isonline = 0)
+    {
         $this->__measureaudit->mastatus = 'checkno';
         $this->__measureaudit->audittime = time();
         $this->__measureaudit->onlineaudit = $isonline;
@@ -154,7 +182,8 @@ class MeasureauditAct {
         return $this->__measureaudit->update(array('where' => 'maid=?', 'param' => array($maid)));
     }
 
-    public function setStatusTo($maid, $status = 3, $auditcontent = '',$isonline=0) {
+    public function setStatusTo($maid, $status = 3, $auditcontent = '', $isonline = 0)
+    {
         if ($status == 3) {
             $this->__measureaudit->mastatus = 'checked';
         }
@@ -169,66 +198,80 @@ class MeasureauditAct {
         return $this->__measureaudit->update(array('where' => 'maid=?', 'param' => array($maid)));
     }
 
-    public function getRowInfo($pmid, $numpname, $auditoruid) {
+    public function getRowInfo($pmid, $numpname, $auditoruid)
+    {
         return $this->__measureaudit->getOne(array('where' => 'pmid=? and numpname=? and auditoruid=?', 'desc' => 'times', 'param' => array($pmid, $numpname, $auditoruid), 'asArray' => TRUE));
     }
 
 // for api
-    public function getLastNewRowInfo($pmid, $numpname, $auditoruid) {
+    public function getLastNewRowInfo($pmid, $numpname, $auditoruid)
+    {
         $maxtimesArray = $this->getMaxTimes($pmid, $numpname);
         return $this->__measureaudit->getOne(array('where' => 'pmid=? and numpname=? and auditoruid=? and times=?', 'param' => array($pmid, $numpname, $auditoruid, $maxtimesArray['maxtimes']), 'asArray' => TRUE));
     }
 
-    public function getStatusTender($pmid, $numpname) {
+    public function getStatusTender($pmid, $numpname)
+    {
         return $this->__measureaudit->getOne(array('where' => 'pmid=? and numpname=? and last=1', 'param' => array($pmid, $numpname), 'asArray' => TRUE));
     }
 
-    public function getStatusTen($pmid, $numpname) {
+    public function getStatusTen($pmid, $numpname)
+    {
         return $this->__measureaudit->find(array('where' => 'pmid=? and numpname=?', 'param' => array($pmid, $numpname), 'asArray' => TRUE));
     }
 
-    public function getAuditUser($bid, $num) {
+    public function getAuditUser($bid, $num)
+    {
         return $this->__measureaudit->find(array('where' => 'pmid=? and numpname=? order by last desc,maid asc', 'param' => array($bid, $num), 'asArray' => TRUE));
     }
 
     // 去重复
-    public function getAuditUserRedo($bid, $num) {
+    public function getAuditUserRedo($bid, $num)
+    {
         $maxtimesArray = $this->getMaxTimes($bid, $num);
         return $this->__measureaudit->find(array('where' => 'pmid=? and numpname=? and times=? order by last desc,maid asc', 'param' => array($bid, $num, $maxtimesArray['maxtimes']), 'asArray' => TRUE));
     }
 
     // 去重复
-    public function getMaxTimes($bid, $num) {
+    public function getMaxTimes($bid, $num)
+    {
         return $this->__measureaudit->getOne(array('select' => 'max(times) as maxtimes', 'where' => 'pmid=? and numpname=?', 'param' => array($bid, $num), 'asArray' => TRUE));
     }
 
-    public function getMaxTimesInt($bid, $num) {
+    public function getMaxTimesInt($bid, $num)
+    {
         return $this->__measureaudit->getOne(array('select' => 'max(times) as maxtimes', 'where' => 'pmid=? and numpname=?', 'param' => array($bid, $num), 'asArray' => TRUE))['maxtimes'];
     }
 
-    public function delAuditUser($tenderid, $phaseno, $uid) {
+    public function delAuditUser($tenderid, $phaseno, $uid)
+    {
         return $this->__measureaudit->delete(array('where' => 'pmid=? and numpname=? and auditoruid=?', 'param' => array($tenderid, $phaseno, $uid), 'asArray' => TRUE));
     }
 
-    public function delAuditUserTimes($tenderid, $phaseno, $uid, $times = 0) {
+    public function delAuditUserTimes($tenderid, $phaseno, $uid, $times = 0)
+    {
         return $this->__measureaudit->delete(array('where' => 'pmid=? and numpname=? and auditoruid=? and times=?', 'param' => array($tenderid, $phaseno, $uid, $times), 'asArray' => TRUE));
     }
 
-    public function getCurrUserAllProject($audituid) {
+    public function getCurrUserAllProject($audituid)
+    {
         return $this->__measureaudit->find(array('where' => 'auditoruid=?', 'param' => array($audituid), 'desc' => 'numpname,times', 'groupby' => 'pmid', 'asArray' => TRUE));
     }
 
     // for API 获取用户参与PMID组
-    public function getPmidGroup($audituid) {
+    public function getPmidGroup($audituid)
+    {
         return $this->__measureaudit->find(array('where' => 'auditoruid=?', 'param' => array($audituid), 'groupby' => 'pmid', 'asArray' => TRUE));
     }
 
     // for API 根据pmid,审核人id 获取最新一期最新一次记录
-    public function getLastNumTimes($pmid, $audituid) {
+    public function getLastNumTimes($pmid, $audituid)
+    {
         return $this->__measureaudit->getOne(array('where' => 'auditoruid=? and pmid=?', 'desc' => 'maid', 'param' => array($audituid, $pmid), 'asArray' => TRUE));
     }
 
-    public function getUserPmid($audituid) {
+    public function getUserPmid($audituid)
+    {
         return $this->__measureaudit->find(array('select' => 'pmid', 'where' => 'auditoruid=?', 'param' => array($audituid), 'groupby' => 'pmid', 'asArray' => TRUE));
     }
 
@@ -239,9 +282,27 @@ class MeasureauditAct {
      * @return type
      *  最新一次的
      */
-    public function getAuditOpinion($tenderid, $phaseno) {
+    public function getAuditOpinion($tenderid, $phaseno)
+    {
         $maxtimesArray = $this->getMaxTimes($tenderid, $phaseno);
         return $this->__measureaudit->find(array('select' => 'auditoruid,auditcontent', 'where' => 'pmid=? and numpname=? and times=?', 'param' => array($tenderid, $phaseno, $maxtimesArray['maxtimes']), 'asArray' => TRUE));
     }
 
+    public function getMyChecking($pid, $auditoruid, $all = false)
+    {
+        if ($all) {
+            return $this->__measureaudit->find(array('where' => 'pid=? and auditoruid=? and mastatus=\'checking\'', 'param' => array($pid, $auditoruid), 'asArray' => TRUE));
+        } else {
+            return $this->__measureaudit->getOne(array('where' => 'pid=? and auditoruid=? and mastatus=\'checking\'', 'param' => array($pid, $auditoruid), 'asArray' => TRUE));
+        }
+
+    }
+
+    public function getCountMyChecking($pid, $auditoruid)
+    {
+
+        return $this->__measureaudit->count(array('where' => 'pid=? and auditoruid=? and mastatus=\'checking\'', 'param' => array($pid, $auditoruid)));
+
+    }
+
 }

protected/controller/RProjectController.php

@@ -56,7 +56,11 @@ class RProjectController extends DooController
         $mpidArray = $this->measureauditact->getAuditProject($this->auth->getUid());
         if (isset($mpidArray[0]['pid'])) {
             foreach ($mpidArray as $key => $value) {
+                // 审批操作按照时间排序多标段
+                $numOfChecking = $this->measureauditact->getCountMyChecking($value['pid'], $this->auth->getUid());
+                // end
                 $this->data['proArray'][$key] = $this->project->getRowByPid($value['pid']);
+                $this->data['proArray'][$key]['numofchecking'] = $numOfChecking;
                 $this->data['proArray'][$key]['contracttotal'] = $this->actmeasure->getTotalWithPid($value['pid']);
                 $this->data['proArray'][$key]['changTotal'] = $this->numofperact->getChangTotal($value['pid']);
 //                $this->data['proArray'][$key]['contracttotal'] += $this->data['proArray'][$key]['changTotal'];
@@ -88,7 +92,11 @@ class RProjectController extends DooController
 
     public function proSection()
     {
-        $this->data['allproArray'] = $this->project->getAll();
+        $mpidArray = $this->measureauditact->getAuditProject($this->auth->getUid());
+        foreach ($mpidArray as $k1 => $v1) {
+            if ($v1['pid'] != $this->params['pid'])
+                $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
+        }
         $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
         $this->data['conArray'] = $this->contractact->getRowByPid($this->params['pid']);
         $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
@@ -135,7 +143,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/'.$numStatusArray['mpid'].'">' . $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>
@@ -166,7 +174,11 @@ class RProjectController extends DooController
 
     function proSectionMeasure()
     {
-        $this->data['allproArray'] = $this->project->getAll();
+        $mpidArray = $this->measureauditact->getAuditProject($this->auth->getUid());
+        foreach ($mpidArray as $k1 => $v1) {
+            if ($v1['pid'] != $this->params['pid'])
+                $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
+        }
         $this->data['currproArray'] = $this->project->getRowByPid($this->params['pid']);
         $this->data['pid'] = $this->params['pid'];
         $this->data['mpid'] = $this->params['mpid'];
@@ -249,7 +261,11 @@ class RProjectController extends DooController
     public function proDetail()
     {
         // 项目名称
-        $this->data['allproArray'] = $this->project->getAll();
+        $mpidArray = $this->measureauditact->getAuditProject($this->auth->getUid());
+        foreach ($mpidArray as $k1 => $v1) {
+            if ($v1['pid'] != $this->params['pid'])
+                $this->data['allproArray'][] = $this->project->getRowByPid($v1['pid']);
+        }
         $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']);
@@ -310,14 +326,14 @@ class RProjectController extends DooController
         if ($_POST['act'] == 'p') {
             if ($this->measureauditact->setStatusTo($auditArray['maid'], 3, $_POST['content'], 1)) {
                 $countAudit = count($auditUserArray);
-                if ($auditArray['last'] == '1') {
+                if ($auditArray['last'] == 1) {
                     $this->measureauditact->setStatusTo($auditUserArray[0]['maid'], 3);
                     $this->numofperact->updateAuditStatus($lastRowArray['pmid'], $lastRowArray['numpname'], 'checked', $maxTimes['times']);
                     echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
                     die();
                 } else {
-                    if (($countAudit == 2) && ($auditUserArray[0]['last'] == 1) && ($auditUserArray[1]['maid'] == $auditArray['maid'])) {
-                        $this->measureauditact->updateMastatus($auditUserArray[0]['maid']);
+                    if (($countAudit == 2) && ($auditUserArray[1]['last'] == 1) && ($auditUserArray[0]['maid'] == $auditArray['maid'])) {
+                        $this->measureauditact->updateMastatus($auditUserArray[1]['maid']);
                         $this->numofperact->updateAuditStatus($lastRowArray['pmid'], $lastRowArray['numpname'], 'checking', $maxTimes['times']);
                         echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
                         die();
@@ -352,6 +368,7 @@ class RProjectController extends DooController
         $this->data['times'] = $lastRowArray['times'];
         $this->data['pid'] = $this->params['pid'];
         foreach ($auditUserArray as $key => $value) {
+            $i = $key + 1;
             if ($value['auditoruid'] == $this->auth->getUid()) {
                 $this->data['mastatus'] = $value['mastatus'];
                 $this->data['maid'] = $value['maid'];
@@ -359,31 +376,27 @@ class RProjectController extends DooController
             if ($value['mastatus'] == 'uncheck') {
                 $statuStr = '';
                 $statucolorStr = '';
-                $classStr = '';
-                $icoStr = '';
+                $statushtml = '<li title="" class=""><img src="' . Doo::conf()->APP_URL . 'global/images/avtra.png"></li>';
             }
             if ($value['mastatus'] == 'checking') {
                 $statuStr = '<h4 class="colOrange">审核中</h4>';
                 $statucolorStr = 'colOrange';
-                $classStr = 'wait';
-                $icoStr = 'k';
+                $statushtml = '<li title="审批中" class="wait"><span data-icon="k" aria-hidden="true"></span> <img src="' . Doo::conf()->APP_URL . 'global/images/avtra.png"></li>';
             }
             if ($value['mastatus'] == 'checked') {
                 $statuStr = '<h4 class="colGreen">审批完成（' . date('Y-m-d', $value['audittime']) . '）</h4>';
                 $statucolorStr = 'colGreen';
-                $classStr = 'pass';
-                $icoStr = 'd';
+                $statushtml = '<li title="审批通过" class="pass"><span data-icon="d" aria-hidden="true"></span><img src="' . Doo::conf()->APP_URL . 'global/images/avtra.png"></li>';
             }
             if ($value['mastatus'] == 'checkno') {
                 $statuStr = '<h4 class="colRed">审批不通过（' . date('Y-m-d', $value['audittime']) . '）</h4>';
                 $statucolorStr = 'colRed';
-                $classStr = 'notpass';
-                $icoStr = 'e';
+                $statushtml = '<li title="审批不通过" class="notpass"><span data-icon="e" aria-hidden="true"></span><img src="' . Doo::conf()->APP_URL . 'global/images/avtra.png"></li>';
             }
             $auditUserArray[$key]['statuStr'] = $statuStr;
             $auditUserArray[$key]['statucolorStr'] = $statucolorStr;
-            $auditUserArray[$key]['classStr'] = $classStr;
-            $auditUserArray[$key]['icoStr'] = $icoStr;
+            $auditUserArray[$key]['statushtml'] = $statushtml;
+            $auditUserArray[$key]['k'] = $i;
             $auditUserArray[$key]['name'] = $this->profile->getProWithUid($value['auditoruid'])['name'];
         }
         $this->data['auditArray'] = $auditUserArray;

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

@@ -22,7 +22,7 @@
 		<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 title="返回" href="{{rootUrl}}rproject/{{pid}}/section"><span class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
 			    <li class="dropdown">
 				<a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown" class="dropdown-toggle">
 				    {{currproArray.pname}}<b class="caret"></b>

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

@@ -22,7 +22,7 @@
          <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 title="返回" href="{{rootUrl}}rproject/{{pid}}/section"><span class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
           <li class="dropdown">
             <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}" data-toggle="dropdown" class="dropdown-toggle">
               第{{ToChinaseNum(currnum)}}期<b class="caret"></b>
@@ -38,7 +38,7 @@
      <!--导航-->
      <ul class="nav nav-tabs">
          <li>
-             <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
+             <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail/{{mpid}}">标段概况</a>
          </li>
          <!--<li>-->
          <!--<a href="/rproject/{{pid}}/section/{{pmid}}/measure">审批</a>-->
@@ -108,8 +108,8 @@
             {{auditArray' value.statuStr}}
           </div>
           <ul class="avatar clearfix">
-            <li class="num">1</li>
-            <li title="审批通过" class="{{auditArray' value.classStr}}"><span data-icon="{{auditArray' value.icoStr}}" aria-hidden="true"></span><img src="{{rootUrl}}global/images/avtra.png"></li>
+            <li class="num">{{auditArray' value.k}}</li>
+              {{auditArray' value.statushtml}}
             <li class="name {{auditArray' value.statucolorStr}}">{{auditArray' value.name}}</li>
             <li class="con"><p>{{auditArray' value.auditcontent}}</p></li>
           </ul>
@@ -179,7 +179,8 @@
             data:{"act":act,"pmid":pmid,"numpname":numpname,"times":times,"content":content},
             url:"/rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}",
             success: function(data){
-                location.href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}";
+                if(data['status']==1)
+                window.location.href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}";
             }
         });
     });

protected/view/r-project.html

@@ -46,7 +46,7 @@
 					<div class="bar bar-success" style="width: {{proArray' value.pcurrdone}};">{{proArray' value.pcurrdone}}</div>
 				    </div>
 				</div>
-				<!--<div class="detail2 fR"><p style="margin:0 0 5px 0">{{proArray' value.pid}}（<b>第七期</b>）</p><p><a href="{{rootUrl}}rproject/{{proArray' value.pid}}/section/{{proArray' value.pid}}/measure" class="btn btn-warning btn-small">开始审批</a></p><p><b class="colGreen">已完成</b></p><p><b class="colOrange">待审批</b></p></div>-->
+				<div class="detail2 fR"><p style="margin:0 0 5px 0" class="colOrange">有 <b>{{proArray' value.numofchecking}}</b> 个标段需要审批</p></div>
 			    </div>
 			</div>
 			<!-- endloop -->

protected/view/w-project-detail.html

@@ -195,7 +195,7 @@
 										name: '金额',
 										position: 'left',
 										axisLabel: {
-										formatter: '{value} 元'
+										formatter: '{value}'
 										},
 										splitArea: {show: true}
 									},