diff --git a/module/programplan/lang/zh-cn.php b/module/programplan/lang/zh-cn.php index 4d456fd181..627a2e5d4b 100644 --- a/module/programplan/lang/zh-cn.php +++ b/module/programplan/lang/zh-cn.php @@ -53,8 +53,10 @@ $lang->programplan->hideCriticalPath = '隐藏关键路径'; $lang->programplan->showCriticalPath = '显示关键路径'; $lang->programplan->errorBegin = '阶段的开始时间不能小于所属项目的开始时间%s'; $lang->programplan->errorEnd = '阶段的结束时间不能大于所属项目的结束时间%s'; -$lang->programplan->emptyBegin = '『计划开始』应当为合法的日期'; -$lang->programplan->emptyEnd = '『计划完成』应当为合法的日期'; +$lang->programplan->emptyBegin = '『计划开始』日期不能为空'; +$lang->programplan->emptyEnd = '『计划完成』日期不能为空'; +$lang->programplan->checkBegin = '『计划开始』应当为合法的日期'; +$lang->programplan->checkEnd = '『计划完成』应当为合法的日期'; $lang->programplan->milestoneList[1] = '是'; $lang->programplan->milestoneList[0] = '否'; diff --git a/module/programplan/model.php b/module/programplan/model.php index 1b767fadfb..15beca9b72 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -447,16 +447,26 @@ class programplanModel extends model dao::$errors['message'][] = $this->lang->programplan->error->percentNumber; return false; } - if($plan->begin == '0000-00-00' or !validater::checkDate($plan->begin)) + if($plan->begin == '0000-00-00') { dao::$errors['message'][] = $this->lang->programplan->emptyBegin; return false; } - if($plan->end == '0000-00-00' or !validater::checkDate($plan->end)) + if(!validater::checkDate($plan->begin)) + { + dao::$errors['message'][] = $this->lang->programplan->checkBegin; + return false; + } + if($plan->end == '0000-00-00') { dao::$errors['message'][] = $this->lang->programplan->emptyEnd; return false; } + if(!validater::checkDate($plan->end)) + { + dao::$errors['message'][] = $this->lang->programplan->checkEnd; + return false; + } if($plan->end != '0000-00-00' and $plan->end < $plan->begin) { dao::$errors['message'][] = $this->lang->programplan->error->planFinishSmall;