Skip to content

T
Tia-dev
Commit fb38ed45 authored by Dida Adams Arizona's avatar Dida Adams Arizona
Browse files
Options

Merge branch 'faisal' into 'master' 

Faisal

See merge request !1031
parents 2026af0f a09b2183
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 212 additions and 122 deletions
src/container/Laporan/CatPQ.js
View file @ fb38ed45
This diff is collapsed.
src/container/Laporan/SubHolding.js
View file @ fb38ed45
...@@ -1180,95 +1180,83 @@ export default class SubHolding extends Component { ...@@ -1180,95 +1180,83 @@ export default class SubHolding extends Component {
} }
}) })
} else if (this.state.report.value === 7) { } else if (this.state.report.value === 7) {
api.create().getReportBSMB(payload).then(response => { let payload = {
"report_id": this.state.report.value,
"company_id": this.state.company.company_id,
"periode": this.state.periode.periode,
"months": "1"
}
api.create().getReportBSSuma(payload).then(response => {
console.log(payload); console.log(payload);
console.log(response); console.log(response);
// let dataTable = [] let dataTable = []
// if (response.data) { if (response.data) {
// let res = response.data.data let res = response.data.data
// const handlePushChild = (item) => { const handlePushChild = (item) => {
// let indexIDzz = dataTable.findIndex((val) => val[1] === item.id) let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
// if (indexIDzz === -1) { if (indexIDzz === -1) {
// dataTable.push([ dataTable.push([
// item.type_report_id, item.type_report_id,
// item.id, item.id,
// item.parent, item.parent,
// item.formula, item.formula,
// item.level, item.level,
// item.description, item.description,
// item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before, item.balance_sheet.last_month,
// Number(item.balance_sheet.january).toFixed(1), item.balance_sheet.actual,
// Number(item.balance_sheet.february).toFixed(1), item.balance_sheet.mb,
// Number(item.balance_sheet.march).toFixed(1), item.balance_sheet.percent_of_mb,
// Number(item.balance_sheet.april).toFixed(1), item.balance_sheet.ol,
// Number(item.balance_sheet.may).toFixed(1), item.balance_sheet.percent_of_ol,
// Number(item.balance_sheet.june).toFixed(1), item.balance_sheet.last_year,
// Number(item.balance_sheet.july).toFixed(1), item.balance_sheet.forecast_next_year,
// Number(item.balance_sheet.august).toFixed(1), item.balance_sheet.forecast_next_two_year,
// Number(item.balance_sheet.september).toFixed(1), item.order
// Number(item.balance_sheet.october).toFixed(1), ])
// Number(item.balance_sheet.november).toFixed(1), }
// Number(item.balance_sheet.december).toFixed(1), if (item.children !== null) {
// Number(item.balance_sheet.total_current_year).toFixed(1), if (item.children.length > 0) {
// Number(item.balance_sheet.total_next_year).toFixed(1), item.children.map((items, indexs) => {
// Number(item.balance_sheet.total_more_year).toFixed(1), handlePushChild(items)
// item.order, })
// item.condition_it_should_be, }
// item.condition_if_wrong }
// ]) }
// } res.map((item, index) => {
// if (item.children !== null) { dataTable.push([
// if (item.children.length > 0) { item.type_report_id,
// item.children.map((items, indexs) => { item.id,
// handlePushChild(items) item.parent,
// }) item.formula,
// } item.level,
// } item.description,
// } item.balance_sheet.last_month,
// res.map((item, index) => { item.balance_sheet.actual,
// dataTable.push([ item.balance_sheet.mb,
// item.type_report_id, item.balance_sheet.percent_of_mb,
// item.id, item.balance_sheet.ol,
// item.parent, item.balance_sheet.percent_of_ol,
// item.formula, item.balance_sheet.last_year,
// item.level, item.balance_sheet.forecast_next_year,
// item.description, item.balance_sheet.forecast_next_two_year,
// item.balance_sheet.total_actual_before === null ? "0.0" : item.balance_sheet.total_actual_before === "" ? "0.0" : item.balance_sheet.total_actual_before, item.order
// Number(item.balance_sheet.january).toFixed(1), ])
// Number(item.balance_sheet.february).toFixed(1), if (item.children !== null) {
// Number(item.balance_sheet.march).toFixed(1), if (item.children.length > 0) {
// Number(item.balance_sheet.april).toFixed(1), item.children.map((items, indexs) => {
// Number(item.balance_sheet.may).toFixed(1), handlePushChild(items)
// Number(item.balance_sheet.june).toFixed(1), })
// Number(item.balance_sheet.july).toFixed(1), }
// Number(item.balance_sheet.august).toFixed(1), }
// Number(item.balance_sheet.september).toFixed(1), })
// Number(item.balance_sheet.october).toFixed(1), // this.setState({ dataTable, previewTable: true, loading: false, previewDownload: true })
// Number(item.balance_sheet.november).toFixed(1), this.setState({ dataTable }, () => {
// Number(item.balance_sheet.december).toFixed(1), console.log(this.state.dataTable)
// Number(item.balance_sheet.total_current_year).toFixed(1), // this.getBalanceSheetMR(payload)
// Number(item.balance_sheet.total_next_year).toFixed(1), })
// Number(item.balance_sheet.total_more_year).toFixed(1), } else {
// item.order, this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
// item.condition_it_should_be, }
// item.condition_if_wrong
// ])
// if (item.children !== null) {
// if (item.children.length > 0) {
// item.children.map((items, indexs) => {
// handlePushChild(items)
// })
// }
// }
// })
// // this.setState({ dataTable, previewTable: true, loading: false, previewDownload: true })
// this.setState({ dataTable }, () => {
// console.log(this.state.dataTable)
// this.getBalanceSheetMR(payload)
// })
// } else {
// this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
// }
this.setState({ previewTable: true, loading: false, previewDownload: false }) this.setState({ previewTable: true, loading: false, previewDownload: false })
}) })
......
src/container/Laporan/TableSubHolding.js
View file @ fb38ed45
This diff is collapsed.
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