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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_72349

Browse Source
This commit is contained in:
wangzemei
2022-10-18 08:56:26 +08:00
parent 5064fc3669 bb90adf795
commit 7075426106
28 changed files with 115 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/view/taskteam.html.php
+11 -4
View File
@@ -4,6 +4,7 @@
#taskTeamEditor .estimateBox input {background-color: #fff; border-right-width: 0px;}
#taskTeamEditor input, #taskTeamEditor span, #taskTeamEditor .chosen-container > a {border-color: #eee;}
</style>
<?php $hiddenArrow = (empty($task->mode) or $task->mode == 'linear') ? '' : 'hidden';?>
<?php $i = 1;?>
<?php if(!empty($task->team)):?>
<?php foreach($task->team as $member):?>
@@ -24,10 +25,10 @@ if($task->mode == 'linear' and strpos('|closed|cancel|pause|', $task->status) !=
$hourDisabled = $memberDisabled;
if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = false;
?>
<tr class='member-<?php echo $memberStatus;?>' data-estimate='<?php echo (float)$member->estimate?>' data-consumed='<?php echo (float)$member->consumed?>' data-left='<?php echo (float)$member->left?>'>
<tr class='member member-<?php echo $memberStatus;?>' data-estimate='<?php echo (float)$member->estimate?>' data-consumed='<?php echo (float)$member->consumed?>' data-left='<?php echo (float)$member->left?>'>
<td>
<span class="team-number"><?php echo $i;?></span>
<i class="icon icon-angle-down"></i>
<i class="icon icon-angle-down <?php echo $hiddenArrow;?>"></i>
</td>
<td class='w-250px'>
<?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'" . ($memberDisabled ? ' disabled' : ''))?>
@@ -55,10 +56,10 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
<?php $i ++;?>
<?php endforeach;?>
<?php endif;?>
<tr class='template teamTemplate member-wait'>
<tr class='template teamTemplate member member-wait'>
<td>
<span class="team-number"><?php echo $i;?></span>
<i class="icon icon-angle-down"></i>
<i class="icon icon-angle-down <?php echo $hiddenArrow;?>"></i>
</td>
<td class='w-240px'>
<?php echo html::select("team[]", $members, '', "class='form-control chosen'")?>
@@ -226,6 +227,10 @@ $(document).ready(function()
{
$newRow.removeClass('highlight');
}, 1600);
var taskMode = $('#mode').val();
if(taskMode == 'multi') $('#taskTeamEditor tr.member .icon-angle-down').addClass('hidden');
disableMembers();
adjustButtons();
setLineNumber();
@@ -278,9 +283,11 @@ $(document).ready(function()
if($(this).val() == 'multi')
{
disableMembers();
$('#taskTeamEditor tr.member .icon-angle-down').addClass('hidden');
}
else
{
$('#taskTeamEditor tr.member .icon-angle-down').removeClass('hidden');
$taskTeamEditor.find('select#team').each(function()
{
$(this).find('option:disabled').removeAttr('disabled').trigger("chosen:updated");