* Finish task #40843.

This commit is contained in:
tianshujie98
2021-08-03 10:55:39 +08:00
parent 2e0d20f7b9
commit d83bb8b852
10 changed files with 14 additions and 14 deletions

View File

@@ -49,13 +49,13 @@ $(function()
}
})
$('#cancel').click(function()
$('#cancelBtn').click(function()
{
$('#syncPRJUnit').val('false');
$('#exchangeRate').val('');
})
$('#confirm').click(function()
$('#confirmBtn').click(function()
{
var exchangeRate = $('#rate').val();
if(!exchangeRate)

View File

@@ -53,7 +53,7 @@ $lang->program->beginGreateChild = "Child earliest begin: %s, parent begi
$lang->program->endLetterChild = "Child latest end: %s, parent end date > = child latest end date.";
$lang->program->closeErrorMessage = 'There are subprograms or projects that are not closed';
$lang->program->confirmDelete = "Do you want to delete it?";
$lang->program->confirmChangePRJUint = 'Do you want to update the budget unit of the project of the program? If yes, please the current exchange rate.';
$lang->program->confirmChangePRJUint = 'Synchronize the budget unit of the subprograms and the projects of the program? If yes, please the current exchange rate.';
$lang->program->exRateNotNegative = 'The『exchange rate』should not be negative.';
$lang->program->changePRJUnit = 'Update the budget unit of the project';
$lang->program->hasChildren = 'It has child programs or projects. You cannot delete it.';

View File

@@ -56,7 +56,7 @@ $lang->program->endLetterChild = "Child latest end: %s, parent end date
$lang->program->closeErrorMessage = 'There are subprograms or projects that are not closed';
$lang->program->hasChildren = 'The program has a child program or the project exists and can not be deleted.';
$lang->program->confirmDelete = "Do you want to delete it?";
$lang->program->confirmChangePRJUint = 'Do you want to update the budget unit of the project of the program? If yes, please the current exchange rate.';
$lang->program->confirmChangePRJUint = 'Synchronize the budget unit of the subprograms and the projects of the program? If yes, please the current exchange rate.';
$lang->program->exRateNotNegative = 'The『exchange rate』should not be negative.';
$lang->program->changePRJUnit = 'Update the budget unit of the project';
$lang->program->readjustTime = 'Change the program begin&end date.';

View File

@@ -53,7 +53,7 @@ $lang->program->beginGreateChild = "Child earliest begin: %s, parent begi
$lang->program->endLetterChild = "Child latest end: %s, parent end date > = child latest end date.";
$lang->program->closeErrorMessage = 'There are subprograms or projects that are not closed';
$lang->program->confirmDelete = "Do you want to delete it?";
$lang->program->confirmChangePRJUint = 'Do you want to update the budget unit of the project of the program? If yes, please the current exchange rate.';
$lang->program->confirmChangePRJUint = 'Synchronize the budget unit of the subprograms and the projects of the program? If yes, please the current exchange rate.';
$lang->program->exRateNotNegative = 'The『exchange rate』should not be negative.';
$lang->program->changePRJUnit = 'Update the budget unit of the project';
$lang->program->hasChildren = 'It has child programs or projects. You cannot delete it.';

View File

@@ -53,7 +53,7 @@ $lang->program->beginGreateChild = "Child earliest begin: %s, parent begi
$lang->program->endLetterChild = "Child latest end: %s, parent end date > = child latest end date.";
$lang->program->closeErrorMessage = 'There are subprograms or projects that are not closed';
$lang->program->confirmDelete = "Do you want to delete it?";
$lang->program->confirmChangePRJUint = 'Do you want to update the budget unit of the project of the program? If yes, please the current exchange rate.';
$lang->program->confirmChangePRJUint = 'Synchronize the budget unit of the subprograms and the projects of the program? If yes, please the current exchange rate.';
$lang->program->exRateNotNegative = 'The『exchange rate』should not be negative.';
$lang->program->changePRJUnit = 'Update the budget unit of the project';
$lang->program->hasChildren = 'It has child programs or projects. You cannot delete it.';

View File

@@ -67,7 +67,7 @@ $lang->program->endLetterChild = "子项目的最大完成日期:%s
$lang->program->closeErrorMessage = '存在子项目集或项目为未关闭状态';
$lang->program->hasChildren = '该项目集有子项目集或项目存在,不能删除。';
$lang->program->confirmDelete = "您确定要删除吗?";
$lang->program->confirmChangePRJUint = '是否同步更新项目集下项目的预算的单位?若确认更新,请填写今日汇率。';
$lang->program->confirmChangePRJUint = '是否同步更新项目集下子项目集和项目的预算的单位?若确认更新,请填写今日汇率。';
$lang->program->exRateNotNegative = '『汇率』不能是负数。';
$lang->program->changePRJUnit = '更新项目预算单位';
$lang->program->readjustTime = '重新调整项目集起止时间';

View File

@@ -453,8 +453,8 @@ class programModel extends model
$this->dao->update(TABLE_PROJECT)
->set('budgetUnit')->eq($program->budgetUnit)
->beginIF(!empty($_POST['exchangeRate']))->set("budget = {$_POST['exchangeRate']} * `budget`")->fi()
->where('parent')->eq($programID)
->andWhere('type')->eq('project')
->where('path')->like(",{$programID},%")
->andWhere('type')->in('program,project')
->exec();
}

View File

@@ -140,8 +140,8 @@
</tr>
<tr>
<td colspan='3' class='text-center'>
<?php echo html::commonButton($lang->confirm, "id='confirm'", 'btn btn-primary btn-wide');?>
<?php echo html::commonButton($lang->cancel, "data-dismiss='modal' id='cancel'", 'btn btn-default btn-wide');?>
<?php echo html::commonButton($lang->confirm, "id='confirmBtn'", 'btn btn-primary btn-wide');?>
<?php echo html::commonButton($lang->cancel, "data-dismiss='modal' id='cancelBtn'", 'btn btn-default btn-wide');?>
</td>
</tr>
</table>

View File

@@ -8,3 +8,6 @@ td.c-actions {overflow: visible;}
#programBox {float: left; margin-right: 10px; width: 170px !important;}
#programID_chosen div.chosen-drop.chosen-auto-max-width.in {width: 450px !important;}
#switchButton {background: #fff !important;}
.icon-cards-view {padding-left: 7px; font-size: 16px;}
.icon-list {padding-left: 7px;}
.panel-actions {position: relative; padding: 0 0;}

View File

@@ -11,9 +11,6 @@
*/
?>
<style>
.panel-actions {position: relative; padding: 0 0;}
.icon-cards-view {padding-left: 7px; font-size: 16px;}
.icon-list {padding-left: 7px;}
#cards {margin: 0 0;}
#cards > .col {width: 25%;}
#cards .panel {margin: 10px 0; border: 1px solid #DCDCDC; border-radius: 4px; box-shadow: none; cursor: pointer; height: 190px;}