Skip to content

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

Merge branch 'riri' into 'master' 

issue demo ropl

See merge request !1464
parents 520b3fdd 8281667b
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 57 deletions
src/container/RollingOutlook/ProfitLossRO.js
View file @ 20d08e48
...@@ -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(handleValue(val, tableMeta)).toFixed(1)}
// />
// </span>
// :
// tableMeta.rowData[0] === 3 ?
// <div style={{ flex: 1 }}>
// <FormControlLabel
// style={{ margin: 0 }}
// value={val}
// control={
// <NumberFormat
// thousandSeparator={true}
// style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
// type="text"
// placeholder=""
// // disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)}
// disabled={true}
// value={Number(val).toFixed(1)} // value={Number(val).toFixed(1)}
value={Number(handleValue(val, tableMeta)).toFixed(1)} // onBlur={(event) => {
/> // handleChange(event.target.value, tableMeta)
</span> // }}
: // />
tableMeta.rowData[0] === 3 ? // }
<div style={{ flex: 1 }}> // />
<FormControlLabel // </div>
style={{ margin: 0 }} // :
value={val} // tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
control={ // <div style={{ flex: 1 }}>
<NumberFormat // <FormControlLabel
thousandSeparator={true} // style={{ margin: 0 }}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // value={val}
type="text" // control={
placeholder="" // <NumberFormat
// disabled={this.props.isApprover? true : (this.state.get_for == 'view'? true : false)} // thousandSeparator={true}
disabled={true} // style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
value={Number(val).toFixed(1)} // type="text"
onBlur={(event) => { // placeholder=""
handleChange(event.target.value, tableMeta) // disabled={true}
}} // value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/> // />
} // }
/> // />
</div> // </div>
: // :
tableMeta.rowData[0] === 5 || tableMeta.rowData[0] === 6 ?
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={val}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(handleFormula(val, tableMeta, 1)).toFixed(1)}
/>
}
/>
</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