Skip to content

T
Tia-dev
Commit c54a3281 authored by Riri Novita's avatar Riri Novita
Browse files
Options

Merge branch 'dev-riri' into 'ENV-DEV' 

Issue Prod Subco

See merge request !2272
parents 02889437 961bc557
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
src/container/Reports/SubHolding.js
View file @ c54a3281
...@@ -4328,7 +4328,9 @@ export default class SubHolding extends Component { ...@@ -4328,7 +4328,9 @@ export default class SubHolding extends Component {
onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true, previewTable: false }, () => { onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true, previewTable: false }, () => {
let tahun = Number(this.state.periode.periode) let tahun = Number(this.state.periode.periode)
let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
this.setState({ report: bizpar[0], reportType: bizpar }) console.log(bizpar);
console.log(defaultReport);
this.setState({ report: this.state.report, reportType: bizpar })
this.getCurrency(this.state.company.company_id) this.getCurrency(this.state.company.company_id)
this.getReportType() this.getReportType()
})} })}
...@@ -4351,7 +4353,9 @@ export default class SubHolding extends Component { ...@@ -4351,7 +4353,9 @@ export default class SubHolding extends Component {
this.getCurrency(newInputValue.company_id) this.getCurrency(newInputValue.company_id)
let tahun = Number(this.state.periode.periode) let tahun = Number(this.state.periode.periode)
let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
this.setState({ report: bizpar[0], reportType: bizpar }) console.log(bizpar);
console.log(defaultReport);
this.setState({ report: this.state.report, reportType: bizpar })
})} })}
disableClearable disableClearable
style={{ width: 250 }} style={{ width: 250 }}
...@@ -4392,7 +4396,8 @@ export default class SubHolding extends Component { ...@@ -4392,7 +4396,8 @@ export default class SubHolding extends Component {
// } // }
let tahun = Number(this.state.periode.periode) let tahun = Number(this.state.periode.periode)
let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport let bizpar = tahun >= 2024 && defaultCurrencyID == 2 && newInputValue.id == 1 ? defaultReport.filter(e => e.report === 2) : defaultReport
this.setState({ report: bizpar[0], reportType: bizpar }) let indexID = bizpar.findIndex((val) => val.value == this.state.report.value)
this.setState({ report: indexID == -1 ? bizpar[0] : this.state.report, reportType: bizpar })
this.getReportType() this.getReportType()
})} })}
......
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