Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

fix cp project js error

See merge request easycorp/zentaopms!6447
This commit is contained in:
孙广明
2022-12-02 00:59:43 +00:00
6 changed files with 30 additions and 0 deletions
+1
View File
@@ -27,3 +27,4 @@
.futureBox {vertical-align: top !important; padding-top: 13px !important;}
#projectType {padding-top: 7px !important;}
.division .icon-help {margin-left: 15px}
.has-info {border-color: #0c64eb!important;}
+6
View File
@@ -374,3 +374,9 @@ $lang->project->action = new stdclass();
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
$lang->project->multiple = "Multi {$lang->executionCommon}";
$lang->project->copyproject = new stdClass();
$lang->project->copyproject->nameTips = '『Project Name』Cannot be repeated.';
$lang->project->copyproject->codeTips = '『Project Code』Cannot be repeated.';
$lang->project->copyproject->endTips = '『Schedule End』Cannot be empty.';
$lang->project->copyproject->daysTips = '『Available working days』Should be numerical.';
+6
View File
@@ -374,3 +374,9 @@ $lang->project->action = new stdclass();
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
$lang->project->multiple = "Multi {$lang->executionCommon}";
$lang->project->copyproject = new stdClass();
$lang->project->copyproject->nameTips = '『Project Name』Cannot be repeated.';
$lang->project->copyproject->codeTips = '『Project Code』Cannot be repeated.';
$lang->project->copyproject->endTips = '『Schedule End』Cannot be empty.';
$lang->project->copyproject->daysTips = '『Available working days』Should be numerical.';
+6
View File
@@ -374,3 +374,9 @@ $lang->project->action = new stdclass();
$lang->project->action->managed = '$date, managed by <strong>$actor</strong>. $extra' . "\n";
$lang->project->multiple = "Multi {$lang->executionCommon}";
$lang->project->copyproject = new stdClass();
$lang->project->copyproject->nameTips = '『Project Name』Cannot be repeated.';
$lang->project->copyproject->codeTips = '『Project Code』Cannot be repeated.';
$lang->project->copyproject->endTips = '『Schedule End』Cannot be empty.';
$lang->project->copyproject->daysTips = '『Available working days』Should be numerical.';
+6
View File
@@ -374,3 +374,9 @@ $lang->project->action = new stdclass();
$lang->project->action->managed = '$date, 由 <strong>$actor</strong> 维护。$extra' . "\n";
$lang->project->multiple = "启用{$lang->executionCommon}";
$lang->project->copyproject = new stdClass();
$lang->project->copyproject->nameTips = '『项目名称』不可重复需要修改。';
$lang->project->copyproject->codeTips = '『项目代号』不可重复需要修改。';
$lang->project->copyproject->endTips = '『计划完成』不能为空。';
$lang->project->copyproject->daysTips = '『可用工作日』应当是数字。';
+5
View File
@@ -35,6 +35,11 @@
<?php js::set('ignore', $lang->project->ignore);?>
<?php $requiredFields = $config->project->create->requiredFields;?>
<?php js::set('requiredFields', $requiredFields);?>
<?php js::set('copyType', '');?>
<?php js::set('nameTips', $lang->project->copyproject->nameTips);?>
<?php js::set('codeTips', $lang->project->copyproject->codeTips);?>
<?php js::set('endTips', $lang->project->copyproject->endTips);?>
<?php js::set('daysTips', $lang->project->copyproject->daysTips);?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>