Skip to content

T
Tia-dev
Commit 01a69d6d authored by rifkaki's avatar rifkaki
Browse files
Options

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

parents 5d08bd3c f64b8d53
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 41 deletions
src/container/MonthlyReport.js
View file @ 01a69d6d
......@@ -832,9 +832,11 @@ export default class MonthlyReport extends Component {
cursor: tableMeta.rowData[5] ? 'pointer' : 'default',
borderColor: 'transparent'
}}
onClick={() =>
// tableMeta.rowData[5] ?
onClick={() =>{
this.clickDetail(tableMeta.rowData[1], tableMeta.rowData[4], tableMeta.rowData[2], tableMeta.rowData[3])
console.log(tableMeta.rowData)
}
// tableMeta.rowData[5] ?
// : null
}
>
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 01a69d6d
......@@ -486,18 +486,18 @@ export default class ProfitLossMR extends Component {
item.actual === "" ? "" : item.actual,
0,
item.actual_previous_month === null ? "" : item.actual_previous_month === "" ? "" : item.actual_previous_month,
0,
0,
0,
0,
0,
0,
// item.amount_act_vs_previous_month,
// item.percent_act_vs_previous_month,
// item.amount_act_vs_mb,
// item.percent_act_vs_mb,
// item.amount_act_vs_rb,
// item.percent_act_vs_rb,
// 0,
// 0,
// 0,
// 0,
// 0,
// 0,
item.amount_act_vs_previous_month,
item.percent_act_vs_previous_month,
item.amount_act_vs_mb,
item.percent_act_vs_mb,
item.amount_act_vs_rb,
item.percent_act_vs_rb,
item.mtd_vs_mb ,
item.mtd_vs_rb ,
item.mtd_vs_previous_month ,
......
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