Merge branch 'sprint/235_dongli_bug26188' into 'master'

* Fix bug #26188,#26715.

See merge request easycorp/zentaopms!5241
This commit is contained in:
王怡栋
2022-09-01 07:53:43 +00:00
2 changed files with 12 additions and 0 deletions
+1
View File
@@ -1 +1,2 @@
#mainContent table > tbody > tr > td > div.text-danger.help-text {word-break: break-all;}
[lang^=fr] #mainContent table > tbody > tr {white-space: nowrap;}
+11
View File
@@ -145,6 +145,17 @@ function setParentProgram(parentProgram)
}
budgetOverrunTips();
outOfDateTip();
$('#budgetUnit').val(data.budgetUnit).trigger('chosen:updated');
if(typeof(data.availableBudget) == 'undefined')
{
$('#budget').removeAttr('placeholder').attr('disabled', true);
$('#future').prop('checked', true);
}
else
{
$('#budget').removeAttr('disabled')
$('#future').prop('checked', false);
}
});
$('#parent').attr('data-lastSelected', parentProgram);