禅道BUG修复

global/css/style.css

@@ -611,7 +611,7 @@ left:5px
   padding:0 15px;
   height:54px;
   line-height:54px;
-  margin-right:5px;
+  width:30px;
 }
 .avatar li.name {
   font-size:14px;

protected/config/routes.conf.php

@@ -22,6 +22,7 @@ $route['*']['/project/:pid/section/:pmid/files/recover/page/:pindex'] = array('P
 $route['*']['/project/section/:iaid/file'] = array('ProjectController', 'getItemFileHistory');
 $route['*']['/project/section/get/:iaid/attachment'] = array('ProjectController', 'proSectionGetFiles');
 $route['*']['/project/:pid/section/:pmid/files/num/:numpname/page/:pindex'] = array('ProjectController', 'proSectionFiles');
+$route['*']['/project/:pid/section/:pmid/files/page/:pindex/num/:numpname'] = array('ProjectController', 'proSectionFiles');
 $route['*']['/project/:pid/section/:pmid/files/user/:userid/page/:pindex'] = array('ProjectController', 'proSectionFiles');
 $route['*']['/project/:pid/section/:pmid/files/num/:numpname/user/:userid/page/:pindex'] = array('ProjectController', 'proSectionFiles');
 $route['*']['/project/:pid/section/:pmid/files/user/:userid/num/:numpname/page/:pindex'] = array('ProjectController', 'proSectionFiles');
@@ -44,6 +45,7 @@ $route['*']['/rproject/:pid/section/:pmid/files/recover/page/:pindex'] = array('
 $route['*']['/rproject/section/get/:iaid/attachment'] = array('RProjectController', 'proSectionGetFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/num/:numpname/page/:pindex'] = array('RProjectController', 'proSectionFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/page/:pindex/num/:numpname'] = array('RProjectController', 'proSectionFiles');
+$route['*']['/rproject/:pid/section/:pmid/files/page/:pindex/num/:numpname'] = array('RProjectController', 'proSectionFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/user/:userid/page/:pindex'] = array('RProjectController', 'proSectionFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/page/:pindex/user/:userid'] = array('RProjectController', 'proSectionFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/num/:numpname/user/:userid/page/:pindex'] = array('RProjectController', 'proSectionFiles');
@@ -64,6 +66,7 @@ $route['*']['/sproject/:pid/section/:pmid/files/recover'] = array('SProjectContr
 $route['*']['/sproject/section/get/:iaid/attachment'] = array('SProjectController', 'proSectionGetFiles');
 $route['*']['/sproject/:pid/section/:pmid/files/recover/page/:pindex'] = array('SProjectController', 'proSectionFilesRecover');
 $route['*']['/sproject/:pid/section/:pmid/files/num/:numpname/page/:pindex'] = array('SProjectController', 'proSectionFiles');
+$route['*']['/sproject/:pid/section/:pmid/files/page/:pindex/num/:numpname'] = array('SProjectController', 'proSectionFiles');
 $route['*']['/sproject/:pid/section/:pmid/files/user/:userid/page/:pindex'] = array('SProjectController', 'proSectionFiles');
 $route['*']['/sproject/:pid/section/:pmid/files/num/:numpname/user/:userid/page/:pindex'] = array('SProjectController', 'proSectionFiles');
 $route['*']['/sproject/:pid/section/:pmid/files/user/:userid/num/:numpname/page/:pindex'] = array('SProjectController', 'proSectionFiles');

protected/controller/RProjectController.php

@@ -777,7 +777,13 @@ class RProjectController extends DooController
             $auditUserArray[$key]['k'] = $i;
             $auditUserArray[$key]['name'] = $this->profile->getProWithUid($value['auditoruid'])['name'];
         }
+        $strAvatar = $this->auth->getAvatar($measureArray['uid']);
+        $orginArray['avatar'] = '<img src="' . $strAvatar . '"></li>';
+        $orginArray['name'] = $this->profile->getProWithUid($measureArray['uid'])['name'];
+        $attfileArray = $this->attfile->getFirstFile($lastRowArray['pmid'], $lastRowArray['numpname'], $lastRowArray['times']);
+        $orginArray['time'] = date('Y-m-d', $attfileArray['intime']);
         $this->data['auditArray'] = $auditUserArray;
+        $this->data['orginArray'] = $orginArray;
         $this->data['pmid'] = $this->params['pmid'];
         $this->data['pid'] = $this->params['pid'];
         $this->data['mpid'] = $this->params['mpid'];

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

@@ -28,25 +28,25 @@
 
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{currconArray.stname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
-                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+                            <li><a href="{{rootUrl}}rproject/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
                             <!-- endloop -->
                         </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{curractmeasureArray.pmname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                                <a href="{{rootUrl}}rproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->

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

@@ -31,8 +31,7 @@
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop numArray -->
-                            <li><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{numArray' value.mpid}}">第{{ToChinaseNum(numArray'
-                                value.numpname)}}期</a></li>
+                            <li><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{numArray' value.mpid}}">第{{ToChinaseNum(numArray' value.numpname)}}期</a></li>
                             <!-- endloop -->
                         </ul>
                     </li>
@@ -123,7 +122,22 @@
                 </div>
             </div>
             <!--审批操作栏-->
-            <!--审批列表-->
+            <!--原报信息-->
+            <!-- if {{orginArray.time}} -->
+            <div class="reportList">
+                <div class="avatarBar clearfix">
+                    <div class="fR">
+                        <h4 class="colGreen">原报上报（{{orginArray.time}}）</h4>
+                    </div>
+                    <ul class="avatar clearfix">
+                        <li class="num" style="font-size:14px">原报</li>
+                        <li title="审批通过" class="pass"><span data-icon="d" aria-hidden="true"></span>{{orginArray.avatar}}</li>
+                        <li class="name colGreen">{{orginArray.name}}</li>
+                        <li class="con"></li>
+                    </ul>
+                </div>
+            </div>
+            <!-- endif -->
             <!-- loop auditArray -->
             <div class="reportList">
                 <div class="avatarBar clearfix">

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

@@ -60,7 +60,7 @@
 		    <!--导航-->
 		    <ul class="nav nav-tabs">
 			<li class="active">
-			    <a href="{{rootUrl}}sproject/{{pid}}/section/detail">标段概况</a>
+			    <a href="{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
 			</li>
 				<li><a href="{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
 		    </ul>

protected/view/s-project-section-files.html

@@ -22,31 +22,31 @@
         <div class="mainContent">
             <div class="title clearfix">
                 <ul class="nav nav-pills">
-                    <li class="dropdown"><a title="返回" href="{{rootUrl}}project/{{currproArray.pid}}/section"><span
+                    <li class="dropdown"><a title="返回" href="{{rootUrl}}sproject/{{currproArray.pid}}/section"><span
                             class="closePanel" aria-hidden="true" data-icon="Z"></span></a></li>
                     <li class="dropdown">
 
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{currconArray.stname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allconArray -->
-                            <li><a href="{{rootUrl}}project/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
+                            <li><a href="{{rootUrl}}sproject/{{currproArray.pid}}/section">{{allconArray' value.stname}}</a></li>
                             <!-- endloop -->
                         </ul>
                     </li>
                     <li class="dropdown">
-                        <a href="{{rootUrl}}project/{{currproArray.pid}}/section" data-toggle="dropdown"
+                        <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section" data-toggle="dropdown"
                            class="dropdown-toggle">
                             {{curractmeasureArray.pmname}}<b class="caret"></b>
                         </a>
                         <ul class="dropdown-menu">
                             <!-- loop allactmeasureArray -->
                             <li>
-                                <a href="{{rootUrl}}project/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
+                                <a href="{{rootUrl}}sproject/{{currproArray.pid}}/section/{{allactmeasureArray' value.pmid}}/detail">{{allactmeasureArray' value.pmname}}</a></li>
                             <!-- endloop -->
                             <!--				    <li class="divider"></li>
                                                 <li><a href="#">共18标段，查看更多</a></li>-->
@@ -59,7 +59,7 @@
                 <li>
                     <a href="{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
-                <li class="active"><a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
+                <li class="active"><a href="{{rootUrl}}sproject/{{pid}}/section/{{pmid}}/files">附件</a></li>
             </ul>
             <!--导航-->
             <!--筛选工具-->