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

*Finish task 46662 46664 46669.

Browse Source
This commit is contained in:
zhengrunyu
2021-12-30 09:14:30 +08:00
parent d28dcd7d63
commit ea8052baa0
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/productplan/js/batchedit.js
+18 -18
View File
@@ -9,17 +9,17 @@ function changeDate(planID)
{
if($("#future"+planID).prop('checked'))
{
$("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');
$("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');
}
else
{
$("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');
$("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');
}
@@ -37,19 +37,19 @@ function setPlanStatus(planID, status)
{
if(status != 'wait')
{
$('#future'+planID).closest('div').addClass('hidden');
$("input[name='begin["+planID+"]']").closest('td').addClass('required');
$("input[name='end["+planID+"]']").closest('td').addClass('required');
$("input[name='begin"+planID+"']").removeAttr('disabled');
$("input[name='end"+planID+"']").removeAttr('disabled');
$('#future' + planID).closest('div').addClass('hidden');
$("input[name='begin[" + planID + "]']").closest('td').addClass('required');
$("input[name='end[" + planID + "]']").closest('td').addClass('required');
$("input[name='begin" + planID + "']").removeAttr('disabled');
$("input[name='end" + planID + "']").removeAttr('disabled');
}
else
{
$('#future'+planID).closest('div').removeClass('hidden');
$("input[name='begin["+planID+"]']").closest('td').removeClass('required');
$("input[name='end["+planID+"]']").closest('td').removeClass('required');
$("input[name='begin"+planID+"']").attr('disabled', 'disabled');
$("input[name='end"+planID+"']").attr('disabled', 'disabled');
$('#future' + planID).closest('div').removeClass('hidden');
$("input[name='begin[" + planID + "]']").closest('td').removeClass('required');
$("input[name='end[" + planID + "]']").closest('td').removeClass('required');
$("input[name='begin" + planID + "']").attr('disabled', 'disabled');
$("input[name='end" + planID + "']").attr('disabled', 'disabled');
}
}
module/productplan/model.php
+2 -2
View File
@@ -455,7 +455,7 @@ class productplanModel extends model
->remove('delta,uid,future')
->get();
if($oldPlan->parent != 0 and $oldPlan->parent != -1) $parentPlan = $this->getByID($oldPlan->parent);
if($oldPlan->parent > 0) $parentPlan = $this->getByID($oldPlan->parent);
if(!empty($parentPlan->begin))
{
if($plan->begin < $parentPlan->begin) dao::$errors['begin'] = sprintf($this->lang->productplan->beginLetterParent, $parentPlan->begin);
@@ -520,7 +520,7 @@ class productplanModel extends model
$plan->end = $data->end[$planID] == '' ? '2030-01-01' : $data->end[$planID];
$plan->status = $data->status[$planID];
if($oldPlans[$planID]->parent != 0 and $oldPlans[$planID]->parent != -1) $parentPlan = $this->getByID($oldPlans[$planID]->parent);
if($oldPlans[$planID]->parent > 0) $parentPlan = $this->getByID($oldPlans[$planID]->parent);
if(!empty($parentPlan->begin))
{
if($plan->begin < $parentPlan->begin) dao::$errors['begin'] = sprintf($this->lang->productplan->beginLetterParent, $parentPlan->begin);