1.附件pmid无效bug

2.分页链接bug

protected/config/routes.conf.php

@@ -42,7 +42,9 @@ $route['*']['/rproject/:pid/section/:pmid/files/recover'] = array('RProjectContr
 $route['*']['/rproject/:pid/section/:pmid/files/recover/page/:pindex'] = array('RProjectController', 'proSectionFilesRecover');
 $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/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');
 $route['*']['/rproject/:pid/section/:pmid/files/user/:userid/num/:numpname/page/:pindex'] = array('RProjectController', 'proSectionFiles');
 $route['*']['/rproject/:pid/section/:pmid/files/user/:userid/page/:pindex/num/:numpname'] = array('RProjectController', 'proSectionFiles');

protected/controller/ClientController.php

@@ -1168,7 +1168,7 @@ class ClientController extends DooController
                 $memoStr = iconv('GBK', 'UTF-8', $_POST['Memo']);
                 $fnArray = explode('.', $fileArray['filename']);
                 $filenameStr = iconv('GBK', 'UTF-8', $fnArray[0]);
-                $postArray = array('ownerid' => $this->params['uid'], 'pid' => $pidArray['pid'], 'pmid' => $this->params['pmid'], 'filename' => $filenameStr, 'filesize' => $fileArray['filesize'], 'fileext' => $fileArray['fileext'], 'filepath' => $fileArray['filepath']);
+                $postArray = array('ownerid' => $this->params['uid'], 'pid' => $pidArray['pid'], 'pmid' => $this->params['tenderid'], 'filename' => $filenameStr, 'filesize' => $fileArray['filesize'], 'fileext' => $fileArray['fileext'], 'filepath' => $fileArray['filepath']);
                 $iaid = $this->itemfile->insertItemFileRecord($postArray);
                 if ($iaid > 1) {
                     $itemMeasureNumArray = array('iaid' => $iaid, 'pid' => $pidArray['pid'], 'pmid' => $this->params['tenderid'], 'numpname' => $_POST['phase'], 'ownerid' => $this->params['uid'], 'itemid' => $_POST['itemid'], 'categoryid' => array_search($_POST['category'], $this->fileTypeArray), 'tips' => $memoStr);

protected/controller/ProjectController.php

@@ -447,9 +447,9 @@ class ProjectController extends DooController
         foreach ($owneridArray as $k => $v) {
             $this->data['owneridArray'][$k]['name'] = $this->profile->getProWithUid($v['ownerid'])['name'];
             $this->data['owneridArray'][$k]['iaid'] = $v['iaid'];
+            $this->data['owneridArray'][$k]['ownerid'] = $v['ownerid'];
         }
 
-
 // 分页
         $totalArchive = $this->itemmeasurenum->getCount($this->params['pmid'], 0, $this->params['numpname'], $this->params['userid']);
         if ($totalArchive) {
@@ -556,7 +556,7 @@ class ProjectController extends DooController
 
         $totalArchive = $this->itemmeasurenum->getCount($this->params['pmid']);
         if ($totalArchive) {
-            $pager = new DooPager(Doo::conf()->APP_URL . 'project/' . $this->params['pmid'] . '/section/' . $this->params['pmid'] . '/files/recover/page', $totalArchive, 1, 1);
+            $pager = new DooPager(Doo::conf()->APP_URL . 'project/' . $this->params['pmid'] . '/section/' . $this->params['pmid'] . '/files/recover/page', $totalArchive, 20, 100);
             $pager->setCss('', 'disabled', 'active');
             if (isset($this->params['pindex']))
                 $pager->paginate(intval($this->params['pindex']));

protected/controller/RProjectController.php

@@ -325,6 +325,7 @@ class RProjectController extends DooController
         foreach ($owneridArray as $k => $v) {
             $this->data['owneridArray'][$k]['name'] = $this->profile->getProWithUid($v['ownerid'])['name'];
             $this->data['owneridArray'][$k]['iaid'] = $v['iaid'];
+            $this->data['owneridArray'][$k]['ownerid'] = $v['ownerid'];
         }
 
 
@@ -435,7 +436,7 @@ class RProjectController extends DooController
 
         $totalArchive = $this->itemmeasurenum->getCount($this->params['pmid']);
         if ($totalArchive) {
-            $pager = new DooPager(Doo::conf()->APP_URL . 'rproject/' . $this->params['pmid'] . '/section/' . $this->params['pmid'] . '/files/recover/page', $totalArchive, 1, 1);
+            $pager = new DooPager(Doo::conf()->APP_URL . 'rproject/' . $this->params['pmid'] . '/section/' . $this->params['pmid'] . '/files/recover/page', $totalArchive, 20, 100);
             $pager->setCss('', 'disabled', 'active');
             if (isset($this->params['pindex']))
                 $pager->paginate(intval($this->params['pindex']));

protected/controller/SProjectController.php

@@ -394,6 +394,7 @@ class SProjectController extends DooController
         foreach ($owneridArray as $k => $v) {
             $this->data['owneridArray'][$k]['name'] = $this->profile->getProWithUid($v['ownerid'])['name'];
             $this->data['owneridArray'][$k]['iaid'] = $v['iaid'];
+            $this->data['owneridArray'][$k]['ownerid'] = $v['ownerid'];
         }
 
 
@@ -504,7 +505,7 @@ class SProjectController extends DooController
 
         $totalArchive = $this->itemmeasurenum->getCount($this->params['pmid']);
         if ($totalArchive) {
-            $pager = new DooPager(Doo::conf()->APP_URL . 'sproject/' . $this->params['pmid'] . '/section/' . $this->params['pmid'] . '/files/recover/page', $totalArchive, 1, 1);
+            $pager = new DooPager(Doo::conf()->APP_URL . 'sproject/' . $this->params['pmid'] . '/section/' . $this->params['pmid'] . '/files/recover/page', $totalArchive, 20, 100);
             $pager->setCss('', 'disabled', 'active');
             if (isset($this->params['pindex']))
                 $pager->paginate(intval($this->params['pindex']));

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

@@ -116,7 +116,7 @@
                                         <span class="caret"></span>
                                     </a>
                                     <ul class="dropdown-menu">
-                                        <li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>
+                                        <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
                                         <li><a href="{{rootUrl}}{{itemMeasureArray' value.filepath}}"><i
                                                 class="icon-download-alt"></i>&nbsp;下载</a></li>
                                         <li><a id="recovery_{{itemMeasureArray' value.imnid}}"

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

@@ -74,7 +74,7 @@
                         <option value="0">不限期数</option>
                         <!-- loop groupArray -->
                         <option <!-- if {{num}} == {{groupArray' value.mpid}} --> selected <!-- endif -->
-                        value="{{groupArray' value.mpid}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
+                        value="{{groupArray' value.numpname}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
                         </option>
                         <!-- endloop -->
                     </select>
@@ -82,7 +82,7 @@
                         <option value="0">上传者</option>
                         <!-- loop owneridArray -->
                         <option <!-- if {{user}} == {{owneridArray' value.iaid}} --> selected <!-- endif -->
-                        value="{{owneridArray' value.iaid}}">{{owneridArray' value.name}}</option>
+                        value="{{owneridArray' value.ownerid}}">{{owneridArray' value.name}}</option>
                         <!-- endloop -->
                     </select>
                     <a href="/rproject/{{pid}}/section/{{pmid}}/files/recover" class="fR">附件回收站</a>
@@ -391,25 +391,19 @@
 
         $("#numpname").change(function () {
             var localurl = window.location.href;
-            var page = localurl.indexOf("/page/");
+            var page = localurl.indexOf("page/");
             var user = localurl.indexOf("user/");
-            if (page != "-1") {
-                if (user != "-1") {
-                    var nowurl = localurl.replace(/\/num\/\d+/, "");
-                    var url = nowurl + "/num/" + $(this).val();
-                    window.location.href = url;
-                } else {
-                    var nowurl = localurl.replace(/num\/\d+/, "");
-                    var url = nowurl + "num/" + $(this).val();
-                    window.location.href = url;
-                }
-            } else {
-                if (user != "-1") {
-                    var url = window.location.href + "num/" + $(this).val() + "/page/1";
-                    window.location.href = url;
-                } else {
+            var num = localurl.indexOf("num/");
+            if (num != "-1") {
+                var nowurl = localurl.replace(/num\/\d+/, "num/" + $(this).val());
+                window.location.href = nowurl;
+            }else {
+                if (page == "-1") {
                     var url = window.location.href + "/num/" + $(this).val() + "/page/1";
                     window.location.href = url;
+                }else{
+                    var url = window.location.href + "/num/" + $(this).val();
+                    window.location.href = url;
                 }
             }
         });
@@ -417,24 +411,18 @@
         $("#uploaduser").change(function () {
             var localurl = window.location.href;
             var page = localurl.indexOf("page/");
+            var user = localurl.indexOf("user/");
             var num = localurl.indexOf("num/");
-            if (page != "-1") {
-                if (num != "-1") {
-                    var nowurl = localurl.replace(/\/user\/\d+/, "");
-                    var url = nowurl + "/user/" + $(this).val();
-                    window.location.href = url;
-                } else {
-                    var nowurl = localurl.replace(/user\/\d+/, "");
-                    var url = nowurl + "user/" + $(this).val();
-                    window.location.href = url;
-                }
-            } else {
-                if (num != "-1") {
-                    var url = window.location.href + "user/" + $(this).val() + "/page/1";
-                    window.location.href = url;
-                } else {
+            if (user != "-1") {
+                var nowurl = localurl.replace(/user\/\d+/, "user/" + $(this).val());
+                window.location.href = nowurl;
+            }else {
+                if (page == "-1") {
                     var url = window.location.href + "/user/" + $(this).val() + "/page/1";
                     window.location.href = url;
+                }else{
+                    var url = window.location.href + "/user/" + $(this).val();
+                    window.location.href = url;
                 }
             }
         });

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

@@ -109,7 +109,7 @@
                                         <span class="caret"></span>
                                     </a>
                                     <ul class="dropdown-menu">
-                                        <li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>
+                                        <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
                                         <li><a href="{{rootUrl}}{{itemMeasureArray' value.filepath}}"><i
                                                 class="icon-download-alt"></i>&nbsp;下载</a></li>
                                         <li><a id="recovery_{{itemMeasureArray' value.imnid}}"

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

@@ -69,7 +69,7 @@
                         <option value="0">不限期数</option>
                         <!-- loop groupArray -->
                         <option <!-- if {{num}} == {{groupArray' value.mpid}} --> selected <!-- endif -->
-                        value="{{groupArray' value.mpid}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
+                        value="{{groupArray' value.numpname}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
                         </option>
                         <!-- endloop -->
                     </select>
@@ -77,7 +77,7 @@
                         <option value="0">上传者</option>
                         <!-- loop owneridArray -->
                         <option <!-- if {{user}} == {{owneridArray' value.iaid}} --> selected <!-- endif -->
-                        value="{{owneridArray' value.iaid}}">{{owneridArray' value.name}}</option>
+                        value="{{owneridArray' value.ownerid}}">{{owneridArray' value.name}}</option>
                         <!-- endloop -->
                     </select>
                     <a href="/sproject/{{pid}}/section/{{pmid}}/files/recover" class="fR">附件回收站</a>
@@ -387,25 +387,19 @@
 
         $("#numpname").change(function () {
             var localurl = window.location.href;
-            var page = localurl.indexOf("/page/");
+            var page = localurl.indexOf("page/");
             var user = localurl.indexOf("user/");
-            if (page != "-1") {
-                if (user != "-1") {
-                    var nowurl = localurl.replace(/\/num\/\d+/, "");
-                    var url = nowurl + "/num/" + $(this).val();
-                    window.location.href = url;
-                } else {
-                    var nowurl = localurl.replace(/num\/\d+/, "");
-                    var url = nowurl + "num/" + $(this).val();
-                    window.location.href = url;
-                }
-            } else {
-                if (user != "-1") {
-                    var url = window.location.href + "num/" + $(this).val() + "/page/1";
-                    window.location.href = url;
-                } else {
+            var num = localurl.indexOf("num/");
+            if (num != "-1") {
+                var nowurl = localurl.replace(/num\/\d+/, "num/" + $(this).val());
+                window.location.href = nowurl;
+            }else {
+                if (page == "-1") {
                     var url = window.location.href + "/num/" + $(this).val() + "/page/1";
                     window.location.href = url;
+                }else{
+                    var url = window.location.href + "/num/" + $(this).val();
+                    window.location.href = url;
                 }
             }
         });
@@ -413,24 +407,18 @@
         $("#uploaduser").change(function () {
             var localurl = window.location.href;
             var page = localurl.indexOf("page/");
+            var user = localurl.indexOf("user/");
             var num = localurl.indexOf("num/");
-            if (page != "-1") {
-                if (num != "-1") {
-                    var nowurl = localurl.replace(/\/user\/\d+/, "");
-                    var url = nowurl + "/user/" + $(this).val();
-                    window.location.href = url;
-                } else {
-                    var nowurl = localurl.replace(/user\/\d+/, "");
-                    var url = nowurl + "user/" + $(this).val();
-                    window.location.href = url;
-                }
-            } else {
-                if (num != "-1") {
-                    var url = window.location.href + "user/" + $(this).val() + "/page/1";
-                    window.location.href = url;
-                } else {
+            if (user != "-1") {
+                var nowurl = localurl.replace(/user\/\d+/, "user/" + $(this).val());
+                window.location.href = nowurl;
+            }else {
+                if (page == "-1") {
                     var url = window.location.href + "/user/" + $(this).val() + "/page/1";
                     window.location.href = url;
+                }else{
+                    var url = window.location.href + "/user/" + $(this).val();
+                    window.location.href = url;
                 }
             }
         });

protected/view/w-project-section-files-recover.html

@@ -112,7 +112,7 @@
                                         <span class="caret"></span>
                                     </a>
                                     <ul class="dropdown-menu">
-                                        <li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>
+                                        <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
                                         <li><a href="{{rootUrl}}{{itemMeasureArray' value.filepath}}"><i
                                                 class="icon-download-alt"></i>&nbsp;下载</a></li>
                                         <li><a id="recovery_{{itemMeasureArray' value.imnid}}"

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

@@ -70,7 +70,7 @@
                         <option value="0">不限期数</option>
                         <!-- loop groupArray -->
                         <option <!-- if {{num}} == {{groupArray' value.mpid}} --> selected <!-- endif -->
-                        value="{{groupArray' value.mpid}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
+                        value="{{groupArray' value.numpname}}">第{{ToChinaseNum(groupArray' value.numpname)}}期
                         </option>
                         <!-- endloop -->
                     </select>
@@ -78,7 +78,7 @@
                         <option value="0">上传者</option>
                         <!-- loop owneridArray -->
                         <option <!-- if {{user}} == {{owneridArray' value.iaid}} --> selected <!-- endif -->
-                        value="{{owneridArray' value.iaid}}">{{owneridArray' value.name}}</option>
+                        value="{{owneridArray' value.ownerid}}">{{owneridArray' value.name}}</option>
                         <!-- endloop -->
                     </select>
                     <a href="/project/{{pid}}/section/{{pmid}}/files/recover" class="fR">附件回收站</a>
@@ -388,25 +388,19 @@
 
         $("#numpname").change(function () {
             var localurl = window.location.href;
-            var page = localurl.indexOf("/page/");
+            var page = localurl.indexOf("page/");
             var user = localurl.indexOf("user/");
-            if (page != "-1") {
-                if (user != "-1") {
-                    var nowurl = localurl.replace(/\/num\/\d+/, "");
-                    var url = nowurl + "/num/" + $(this).val();
-                    window.location.href = url;
-                } else {
-                    var nowurl = localurl.replace(/num\/\d+/, "");
-                    var url = nowurl + "num/" + $(this).val();
-                    window.location.href = url;
-                }
-            } else {
-                if (user != "-1") {
-                    var url = window.location.href + "num/" + $(this).val() + "/page/1";
-                    window.location.href = url;
-                } else {
+            var num = localurl.indexOf("num/");
+            if (num != "-1") {
+                var nowurl = localurl.replace(/num\/\d+/, "num/" + $(this).val());
+                window.location.href = nowurl;
+            }else {
+                if (page == "-1") {
                     var url = window.location.href + "/num/" + $(this).val() + "/page/1";
                     window.location.href = url;
+                }else{
+                    var url = window.location.href + "/num/" + $(this).val();
+                    window.location.href = url;
                 }
             }
         });
@@ -414,24 +408,18 @@
         $("#uploaduser").change(function () {
             var localurl = window.location.href;
             var page = localurl.indexOf("page/");
+            var user = localurl.indexOf("user/");
             var num = localurl.indexOf("num/");
-            if (page != "-1") {
-                if (num != "-1") {
-                    var nowurl = localurl.replace(/\/user\/\d+/, "");
-                    var url = nowurl + "/user/" + $(this).val();
-                    window.location.href = url;
-                } else {
-                    var nowurl = localurl.replace(/user\/\d+/, "");
-                    var url = nowurl + "user/" + $(this).val();
-                    window.location.href = url;
-                }
-            } else {
-                if (num != "-1") {
-                    var url = window.location.href + "user/" + $(this).val() + "/page/1";
-                    window.location.href = url;
-                } else {
+            if (user != "-1") {
+                var nowurl = localurl.replace(/user\/\d+/, "user/" + $(this).val());
+                window.location.href = nowurl;
+            }else {
+                if (page == "-1") {
                     var url = window.location.href + "/user/" + $(this).val() + "/page/1";
                     window.location.href = url;
+                }else{
+                    var url = window.location.href + "/user/" + $(this).val();
+                    window.location.href = url;
                 }
             }
         });