Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/zentaopms230'

Browse Source
This commit is contained in:
wangyidong
2022-09-01 13:28:26 +08:00
parent 5bb9d5ea6d da43a0c083
commit e7d65e1dce
47 changed files with 1591 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/view/view.html.php
+7 -2
View File
@@ -262,7 +262,7 @@
<th><?php echo $lang->task->assignedTo;?></th>
<td>
<?php
if(!empty($task->team) and $task->mode == 'multi' and $task->status != 'closed')
if(!empty($task->team) and $task->mode == 'multi' and strpos('done,cencel,closed', $task->status) === false)
{
foreach($task->team as $member) echo ' ' . zget($users, $member->account);
}
@@ -349,14 +349,19 @@
<th class='text-center'><?php echo $lang->task->estimate?></th>
<th class='text-center'><?php echo $lang->task->consumed?></th>
<th class='text-center'><?php echo $lang->task->left?></th>
<th class='text-center'><?php echo $lang->statusAB;?></th>
</tr>
</thead>
<?php foreach($task->team as $member):?>
<tr class='text-center'>
<td class='text-left'><?php echo zget($users, $member->account)?></td>
<td class='text-left'>
<?php echo zget($users, $member->account);?>
<?php if($member->transfer) echo "({$lang->task->replace})";?>
</td>
<td><?php echo (float)$member->estimate?></td>
<td><?php echo (float)$member->consumed?></td>
<td><?php echo (float)$member->left?></td>
<td class="status-<?php echo $member->status;?>"><?php echo zget($lang->task->statusList, $member->status);?></td>
</tr>
<?php endforeach;?>
</table>