Skip to content

T
Tia-dev
Commit 4f64f80c authored by Rifka Kurnia's avatar Rifka Kurnia
Browse files
Options

Merge branch 'rifka' into 'master' 

tp add index baru

See merge request !1039
parents 1d8ace3e f4075fbf
Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 62 deletions
src/api/index.js
View file @ 4f64f80c
......@@ -244,6 +244,7 @@ const create = (type = "") => {
const getReportPLMR = (body) => api.post('/transaction/db_profit_loss/monthly_report/get_report_hierarki', body)
const getReportTPMB = (body) => api.post('/transaction/db_tax_planning/master_budget/get_report_hierarki', body)
const getReportTPMR = (body) => api.post('/transaction/db_tax_planning/monthly_report/get_report_hierarki', body)
const getReportTP = (body) => api.post('/transaction/db_tax_planning/get_report_hierarki', body)
const getAllReportOI = (body) => api.post('/transaction/db_operating_indicator/get_report_hierarki', body)
const getReportOIMB = (body) => api.post('/transaction/db_operating_indicator/master_budget/get_report_hierarki', body)
const getReportOIMR = (body) => api.post('/transaction/db_operating_indicator/monthly_report/get_report_hierarki', body)
......@@ -606,6 +607,7 @@ const create = (type = "") => {
getReportPLMR,
getReportTPMB,
getReportTPMR,
getReportTP,
getReportOIMB,
getReportOIMR,
getReportCFSumaMB,
......
src/container/Laporan/SubHolding.js
View file @ 4f64f80c
......@@ -836,39 +836,55 @@ export default class SubHolding extends Component {
}
})
} else if (this.state.report.value === 5) {
api.create().getReportTPMB(payload).then(response => {
api.create().getReportTP(payload).then(response => {
console.log(payload);
console.log(response);
let dataTable = []
if (response.data) {
if (response.data.status === 'success') {
let res = response.data.data
console.log(res)
const handlePushChild = (item) => {
let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
if (indexIDzz === -1) {
dataTable.push([
item.type_report_id,
item.type_report_tax.value_tbc.type_report_id,
item.type_report_tax.value_fc.type_report_id,
item.type_report_tax.value_tbf.type_report_id,
// item.type_report_tax.value_tbc.type_report_id,
// item.type_report_tax.value_fc.type_report_id,
// item.type_report_tax.value_tbf.type_report_id,
0,
0,
0,
item.id,
item.parent,
{ tbc: item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
item.level,
item.description,
item.tax_planning.january.tbf,
item.tax_planning.february.tbf,
item.tax_planning.march.tbf,
item.tax_planning.april.tbf,
item.tax_planning.may.tbf,
item.tax_planning.june.tbf,
item.tax_planning.july.tbf,
item.tax_planning.august.tbf,
item.tax_planning.september.tbf,
item.tax_planning.october.tbf,
item.tax_planning.november.tbf,
item.tax_planning.december.tbf,
item.tax_planning_report.january,
item.tax_planning_report.february,
item.tax_planning_report.march,
item.tax_planning_report.april,
item.tax_planning_report.may,
item.tax_planning_report.june,
item.tax_planning_report.july,
item.tax_planning_report.august,
item.tax_planning_report.september,
item.tax_planning_report.october,
item.tax_planning_report.november,
item.tax_planning_report.december,
item.order,
item.tax_planning_report.monthly_january,
item.tax_planning_report.monthly_february,
item.tax_planning_report.monthly_march,
item.tax_planning_report.monthly_april,
item.tax_planning_report.monthly_may,
item.tax_planning_report.monthly_june,
item.tax_planning_report.monthly_july,
item.tax_planning_report.monthly_august,
item.tax_planning_report.monthly_september,
item.tax_planning_report.monthly_october,
item.tax_planning_report.monthly_november,
item.tax_planning_report.monthly_december,
])
}
if (item.children !== null) {
......@@ -882,27 +898,42 @@ export default class SubHolding extends Component {
res.map((item, index) => {
dataTable.push([
item.type_report_id,
item.type_report_tax.value_tbc.type_report_id,
item.type_report_tax.value_fc.type_report_id,
item.type_report_tax.value_tbf.type_report_id,
// item.type_report_tax.value_tbc.type_report_id,
// item.type_report_tax.value_fc.type_report_id,
// item.type_report_tax.value_tbf.type_report_id,
0,
0,
0,
item.id,
item.parent,
{ tbc: item.formula_tax.value_tbc, fcp: item.formula_tax.value_fc, tbf: item.formula_tax.value_tbf },
item.level,
item.description,
item.tax_planning.january.tbf,
item.tax_planning.february.tbf,
item.tax_planning.march.tbf,
item.tax_planning.april.tbf,
item.tax_planning.may.tbf,
item.tax_planning.june.tbf,
item.tax_planning.july.tbf,
item.tax_planning.august.tbf,
item.tax_planning.september.tbf,
item.tax_planning.october.tbf,
item.tax_planning.november.tbf,
item.tax_planning.december.tbf,
item.tax_planning_report.january,
item.tax_planning_report.february,
item.tax_planning_report.march,
item.tax_planning_report.april,
item.tax_planning_report.may,
item.tax_planning_report.june,
item.tax_planning_report.july,
item.tax_planning_report.august,
item.tax_planning_report.september,
item.tax_planning_report.october,
item.tax_planning_report.november,
item.tax_planning_report.december,
item.order,
item.tax_planning_report.monthly_january,
item.tax_planning_report.monthly_february,
item.tax_planning_report.monthly_march,
item.tax_planning_report.monthly_april,
item.tax_planning_report.monthly_may,
item.tax_planning_report.monthly_june,
item.tax_planning_report.monthly_july,
item.tax_planning_report.monthly_august,
item.tax_planning_report.monthly_september,
item.tax_planning_report.monthly_october,
item.tax_planning_report.monthly_november,
item.tax_planning_report.monthly_december,
])
if (item.children !== null) {
if (item.children.length > 0) {
......@@ -913,10 +944,10 @@ export default class SubHolding extends Component {
}
})
console.log(dataTable)
// this.setState({ dataTable, previewTable: true, loading: false, previewDownload: true })
this.setState({ dataTable }, () => {
this.getTaxPlanMR(payload)
})
this.setState({ dataTable, previewTable: true, loading: false, previewDownload: true })
// this.setState({ dataTable }, () => {
// this.getTaxPlanMR(payload)
// })
} else {
this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
if (response.data.message.includes("Someone Logged In")) {
......@@ -1804,7 +1835,6 @@ export default class SubHolding extends Component {
let res = response.data.data
res.map((item, index) => {
let indexID = dataTable.findIndex((val) => val[4] == item.id)
console.log(indexID)
if (indexID != -1) {
const handlePushChild = (items) => {
let indexIDzz = dataTable.findIndex((val) => val[4] === items.id)
......
src/container/Laporan/TableSubHolding.js
View file @ 4f64f80c
......@@ -9453,7 +9453,8 @@ export default class TableSubHolding extends Component {
options: {
display: false
}
}, {
},
{
name: "",
options: {
display: false
......@@ -9468,7 +9469,8 @@ export default class TableSubHolding extends Component {
options: {
display: false
}
}, {
},
{
name: "",
options: {
display: false
......@@ -9578,9 +9580,9 @@ export default class TableSubHolding extends Component {
<div className="grid grid-3x content-center">
<div className="grid grid-4x content-center">
<div className="col-1">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9602,9 +9604,9 @@ export default class TableSubHolding extends Component {
}
</div>
<div className="col-2">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9625,9 +9627,9 @@ export default class TableSubHolding extends Component {
}
</div>
<div className="col-3">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9648,9 +9650,9 @@ export default class TableSubHolding extends Component {
}
</div>
<div className="col-4">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9673,9 +9675,9 @@ export default class TableSubHolding extends Component {
</div>
<div className="grid grid-4x content-center">
<div className="col-1">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9696,9 +9698,9 @@ export default class TableSubHolding extends Component {
}
</div>
<div className="col-2">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9719,9 +9721,9 @@ export default class TableSubHolding extends Component {
}
</div>
<div className="col-3">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9742,9 +9744,9 @@ export default class TableSubHolding extends Component {
}
</div>
<div className="col-4">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9767,9 +9769,9 @@ export default class TableSubHolding extends Component {
</div>
<div className="grid grid-4x content-center">
<div className="col-1">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9790,9 +9792,9 @@ export default class TableSubHolding extends Component {
}
</div>
<div className="col-2">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9813,9 +9815,9 @@ export default class TableSubHolding extends Component {
}
</div>
<div className="col-3">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
......@@ -9836,9 +9838,9 @@ export default class TableSubHolding extends Component {
}
</div>
<div className="col-4">
{tableMeta.rowData[3] === 4 ?
{tableMeta.rowData[0] === 4 ?
null
: tableMeta.rowData[3] === 1 ?
: tableMeta.rowData[3] === 1 || tableMeta.rowData[8] === "Fiscal Correction positive / (negative) Year To Date" ?
null :
<div style={{ flex: 1 }}>
<FormControlLabel
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