Merge branch 'master_liuhong_63781' into 'master'

Master liuhong 63781

See merge request easycorp/zentaopms!4858
This commit is contained in:
王怡栋
2022-08-09 05:34:39 +00:00
2 changed files with 2 additions and 1 deletions
+1
View File
@@ -16,3 +16,4 @@ tbody.sortable > tr > td.sort-handler {color: #3c4353 !important;}
div.checkbox-primary + span.table-nest-icon {margin-left:0px !important;}
#checkAll + label.hover:after {border-width: 0px;}
.c-budget {padding-right:16px !important;}
+1 -1
View File
@@ -80,7 +80,7 @@
<?php endif;?>
</td>
<?php $programBudget = $this->loadModel('project')->getBudgetWithUnit($program->budget);?>
<td class='text-right'><?php echo $program->budget != 0 ? zget($lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $lang->project->future;?></td>
<td class='text-right c-budget'><?php echo $program->budget != 0 ? zget($lang->project->currencySymbol, $program->budgetUnit) . ' ' . $programBudget : $lang->project->future;?></td>
<td><?php echo $program->begin;?></td>
<td><?php echo $program->end == LONG_TIME ? $lang->program->longTime : $program->end;?></td>
<td>