1.文件名文件描述改名bug

protected/class/itemfile.php

@@ -42,9 +42,13 @@ class ItemFile
         return $oldiaid ? $this->__itemfile->find(array('where' => 'oldiaid=?', 'param' => array($oldiaid), 'asArray' => TRUE)) : FALSE;
     }
 
-    public function updateItemFields($id, $fname)
+    public function updateItemFields($id, $fname, $encode = 1)
     {
-        $this->__itemfile->filename = iconv('GBK', 'UTF-8', $fname);
+        if ($encode == 1) {
+            $this->__itemfile->filename = iconv('GBK', 'UTF-8', $fname);
+        } else {
+            $this->__itemfile->filename = $fname;
+        }
         return $this->__itemfile->update(array('where' => 'iaid=?', 'param' => array($id)));
     }
 

protected/class/itemmeasurenum.php

@@ -75,9 +75,13 @@ class ItemMeasureNumpofper
         return $this->__itemMeasureNum->getOne(array('where' => 'imnid=?', 'param' => array($imnid), 'asArray' => TRUE));
     }
 
-    public function updateItemFields($id, $tips)
+    public function updateItemFields($id, $tips, $encode = 1)
     {
-        $this->__itemMeasureNum->tips = iconv('GBK', 'UTF-8', $tips);
+        if ($encode == 1) {
+            $this->__itemMeasureNum->tips = iconv('GBK', 'UTF-8', $tips);
+        } else {
+            $this->__itemMeasureNum->tips = $tips;
+        }
         return $this->__itemMeasureNum->update(array('where' => 'imnid=?', 'param' => array($id)));
     }
 

protected/controller/ProjectController.php

@@ -394,8 +394,10 @@ class ProjectController extends DooController
             $filedesc = $_POST['filedesc'];
             $imnidArray = $this->itemmeasurenum->getRowData($_POST['upimnid']);
             if ($imnidArray['iaid'] > 0) {
-                $this->itemmeasurenum->updateItemFields($_POST['upimnid'], $filedesc);
-                $this->itemfle->updateItemFields($imnidArray['iaid'], $filename);
+                if (isset($filedesc))
+                    $this->itemmeasurenum->updateItemFields($_POST['upimnid'], $filedesc, 0);
+                if (isset($filename))
+                    $this->itemfle->updateItemFields($imnidArray['iaid'], $filename, 0);
                 echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
                 die();
             }

protected/controller/RProjectController.php

@@ -272,12 +272,18 @@ class RProjectController extends DooController
             $filedesc = $_POST['filedesc'];
             $imnidArray = $this->itemmeasurenum->getRowData($_POST['upimnid']);
             if ($imnidArray['iaid'] > 0) {
-                $this->itemmeasurenum->updateItemFields($_POST['upimnid'], $filedesc);
-                $this->itemfle->updateItemFields($imnidArray['iaid'], $filename);
+                if (isset($filename))
+                    $this->itemfle->updateItemFields($imnidArray['iaid'], $filename, 0);
+                if (isset($filedesc))
+                    $this->itemmeasurenum->updateItemFields($_POST['upimnid'], $filedesc, 0);
                 echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
                 die();
             }
         }
+        $numStatusArray = $this->numofperact->getLastStatus3($this->params['pid'], $this->params['pmid']);
+        if (!isset($numStatusArray['currstatus'])) {
+            $numStatusArray['currstatus'] = 'uncheck';
+        }
 
         // 面包屑导航项目
         $this->data['currproArray'] = $this->data['allproArray'] = NULL;
@@ -359,7 +365,7 @@ class RProjectController extends DooController
         }
         $this->data['pid'] = $this->params['pid'];
         $this->data['pmid'] = $this->params['pmid'];
-        $this->data['mpid'] = $this->params['mpid'];
+        $this->data['mpid'] = $numStatusArray['mpid'];
         $this->data['user'] = $this->params['userid'];
         $this->data['num'] = $this->params['numpname'];
         $this->data['pager'] = $pager->output;
