Merge branch 'faisal' into 'master'

Faisal

See merge request !1214

src/api/index.js

@@ -189,6 +189,7 @@ const create = (type = "") => {
   const getAllMasterDataCat = () => api.get('item_report_company/get_all_item_report_company')
   const getParentItemReport = (body) => api.post('item_report/get_parent_item_report_default', body)
   const saveMasterDataCat = (body) => api.post('item_report_company/create_item_report_company', body)
+  const getDetailMasterDataCat = (idCompany, years) => api.get(`item_report_company/get_item_report_company_by_companyid_years/${idCompany}/${years}`)
   const deleteMasterDataCat = (idCompany, years) => api.get(`item_report_company/delete_item_report_company/${idCompany}/${years}`)
 
   //Transaction
@@ -693,7 +694,7 @@ const create = (type = "") => {
     getAllMasterDataCat,
     getParentItemReport,
     saveMasterDataCat,
-    // getDetailMasterDataCat,
+    getDetailMasterDataCat,
     deleteMasterDataCat
   }
 }

src/container/MasterData/MasterDataCAT/EditMasterDataCAT.js

@@ -391,7 +391,8 @@ export default class EditMasterDataCAT extends Component {
     }
 
     getDetailMasterDataCat() {
-        api.create().getDetailReportItems(this.props.data[1]).then((response) => {
+        console.log(this.props);
+        api.create().getDetailMasterDataCat(this.props.data[1], this.props.data[6]).then((response) => {
             console.log(response);
             if (response.data) {
                 if (response.ok) {