Commit 0cb33513 authored by Riri Novita's avatar Riri Novita

Merge branch 'riri' into 'master'

apdet

See merge request !883
parents eb391cc1 aecd35a1
...@@ -949,24 +949,24 @@ export default class ProfitLossMR extends Component { ...@@ -949,24 +949,24 @@ export default class ProfitLossMR extends Component {
value={Number(tableMeta.rowData[7]).toFixed(1)} value={Number(tableMeta.rowData[7]).toFixed(1)}
/> />
: :
// tableMeta.rowData[0] === 6 ? tableMeta.rowData[0] === 6 ?
// <div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
// <FormControlLabel <FormControlLabel
// style={{ margin: 0 }} style={{ margin: 0 }}
// value={tableMeta.rowData[7]} value={tableMeta.rowData[7]}
// 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, 0)).toFixed(1)} value={Number(handleFormula(val, tableMeta, 0)).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