Skip to content

T
Tia-dev
Commit bdaa940f authored by d.arizona's avatar d.arizona
Browse files
Options

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

parents 04c6c143 ad5fb4b5
Hide whitespace changes
Inline Side-by-side
Showing with 1309 additions and 2146 deletions
src/api/index.js
View file @ bdaa940f
...@@ -367,6 +367,7 @@ const create = (type = "") => { ...@@ -367,6 +367,7 @@ const create = (type = "") => {
const getHierarkiDBPLRO = (body) => api.post('transaction/db_profit_loss/rolling_outlook/get_report_hierarki', body) const getHierarkiDBPLRO = (body) => api.post('transaction/db_profit_loss/rolling_outlook/get_report_hierarki', body)
const createDBPLRO = (body) => api.post('transaction/db_profit_loss/rolling_outlook/create_rolling_outlook', body) const createDBPLRO = (body) => api.post('transaction/db_profit_loss/rolling_outlook/create_rolling_outlook', body)
const getDetailReportOLPACAT = (body) => api.post('transaction/cat/outlook_pa/get_report_hierarki', body) const getDetailReportOLPACAT = (body) => api.post('transaction/cat/outlook_pa/get_report_hierarki', body)
const createCATOLPA = (body) => api.post('transaction/cat/outlook_pa/create_outlook_pa', body)
// Monthly // Monthly
const getMonthlyReport = (body) => api.post('transaction/monthly_report/get_all_report', body) const getMonthlyReport = (body) => api.post('transaction/monthly_report/get_all_report', body)
...@@ -804,7 +805,8 @@ const create = (type = "") => { ...@@ -804,7 +805,8 @@ const create = (type = "") => {
createDBPLOLPA, createDBPLOLPA,
getHierarkiDBPLRO, getHierarkiDBPLRO,
createDBPLRO, createDBPLRO,
getDetailReportOLPACAT getDetailReportOLPACAT,
createCATOLPA
} }
} }
......
src/container/Laporan/SubHolding.js
View file @ bdaa940f
...@@ -568,17 +568,17 @@ export default class SubHolding extends Component { ...@@ -568,17 +568,17 @@ export default class SubHolding extends Component {
item.profit_loss.ol_pa_october, item.profit_loss.ol_pa_october,
item.profit_loss.ol_pa_november, item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december, item.profit_loss.ol_pa_december,
item.profit_loss.historialLast10YearList // item.profit_loss.historialLast10YearList,
// item.profit_loss.historialLast10YearList[0].value === null ? "0" : item.profit_loss.historialLast10YearList[0].value, item.profit_loss.history_last_nine_year,
// item.profit_loss.historialLast10YearList[1].value === null ? "0" : item.profit_loss.historialLast10YearList[1].value, item.profit_loss.history_last_eight_year,
// item.profit_loss.historialLast10YearList[2].value === null ? "0" : item.profit_loss.historialLast10YearList[2].value, item.profit_loss.history_last_seven_year,
// item.profit_loss.historialLast10YearList[3].value === null ? "0" : item.profit_loss.historialLast10YearList[3].value, item.profit_loss.history_last_six_year,
// item.profit_loss.historialLast10YearList[4].value === null ? "0" : item.profit_loss.historialLast10YearList[4].value, item.profit_loss.history_last_five_year,
// item.profit_loss.historialLast10YearList[5].value === null ? "0" : item.profit_loss.historialLast10YearList[5].value, item.profit_loss.history_last_four_year,
// item.profit_loss.historialLast10YearList[6].value === null ? "0" : item.profit_loss.historialLast10YearList[6].value, item.profit_loss.history_last_three_year,
// item.profit_loss.historialLast10YearList[7].value === null ? "0" : item.profit_loss.historialLast10YearList[7].value, item.profit_loss.history_last_two_year,
// item.profit_loss.historialLast10YearList[8].value === null ? "0" : item.profit_loss.historialLast10YearList[8].value, item.profit_loss.history_last_year,
// item.profit_loss.historialLast10YearList[9].value === null ? "0" : item.profit_loss.historialLast10YearList[9].value item.profit_loss.history_current_year,
]) ])
} }
...@@ -700,17 +700,17 @@ export default class SubHolding extends Component { ...@@ -700,17 +700,17 @@ export default class SubHolding extends Component {
item.profit_loss.ol_pa_october, item.profit_loss.ol_pa_october,
item.profit_loss.ol_pa_november, item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december, item.profit_loss.ol_pa_december,
item.profit_loss.historialLast10YearList // item.profit_loss.historialLast10YearList
// item.profit_loss.historialLast10YearList[0].value === null ? "0" : item.profit_loss.historialLast10YearList[0].value, item.profit_loss.history_last_nine_year,
// item.profit_loss.historialLast10YearList[1].value === null ? "0" : item.profit_loss.historialLast10YearList[1].value, item.profit_loss.history_last_eight_year,
// item.profit_loss.historialLast10YearList[2].value === null ? "0" : item.profit_loss.historialLast10YearList[2].value, item.profit_loss.history_last_seven_year,
// item.profit_loss.historialLast10YearList[3].value === null ? "0" : item.profit_loss.historialLast10YearList[3].value, item.profit_loss.history_last_six_year,
// item.profit_loss.historialLast10YearList[4].value === null ? "0" : item.profit_loss.historialLast10YearList[4].value, item.profit_loss.history_last_five_year,
// item.profit_loss.historialLast10YearList[5].value === null ? "0" : item.profit_loss.historialLast10YearList[5].value, item.profit_loss.history_last_four_year,
// item.profit_loss.historialLast10YearList[6].value === null ? "0" : item.profit_loss.historialLast10YearList[6].value, item.profit_loss.history_last_three_year,
// item.profit_loss.historialLast10YearList[7].value === null ? "0" : item.profit_loss.historialLast10YearList[7].value, item.profit_loss.history_last_two_year,
// item.profit_loss.historialLast10YearList[8].value === null ? "0" : item.profit_loss.historialLast10YearList[8].value, item.profit_loss.history_last_year,
// item.profit_loss.historialLast10YearList[9].value === null ? "0" : item.profit_loss.historialLast10YearList[9].value item.profit_loss.history_current_year,
]) ])
if (item.children !== null) { if (item.children !== null) {
if (item.children.length > 0) { if (item.children.length > 0) {
...@@ -863,7 +863,18 @@ export default class SubHolding extends Component { ...@@ -863,7 +863,18 @@ export default class SubHolding extends Component {
item.balance_sheet.ol_pa_october, item.balance_sheet.ol_pa_october,
item.balance_sheet.ol_pa_november, item.balance_sheet.ol_pa_november,
item.balance_sheet.ol_pa_december, item.balance_sheet.ol_pa_december,
item.balance_sheet.historial_last_10_years_list // item.balance_sheet.historial_last_10_years_list,
item.balance_sheet.history_last_nine_year,
item.balance_sheet.history_last_eight_year,
item.balance_sheet.history_last_seven_year,
item.balance_sheet.history_last_six_year,
item.balance_sheet.history_last_five_year,
item.balance_sheet.history_last_four_year,
item.balance_sheet.history_last_three_year,
item.balance_sheet.history_last_two_year,
item.balance_sheet.history_last_year,
item.balance_sheet.history_current_year,
]) ])
} }
...@@ -986,7 +997,18 @@ export default class SubHolding extends Component { ...@@ -986,7 +997,18 @@ export default class SubHolding extends Component {
item.balance_sheet.ol_pa_october, item.balance_sheet.ol_pa_october,
item.balance_sheet.ol_pa_november, item.balance_sheet.ol_pa_november,
item.balance_sheet.ol_pa_december, item.balance_sheet.ol_pa_december,
item.balance_sheet.historial_last_10_years_list // item.balance_sheet.historial_last_10_years_list
item.balance_sheet.history_last_nine_year,
item.balance_sheet.history_last_eight_year,
item.balance_sheet.history_last_seven_year,
item.balance_sheet.history_last_six_year,
item.balance_sheet.history_last_five_year,
item.balance_sheet.history_last_four_year,
item.balance_sheet.history_last_three_year,
item.balance_sheet.history_last_two_year,
item.balance_sheet.history_last_year,
item.balance_sheet.history_current_year,
]) ])
if (item.children !== null) { if (item.children !== null) {
if (item.children.length > 0) { if (item.children.length > 0) {
...@@ -1156,16 +1178,16 @@ export default class SubHolding extends Component { ...@@ -1156,16 +1178,16 @@ export default class SubHolding extends Component {
item.profit_loss.ol_pa_october, item.profit_loss.ol_pa_october,
item.profit_loss.ol_pa_november, item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december, item.profit_loss.ol_pa_december,
item.profit_loss.history_current_year, item.profit_loss.history_last_nine_year,
item.profit_loss.history_last_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_eight_year, item.profit_loss.history_last_eight_year,
item.profit_loss.history_last_nine_year item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_year,
item.profit_loss.history_current_year,
]) ])
if (item.children !== null) { if (item.children !== null) {
...@@ -1290,16 +1312,16 @@ export default class SubHolding extends Component { ...@@ -1290,16 +1312,16 @@ export default class SubHolding extends Component {
item.profit_loss.ol_pa_october, item.profit_loss.ol_pa_october,
item.profit_loss.ol_pa_november, item.profit_loss.ol_pa_november,
item.profit_loss.ol_pa_december, item.profit_loss.ol_pa_december,
item.profit_loss.history_current_year, item.profit_loss.history_last_nine_year,
item.profit_loss.history_last_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_eight_year, item.profit_loss.history_last_eight_year,
item.profit_loss.history_last_nine_year item.profit_loss.history_last_seven_year,
item.profit_loss.history_last_six_year,
item.profit_loss.history_last_five_year,
item.profit_loss.history_last_four_year,
item.profit_loss.history_last_three_year,
item.profit_loss.history_last_two_year,
item.profit_loss.history_last_year,
item.profit_loss.history_current_year,
]) ])
if (item.children !== null) { if (item.children !== null) {
if (item.children.length > 0) { if (item.children.length > 0) {
...@@ -2246,7 +2268,7 @@ export default class SubHolding extends Component { ...@@ -2246,7 +2268,7 @@ export default class SubHolding extends Component {
} else if (this.state.report.value === 8) { } else if (this.state.report.value === 8) {
let dbSumaPL = [] let dbSumaPL = []
let payloadPL = {...payload, report_id: 28, months: this.state.month.month_id} let payloadPL = {...payload, report_id: 28, months: this.state.month.month_id}
api.create().getReportPLSummary(payloadPL).then(response => { api.create().getReportPLSuma(payloadPL).then(response => {
console.log(response); console.log(response);
if (response.data) { if (response.data) {
if (response.data.status === 'success') { if (response.data.status === 'success') {
...@@ -3848,10 +3870,10 @@ export default class SubHolding extends Component { ...@@ -3848,10 +3870,10 @@ export default class SubHolding extends Component {
a.click(); a.click();
} }
} else if (this.state.report.value === 8) { } else if (this.state.report.value === 8) {
let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report_summary?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1` let url = `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
console.log(url); console.log(url);
let res = await fetch( let res = await fetch(
`${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report_summary?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1` `${process.env.REACT_APP_URL_MAIN_BE}/public/transaction/summary_profit_loss/export_report?submission_id=${this.state.submissionID === null ? "" : this.state.submissionID}&&report_id=28&&company_id=${this.state.company.company_id}&&year=${this.state.periode.periode}&&revision=${this.state.revisionType}&&months=${this.state.month.month_id}&&quarter=1`
) )
res = await res.blob() res = await res.blob()
this.setState({ loading: false }) this.setState({ loading: false })
......
src/container/Laporan/TableSubHolding.js
View file @ bdaa940f
...@@ -4647,7 +4647,8 @@ export default class TableSubHolding extends Component { ...@@ -4647,7 +4647,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][0]) === "0" ? "" : Number(tableMeta.rowData[109][0]).toFixed(1))} value={String(tableMeta.rowData[109]) === "" ? "" : Number(tableMeta.rowData[109]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][0]) === "0" ? "" : Number(tableMeta.rowData[109][0]).toFixed(1))}
/> />
} }
/> />
...@@ -4670,7 +4671,8 @@ export default class TableSubHolding extends Component { ...@@ -4670,7 +4671,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][1]) === "0" ? "" : Number(tableMeta.rowData[109][1]).toFixed(1))} value={String(tableMeta.rowData[110]) === "" ? "" : Number(tableMeta.rowData[110]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][1]) === "0" ? "" : Number(tableMeta.rowData[109][1]).toFixed(1))}
/> />
} }
/> />
...@@ -4693,7 +4695,8 @@ export default class TableSubHolding extends Component { ...@@ -4693,7 +4695,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][2]) === "0" ? "" : Number(tableMeta.rowData[109][2]).toFixed(1))} value={String(tableMeta.rowData[111]) === "" ? "" : Number(tableMeta.rowData[111]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][2]) === "0" ? "" : Number(tableMeta.rowData[109][2]).toFixed(1))}
/> />
} }
/> />
...@@ -4716,7 +4719,8 @@ export default class TableSubHolding extends Component { ...@@ -4716,7 +4719,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][3]) === "0" ? "" : Number(tableMeta.rowData[109][3]).toFixed(1))} value={String(tableMeta.rowData[112]) === "" ? "" : Number(tableMeta.rowData[112]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][3]) === "0" ? "" : Number(tableMeta.rowData[109][3]).toFixed(1))}
/> />
} }
/> />
...@@ -4739,7 +4743,8 @@ export default class TableSubHolding extends Component { ...@@ -4739,7 +4743,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][4]) === "0" ? "" : Number(tableMeta.rowData[109][4]).toFixed(1))} value={String(tableMeta.rowData[113]) === "" ? "" : Number(tableMeta.rowData[113]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][4]) === "0" ? "" : Number(tableMeta.rowData[109][4]).toFixed(1))}
/> />
} }
/> />
...@@ -4764,7 +4769,8 @@ export default class TableSubHolding extends Component { ...@@ -4764,7 +4769,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][5]) === "0" ? "" : Number(tableMeta.rowData[109][5]).toFixed(1))} value={String(tableMeta.rowData[114]) === "" ? "" : Number(tableMeta.rowData[114]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][5]) === "0" ? "" : Number(tableMeta.rowData[109][5]).toFixed(1))}
/> />
} }
/> />
...@@ -4787,7 +4793,8 @@ export default class TableSubHolding extends Component { ...@@ -4787,7 +4793,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][6]) === "0" ? "" : Number(tableMeta.rowData[109][6]).toFixed(1))} value={String(tableMeta.rowData[115]) === "" ? "" : Number(tableMeta.rowData[115]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][6]) === "0" ? "" : Number(tableMeta.rowData[109][6]).toFixed(1))}
/> />
} }
/> />
...@@ -4810,7 +4817,8 @@ export default class TableSubHolding extends Component { ...@@ -4810,7 +4817,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][7]) === "0" ? "" : Number(tableMeta.rowData[109][7]).toFixed(1))} value={String(tableMeta.rowData[116]) === "" ? "" : Number(tableMeta.rowData[116]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][7]) === "0" ? "" : Number(tableMeta.rowData[109][7]).toFixed(1))}
/> />
} }
/> />
...@@ -4833,7 +4841,8 @@ export default class TableSubHolding extends Component { ...@@ -4833,7 +4841,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][8]) === "0" ? "" : Number(tableMeta.rowData[109][8]).toFixed(1))} value={String(tableMeta.rowData[117]) === "" ? "" : Number(tableMeta.rowData[117]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][8]) === "0" ? "" : Number(tableMeta.rowData[109][8]).toFixed(1))}
/> />
} }
/> />
...@@ -4856,7 +4865,8 @@ export default class TableSubHolding extends Component { ...@@ -4856,7 +4865,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][9]) === "0" ? "" : Number(tableMeta.rowData[109][9]).toFixed(1))} value={String(tableMeta.rowData[118]) === "" ? "" : Number(tableMeta.rowData[118]).toFixed(1)}
// value={tableMeta.rowData[109] == null ? "" : (String(tableMeta.rowData[109][9]) === "0" ? "" : Number(tableMeta.rowData[109][9]).toFixed(1))}
/> />
} }
/> />
...@@ -4924,6 +4934,41 @@ export default class TableSubHolding extends Component { ...@@ -4924,6 +4934,41 @@ export default class TableSubHolding extends Component {
options: { options: {
display: false display: false
} }
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
} }
] ]
...@@ -8443,7 +8488,8 @@ export default class TableSubHolding extends Component { ...@@ -8443,7 +8488,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][0]) === "0" ? "" : Number(tableMeta.rowData[108][0]).toFixed(1))} value={String(tableMeta.rowData[108]) === "" ? "" : Number(tableMeta.rowData[108]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][0]) === "0" ? "" : Number(tableMeta.rowData[108][0]).toFixed(1))}
/> />
} }
/> />
...@@ -8466,7 +8512,8 @@ export default class TableSubHolding extends Component { ...@@ -8466,7 +8512,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][1]) === "0" ? "" : Number(tableMeta.rowData[108][1]).toFixed(1))} value={String(tableMeta.rowData[109]) === "" ? "" : Number(tableMeta.rowData[109]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][1]) === "0" ? "" : Number(tableMeta.rowData[108][1]).toFixed(1))}
/> />
} }
/> />
...@@ -8489,7 +8536,8 @@ export default class TableSubHolding extends Component { ...@@ -8489,7 +8536,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][2]) === "0" ? "" : Number(tableMeta.rowData[108][2]).toFixed(1))} value={String(tableMeta.rowData[110]) === "" ? "" : Number(tableMeta.rowData[110]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][2]) === "0" ? "" : Number(tableMeta.rowData[108][2]).toFixed(1))}
/> />
} }
/> />
...@@ -8512,7 +8560,8 @@ export default class TableSubHolding extends Component { ...@@ -8512,7 +8560,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][3]) === "0" ? "" : Number(tableMeta.rowData[108][3]).toFixed(1))} value={String(tableMeta.rowData[111]) === "" ? "" : Number(tableMeta.rowData[111]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][3]) === "0" ? "" : Number(tableMeta.rowData[108][3]).toFixed(1))}
/> />
} }
/> />
...@@ -8535,7 +8584,8 @@ export default class TableSubHolding extends Component { ...@@ -8535,7 +8584,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][4]) === "0" ? "" : Number(tableMeta.rowData[108][4]).toFixed(1))} value={String(tableMeta.rowData[112]) === "" ? "" : Number(tableMeta.rowData[112]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][4]) === "0" ? "" : Number(tableMeta.rowData[108][4]).toFixed(1))}
/> />
} }
/> />
...@@ -8560,7 +8610,8 @@ export default class TableSubHolding extends Component { ...@@ -8560,7 +8610,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][5]) === "0" ? "" : Number(tableMeta.rowData[108][5]).toFixed(1))} value={String(tableMeta.rowData[113]) === "" ? "" : Number(tableMeta.rowData[113]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][5]) === "0" ? "" : Number(tableMeta.rowData[108][5]).toFixed(1))}
/> />
} }
/> />
...@@ -8583,7 +8634,8 @@ export default class TableSubHolding extends Component { ...@@ -8583,7 +8634,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][6]) === "0" ? "" : Number(tableMeta.rowData[108][6]).toFixed(1))} value={String(tableMeta.rowData[114]) === "" ? "" : Number(tableMeta.rowData[114]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][6]) === "0" ? "" : Number(tableMeta.rowData[108][6]).toFixed(1))}
/> />
} }
/> />
...@@ -8606,7 +8658,8 @@ export default class TableSubHolding extends Component { ...@@ -8606,7 +8658,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][7]) === "0" ? "" : Number(tableMeta.rowData[108][7]).toFixed(1))} value={String(tableMeta.rowData[115]) === "" ? "" : Number(tableMeta.rowData[115]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][7]) === "0" ? "" : Number(tableMeta.rowData[108][7]).toFixed(1))}
/> />
} }
/> />
...@@ -8629,7 +8682,8 @@ export default class TableSubHolding extends Component { ...@@ -8629,7 +8682,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][8]) === "0" ? "" : Number(tableMeta.rowData[108][8]).toFixed(1))} value={String(tableMeta.rowData[116]) === "" ? "" : Number(tableMeta.rowData[116]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][8]) === "0" ? "" : Number(tableMeta.rowData[108][8]).toFixed(1))}
/> />
} }
/> />
...@@ -8652,7 +8706,8 @@ export default class TableSubHolding extends Component { ...@@ -8652,7 +8706,8 @@ export default class TableSubHolding extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][9]) === "0" ? "" : Number(tableMeta.rowData[108][9]).toFixed(1))} value={String(tableMeta.rowData[117]) === "" ? "" : Number(tableMeta.rowData[117]).toFixed(1)}
// value={tableMeta.rowData[108] == null ? "" : (String(tableMeta.rowData[108][9]) === "0" ? "" : Number(tableMeta.rowData[108][9]).toFixed(1))}
/> />
} }
/> />
...@@ -8720,6 +8775,46 @@ export default class TableSubHolding extends Component { ...@@ -8720,6 +8775,46 @@ export default class TableSubHolding extends Component {
options: { options: {
display: false display: false
} }
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
} }
] ]
...@@ -12510,6 +12605,46 @@ export default class TableSubHolding extends Component { ...@@ -12510,6 +12605,46 @@ export default class TableSubHolding extends Component {
options: { options: {
display: false display: false
} }
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
}, {
name: "",
options: {
display: false
}
} }
] ]
src/container/OutlookPA.js
View file @ bdaa940f
...@@ -226,9 +226,9 @@ export default class OutlookPA extends Component { ...@@ -226,9 +226,9 @@ export default class OutlookPA extends Component {
item.revision item.revision
] ]
}) })
dataTable.push([ // dataTable.push([
5, "Corporate Annual Target", 0, "not-yet", 39, false, 0 // 5, "Corporate Annual Target", 0, "not-yet", 39, false, 0
]) // ])
let dataTableRevision = response.data.data.map((item, index) => { let dataTableRevision = response.data.data.map((item, index) => {
return [ return [
item.report_id, item.report_id,
...@@ -615,7 +615,8 @@ export default class OutlookPA extends Component { ...@@ -615,7 +615,8 @@ export default class OutlookPA extends Component {
visibleCF: true, visibleCF: true,
visibleCAT: false visibleCAT: false
}) })
} else if (item === 'Corporate Annual Target') { // } else if (item === 'Corporate Annual Target') {
} else if (item === 'CAT') {
this.setState({ this.setState({
visibleOutlookPA: false, visibleOutlookPA: false,
visibleBS: false, visibleBS: false,
...@@ -1365,7 +1366,7 @@ export default class OutlookPA extends Component { ...@@ -1365,7 +1366,7 @@ export default class OutlookPA extends Component {
name: "Action", name: "Action",
options: { options: {
customBodyRender: (val, tableMeta) => { customBodyRender: (val, tableMeta) => {
console.log(tableMeta) // console.log(tableMeta)
return ( return (
<div style={{ display: 'flex' }}> <div style={{ display: 'flex' }}>
<button <button
......
src/container/OutlookPA/CorporateAnnualTargetOLPA.js
View file @ bdaa940f
This source diff could not be displayed because it is too large. You can view the blob instead.
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