Quellcode durchsuchen

计量支付在线审批
审批页面信息显示
无锁接口变更拉去文件名称

NoNZero vor 9 Jahren
Ursprung
Commit
ced8c5b076

+ 1 - 1
protected/config/routes.conf.php

@@ -21,7 +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');
+$route['*']['/rproject/:pid/section/:pmid/report/:mpid'] = array('RProjectController', 'proReport');
 // S
 $route['get']['/sproject/index'] = array('SProjectController', 'index');
 $route['get']['/sproject/:pid/section'] = array('SProjectController', 'proSection');

+ 5 - 2
protected/controller/ClientController.php

@@ -253,7 +253,10 @@ class ClientController extends DooController
                     if ($value['mastatus'] != 'uncheck') {
                         $isUnCheck = FALSE;
                     }
-                    $auditInfo[] = array('uid' => $userArray['userid'], 'name' => $userArray['name'], 'company' => $userArray['company'], 'jobs' => $userArray['jobs'], 'avatar' => $this->auth->getAvatar($value['auditoruid']), 'mastatus' => $this->statusArray[$value['mastatus']], 'CheckerMemo' => $value['auditcontent']);
+                    if($value['audittime']>0){
+                        $value['audittime'] = date('Y-m-d',$value['audittime']);
+                    }
+                    $auditInfo[] = array('uid' => $userArray['userid'], 'name' => $userArray['name'], 'company' => $userArray['company'], 'jobs' => $userArray['jobs'], 'avatar' => $this->auth->getAvatar($value['auditoruid']), 'mastatus' => $this->statusArray[$value['mastatus']], 'CheckerMemo' => $value['auditcontent'],'onlineaudit' => $value['onlineaudit'],'audittime'=>$value['audittime']);
                 }
             }
             if ($ownerStatusArray) {
@@ -967,7 +970,7 @@ class ClientController extends DooController
                 $downArray = NULL;
                 $pathinfo = pathinfo($urlinfoArray['filepath']);
                 if (isset($pathinfo['dirname']))
-                    $downArray[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo['dirname'] . '/' . $pathinfo['filename'] . '/ProjectFile_UnLock', 'MD5_Jl' => $urlinfoArray['filehashcode'], 'proName' => $proArray['pname'], 'stName' => $stArray['stname'], 'pnameid' => $proArray['pid'], 'ptypeid' => $stArray['stid'], 'BidName' => $MeasureArray['pmname']);
+                    $downArray[] = array('downurl' => Doo::conf()->APP_URL . $pathinfo['dirname'] . '/' . $pathinfo['filename'] . '/ProjectFile.rmf', 'MD5_Jl' => $urlinfoArray['filehashcode'], 'proName' => $proArray['pname'], 'stName' => $stArray['stname'], 'pnameid' => $proArray['pid'], 'ptypeid' => $stArray['stid'], 'BidName' => $MeasureArray['pmname']);
                 echo json_encode(array('status' => TRUE, 'msg' => '', 'info' => $downArray), JSON_UNESCAPED_UNICODE);
                 die();
             } else {

+ 29 - 1
protected/controller/RProjectController.php

@@ -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);
     }
 }

Datei-Diff unterdrückt, da er zu groß ist
+ 12 - 48
protected/view/r-project-section-report.html