@@ -578,7 +584,10 @@ class RProjectController extends DooController
 
     public function proDetail()
     {
-        $numStatusArray = $this->numofperact->getLastRow($this->params['pid'], $this->params['pmid']);
+        $numStatusArray = $this->numofperact->getLastStatus3($this->params['pid'], $this->params['pmid']);
+        if (!isset($numStatusArray['currstatus'])) {
+            $numStatusArray['currstatus'] = 'uncheck';
+        }
         // 项目名称
         $mpidArray = $this->measureauditact->getAuditProject2($this->auth->getUid());
         foreach ($mpidArray as $k1 => $v1) {

protected/controller/SProjectController.php

@@ -341,8 +341,10 @@ class SProjectController extends DooController
             $filedesc = $_POST['filedesc'];
             $imnidArray = $this->itemmeasurenum->getRowData($_POST['upimnid']);
             if ($imnidArray['iaid'] > 0) {
-                $this->itemmeasurenum->updateItemFields($_POST['upimnid'], $filedesc);
-                $this->itemfle->updateItemFields($imnidArray['iaid'], $filename);
+                if (isset($filedesc))
+                    $this->itemmeasurenum->updateItemFields($_POST['upimnid'], $filedesc, 0);
+                if (isset($filename))
+                    $this->itemfle->updateItemFields($imnidArray['iaid'], $filename, 0);
                 echo json_encode(array('status' => 1), JSON_UNESCAPED_UNICODE);
                 die();
             }

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

@@ -130,8 +130,8 @@
                                     </a>
                                     <ul class="dropdown-menu">
                                         <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
-                                        <!--<li><a href="#file-edit" data-toggle="modal"><i class="icon-pencil"></i>&nbsp;编辑</a>-->
-                                        <!--</li>-->
+                                        <li><a href="#file-edit" data-toggle="modal"><i class="icon-pencil"></i>&nbsp;编辑</a>
+                                        </li>
                                         <li><a><i class="icon-download-alt"></i>&nbsp;下载</a></li>
                                     </ul>
                                 </div>
@@ -338,11 +338,11 @@
             var upfiledesc = $("#upfiledesc").val();
             var imnid = $("#upimnid").val();
             $.ajax({
-                type: "POST",
+                url: "/rproject/{{pid}}/section/{{pmid}}/files",
+                type: "post",
                 dataType: "json",
                 cache: false,
                 data: {"upimnid": imnid, "filename": upfilename, "filedesc": upfiledesc},
-                url: "/rproject/{{pid}}/section/{{pmid}}/files",
                 success: function (data) {
                     if (data['status'] == 1) {
                         window.location.href = "{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/files";

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

@@ -44,11 +44,14 @@
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/detail">标段概况</a>
                 </li>
                 <li>
-                    <a href="/rproject/{{pid}}/section/{{pmid}}/files/{{mpid}}">附件</a>
+                    <a href="/rproject/{{pid}}/section/{{pmid}}/files">附件</a>
                 </li>
+                <!-- if {{mpid}}>0 -->
                 <li class="active">
                     <a href="{{rootUrl}}rproject/{{pid}}/section/{{pmid}}/report/{{mpid}}">审批</a>
                 </li>
+                <!-- endif -->
+
             </ul>
             <!--导航-->
             <!--本期数据-->

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

@@ -125,8 +125,8 @@
                                     </a>
                                     <ul class="dropdown-menu">
                                         <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
-                                        <!--<li><a href="#file-edit" data-toggle="modal"><i class="icon-pencil"></i>&nbsp;编辑</a>-->
-                                        <!--</li>-->
+                                        <li><a href="#file-edit" data-toggle="modal"><i class="icon-pencil"></i>&nbsp;编辑</a>
+                                        </li>
                                         <li><a><i class="icon-download-alt"></i>&nbsp;下载</a></li>
                                     </ul>
                                 </div>

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

@@ -126,8 +126,8 @@
                                     </a>
                                     <ul class="dropdown-menu">
                                         <!--<li><a><i class="icon-eye-open"></i>&nbsp;预览</a></li>-->
-                                        <!--<li><a href="#file-edit" data-toggle="modal"><i class="icon-pencil"></i>&nbsp;编辑</a>-->
-                                        <!--</li>-->
+                                        <li><a href="#file-edit" data-toggle="modal"><i class="icon-pencil"></i>&nbsp;编辑</a>
+                                        </li>
                                         <li><a><i class="icon-download-alt"></i>&nbsp;下载</a></li>
                                     </ul>
                                 </div>