Commit 29418ea4 authored by Riri Novita's avatar Riri Novita

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

parents 9c1bdffb 87ff1323
...@@ -2052,18 +2052,18 @@ export default class SubHolding extends Component { ...@@ -2052,18 +2052,18 @@ export default class SubHolding extends Component {
// console.log(indexIDzz) // console.log(indexIDzz)
if (indexIDzz != -1) { if (indexIDzz != -1) {
dataTable2.push([...dataTable[indexIDzz], dataTable2.push([...dataTable[indexIDzz],
Number(items.ratio.monthly_january).toFixed(2), String(items.ratio.monthly_january) == "" ? "" : Number(items.ratio.monthly_january).toFixed(2),
Number(items.ratio.monthly_february).toFixed(2), String(items.ratio.monthly_february) == "" ? "" : Number(items.ratio.monthly_february).toFixed(2),
Number(items.ratio.monthly_march).toFixed(2), String(items.ratio.monthly_march) == "" ? "" : Number(items.ratio.monthly_march).toFixed(2),
Number(items.ratio.monthly_april).toFixed(2), String(items.ratio.monthly_april) == "" ? "" : Number(items.ratio.monthly_april).toFixed(2),
Number(items.ratio.monthly_may).toFixed(2), String(items.ratio.monthly_may) == "" ? "" : Number(items.ratio.monthly_may).toFixed(2),
Number(items.ratio.monthly_june).toFixed(2), String(items.ratio.monthly_june) == "" ? "" : Number(items.ratio.monthly_june).toFixed(2),
Number(items.ratio.monthly_july).toFixed(2), String(items.ratio.monthly_july) == "" ? "" : Number(items.ratio.monthly_july).toFixed(2),
Number(items.ratio.monthly_august).toFixed(2), String(items.ratio.monthly_august) == "" ? "" : Number(items.ratio.monthly_august).toFixed(2),
Number(items.ratio.monthly_september).toFixed(2), String(items.ratio.monthly_september) == "" ? "" : Number(items.ratio.monthly_september).toFixed(2),
Number(items.ratio.monthly_october).toFixed(2), String(items.ratio.monthly_october) == "" ? "" : Number(items.ratio.monthly_october).toFixed(2),
Number(items.ratio.monthly_november).toFixed(2), String(items.ratio.monthly_november) == "" ? "" : Number(items.ratio.monthly_november).toFixed(2),
Number(items.ratio.monthly_december).toFixed(2), String(items.ratio.monthly_december) == "" ? "" : Number(items.ratio.monthly_december).toFixed(2),
]) ])
} }
if (items.children !== null) { if (items.children !== null) {
...@@ -2076,18 +2076,18 @@ export default class SubHolding extends Component { ...@@ -2076,18 +2076,18 @@ export default class SubHolding extends Component {
} }
dataTable2.push([...dataTable[indexID], dataTable2.push([...dataTable[indexID],
Number(item.ratio.monthly_january).toFixed(2), String(item.ratio.monthly_january) == "" ? "" : Number(item.ratio.monthly_january).toFixed(2),
Number(item.ratio.monthly_february).toFixed(2), String(item.ratio.monthly_february) == "" ? "" : Number(item.ratio.monthly_february).toFixed(2),
Number(item.ratio.monthly_march).toFixed(2), String(item.ratio.monthly_march) == "" ? "" : Number(item.ratio.monthly_march).toFixed(2),
Number(item.ratio.monthly_april).toFixed(2), String(item.ratio.monthly_april) == "" ? "" : Number(item.ratio.monthly_april).toFixed(2),
Number(item.ratio.monthly_may).toFixed(2), String(item.ratio.monthly_may) == "" ? "" : Number(item.ratio.monthly_may).toFixed(2),
Number(item.ratio.monthly_june).toFixed(2), String(item.ratio.monthly_june) == "" ? "" : Number(item.ratio.monthly_june).toFixed(2),
Number(item.ratio.monthly_july).toFixed(2), String(item.ratio.monthly_july) == "" ? "" : Number(item.ratio.monthly_july).toFixed(2),
Number(item.ratio.monthly_august).toFixed(2), String(item.ratio.monthly_august) == "" ? "" : Number(item.ratio.monthly_august).toFixed(2),
Number(item.ratio.monthly_september).toFixed(2), String(item.ratio.monthly_september) == "" ? "" : Number(item.ratio.monthly_september).toFixed(2),
Number(item.ratio.monthly_october).toFixed(2), String(item.ratio.monthly_october) == "" ? "" : Number(item.ratio.monthly_october).toFixed(2),
Number(item.ratio.monthly_november).toFixed(2), String(item.ratio.monthly_november) == "" ? "" : Number(item.ratio.monthly_november).toFixed(2),
Number(item.ratio.monthly_december).toFixed(2), String(item.ratio.monthly_december) == "" ? "" : Number(item.ratio.monthly_december).toFixed(2),
]) ])
if (item.children !== null) { if (item.children !== null) {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment