Commit 017e5833 authored by d.arizona's avatar d.arizona

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

parents 9a669c70 2026af0f
......@@ -250,6 +250,10 @@ const create = (type = "") => {
const getReportCFSumaMB = (body) => api.post('/transaction/summary_cash_flow/master_budget/get_report_hierarki', body)
const getReportCFSumaMR = (body) => api.post('/transaction/summary_cash_flow/monthly_report/get_report_hierarki', body)
const getReportCFSuma = (body) => api.post('/transaction/summary_cash_flow/summary/get_report_hierarki', body)
const getReportFRMB = (body) => api.post('/transaction/summary_ratio/master_budget/get_report_hierarki', body)
const getReportFRMR = (body) => api.post('/transaction/summary_ratio/monthly_report/get_report_hierarki', body)
const getReportFRLastMR = (body) => api.post('/transaction/summary_ratio/monthly_report_last_year/get_report_hierarki', body)
//CASH FLOW
const getDetailReportCF = (body) => api.post('/transaction/cash_flow/master_budget/get_report_hierarki', body)
......@@ -608,7 +612,10 @@ const create = (type = "") => {
getReportCFSuma,
getAllReportBS,
getAllReportPLDetail,
getAllReportOI
getAllReportOI,
getReportFRMB,
getReportFRMR,
getReportFRLastMR
}
}
......
......@@ -1489,9 +1489,10 @@ export default class SubHolding extends Component {
this.setState({ previewTable: true, loading: false, previewDownload: false })
})
} else if (this.state.report.value === 9) {
api.create().getReportHierarkiFRMB(payload).then(response => {
// console.log(payload);
// console.log(response);
let paylodFR = {...payload, months: this.state.month.month_id}
api.create().getReportFRMB(paylodFR).then(response => {
console.log(payload);
console.log(response);
// let dataTable = []
// if (response.data) {
// if (response.data.status === 'success') {
......@@ -1613,7 +1614,7 @@ export default class SubHolding extends Component {
// } else {
// this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
// }
this.setState({ previewTable: true, loading: false, previewDownload: false })
this.setState({ previewTable: true, loading: false, previewDownload: true })
})
}
......
......@@ -15774,7 +15774,7 @@ export default class TableSubHolding extends Component {
),
setCellProps: () => ({ style2 }),
customBodyRender: (value, tableMeta, updateValue) => {
console.log(tableMeta)
// console.log(tableMeta)
return (
<div>
<div className="grid grid-2x content-center">
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