更新报表管理的内容

jlzfver.sql

@@ -3,7 +3,7 @@
 -- https://www.phpmyadmin.net/
 --
 -- Host: 10.252.250.130
+-- Generation Time: 2017-08-04 15:46:55
 -- 服务器版本： 10.0.17-MariaDB-1~trusty-log
 -- PHP Version: 7.0.15-0ubuntu0.16.04.4
 
@@ -76,7 +76,9 @@ CREATE TABLE `fc_report` (
   `cateid` int(11) UNSIGNED NOT NULL COMMENT '所属类别',
   `parentid` int(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '所属类别父类，默认为0，都为父类',
   `userid` int(11) UNSIGNED NOT NULL COMMENT '谁创建本报表',
-  `edittime` int(15) UNSIGNED NOT NULL COMMENT '最新更新时间'
+  `edittime` int(15) UNSIGNED NOT NULL COMMENT '最新更新时间',
+  `lastedit` int(11) NOT NULL COMMENT '最新一次操作时间',
+  `lastuser` varchar(50) COLLATE utf8_unicode_ci NOT NULL COMMENT '最新一次操作人'
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci COMMENT='报表';
 
 -- --------------------------------------------------------
@@ -97,7 +99,11 @@ CREATE TABLE `fc_user` (
 
 INSERT INTO `fc_user` (`id`, `username`, `password`) VALUES
 (1, '纵横知道', '$2a$08$X2qbaqmSATLNPmrjVoV9AuYFo2i28omEBWsHc16eK0R1VNtTzF/C6'),
-(2, '纵横', '$2a$08$/s0ayZBQGcOrOwSJ8RIyUu62RL0dnwzn4BGcax53MN6wd4Tlz9302');
+(2, '纵横', '$2a$08$/s0ayZBQGcOrOwSJ8RIyUu62RL0dnwzn4BGcax53MN6wd4Tlz9302'),
+(3, '纵横青青', '$2a$08$0VaHvE17PLZk23DTB.Y.SOBT7arn8cwTXTsG.CFAzJwl.A11EdpfS'),
+(4, '纵横海珠', '$2a$08$M10HfSyQD0NqfJ.aFzrhk.BoDLpndKwNDWtjgZavEA0f28a3FDGUW'),
+(5, '纵横小爱', '$2a$08$rj7foT3dD.O8bgfNBMciVubaaHh3H17AbQ2eG/3yhsL2q9g2a863q'),
+(6, '纵横佩玲', '$2a$08$RjRFX8/SkbYHd33Jg13nz.EPn6uzar8bc9TwqjqKt4yN.uX4PmQv6');
 
 -- --------------------------------------------------------
 
@@ -254,7 +260,7 @@ ALTER TABLE `fc_item`
 -- 使用表AUTO_INCREMENT `fc_log`
 --
 ALTER TABLE `fc_log`
-  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1085;
+  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1162;
 --
 -- 使用表AUTO_INCREMENT `fc_report`
 --
@@ -264,7 +270,7 @@ ALTER TABLE `fc_report`
 -- 使用表AUTO_INCREMENT `fc_user`
 --
 ALTER TABLE `fc_user`
-  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=3;
+  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=7;
 --
 -- 使用表AUTO_INCREMENT `fc_version`
 --

protected/config/routes.conf.php

@@ -37,23 +37,24 @@ $route['*']['/addreport/:status'] = array('MainController', 'AddReport');
 $route['*']['/addreport/:status/item/:itemid'] = array('MainController', 'AddReport');
 $route['*']['/setreport'] = array('MainController', 'SetReport');
 $route['*']['/deletereport/:reportid'] = array('MainController', 'DelReport');
+$route['*']['/deletereport/:reportid/page/:pindex'] = array('MainController', 'DelReport');
 $route['*']['/deletereport/:reportid/cate/:cateid'] = array('MainController', 'DelReport');
-$route['*']['/deletereport/:reportid/cate/:cateid/pindex/:pindex'] = array('MainController', 'DelReport');
+$route['*']['/deletereport/:reportid/cate/:cateid/page/:pindex'] = array('MainController', 'DelReport');
 $route['*']['/deletereport/:reportid/item/:itemid'] = array('MainController', 'DelReport');
-$route['*']['/deletereport/:reportid/item/:itemid/pindex/:pindex'] = array('MainController', 'DelReport');
+$route['*']['/deletereport/:reportid/item/:itemid/page/:pindex'] = array('MainController', 'DelReport');
 $route['*']['/deletereport/:reportid/sort/:sort'] = array('MainController', 'DelReport');
-$route['*']['/deletereport/:reportid/sort/:sort/pindex/:pindex'] = array('MainController', 'DelReport');
+$route['*']['/deletereport/:reportid/sort/:sort/page/:pindex'] = array('MainController', 'DelReport');
 $route['*']['/deletereport/:reportid/cate/:cateid/sort/:sort'] = array('MainController', 'DelReport');
-$route['*']['/deletereport/:reportid/cate/:cateid/sort/:sort/pindex/:pindex'] = array('MainController', 'DelReport');
+$route['*']['/deletereport/:reportid/cate/:cateid/sort/:sort/page/:pindex'] = array('MainController', 'DelReport');
 $route['*']['/deletereport/:reportid/item/:itemid/sort/:sort'] = array('MainController', 'DelReport');
-$route['*']['/deletereport/:reportid/item/:itemid/sort/:sort/pindex/:pindex'] = array('MainController', 'DelReport');
+$route['*']['/deletereport/:reportid/item/:itemid/sort/:sort/page/:pindex'] = array('MainController', 'DelReport');
 $route['*']['/deletereport/:reportid/area/:area'] = array('MainController', 'DelReport');
 $route['*']['/deletereport/:reportid/area/:area'] = array('MainController', 'DelReport');
-$route['*']['/deletereport/:reportid/area/:area/pindex/:pindex'] = array('MainController', 'DelReport');
+$route['*']['/deletereport/:reportid/area/:area/page/:pindex'] = array('MainController', 'DelReport');
 $route['*']['/deletereport/:reportid/cate/:cateid/area/:area'] = array('MainController', 'DelReport');
-$route['*']['/deletereport/:reportid/cate/:cateid/area/:area/pindex/:pindex'] = array('MainController', 'DelReport');
+$route['*']['/deletereport/:reportid/cate/:cateid/area/:area/page/:pindex'] = array('MainController', 'DelReport');
 $route['*']['/deletereport/:reportid/cate/:cateid/area/:area/sort/:sort'] = array('MainController', 'DelReport');
-$route['*']['/deletereport/:reportid/cate/:cateid/area/:area/sort/:sort/pindex/:pindex'] = array('MainController', 'DelReport');
+$route['*']['/deletereport/:reportid/cate/:cateid/area/:area/sort/:sort/page/:pindex'] = array('MainController', 'DelReport');
 
 //版本管理
 $route['*']['/versionlist/:reportid'] = array('MainController', 'VersionList');

protected/controller/MainController.php

@@ -46,8 +46,8 @@ class MainController extends DooController {
         }
         if(isset($this->params['sort'])){
             $pagesql .= '/sort/'.$this->params['sort'];
-            if($this->params['sort'] == 'report'){
-                $sortsql = 'report';
+            if($this->params['sort'] == 'report' || $this->params['sort'] == 'edit'){
+                $sortsql = $this->params['sort'];
             }
             $this->data['sort'] = $this->params['sort'];
         }
@@ -215,7 +215,9 @@ class MainController extends DooController {
                 'parentid' => isset($_POST['cateselect']) ? $_POST['parentselect'] : 0,
                 'cateid' => isset($_POST['cateselect']) ? $_POST['cateselect'] : $_POST['parentselect'],
                 'userid' => $this->data['uid'],
-                'edittime' => time()
+                'edittime' => time(),
+                'lastedit' => time(),
+                'lastuser' => $this->data['username']
             );
             $reportid = $report->_insertAttributes('report', $reports);
 
@@ -246,26 +248,27 @@ class MainController extends DooController {
         $t=DOO::conf()->SITE_PATH."jlbb/".$reportId;
         $this->IoHandler->RemoveDir($t);
 
+
         //路由返回
         $returnurl = '/reportlist';
 
-        if(isset($_POST['itemid'])) {
+        if(isset($this->params['itemid'])) {
             $returnurl .= '/1';
         }
-        if(isset($_POST['itemid']) && $_POST['itemid'] != 0){
-            $returnurl .= '/item/'.$_POST['itemid'];
+        if(isset($this->params['itemid']) && $this->params['itemid'] != 0){
+            $returnurl .= '/item/'.$this->params['itemid'];
         }
-        if(isset($_POST['cateid']) && !empty($_POST['cateid'])){
-            $returnurl .= '/cate/'.$_POST['cateid'];
+        if(isset($this->params['cateid']) && !empty($this->params['cateid'])){
+            $returnurl .= '/cate/'.$this->params['cateid'];
         }
-        if(isset($_POST['area']) && is_numeric($_POST['area'])){
-            $returnurl .= '/area/'.$_POST['area'];
+        if(isset($this->params['area']) && is_numeric($this->params['area'])){
+            $returnurl .= '/area/'.$this->params['area'];
         }
-        if(isset($_POST['sort']) && $_POST['sort'] == 'report'){
+        if(isset($this->params['sort']) && $this->params['sort'] == 'report'){
             $returnurl .= '/sort/report';
         }
-        if(isset($_POST['pindex'])){
-            $returnurl .= '/page/'.$_POST['pindex'];
+        if(isset($this->params['pindex'])){
+            $returnurl .= '/page/'.$this->params['pindex'];
         }
 
         return $returnurl;
@@ -273,13 +276,37 @@ class MainController extends DooController {
 
     //版本管理
     public function VersionList(){
-        if(isset($this->params['reportid'])){
-            Doo::loadModel('version');
-            $version = new Version();
-            $versionlist = $version->getRowbyreport($this->params['reportid']);
-            $this->data['versionlist'] = $versionlist;
-            $this->data['reportid'] = $this->params['reportid'];
-            $this->render('formver-list', $this->data, TRUE);die;
+        if(isset($this->params['reportid']) && is_numeric($this->params['reportid'])){
+            Doo::loadModel('report');
+            $report = new Report();
+            $reportmsg = $report->getRowbyid($this->params['reportid']);
+            if(!empty($reportmsg)){
+                $this->data['report'] = $reportmsg;
+                Doo::loadModel('category');
+                $category2 = new Category();
+                if($reportmsg['parentid'] != 0){
+                    $catename = $category2->getnamebyid($reportmsg['parentid']).'/'.$category2->getnamebyid($reportmsg['cateid']);
+                }else{
+                    $catename = $category2->getnamebyid($reportmsg['cateid']);
+                }
+                $this->data['report']['catename'] = $catename;
+
+                Doo::loadModel('version');
+                $version = new Version();
+                $versionlist = $version->getRowbyreport($this->params['reportid']);
+                Doo::loadModel('log');
+                Doo::loadModel('fcuser');
+                foreach($versionlist as $k => $v){
+                    $log = new Log();
+                    $user = new Fcuser();
+                    $logmsg = $log->getRowbyVerTime($v['verid'],$v['edittime']);
+                    $versionlist[$k]['editname'] = !empty($logmsg) ? $user->getUsernameByID($logmsg['userid']) : '';
+
+                }
+                $this->data['versionlist'] = $versionlist;
+                $this->data['reportid'] = $this->params['reportid'];
+                $this->render('formver-list', $this->data, TRUE);die;
+            }
         }
         return '/reportlist';
     }
@@ -345,6 +372,13 @@ class MainController extends DooController {
             $log->content = date('Y-m-d H:i:s',$time).' '.$this->data['username'].' 创建版本'.$version['vername'];
             $log->insert();
 
+            $report2 = new Report();
+            $report2->reportid = $version['reportid'];
+            $report2->edittime = $time;
+            $report2->lastedit = $time;
+            $report2->lastuser = $this->data['username'];
+            $report2->update();
+
             include (DOO::conf()->SITE_PATH . 'protected/plugin/io.han.php');
             $this->IoHandler = new IoHandler();
             //调用定义物理路径
@@ -443,24 +477,26 @@ class MainController extends DooController {
             $version->xmlbody = trim($_POST['editor']);
             $version->status = isset($_POST['caogao']) ? 1 : 2;
             $version->edittime = time();
+
             if(isset($_POST['firsttime'])){
 //                $version->addtime = $time;
                 $addtime = $time;
-
                 $report->edittime = $time;
-                $report->reportid = $_POST['reportid'];
-                $report->update();
             }else{
                 $version2 = new Version();
                 $addtime = $version2->getvertime($_POST['verid']);
             }
             $version->update();
 
+            $report->reportid = $_POST['reportid'];
+            $report->lastedit = isset($_POST['firsttime']) ? $time : time();
+            $report->lastuser = $this->data['username'];
+            $report->update();
+
             //调用定义物理路径
             $t=DOO::conf()->SITE_PATH."jlbb/".$_POST['reportid'];
 
             $xmlName = $_POST['verid'].'_'.date('YmdHis',$addtime).'.xml';
-
             $editor = iconv("UTF-8", "GB2312", $_POST['editor']);
             $xml = trim($editor);
             $myfile = fopen($t.'/'.$xmlName, "w");
@@ -536,6 +572,22 @@ class MainController extends DooController {
                 $version->edittime = time();
                 $version->update();
 
+                Doo::loadModel('report');
+                $report = new Report();
+                $report->reportid = $vermsg['reportid'];
+                $report->lastedit = time();
+                $report->lastuser = $this->data['username'];
+                $report->update();
+
+                Doo::loadModel('log');
+                $log = new Log();
+                $log->verid = $vermsg['verid'];
+                $log->reportid = $vermsg['reportid'];
+                $log->userid = $this->data['uid'];
+                $log->addtime = time();
+                $log->content = '';
+                $log->insert();
+
                 //调用定义物理路径
                 $t=DOO::conf()->SITE_PATH."jlbb/".$vermsg['reportid'];
 

protected/model/fcuser.php

@@ -27,4 +27,8 @@ class Fcuser extends DooModel {
     public function getRowByuser($username){
         return $this->getOne(array('where' => 'username="'.$username.'"', 'asArray' => TRUE));
     }
+
+    public function getUsernameByID($id){
+        return $this->getOne(array('select' => 'username', 'where' => 'id='.$id, 'asArray' => TRUE))['username'];
+    }
 }

protected/model/log.php

@@ -27,4 +27,8 @@ class Log extends DooModel {
         return $this->find(array('select' => 'content', 'where' => 'verid='.$verid,  'asc' => 'addtime', 'asArray' => TRUE));
     }
 
+    public function getRowbyVerTime($verid,$time){
+        return $this->getOne(array('where' => 'verid=? and addtime=?', 'param' => array($verid,$time), 'desc' => 'id' ,'asArray' => TRUE));
+    }
+
 }

protected/model/report.php

@@ -16,10 +16,12 @@ class Report extends DooModel {
     public $parentid;
     public $userid;
     public $edittime;
+    public $lastedit;
+    public $lastuser;
 
     public $_table = 'fc_report';
     public $_primarykey = 'reportid';
-    public $_fields = array('reportid', 'reportname', 'areacate', 'itemid', 'cateid', 'parentid', 'userid','edittime');
+    public $_fields = array('reportid', 'reportname', 'areacate', 'itemid', 'cateid', 'parentid', 'userid','edittime','lastedit','lastuser');
 
     public function __construct() {
         parent::setupModel(__CLASS__);
@@ -28,6 +30,8 @@ class Report extends DooModel {
     public function getitemRowbylimit($limit,$itemid = 0,$sort = '',$sql = ''){
         if($sort == 'report'){
             return $this->find(array('where' => 'itemid='.$itemid.$sql, 'asc' => 'reportname', 'limit' => $limit, 'asArray' => TRUE));
+        }elseif($sort == 'edit'){
+            return $this->find(array('where' => 'itemid='.$itemid.$sql, 'desc' => 'lastedit', 'limit' => $limit, 'asArray' => TRUE));
         }else{
             return $this->find(array('where' => 'itemid='.$itemid.$sql, 'desc' => 'edittime', 'limit' => $limit, 'asArray' => TRUE));
         }
@@ -36,6 +40,8 @@ class Report extends DooModel {
     public function getAllitemRowbylimit($limit,$sort = ''){
         if($sort == 'report'){
             return $this->find(array('where' => 'itemid!=0', 'asc' => 'reportname', 'limit' => $limit, 'asArray' => TRUE));
+        }elseif($sort == 'edit'){
+            return $this->find(array('where' => 'itemid!=0', 'desc' => 'lastedit', 'limit' => $limit, 'asArray' => TRUE));
         }else{
             return $this->find(array('where' => 'itemid!=0', 'desc' => 'edittime', 'limit' => $limit, 'asArray' => TRUE));
         }
@@ -44,6 +50,8 @@ class Report extends DooModel {
     public function getcateRowbylimit($limit,$cateid = 0,$sql = '',$sort = ''){
         if($sort == 'report') {
             return $this->find(array('where' => 'itemid=0 and (cateid=' . $cateid . ' or parentid=' . $cateid . ')' . $sql, 'asc' => 'reportname', 'limit' => $limit, 'asArray' => TRUE));
+        }elseif($sort == 'edit') {
+            return $this->find(array('where' => 'itemid=0 and (cateid=' . $cateid . ' or parentid=' . $cateid . ')' . $sql, 'desc' => 'lastedit', 'limit' => $limit, 'asArray' => TRUE));
         }else{
             return $this->find(array('where' => 'itemid=0 and (cateid=' . $cateid . ' or parentid=' . $cateid . ')' . $sql, 'desc' => 'edittime', 'limit' => $limit, 'asArray' => TRUE));
         }

protected/view/edit-formver.html

@@ -76,7 +76,7 @@
                       <input type="hidden" class="form-control input-sm" id="vername" value="{{version.vername}}" name="vername">
                       <input type="hidden" class="form-control input-sm" id="verid" value="{{version.verid}}" name="verid">
                       <input type="hidden" class="form-control input-sm" value="{{version.reportid}}" name="reportid">
-                      <input type="hidden" class="form-control input-sm" value="1" name="firsttime">
+                      <!-- if isset({{status}}) --><input type="hidden" class="form-control input-sm" value="1" name="firsttime"><!-- endif -->
                   </div>
                 </div>
               </div>
@@ -200,7 +200,7 @@
               <div class="form-group">
                 <ul>
                     <!-- loop loglist -->
-                    <li>{{loglist' value.content}}</li>
+                    <!-- if !empty({{{{loglist' value.content}}) --><li>{{loglist' value.content}}</li><!-- endif -->
                     <!-- endloop -->
                 </ul>
               </div>

protected/view/form-list.html

@@ -38,6 +38,7 @@
             <div class="col-xs-2 col-md-offset-5">
               <select class="form-control" id="sort">
                 <option value="time">按更新时间</option>
+                <option value="edit" <!-- if isset({{sort}}) && {{sort}} == 'edit' -->selected<!-- endif -->>按编辑时间</option>
                 <option value="report" <!-- if isset({{sort}}) && {{sort}} == 'report' -->selected<!-- endif -->>按报表名称</option>
               </select>
             </div>
@@ -52,6 +53,7 @@
             <th>类别</th>
             <th>报表名</th>
             <th>最新版本</th>
+            <th>最新编辑</th>
             <th>历史版本</th>
             <th>操作</th>
           </tr>
@@ -64,6 +66,7 @@
             <td>{{reportlist' value.catename}}</td>
             <td>{{reportlist' value.reportname}}</td>
             <td>{{reportlist' value.edittime}}</td>
+            <td><!-- if !empty({{reportlist' value.lastedit}}) -->{{formatDate(reportlist' value.lastedit)}}<!-- endif --> {{reportlist' value.lastuser}}</td>
             <td><a href="{{rootUrl}}versionlist/{{reportlist' value.reportid}}">{{reportlist' value.versionnum}}</a></td>
             <td><a href="#edit-form" class="btn btn-xs" data-toggle="modal" onclick='editNormalreport("{{reportlist' value.reportid}}","{{reportlist' value.cateid}}","{{reportlist' value.parentid}}","{{reportlist' value.reportname}}","{{reportlist' value.areacate}}");'>编辑</a><a class="btn btn-xs text-danger" href="#delform"  data-toggle="modal" onclick='delreport("{{reportlist' value.reportname}}","{{reportlist' value.reportid}}");'>删除</a></td>
           </tr>
@@ -93,6 +96,7 @@
               <div class="col-xs-2 col-md-offset-5">
                 <select class="form-control" id="sort">
                   <option value="time">按更新时间</option>
+                  <option value="edit" <!-- if isset({{sort}}) && {{sort}} == 'edit' -->selected<!-- endif -->>按编辑时间</option>
                   <option value="report" <!-- if isset({{sort}}) && {{sort}} == 'report' -->selected<!-- endif -->>按报表名称</option>
                 </select>
               </div>
@@ -106,6 +110,7 @@
             <th>类别</th>
             <th>报表名</th>
             <th>最新版本</th>
+            <th>最新编辑</th>
             <th>历史版本</th>
             <th>操作</th>
           </tr>
@@ -118,6 +123,7 @@
             <td>{{reportlist' value.catename}}</td>
             <td>{{reportlist' value.reportname}}</td>
             <td>{{reportlist' value.edittime}}</td>
+            <td><!-- if !empty({{reportlist' value.lastedit}}) != '0' -->{{formatDate(reportlist' value.lastedit)}}<!-- endif --> {{reportlist' value.lastuser}}</td>
             <td><a href="{{rootUrl}}versionlist/{{reportlist' value.reportid}}">{{reportlist' value.versionnum}}</a></td>
             <td><a href="#edit-form" class="btn btn-xs" data-toggle="modal" onclick='edititemreport("{{reportlist' value.reportname}}","{{reportlist' value.reportid}}","{{reportlist' value.itemid}}","{{reporlist' value.parentid}}","{{reportlist' value.cateid}}");'>编辑</a><a class="btn btn-xs text-danger" href="#delform"  data-toggle="modal" onclick='delreport("{{reportlist' value.reportname}}","{{reportlist' value.reportid}}","{{reportlist' value.itemid}}");'>删除</a></td>
           </tr>
@@ -401,8 +407,8 @@
     if($('#delarea').val() != ''){
       href += '/area/'+ $('#delarea').val();
     }
-    if($('#delsort').val() == 'report'){
-      href += '/sort/report';
+    if($('#delsort').val() != 'time'){
+      href += '/sort/'+ $('#delsort').val();
     }
 
     if($('#delpindex').val() != ''){
@@ -418,8 +424,8 @@
       if($(this).val() != 0){
         href += '/item/'+$(this).val();
       }
-      if($('#sort').val() == 'report'){
-        href += '/sort/report';
+      if($('#sort').val() != 'time'){
+        href += '/sort/'+$('#sort').val();
       }
       window.location.href = href;
 
@@ -433,8 +439,8 @@
       if($('#areaselect2').val() != 0){
         href += '/area/'+$('#areaselect2').val();
       }
-      if($('#sort').val() == 'report'){
-        href += '/sort/report';
+      if($('#sort').val() != 'time'){
+        href += '/sort/'+$('#sort').val();
       }
       window.location.href = href;
     });
@@ -447,8 +453,8 @@
       if($(this).val() != 0){
         href += '/area/'+$(this).val();
       }
-      if($('#sort').val() == 'report'){
-        href += '/sort/report';
+      if($('#sort').val() != 'time'){
+        href += '/sort/'+$('#sort').val();
       }
       window.location.href = href;
     });
@@ -470,8 +476,8 @@
           href += '/area/'+$('#areaselect2').val();
         }
       }
-      if($(this).val() == 'report'){
-        href += '/sort/report';
+      if($(this).val() != 'time'){
+        href += '/sort/'+$(this).val();
       }
       window.location.href = href;
     });

protected/view/formver-list.html

@@ -5,13 +5,14 @@
       <div class="page-header">
         <a href="{{rootUrl}}addversion/{{reportid}}" class="btn btn-success pull-right">添加新版本</a>
         <h2 id="basis-info">报表历史版本</h2>
+        <p><!-- if {{report.areacate}} == 1 -->全国<!-- elseif {{report.areacate}} == 2 -->广东<!-- else -->通用<!-- endif --> <span class="glyphicon glyphicon-chevron-right"></span> {{report.catename}} <span class="glyphicon glyphicon-chevron-right"></span> {{report.reportname}}</p>
       </div>
       <table class="table table-hover">
         <thead>
           <tr>
             <th>版本时间</th>
-            <th>最新编辑</th>
             <th>版本内容</th>
+            <th>最新编辑</th>
             <th>操作</th>
           </tr>
         </thead>
@@ -20,8 +21,8 @@
         <!-- loop versionlist -->
           <tr>
             <td>{{formatDate(versionlist' value.addtime)}}<!-- if {{versionlist' value.status}} == 1 -->（草稿）<!-- endif --></td>
-            <td>{{formatDate(versionlist' value.edittime)}}</td>
             <td>{{versionlist' value.content}}</td>
+            <td>{{formatDate(versionlist' value.edittime)}} {{versionlist' value.editname}}</td>
             <td><a class="btn btn-xs" href="{{rootUrl}}version/{{versionlist' value.verid}}">编辑</a>&nbsp;<a href="#delver" class="btn btn-xs text-danger"  data-toggle="modal" onclick="delver('{{versionlist' value.vername}}','{{verisonlist' value.verid}}');">删除</a></td>
           </tr>
         <!-- endloop -->