From 266fdf9ca7c12c2b65dbc419d722ec0b13bf370c Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Wed, 10 Aug 2022 05:42:26 +0000 Subject: [PATCH] * Update code. --- module/program/js/common.js | 1 + module/program/view/edit.html.php | 1 + module/project/js/common.js | 3 +++ module/project/view/create.html.php | 1 + module/project/view/edit.html.php | 1 + 5 files changed, 7 insertions(+) diff --git a/module/program/js/common.js b/module/program/js/common.js index af31edbc9d..64ea25edc4 100644 --- a/module/program/js/common.js +++ b/module/program/js/common.js @@ -338,6 +338,7 @@ function compareChildDate() var selectedProgramID = $('#parent').val(); if($('#dateTip').length > 0) $('#dateTip').remove(); + if(end == longTime) end = LONG_TIME; if(end.length > 0 && begin.length > 0) { var programEnd = new Date(end); diff --git a/module/program/view/edit.html.php b/module/program/view/edit.html.php index 87b92ff8b7..6c4682ef19 100644 --- a/module/program/view/edit.html.php +++ b/module/program/view/edit.html.php @@ -12,6 +12,7 @@ ?> + app->getMethodName());?> execution->weekend);?> program->longTime);?> diff --git a/module/project/js/common.js b/module/project/js/common.js index 850692fcb0..c163c3bb2d 100644 --- a/module/project/js/common.js +++ b/module/project/js/common.js @@ -116,6 +116,7 @@ function computeEndDate(delta) $('#end').val(longTime); $('#daysBox').addClass('hidden'); $('#days').val(0); + outOfDateTip(); return false; } $('#daysBox').removeClass('hidden'); @@ -363,6 +364,8 @@ function outOfDateTip() { var end = $('#end').val(); var begin = $('#begin').val(); + + if(end == longTime) end = LONG_TIME; if(end.length > 0 && begin.length > 0) { var selectedProgramID = $('#parent').val(); diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php index c5f0face04..6ec9c625f3 100755 --- a/module/project/view/create.html.php +++ b/module/project/view/create.html.php @@ -13,6 +13,7 @@ + diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index d028217838..5d0aabb2e7 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -14,6 +14,7 @@ execution->weekend);?> + project->errorSameProducts);?> project->errorSameBranches);?> project->errorSamePlans);?>