Commit d0313fc0 authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

Didam

See merge request !1058
parents 4d4f3397 99d8d7e5
......@@ -2405,7 +2405,7 @@ export default class SubHolding extends Component {
this.getReportType()
})}
disableClearable
style={{ width: 250, marginLeft: 10 }}
style={{ width: 250 }}
renderInput={(params) => <TextField {...params} label="Months" margin="normal" style={{ marginTop: 7 }} />}
value={this.state.month}
/>
......
......@@ -1079,7 +1079,7 @@ export default class MonthlyReport extends Component {
}
})
console.log(dataTable)
this.setState({ dbCF: dataTable, loading: false }, () => {
this.setState({ dbCF: dataTable }, () => {
this.olahDataCashFlow(this.state.dbCF, type)
})
}
......@@ -1797,7 +1797,7 @@ export default class MonthlyReport extends Component {
getOptionLabel={(option) => option.name}
style={{ width: 250 }}
onChange={(event, newInputValue) => {
this.setState({selectedStatus: newInputValue}, () => {
this.setState({selectedStatus: newInputValue, loading: true}, () => {
console.log(newInputValue);
this.getCompanySubmitted()
})
......@@ -1823,7 +1823,7 @@ export default class MonthlyReport extends Component {
{...this.state.listCompany}
id="company"
disabled={this.state.listCompany === null ? true : false}
onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => {
onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true }, () => {
this.getMonthlyReportID()
})}
disableClearable
......
......@@ -289,7 +289,7 @@ export default class BalanceSheetMR extends Component {
downloadTemplate = async () => {
let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/balance_sheet/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/balance_sheet/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&months=${this.props.month.month_id}`
)
res = await res.blob()
// console.log(res)
......
......@@ -232,7 +232,7 @@ export default class FixedAssetsMovementMR extends Component {
downloadTemplate = async () => {
let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/fam/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}`
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/fam/monthly_report/download_template?report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&months=${this.props.month.month_id}`
)
res = await res.blob()
console.log(res);
......
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