Skip to content

T
Tia-dev
Commit 32993b46 authored by rifkaki's avatar rifkaki
Browse files
Options

issue cf & sumaratio

parent 822319d1
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 9 deletions
src/container/Laporan/SubHolding.js
View file @ 32993b46
...@@ -2483,6 +2483,8 @@ export default class SubHolding extends Component { ...@@ -2483,6 +2483,8 @@ export default class SubHolding extends Component {
} }
getCFSumaLastMR(payload, dbSumaCF) { getCFSumaLastMR(payload, dbSumaCF) {
console.log(dbSumaCF)
console.log(this.state.dbSumaCF)
api.create().getReportCFSumaMR(payload).then(response => { api.create().getReportCFSumaMR(payload).then(response => {
console.log(payload); console.log(payload);
console.log(response); console.log(response);
...@@ -2496,6 +2498,7 @@ export default class SubHolding extends Component { ...@@ -2496,6 +2498,7 @@ export default class SubHolding extends Component {
if (indexID != -1) { if (indexID != -1) {
const handlePushChild = (items) => { const handlePushChild = (items) => {
let indexIDzz = dataTable2.findIndex((val) => val[1] === items.id) let indexIDzz = dataTable2.findIndex((val) => val[1] === items.id)
let indexIDSumaChild = dbSumaCF.findIndex((val) => val[0] == items.id)
// console.log(indexIDzz) // console.log(indexIDzz)
if (indexIDzz != -1) { if (indexIDzz != -1) {
dataTable3.push([...dataTable2[indexIDzz], dataTable3.push([...dataTable2[indexIDzz],
...@@ -2511,7 +2514,7 @@ export default class SubHolding extends Component { ...@@ -2511,7 +2514,7 @@ export default class SubHolding extends Component {
items.cash_flow.october, items.cash_flow.october,
items.cash_flow.november, items.cash_flow.november,
items.cash_flow.december, items.cash_flow.december,
...dbSumaCF[indexIDSuma] ...dbSumaCF[indexIDSumaChild]
]) ])
} }
if (items.children !== null) { if (items.children !== null) {
......
src/container/Laporan/TableSubHolding.js
View file @ 32993b46
...@@ -14462,12 +14462,12 @@ export default class TableSubHolding extends Component { ...@@ -14462,12 +14462,12 @@ export default class TableSubHolding extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]).toFixed(2)} value={Number(tableMeta.rowData[9]).toFixed(1)}
/> />
} }
/> />
...@@ -14621,12 +14621,12 @@ export default class TableSubHolding extends Component { ...@@ -14621,12 +14621,12 @@ export default class TableSubHolding extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[13]).toFixed(2)} value={Number(tableMeta.rowData[13]).toFixed(1)}
/> />
} }
/> />
...@@ -14670,12 +14670,12 @@ export default class TableSubHolding extends Component { ...@@ -14670,12 +14670,12 @@ export default class TableSubHolding extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[15]).toFixed(2)} value={Number(tableMeta.rowData[15]).toFixed(1)}
/> />
} }
/> />
...@@ -14717,12 +14717,12 @@ export default class TableSubHolding extends Component { ...@@ -14717,12 +14717,12 @@ export default class TableSubHolding extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: this.props.approveMonthly ? 'black' : '#5198ea', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
suffix={'%'} suffix={'%'}
disabled={true} disabled={true}
value={Number(tableMeta.rowData[17]).toFixed(2)} value={Number(tableMeta.rowData[17]).toFixed(1)}
/> />
} }
/> />
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