Commit bb2541b4 authored by Riri Novita's avatar Riri Novita

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

parents 88be97c6 5339593b
...@@ -271,6 +271,7 @@ const create = (type = "") => { ...@@ -271,6 +271,7 @@ const create = (type = "") => {
const uploadAttachmentMonthly = (body) => api.post('transaction/monthly_report/upload_attachment', body) const uploadAttachmentMonthly = (body) => api.post('transaction/monthly_report/upload_attachment', body)
const deleteAttachmentMonthly = (id) => api.post(`transaction/monthly_report/delete_attachment/${id}`) const deleteAttachmentMonthly = (id) => api.post(`transaction/monthly_report/delete_attachment/${id}`)
const createMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/create_monthly_report', body) const createMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/create_monthly_report', body)
const createMonthlyReportLOCF = (body) => api.post('transaction/monthly_report_locf/create_monthly_report', body)
const createMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/create_monthly_report', body) const createMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/create_monthly_report', body)
const createMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/create_monthly_report', body) const createMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/create_monthly_report', body)
const createMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/create_monthly_report', body) const createMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/create_monthly_report', body)
...@@ -419,6 +420,7 @@ const create = (type = "") => { ...@@ -419,6 +420,7 @@ const create = (type = "") => {
deleteDocument, deleteDocument,
createSubmitReport, createSubmitReport,
createMonthlyReportBS, createMonthlyReportBS,
createMonthlyReportLOCF,
createMonthlyReportTP, createMonthlyReportTP,
createMonthlyReportPL, createMonthlyReportPL,
createMonthlyReportFAM, createMonthlyReportFAM,
......
...@@ -1159,6 +1159,7 @@ export default class MonthlyReport extends Component { ...@@ -1159,6 +1159,7 @@ export default class MonthlyReport extends Component {
onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })} onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
btnCreate={this.state.btnCreate} btnCreate={this.state.btnCreate}
loadview={this.state.loadview} loadview={this.state.loadview}
isApprover={this.state.isApprover}
// getReport={this.getCompanyActive.bind(this)} // getReport={this.getCompanyActive.bind(this)}
/> />
)} )}
...@@ -1175,6 +1176,7 @@ export default class MonthlyReport extends Component { ...@@ -1175,6 +1176,7 @@ export default class MonthlyReport extends Component {
month={this.state.month} month={this.state.month}
saveToMonthlyReport={this.saveToMonthlyReport.bind(this)} saveToMonthlyReport={this.saveToMonthlyReport.bind(this)}
onClickClose={() => this.setState({ visibleFAM: false, visibleMonthlyReport: true })} onClickClose={() => this.setState({ visibleFAM: false, visibleMonthlyReport: true })}
isApprover={this.state.isApprover}
/> />
)} )}
{this.state.visibleCAT && ( {this.state.visibleCAT && (
......
...@@ -360,7 +360,7 @@ export default class BalanceSheetMR extends Component { ...@@ -360,7 +360,7 @@ export default class BalanceSheetMR extends Component {
}) })
}) })
let body = { let body = {
"monthly_report_id": this.props.submissionID, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
"periode": this.props.periode, "periode": this.props.periode,
"report_id": this.props.report_id, "report_id": this.props.report_id,
...@@ -415,7 +415,7 @@ export default class BalanceSheetMR extends Component { ...@@ -415,7 +415,7 @@ export default class BalanceSheetMR extends Component {
}) })
}) })
let payload = { let payload = {
"monthly_report_id": this.props.submissionID, "monthly_report_id": this.props.monthlyReportId,
"company_id": this.props.company.company_id, "company_id": this.props.company.company_id,
"periode": this.props.periode, "periode": this.props.periode,
"report_id": this.props.report_id, "report_id": this.props.report_id,
...@@ -434,10 +434,7 @@ export default class BalanceSheetMR extends Component { ...@@ -434,10 +434,7 @@ export default class BalanceSheetMR extends Component {
}) })
} }
} else { } else {
this.setState({ loading: false }, () => { this.setState({ loading: false })
this.getSubmission()
document.body.style.overflow = 'unset';
})
} }
}) })
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
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