|
@@ -130,7 +130,7 @@ class RProjectController extends DooController
|
|
|
}
|
|
|
$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>';
|
|
|
+ $buttonhtml = '<a class="btn btn-warning btn-small" href="/rproject/'.$this->params['pid'].'/section/'.$v['pmid'].'/report/'.$numStatusArray['mpid'].'">开始审批</a>';
|
|
|
}else{
|
|
|
$buttonhtml = '(<span class="colOrange">' . $this->statusArray[$numStatusArray['currstatus']] . '</span>)';
|
|
|
}
|
|
@@ -267,6 +267,32 @@ class RProjectController extends DooController
|
|
|
|
|
|
public function proReport()
|
|
|
{
|
|
|
+ // 面包屑导航
|
|
|
+
|
|
|
+
|
|
|
+ // 期数列表
|
|
|
+ $tmpArray = $this->numofperact->getGroupByLastOne($this->params['pmid']);
|
|
|
+ foreach($tmpArray as $k => $v){
|
|
|
+ if($v['mpid']==$this->params['mpid']){
|
|
|
+ $this->data['currnum'] = $v['numpname'];
|
|
|
+ $this->data['mpid'] = $v['mpid'];
|
|
|
+ $this->data['MeasureArray2'][] = $v;
|
|
|
+ }else{
|
|
|
+ $this->data['numArray'][] = $v;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $measureArray = $this->actmeasure->getRowByPmid($this->params['pmid']);
|
|
|
+ foreach ($this->data['MeasureArray2'] as $key => $value) {
|
|
|
+ if($value['mpid']==$this->params['mpid']){
|
|
|
+ $this->data['MeasureArray2'][$key]['currstatus'] = $this->statusArray[$value['currstatus']];
|
|
|
+ if ($measureArray['contracttotal'] > ($value['currdone'] > 0)) {
|
|
|
+ $this->data['MeasureArray2'][$key]['lessTotal'] = round(($value['currdone'] / $measureArray['contracttotal']) * 100);
|
|
|
+ } else {
|
|
|
+ $this->data['MeasureArray2'][$key]['lessTotal'] = 0;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //
|
|
|
$lastRowArray = $this->numofperact->getLastNew2($this->params['pmid']);
|
|
|
$auditUserArray = $this->measureauditact->getAllAudit($lastRowArray['pmid'],$lastRowArray['numpname'],$lastRowArray['times']);
|
|
|
$auditArray = $this->measureauditact->getLastNewRowInfo($lastRowArray['pmid'], $lastRowArray['numpname'], $this->auth->getUid());
|
|
@@ -348,6 +374,8 @@ class RProjectController extends DooController
|
|
|
$auditUserArray[$key]['name'] = $this->profile->getProWithUid($value['auditoruid'])['name'];
|
|
|
}
|
|
|
$this->data['auditArray'] = $auditUserArray;
|
|
|
+ $this->data['pmid'] = $this->params['pmid'];
|
|
|
+ $this->data['pid'] = $this->params['pid'];
|
|
|
$this->render('r-project-section-report', $this->data, TRUE);
|
|
|
}
|
|
|
}
|