Commit 902f34f9 authored by Riri Novita's avatar Riri Novita

Merge branch 'riri' into 'master'

ratio

See merge request !1001
parents 5c0baa5f 83af6a4b
......@@ -505,7 +505,7 @@ export default class SubHolding extends Component {
} else if (this.state.report.value === 4) {
api.create().getReportHierarkiFR(payload).then(response => {
// console.log(payload);
// console.log(response);
console.log(response);
let dataTable = []
if (response.data) {
if (response.data.status === 'success') {
......@@ -536,7 +536,7 @@ export default class SubHolding extends Component {
Number(item.ratio.december).toFixed(1),
Number(item.ratio.total_next_year).toFixed(1),
Number(item.ratio.total_more_year).toFixed(1),
Number(item.ratio.monthly_january).toFixed(1)
Number(item.ratio.monthly_january).toFixed(2),
// item.order,
// item.condition_it_should_be,
// item.condition_if_wrong,
......@@ -575,9 +575,10 @@ export default class SubHolding extends Component {
Number(item.ratio.december).toFixed(1),
Number(item.ratio.total_next_year).toFixed(1),
Number(item.ratio.total_more_year).toFixed(1),
item.order,
item.condition_it_should_be,
item.condition_if_wrong
Number(item.ratio.monthly_january).toFixed(2),
// item.order,
// item.condition_it_should_be,
// item.condition_if_wrong
])
if (item.children !== null) {
if (item.children.length > 0) {
......
......@@ -3836,7 +3836,7 @@ export default class TableSubHolding extends Component {
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[22]).toFixed(1)}
value={Number(tableMeta.rowData[22]).toFixed(2)}
/>
}
/>
......
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