Merge branch 'sprint/cyy_71876' into 'master'

Sprint/cyy 71876

See merge request easycorp/zentaopms!5683
This commit is contained in:
李玉春
2022-10-09 06:50:04 +00:00
11 changed files with 95 additions and 40 deletions
+2 -2
View File
@@ -4592,12 +4592,12 @@ class executionModel extends model
if(!$isChild)
{
$trClass = 'is-top-level table-nest-child-hide';
$trAttrs = "data-id='$execution->id' data-order='$execution->order' data-nested='true'";
$trAttrs = "data-id='$execution->id' data-order='$execution->order' data-nested='true' data-status={$execution->status}";
}
else
{
$trClass = 'table-nest-hide';
$trAttrs = "data-id={$execution->id} data-parent={$execution->parent}";
$trAttrs = "data-id={$execution->id} data-parent={$execution->parent} data-status={$execution->status}";
$trAttrs .= " data-nest-parent='$execution->parent' data-order='$execution->order' data-nest-path=',$execution->parent,$execution->id,'";
}