Merge branch 'master' of github.com:easysoft/zentaopms

2017-10-23 17:21:30 +08:00
parent 1508828fc1 c9805574df
commit b252c629d9
13 changed files with 102 additions and 75 deletions
@@ -70,13 +70,18 @@ js::set('browseType', $browseType);
        <tr class='text-center' data-id='<?php echo $task->id?>'>
          <?php foreach ($setting as $key => $value) $this->task->printCell($value, $task, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?>
        </tr>
-          <?php if(!empty($task->children)):?>
-            <?php foreach($task->children as $child):?>
-            <tr class='text-center table-children parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>'>
+          <?php
+            if(!empty($task->children))
+            {
+              $childrenNum = count($task->children);
+              foreach($task->children as $key=>$child)
+              {
+          ?>
+            <tr class='text-center table-children<?php if($key==0) echo ' table-child-top';?><?php if(($key+1) == $childrenNum) echo ' table-child-bottom';?> parent-<?php echo $task->id;?>' data-id='<?php echo $child->id?>'>
              <?php foreach ($setting as $key => $value) $this->task->printCell($value, $child, $users, $browseType, $branchGroups, $modulePairs, $useDatatable ? 'datatable' : 'table');?>
            </tr>
-            <?php endforeach;?>
-          <?php endif;?>
+            <?php }?>
+          <?php }?>
        <?php endforeach;?>
      </tbody>
      <tfoot>