Merge branch 'lyk_25876' into 'master'

* Fix bug 25876.

See merge request easycorp/zentaopms!4793
This commit is contained in:
孙广明
2022-08-05 02:32:36 +00:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -91,7 +91,7 @@
<th><?php echo $lang->execution->days;?></th> <th><?php echo $lang->execution->days;?></th>
<td> <td>
<div class='input-group'> <div class='input-group'>
<?php echo html::input('days', (isset($plan) && !empty($plan->begin) ? helper::workDays($plan->begin, $plan->end) : ''), "class='form-control'");?> <?php echo html::input('days', (isset($plan) && !empty($plan->begin) ? (helper::workDays($plan->begin, $plan->end) + 1) : ''), "class='form-control'");?>
<span class='input-group-addon'><?php echo $lang->execution->day;?></span> <span class='input-group-addon'><?php echo $lang->execution->day;?></span>
</div> </div>
</td><td></td><td></td> </td><td></td><td></td>
+1 -1
View File
@@ -32,7 +32,7 @@ $(function()
} }
else else
{ {
$.apps.open(createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID), 'project') $.apps.open(createLink('execution', 'create', 'projectID=' + projectID + '&executionID=&copyExecutionID=&planID=' + planID + '&confirm=&productID=' + productID), 'execution')
} }
$('#projects').modal('hide'); $('#projects').modal('hide');
}); });