Skip to content

T
Tia-dev
Commit b5ed8d3c authored by Riri Novita's avatar Riri Novita
Browse files
Options

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

parents 2560585b b0faafcb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 199 additions and 659 deletions
src/api/index.js
View file @ b5ed8d3c
...@@ -255,6 +255,7 @@ const create = (type = "") => { ...@@ -255,6 +255,7 @@ const create = (type = "") => {
const getMonthlyReportID = (body) => api.post('transaction/monthly_report_bs/get_monthly_report_id', body) const getMonthlyReportID = (body) => api.post('transaction/monthly_report_bs/get_monthly_report_id', body)
const getHierarkiMontlyReportBS = (body) => api.post('transaction/monthly_report_bs/get_report_hierarki', body) const getHierarkiMontlyReportBS = (body) => api.post('transaction/monthly_report_bs/get_report_hierarki', body)
const getHierarkiMontlyReportOI = (body) => api.post('transaction/monthly_report_oi/get_report_hierarki', body) const getHierarkiMontlyReportOI = (body) => api.post('transaction/monthly_report_oi/get_report_hierarki', body)
const getHierarkiMontlyReportTP = (body) => api.post('transaction/monthly_report_tp/get_report_hierarki', body)
// MonthlyPL // MonthlyPL
const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body) const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
...@@ -442,6 +443,7 @@ const create = (type = "") => { ...@@ -442,6 +443,7 @@ const create = (type = "") => {
getDashboardUser, getDashboardUser,
getHierarkiMontlyReportBS, getHierarkiMontlyReportBS,
getHierarkiMontlyReportOI, getHierarkiMontlyReportOI,
getHierarkiMontlyReportTP,
getDetailReportCF, getDetailReportCF,
getReportHierarkiPL, getReportHierarkiPL,
getMonthlyReportID, getMonthlyReportID,
......
src/container/BudgetTahunan/TaxPlanning.js
View file @ b5ed8d3c
This diff is collapsed.
src/container/Laporan/SubHolding.js
View file @ b5ed8d3c
...@@ -505,7 +505,7 @@ export default class SubHolding extends Component { ...@@ -505,7 +505,7 @@ export default class SubHolding extends Component {
} else if (this.state.report.value === 4) { } else if (this.state.report.value === 4) {
api.create().getReportHierarkiFR(payload).then(response => { api.create().getReportHierarkiFR(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) {
if (response.data.status === 'success') { if (response.data.status === 'success') {
...@@ -522,20 +522,20 @@ export default class SubHolding extends Component { ...@@ -522,20 +522,20 @@ export default class SubHolding extends Component {
item.description, item.description,
item.uom, item.uom,
item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before, item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
Number(item.ratio.january).toFixed(1), Number(item.ratio.january).toFixed(2),
Number(item.ratio.february).toFixed(1), Number(item.ratio.february).toFixed(2),
Number(item.ratio.march).toFixed(1), Number(item.ratio.march).toFixed(2),
Number(item.ratio.april).toFixed(1), Number(item.ratio.april).toFixed(2),
Number(item.ratio.may).toFixed(1), Number(item.ratio.may).toFixed(2),
Number(item.ratio.june).toFixed(1), Number(item.ratio.june).toFixed(2),
Number(item.ratio.july).toFixed(1), Number(item.ratio.july).toFixed(2),
Number(item.ratio.august).toFixed(1), Number(item.ratio.august).toFixed(2),
Number(item.ratio.september).toFixed(1), Number(item.ratio.september).toFixed(2),
Number(item.ratio.october).toFixed(1), Number(item.ratio.october).toFixed(2),
Number(item.ratio.november).toFixed(1), Number(item.ratio.november).toFixed(2),
Number(item.ratio.december).toFixed(1), Number(item.ratio.december).toFixed(2),
Number(item.ratio.total_next_year).toFixed(1), Number(item.ratio.total_next_year).toFixed(2),
Number(item.ratio.total_more_year).toFixed(1), Number(item.ratio.total_more_year).toFixed(2),
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong item.condition_if_wrong
...@@ -559,20 +559,20 @@ export default class SubHolding extends Component { ...@@ -559,20 +559,20 @@ export default class SubHolding extends Component {
item.description, item.description,
item.oum, item.oum,
item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before, item.ratio.total_actual_before === null ? "0.0" : item.ratio.total_actual_before === "" ? "0.0" : item.ratio.total_actual_before,
Number(item.ratio.january).toFixed(1), Number(item.ratio.january).toFixed(2),
Number(item.ratio.february).toFixed(1), Number(item.ratio.february).toFixed(2),
Number(item.ratio.march).toFixed(1), Number(item.ratio.march).toFixed(2),
Number(item.ratio.april).toFixed(1), Number(item.ratio.april).toFixed(2),
Number(item.ratio.may).toFixed(1), Number(item.ratio.may).toFixed(2),
Number(item.ratio.june).toFixed(1), Number(item.ratio.june).toFixed(2),
Number(item.ratio.july).toFixed(1), Number(item.ratio.july).toFixed(2),
Number(item.ratio.august).toFixed(1), Number(item.ratio.august).toFixed(2),
Number(item.ratio.september).toFixed(1), Number(item.ratio.september).toFixed(2),
Number(item.ratio.october).toFixed(1), Number(item.ratio.october).toFixed(2),
Number(item.ratio.november).toFixed(1), Number(item.ratio.november).toFixed(2),
Number(item.ratio.december).toFixed(1), Number(item.ratio.december).toFixed(2),
Number(item.ratio.total_next_year).toFixed(1), Number(item.ratio.total_next_year).toFixed(2),
Number(item.ratio.total_more_year).toFixed(1), Number(item.ratio.total_more_year).toFixed(2),
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong item.condition_if_wrong
......
src/container/MonthlyReport.js
View file @ b5ed8d3c
...@@ -778,7 +778,6 @@ export default class MonthlyReport extends Component { ...@@ -778,7 +778,6 @@ export default class MonthlyReport extends Component {
company={this.state.company} company={this.state.company}
revision={this.state.revisionTable} revision={this.state.revisionTable}
periode={this.state.periode.periode} periode={this.state.periode.periode}
// submissionID={this.state.submissionID}
monthlyReportId={this.state.monthlyReportId} monthlyReportId={this.state.monthlyReportId}
month={this.state.month} month={this.state.month}
// saveToMasterBudget={this.saveToMasterBudget.bind(this)} // saveToMasterBudget={this.saveToMasterBudget.bind(this)}
......
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