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

src/api/index.js

@@ -271,6 +271,7 @@ const create = (type = "") => {
   const uploadAttachmentMonthly = (body) => api.post('transaction/monthly_report/upload_attachment', body)
   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 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 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)
@@ -419,6 +420,7 @@ const create = (type = "") => {
     deleteDocument,
     createSubmitReport,
     createMonthlyReportBS,
+    createMonthlyReportLOCF,
     createMonthlyReportTP,
     createMonthlyReportPL,
     createMonthlyReportFAM,

src/container/MonthlyReport.js

@@ -1159,6 +1159,7 @@ export default class MonthlyReport extends Component {
                         onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
                         btnCreate={this.state.btnCreate}
                         loadview={this.state.loadview}
+                        isApprover={this.state.isApprover}
                     // getReport={this.getCompanyActive.bind(this)}
                     />
                 )}
@@ -1175,6 +1176,7 @@ export default class MonthlyReport extends Component {
                         month={this.state.month}
                         saveToMonthlyReport={this.saveToMonthlyReport.bind(this)}
                         onClickClose={() => this.setState({ visibleFAM: false, visibleMonthlyReport: true })}
+                        isApprover={this.state.isApprover}
                     />
                 )}
                 {this.state.visibleCAT && (

src/container/MonthlyReport/BalanceSheetMR.js

@@ -360,7 +360,7 @@ export default class BalanceSheetMR extends Component {
             })
         })
         let body = {
-            "monthly_report_id": this.props.submissionID,
+            "monthly_report_id": this.props.monthlyReportId,
             "company_id": this.props.company.company_id,
             "periode": this.props.periode,
             "report_id": this.props.report_id,
@@ -415,7 +415,7 @@ export default class BalanceSheetMR extends Component {
             })
         })
         let payload = {
-            "monthly_report_id": this.props.submissionID,
+            "monthly_report_id": this.props.monthlyReportId,
             "company_id": this.props.company.company_id,
             "periode": this.props.periode,
             "report_id": this.props.report_id,
@@ -434,10 +434,7 @@ export default class BalanceSheetMR extends Component {
                     })
                 }
             } else {
-                this.setState({ loading: false }, () => {
-                    this.getSubmission()
-                    document.body.style.overflow = 'unset';
-                })
+                this.setState({ loading: false })
             }
         })
     }