Merge branch 'sprint/master_zhoxudong_14090' into 'master'

Sprint/master zhoxudong 14090

See merge request easycorp/zentaopms!2435

module/execution/css/all.css

@@ -20,7 +20,7 @@ td.flex span.project-type-label {margin-left: 5px; min-width: 36px;}
 .c-status, .c-date, .c-percent, .c-attribute {width: 80px;}
 .c-estimate, .c-consumed, .c-left, .c-pm {width: 70px;}
 .c-progress, .c-burn {width: 60px;}
-.c-percent, .c-realBegan, .c-end, .c-begin, .c-realEnd{width: 100px;}
+.c-code, .c-percent, .c-realBegan, .c-end, .c-begin, .c-realEnd{width: 100px;}
 .c-action {text-align: center;}
 .c-name > span {margin-right: 2px;}
 td.flex span.project-type-label {min-width: 40px;}

module/execution/view/all.html.php

@@ -78,6 +78,7 @@
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
           <th><?php common::printOrderLink('name', $orderBy, $vars, (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?></th>
+          <th class='c-code'><?php common::printOrderLink('code', $orderBy, $vars, $lang->execution->code);?></th>
           <?php if($config->systemMode == 'new' and $this->app->tab == 'execution'):?>
           <th class='c-begin'><?php common::printOrderLink('projectName', $orderBy, $vars, $lang->execution->projectName);?></th></th>
           <?php endif;?>
@@ -134,6 +135,7 @@
               <a class="plan-toggle" data-id="<?php echo $execution->id;?>"><i class="icon icon-angle-double-right"></i></a>
             <?php endif;?>
           </td>
+          <td title='<?php echo $execution->code;?>'><?php echo $execution->code;?></td>
           <?php if($config->systemMode == 'new' and $this->app->tab == 'execution'):?>
           <td class='c-begin' title='<?php echo $execution->projectName;?>'>
              <span class="status-execution status-<?php echo $execution->projectName?>"><?php echo $execution->projectName;?></span>