Merge branch 'sprint/181_zhengrunyu_18165' into 'master'

*Fixbug 18172.

See merge request easycorp/zentaopms!1257

module/productplan/js/edit.js

@@ -70,7 +70,7 @@ function setPlanStatus()
     var status = $('#status').val();
     if(status != 'wait')
     {
-        $('#checkBox').closest('div').addClass('hidden')
+        $('#checkBox').closest('div').addClass('hidden');
         $('#future').val(0);
         $('#begin').closest('td').addClass('required');
         $('#end').closest('td').addClass('required');

module/productplan/view/batchedit.html.php

@@ -59,7 +59,7 @@
           <?php if($plan->end == '2030-01-01') $plan->end = '';?>
           <td class=<?php echo $required;?>><?php echo html::input("begin[$plan->id]", $plan->begin, "class='form-control form-date' $disabled");?></td>
           <td class=<?php echo $required;?>><?php echo html::input("end[$plan->id]", $plan->end, "class='form-control form-date' $disabled");?></td>
-          <?php $hidden = ($plan->status != 'wait' and $plan->parent != -1) ? 'hidden' : '';?>
+          <?php $hidden = ($plan->status != 'wait') ? 'hidden' : '';?>
           <td><div class='checkbox-primary <?php echo $hidden;?>'><input type='checkbox' id="future<?php echo $plan->id; ?>" name='future[<?php echo $plan->id; ?>]' <?php echo $isChecked;?> onclick="changeDate(<?php echo $plan->id;?>);"/><label for='future<?php echo $plan->id; ?>'><?php echo $lang->productplan->future;?></label></div></td>
           <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, $plan, $extendField->field . "[{$plan->id}]") . "</td>";?>
         </tr>