1.9.0 no.6 up

protected/controller/RProjectController.php

@@ -335,13 +335,19 @@ class RProjectController extends DooController
         // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
         $actmeasureArray = $this->actmeasure->getAll();
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
-                if (($vvvv['pmid'] == $this->params['pmid'])) {
-                    $this->data['curractmeasureArray'] = $vvvv;
-                } else {
-                    $this->data['allactmeasureArray'][] = $vvvv;
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
                 }
             }
         }
@@ -448,13 +454,19 @@ class RProjectController extends DooController
         // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
         $actmeasureArray = $this->actmeasure->getAll();
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
-                if (($vvvv['pmid'] == $this->params['pmid'])) {
-                    $this->data['curractmeasureArray'] = $vvvv;
-                } else {
-                    $this->data['allactmeasureArray'][] = $vvvv;
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
                 }
             }
         }
@@ -635,13 +647,19 @@ class RProjectController extends DooController
         // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
         $actmeasureArray = $this->actmeasure->getAll();
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
-                if (($vvvv['pmid'] == $this->params['pmid'])) {
-                    $this->data['curractmeasureArray'] = $vvvv;
-                } else {
-                    $this->data['allactmeasureArray'][] = $vvvv;
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
                 }
             }
         }
@@ -690,13 +708,19 @@ class RProjectController extends DooController
         // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
         $actmeasureArray = $this->actmeasure->getAll();
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
-                if (($vvvv['pmid'] == $this->params['pmid'])) {
-                    $this->data['curractmeasureArray'] = $vvvv;
-                } else {
-                    $this->data['allactmeasureArray'][] = $vvvv;
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
                 }
             }
         }
@@ -930,13 +954,19 @@ class RProjectController extends DooController
         // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
+        $auditArray = $this->measureauditact->getUserPmid($this->auth->getUid());
+        foreach ($auditArray as $key => $value) {
+            $pmidArray[] = $value['pmid'];
+        }
         $actmeasureArray = $this->actmeasure->getAll();
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
-                if (($vvvv['pmid'] == $this->params['pmid'])) {
-                    $this->data['curractmeasureArray'] = $vvvv;
-                } else {
-                    $this->data['allactmeasureArray'][] = $vvvv;
+                if(in_array($vvvv['pmid'],$pmidArray)) {
+                    if (($vvvv['pmid'] == $this->params['pmid'])) {
+                        $this->data['curractmeasureArray'] = $vvvv;
+                    } else {
+                        $this->data['allactmeasureArray'][] = $vvvv;
+                    }
                 }
             }
         }

protected/controller/SProjectController.php

@@ -166,6 +166,8 @@ class SProjectController extends DooController
         // 标段
         // 搜索有没有相应的月份，有就把实际赋值，没有就为零
         $this->data['MeasureArray'] = $this->actmeasure->getRowsByPid($this->params['pid']);
+        $this->data['MyMeasureArray'] = array();
+        $i = 0;
         $totalstid = 0;
         $monthArray = [];
         foreach ($this->data['MeasureArray'] as $key => $value) {
@@ -227,6 +229,11 @@ class SProjectController extends DooController
             foreach ($month1 as $k => $v) {
                 $allmonth1[] = $v;
             }
+
+            if($value['uid'] == $this->auth->getUid()){
+                $this->data['MyMeasureArray'][$i] = $this->data['MeasureArray'][$key];
+                $i++;
+            }
         }
 
         // 中文表述年月
@@ -305,7 +312,8 @@ class SProjectController extends DooController
         // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
