Merge branch 'didam' into 'master'

update

See merge request !981

src/api/index.js

@@ -312,6 +312,9 @@ const create = (type = "") => {
   const uploadMonthlyReportLOCF = (body) => api.post('transaction/locf/monthly_report/import_monthly_report', body)
   const validateSubmitReportOI = (body) => api.post('transaction/operating_indicator/monthly_report/validate_save', body)
   
+  const getListUserSubcoMB = (periode) => api.get(`transaction/get_dashboard_sub_co/master_budget/${periode}`)
+  const getListUserSubcoMR = (months,periode) => api.get(`transaction/get_dashboard_sub_co/monthly_report/${periode}/${months}`)
+
   // MonthlyPL
   // const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
   // const createMonthlyReportPL = (body) => api.post('transaction/monthly_report_pl/create_monthly_report', body)
@@ -561,7 +564,9 @@ const create = (type = "") => {
     deleteAllItemReportLOCF,
     submitMonthlyReport,
     approvalMonthly,
-    createPeriodeRevisionMonthly
+    createPeriodeRevisionMonthly,
+    getListUserSubcoMB,
+    getListUserSubcoMR
   }
 }
 

src/container/MonthlyReport.js

@@ -1050,12 +1050,14 @@ export default class MonthlyReport extends Component {
                                         cursor: tableMeta.rowData[5] ? 'pointer' : 'default',
                                         borderColor: 'transparent'
                                     }}
-                                    onClick={() =>{
+                                    onClick={() =>
+                                        // {
+                                        tableMeta.rowData[5] ?
                                             this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
-                                        console.log(tableMeta.rowData)
-                                    }
-                                        // tableMeta.rowData[5] ?
-                                        // : null
+                                            : null
+                                        // console.log(tableMeta.rowData)
+                                        // }
+                                        
                                     }
                                 >
                                     <Typography style={{ color: tableMeta.rowData[5] ? '#5198ea' : 'GrayText', fontSize: 12, }}>Detail</Typography>