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

* finish task #5667.

Browse Source
This commit is contained in:
wangyidong
2019-06-06 11:03:41 +08:00
parent 16ae56ee9a
commit 02b6bfc8b6
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/view/activate.html.php
+2 -1
View File
@@ -27,7 +27,8 @@
<form method='post' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-70px'><?php echo $lang->task->assignedTo;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-90px' : 'w-70px';?>
<th class='<?php echo $colWidth;?>'><?php echo $lang->task->assignedTo;?></th>
<td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td>
<td></td>
</tr>
module/task/view/finish.html.php
+3 -2
View File
@@ -35,13 +35,14 @@
<form method='post' enctype='multipart/form-data' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
<?php $colWidth = $app->getClientLang() == 'en' ? 'w-110px' : 'w-80px';?>
<th class='<?php echo $colWidth;?>'><?php echo !empty($task->team) ? $lang->task->common . $lang->task->consumed : $lang->task->hasConsumed;?></th>
<td class='w-p25-f'><?php echo $task->consumed;?> <?php echo $lang->workingHour;?></td>
<td></td>
</tr>
<?php if(!empty($task->team)):?>
<tr>
<th class='w-80px'><?php echo $lang->task->hasConsumed;?></th>
<th class='<?php echo $colWidth;?>'><?php echo $lang->task->hasConsumed;?></th>
<td class='w-p25-f'><?php echo $task->myConsumed;?> <?php echo $lang->workingHour;?></td><td></td>
</tr>
<?php endif;?>