Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

*Code batchedit time.

Browse Source
This commit is contained in:
zhengrunyu
2021-12-30 14:35:47 +08:00
parent 32430239a5
commit b5348ab449
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/js/batchedit.js
+9
View File
@@ -42,6 +42,11 @@ function setPlanStatus(planID, status)
$("input[name='end[" + planID + "]']").closest('td').addClass('required');
$("input[name='begin" + planID + "']").removeAttr('disabled');
$("input[name='end" + planID + "']").removeAttr('disabled');
$("input[name='begin[" + planID + "]']").val('').removeClass('form-input-hidden').addClass('form-input-show');
$("input[name='end[" + planID + "]']").val('').removeClass('form-input-hidden').addClass('form-input-show');
$("input[name='begin" + planID + "']").removeClass('form-input-show').addClass('form-input-hidden');
$("input[name='end" + planID + "']").removeClass('form-input-show').addClass('form-input-hidden');
$('.form-date').datetimepicker('update');
}
else
{
@@ -50,6 +55,10 @@ function setPlanStatus(planID, status)
$("input[name='end[" + planID + "]']").closest('td').removeClass('required');
$("input[name='begin" + planID + "']").attr('disabled', 'disabled').val('');
$("input[name='end" + planID + "']").attr('disabled', 'disabled').val('');
$("input[name='begin[" + planID + "]']").val('2030-01-01').removeClass('form-input-show').addClass('form-input-hidden');
$("input[name='end[" + planID + "]']").val('2030-01-01').removeClass('form-input-show').addClass('form-input-hidden');
$("input[name='begin" + planID + "']").val('').removeClass('form-input-hidden').addClass('form-input-show');
$("input[name='end" + planID + "']").val('').removeClass('form-input-hidden').addClass('form-input-show');
}
}
module/productplan/model.php
+10 -6
View File
@@ -393,14 +393,18 @@ class productplanModel extends model
->remove('delta,uid,future')
->get();
if($plan->parentBegin != '2030-01-01')
if($plan->parent > 0)
{
if($plan->begin < $plan->parentBegin) dao::$errors['begin'] = sprintf($this->lang->productplan->beginLetterParent, $plan->parentBegin);
}
if($plan->parentEnd != '2030-01-01')
{
if($plan->end !=='2030-01-01' and $plan->end > $plan->parentEnd) dao::$errors['end'] = sprintf($this->lang->productplan->endGreaterParent, $plan->parentEnd);
if($plan->parentBegin != '2030-01-01')
{
if($plan->begin < $plan->parentBegin) dao::$errors['begin'] = sprintf($this->lang->productplan->beginLetterParent, $plan->parentBegin);
}
if($plan->parentEnd != '2030-01-01')
{
if($plan->end !=='2030-01-01' and $plan->end > $plan->parentEnd) dao::$errors['end'] = sprintf($this->lang->productplan->endGreaterParent, $plan->parentEnd);
}
}
unset($plan->parentBegin);
unset($plan->parentEnd);