-        $actmeasureArray = $this->actmeasure->getAll();
+//        $actmeasureArray = $this->actmeasure->getAll();
+        $actmeasureArray = $this->actmeasure->getRowUser($this->auth->getUid());
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
                 if (($vvvv['pmid'] == $this->params['pmid'])) {
@@ -476,7 +484,7 @@ class SProjectController extends DooController
 // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
-        $actmeasureArray = $this->actmeasure->getAll();
+        $actmeasureArray = $this->actmeasure->getRowUser($this->auth->getUid());
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
                 if (($vvvv['pmid'] == $this->params['pmid'])) {
@@ -597,7 +605,7 @@ class SProjectController extends DooController
 // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
-        $actmeasureArray = $this->actmeasure->getAll();
+        $actmeasureArray = $this->actmeasure->getRowUser($this->auth->getUid());
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {
                 if (($vvvv['pmid'] == $this->params['pmid'])) {
@@ -704,7 +712,6 @@ class SProjectController extends DooController
         // 面包屑导航标段
         $this->data['curractmeasureArray'] = NULL;
         $this->data['allactmeasureArray'] = [];
-//        $actmeasureArray = $this->actmeasure->getAll();
         $actmeasureArray = $this->actmeasure->getRowUser($this->auth->getUid());
         foreach ($actmeasureArray as $kkkk => $vvvv) {
             if ($vvvv['stid'] == $measureArray['stid']) {

protected/view/s-project-section.html

@@ -54,12 +54,12 @@
 						</table>
 						<div style="height:264px;overflow-y:auto">
 							<table class="table table-striped">
-								<!-- loop MeasureArray -->
+								<!-- loop MyMeasureArray -->
 								<tr>
-									<td width="15%"><a href="{{rootUrl}}sproject/{{MeasureArray' value.pid}}/section/{{MeasureArray' value.pmid}}/detail">{{MeasureArray' value.pmname}}</a><br>{{MeasureArray' value.type}}</td><td width="16%" class="taR">￥<b>{{MeasureArray' value.totalplus}}</b><br>第 {{MeasureArray' value.totalnum}} 期（<span class="colOrange">{{MeasureArray' value.ownstatus}}</span>）</td><td width="40%" class="taR"><div class="progress">
-									<div data-original-title="截止上期完成：￥{{MeasureArray' value.nstopnow}}" data-toggle="tooltip" data-placement="bottom" style="width: {{MeasureArray' value.dispstopnow}};" class="progress-bar progress-bar-success">{{MeasureArray' value.dispstopnow}}</div>
-									<div data-original-title="本期完成：￥{{MeasureArray' value.ncurrdone}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MeasureArray' value.dispcurrdone}}" class="progress-bar">{{MeasureArray' value.dispcurrdone}}</div>
-									<div data-original-title="未完成：￥{{MeasureArray' value.nless}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MeasureArray' value.pless}}" class="progress-bar progress-bar-gary">{{MeasureArray' value.pless}}</div>
+									<td width="15%"><a href="{{rootUrl}}sproject/{{MyMeasureArray' value.pid}}/section/{{MyMeasureArray' value.pmid}}/detail">{{MyMeasureArray' value.pmname}}</a><br>{{MyMeasureArray' value.type}}</td><td width="16%" class="taR">￥<b>{{MyMeasureArray' value.totalplus}}</b><br>第 {{MyMeasureArray' value.totalnum}} 期（<span class="colOrange">{{MyMeasureArray' value.ownstatus}}</span>）</td><td width="40%" class="taR"><div class="progress">
+									<div data-original-title="截止上期完成：￥{{MyMeasureArray' value.nstopnow}}" data-toggle="tooltip" data-placement="bottom" style="width: {{MyMeasureArray' value.dispstopnow}};" class="progress-bar progress-bar-success">{{MyMeasureArray' value.dispstopnow}}</div>
+									<div data-original-title="本期完成：￥{{MyMeasureArray' value.ncurrdone}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MyMeasureArray' value.dispcurrdone}}" class="progress-bar">{{MyMeasureArray' value.dispcurrdone}}</div>
+									<div data-original-title="未完成：￥{{MyMeasureArray' value.nless}}" data-toggle="tooltip" data-placement="bottom" style="width:{{MyMeasureArray' value.pless}}" class="progress-bar progress-bar-gary">{{MyMeasureArray' value.pless}}</div>
 								</div></td>
 								</tr>
 								<!-- endloop -->