|
@@ -1298,7 +1298,7 @@ var
|
|
|
sBillsJson = '"id": %d, "pid": %d, "order": %d, "full_path": "%s", "level": %d, "is_leaf" : %d, ' +
|
|
|
'"code": "%s", "b_code": "%s", "name": "%s", "unit": "%s"';
|
|
|
begin
|
|
|
- Result := Format(sBillsJson, [ANode.Rec.ID.AsInteger, ANode.Rec.ParentID.AsInteger, AOrder, AFullPath, ANode.Level, Integer(not ANode.HasChildren),
|
|
|
+ Result := Format(sBillsJson, [ANode.Rec.ID.AsInteger, ANode.Rec.ParentID.AsInteger, AOrder, AFullPath, ANode.Level + 1, Integer(not ANode.HasChildren),
|
|
|
ANode.Rec.Code.AsString, ANode.Rec.B_Code.AsString, ANode.Rec.Name.AsString, ANode.Rec.Units.AsString]);
|
|
|
end;
|
|
|
|
|
@@ -1311,7 +1311,7 @@ var
|
|
|
if AParentPath = '' then
|
|
|
sNodePath := IntToStr(ANode.ID)
|
|
|
else
|
|
|
- sNodePath := AParentPath + '.' + IntToStr(ANode.ID);
|
|
|
+ sNodePath := AParentPath + '-' + IntToStr(ANode.ID);
|
|
|
|
|
|
sgs.Strings[sgs.Count - 1] := sgs.Strings[sgs.Count - 1] + '{';
|
|
|
sgs.Add(Format(' %s', [AnsiToUtf8(GetNodeData(TBillsIDTreeNode(ANode), AOrder, sNodePath))]));
|