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

Merge branch 'sprint200_leiyong_task_56387' into 'sprint_200'

Browse Source 
* Finish task#56387.

See merge request easycorp/zentaopms!3775
This commit is contained in:
孙广明
2022-06-08 07:44:47 +00:00
parent 0c0af6336a 49604b2248
commit a3cf2ab2b4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/css/view.css
+3
View File
@@ -5,3 +5,6 @@
.pull-left{max-width: 80%;}
.MRThWidth {width: 90px !important;}
.btn-edit-comment {z-index: 100;}
#assignedTo a {border-color: transparent;}
#assignedTo a:hover {border-color: rgba(0,0,0,.2);}
module/task/view/view.html.php
+2 -3
View File
@@ -112,7 +112,7 @@
<th class='w-40px'> <?php echo $lang->task->lblPri;?></th>
<th> <?php echo $lang->task->name;?></th>
<th class='w-100px'><?php echo $lang->task->deadline;?></th>
<th class='w-80px'> <?php echo $lang->task->assignedTo;?></th>
<th class='w-120px'> <?php echo $lang->task->assignedTo;?></th>
<th class='w-80px'> <?php echo $lang->task->status;?></th>
<th class='w-60px visible-lg'><?php echo $lang->task->consumedAB . $lang->task->lblHour;?></th>
<th class='w-60px visible-lg'><?php echo $lang->task->leftAB . $lang->task->lblHour;?></th>
@@ -132,13 +132,12 @@
</td>
<td class='text-left' title='<?php echo $child->name;?>'><a class="iframe" data-width="90%" href="<?php echo $this->createLink('task', 'view', "taskID=$child->id", '', true); ?>"><?php echo $child->name;?></a></td>
<td><?php echo $child->deadline;?></td>
<td><?php echo zget($users, $child->assignedTo);?></td>
<td id='assignedTo'><?php $this->task->printAssignedHtml($child, $users);?></td>
<td><?php echo $this->processStatus('task', $child);?></td>
<td class='visible-lg'><?php echo $child->consumed;?></td>
<td class='visible-lg'><?php echo $child->left;?></td>
<td class='c-actions'>
<?php
common::printIcon('task', 'assignTo', "executionID=$child->execution&taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'start', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'activate', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);
common::printIcon('task', 'close', "taskID=$child->id", $child, 'list', '', '', 'iframe showinonlybody', true);