Merge branch 'master' of github.com:easysoft/zentaopms

This commit is contained in:
wangyidong
2019-06-03 15:38:52 +08:00
8 changed files with 24 additions and 15 deletions
+1 -1
View File
@@ -2,6 +2,7 @@
<h2 class="detail-title">
<span class="label-id"><?php echo $task->id?></span>
<span class="label label-task"><?php echo $lang->task->common?></span>
<span class="label label-task"><?php echo zget($lang->task->statusList, $task->status);?></span>
<span class="title">
<?php if($task->parent > 0) echo '<span class="label no-margin label-badge label-light">' . $this->lang->task->childrenAB . '</span>';?>
<?php if(!empty($task->team)) echo '<span class="label no-margin label-badge label-light">' . $this->lang->task->multipleAB . '</span>';?>
@@ -10,7 +11,6 @@
</h2>
<div class="detail-content article-content">
<div class="infos">
<span class="status-task status-wait"><span class="label label-dot"></span> <?php echo zget($lang->task->statusList, $task->status);?></span>
<span><?php echo $lang->task->estimate;?> <?php echo $task->estimate . $lang->workingHour;?></span>
<span><?php echo $lang->task->consumed;?> <?php echo round($task->consumed, 2) . $lang->workingHour;?></span>
<span><?php echo $lang->task->left;?> <?php echo $task->left . $lang->workingHour;?></span>