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

src/api/index.js

@@ -254,6 +254,7 @@ const create = (type = "") => {
 
   // Monthly
   const getMonthlyReport = (body) => api.post('transaction/monthly_report/get_all_report', body)
+  const getMonthlyOI = (body) => api.post('transaction/monthly_report_oi/get_operating_indicator_id', body)
   const getMonthlyReportID = (body) => api.post('transaction/monthly_report/get_monthly_report_id', body)
   const getHierarkiMontlyReportBS = (body) => api.post('transaction/monthly_report_bs/get_report_hierarki', body)
   const getHierarkiMontlyReportOI = (body) => api.post('transaction/monthly_report_oi/get_report_hierarki', body)
@@ -530,7 +531,8 @@ const create = (type = "") => {
     getPerBSiMontlyReportLOCF,
     checkUploadMonthlyReportLOCF,
     uploadMonthlyReportLOCF,
-    validateSubmitReportOI
+    validateSubmitReportOI,
+    getMonthlyOI
   }
 }
 

src/container/MonthlyReport/ProfitLossMR.js

@@ -561,7 +561,7 @@ export default class ProfitLossMR extends Component {
         let err = false
         this.state.dataTable.map((i, index) => {
             if(i[0] === 3 && i[4] === 2) {
-                console.log(i);
+                // console.log(i);
                 if ( i[19] === "" && (Number(i[14]) < this.state.minValue || Number(i[14]) > this.state.maxValue)) {
                     console.log('msk 1');
                     // console.log(i);
@@ -608,8 +608,8 @@ export default class ProfitLossMR extends Component {
         }
         // console.log(JSON.stringify(payload));
         api.create().validateSubmitReportPL(payload).then((response) => {
-            console.log(response.data.data.result)
-            console.log(err);
+            // console.log(response.data.data.result)
+            // console.log(err);
             if (response.data) {
                 if (response.data.status === "success") {
                     if (response.data.data.result && err === false) {