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

Merge branch 'sprint/244_tianshujie_70498' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70498

Browse Source
This commit is contained in:
tianshujie
2022-10-10 16:20:25 +08:00
parent 1b6949c8fb f7a8569d2e
commit 42cc38b87d
3 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/css/create.css
+17 -5
View File
@@ -28,9 +28,21 @@
.c-modulel {width: 110px;}
.keep-row-height {height: 32px;}
#modalTeam .modal-dialog {height: 360px; width: 620px;}
#modalTeam .modal-header {height: 44px; padding: 10px 0;}
#modalTeam .modal-header .modal-title {font-size: 13px; color: #3c4353;}
#modalTeam .modal-body {padding-top: 12px;}
#modalTeam .modal-dialog {height: 340px; width: 620px; color: #3c4353;}
#modalTeam .modal-content {padding: 0 0 5px; height: 340px;}
#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0;}
#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
#modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px!important; overflow-y: scroll!important;}
#taskTeamEditor tr {padding: 8px 7px 8px 7px;}
#taskTeamEditor td {height: 36px;}
#taskTeamEditor td .chosen-single .chosen-search input,
#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
#taskTeamEditor tr td:first-child {width: 40px; position: relative;}
.team-number {display: inline-block; width: 20px; height: 20px; height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
#taskTeamEditor tr:last-child td:first-child .icon {display: none;}
#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
module/task/css/edit.css
+18
View File
@@ -3,3 +3,21 @@
#showAllModuleBox .no-margin {padding-left:22px;}
#taskTeamEditor .sortable .input-group .input-group-addon.required:after {top: 10px; right: 2px; z-index: 3;}
#storyIdBox .chosen-container .chosen-drop.chosen-no-wrap>.chosen-results>li {text-overflow: unset;}
#modalTeam .modal-dialog {padding-bottom: 20px;}
#modalTeam .modal-content {padding: 20px 13px 0; height: 340px;max-height: 296px!important; overflow-y: scroll!important;}
#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; }
#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
#taskTeamEditor tr {padding: 8px 7px 8px 7px;}
#taskTeamEditor td .chosen-single .chosen-search input,
#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
#taskTeamEditor tr td:first-child {width: 40px; position: relative;}
.team-number {display: inline-block; width: 20px; height: 20px; height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
#taskTeamEditor tr:last-child td:first-child .icon {display: none;}
#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
module/task/view/taskteam.html.php
+4 -2
View File
@@ -26,7 +26,8 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
?>
<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?>'>
<td>
<span><?php echo $i;?></span>
<span class="team-number"><?php echo $i;?></span>
<i class="icon icon-angle-down"></i>
</td>
<td class='w-250px'>
<?php echo html::select("team[]", $members, $member->account, "class='form-control chosen'" . ($memberDisabled ? ' disabled' : ''))?>
@@ -56,7 +57,8 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
<?php endif;?>
<tr class='template teamTemplate member-wait'>
<td>
<span><?php echo $i;?></span>
<span class="team-number"><?php echo $i;?></span>
<i class="icon icon-angle-down"></i>
</td>
<td class='w-250px'>
<?php echo html::select("team[]", $members, '', "class='form-control chosen'")?>