From 26cc334d9510925010efc02c7e8a19ec318c1869 Mon Sep 17 00:00:00 2001 From: zhouxin Date: Thu, 28 Oct 2021 10:37:01 +0800 Subject: [PATCH] Finish task #43618. --- module/productplan/js/create.js | 2 +- module/productplan/js/edit.js | 5 ++++- module/productplan/view/edit.html.php | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module/productplan/js/create.js b/module/productplan/js/create.js index 67c80cbebb..080a8d0581 100644 --- a/module/productplan/js/create.js +++ b/module/productplan/js/create.js @@ -54,7 +54,7 @@ $('#future').on('change', function() { if($(this).prop('checked')) { - $('#begin').val('').attr('disabled', 'disabled'); + $('#begin').attr('disabled', 'disabled'); $('#end').val('').parents('tr').hide(); } else diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js index 3acfaeb631..6b4d8cc604 100644 --- a/module/productplan/js/edit.js +++ b/module/productplan/js/edit.js @@ -43,11 +43,14 @@ $('#future').on('change', function() { if($(this).prop('checked')) { - $('#begin').val('').attr('disabled', 'disabled'); + $('#begin').attr('disabled', 'disabled'); $('#end').val('').parents('tr').hide(); } else { + var begin = $('#begin').val(); + if(begin == '') $('#begin').val(today); + $('#begin').removeAttr('disabled'); $('#end').parents('tr').show(); } diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php index 9b418f0e35..e8ac1dc53a 100644 --- a/module/productplan/view/edit.html.php +++ b/module/productplan/view/edit.html.php @@ -14,6 +14,7 @@ execution->weekend);?> +