Skip to content

T
Tia-dev
Commit 5f4e2680 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 9cc6a760 e110fb50
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 70 deletions
src/container/RollingOutlook/BalanceSheetRO.js
View file @ 5f4e2680
...@@ -512,22 +512,23 @@ export default class BalanceSheetRO extends Component { ...@@ -512,22 +512,23 @@ export default class BalanceSheetRO extends Component {
item.level, item.level,
item.item_report, item.item_report,
item.total_december_last_year === "" ? "0" : item.total_december_last_year, item.total_december_last_year === "" ? "0" : item.total_december_last_year,
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.january, formula: item.january_formula } : Number(item.january).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.january, formula: item.january_formula } : Number(item.january).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.february, formula: item.february_formula } : Number(item.february).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.february, formula: item.february_formula } : Number(item.february).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.march, formula: item.march_formula } : Number(item.march).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.march, formula: item.march_formula } : Number(item.march).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.april, formula: item.april_formula } : Number(item.april).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.april, formula: item.april_formula } : Number(item.april).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.may, formula: item.may_formula } : Number(item.may).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.may, formula: item.may_formula } : Number(item.may).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.june, formula: item.june_formula } : Number(item.june).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.june, formula: item.june_formula } : Number(item.june).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.july, formula: item.july_formula } : Number(item.july).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.july, formula: item.july_formula } : Number(item.july).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.august, formula: item.august_formula } : Number(item.august).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.august, formula: item.august_formula } : Number(item.august).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.september, formula: item.september_formula } : Number(item.september).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.september, formula: item.september_formula } : Number(item.september).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.october, formula: item.october_formula } : Number(item.october).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.october, formula: item.october_formula } : Number(item.october).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.november, formula: item.november_formula } : Number(item.november).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.november, formula: item.november_formula } : Number(item.november).toFixed(1),
String(item.item_report).toLocaleLowerCase() == "profit (loss) mtd" ? { value: item.december, formula: item.december_formula } : Number(item.december).toFixed(1), item.type_report_id == 5 || item.type_report_id == 6 ? { value: item.december, formula: item.december_formula } : Number(item.december).toFixed(1),
item.total_december_year === "" ? "0" : item.total_december_year, item.total_december_year === "" ? "0" : item.total_december_year,
item.order, item.order,
item.condition_it_should_be, item.condition_it_should_be,
item.condition_if_wrong item.condition_if_wrong,
item.forecast_formula == null ? [] : item.forecast_formula
] ]
}) })
console.log(dataTable) console.log(dataTable)
......
src/container/RollingOutlook/ProfitLossRO.js
View file @ 5f4e2680
...@@ -695,10 +695,10 @@ export default class ProfitLossROO extends Component { ...@@ -695,10 +695,10 @@ export default class ProfitLossROO extends Component {
dataTable2.map((item, index) => { dataTable2.map((item, index) => {
if (data.rowData[1] == item[2]) { if (data.rowData[1] == item[2]) {
total = item[data.columnIndex] == undefined ? (Number(total) + 0) : (Number(total) + Number(String(item[data.columnIndex]).includes('-') ? Number(String(item[data.columnIndex]).substr(1, String(item[data.columnIndex]).length)) * -1 : Number(item[data.columnIndex]))) total = item[data.columnIndex] == undefined ? (Number(total) + 0) : (Number(total) + Number(String(item[data.columnIndex]).includes('-') ? Number(String(item[data.columnIndex]).substr(1, String(item[data.columnIndex]).length)) * -1 : Number(item[data.columnIndex])))
if (data.rowData[5] == "Revenue") { // if (data.rowData[5] == "Revenue") {
console.log(total); // console.log(total);
// console.log(a); // // console.log(a);
} // }
} }
}) })
// console.log(total); // console.log(total);
...@@ -970,59 +970,59 @@ export default class ProfitLossROO extends Component { ...@@ -970,59 +970,59 @@ export default class ProfitLossROO extends Component {
value={Number(val).toFixed(1)} value={Number(val).toFixed(1)}
/> />
: :
tableMeta.rowData[0] === 2 ? // tableMeta.rowData[0] === 2 ?
<span style={{ fontSize: 12, textAlign: 'right' }}> // <span style={{ fontSize: 12, textAlign: 'right' }}>
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
// value={Number(val).toFixed(1)} // // value={Number(val).toFixed(1)}
value={Number(handleValue(val, tableMeta)).toFixed(1)} // value={Number(handleValue(val, tableMeta)).toFixed(1)}
/> // />
</span> // </span>
: // :
tableMeta.rowData[0] === 3 ? // tableMeta.rowData[0] === 3 ?
<div style={{ flex: 1 }}> // <div style={{ flex: 1 }}>
<FormControlLabel // <FormControlLabel
style={{ margin: 0 }} // style={{ margin: 0 }}
value={val} // value={val}
control={ // control={
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} // // disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
disabled={true} // disabled={true}
value={Number(val).toFixed(1)} // value={Number(val).toFixed(1)}
onBlur={(event) => { // onBlur={(event) => {
handleChange(event.target.value, tableMeta) // handleChange(event.target.value, tableMeta)
}} // }}
/> // />
} // }
/> // />
</div> // </div>
: // :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ? // tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}> // <div style={{ flex: 1 }}>
<FormControlLabel // <FormControlLabel
style={{ margin: 0 }} // style={{ margin: 0 }}
value={val} // value={val}
control={ // control={
<NumberFormat // <NumberFormat
thousandSeparator={true} // thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" // type="text"
placeholder="" // placeholder=""
disabled={true} // disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)} // value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/> // />
} // }
/> // />
</div> // </div>
: // :
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<FormControlLabel <FormControlLabel
style={{ margin: 0 }} style={{ margin: 0 }}
......
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