Skip to content

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

Merge branch 'ENV-DEV' into 'ENV-STAGING' 

Update FAM

See merge request !2039
parents 5b703adf af4fca27
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 34 deletions
src/container/MonthlyReport/FixedAssetsMovementMR.js
View file @ f1b96f20
...@@ -977,22 +977,40 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -977,22 +977,40 @@ export default class FixedAssetsMovementMR extends Component {
{ {
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ? tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
null : null :
<div style={{ flex: 1 }}> this.state.get_for == 'view' ?
<FormControlLabel <div style={{ flex: 1 }}>
style={{ margin: 0 }} <FormControlLabel
value={value} style={{ margin: 0 }}
control={ value={value}
<NumberFormat control={
thousandSeparator={true} <NumberFormat
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }} thousandSeparator={true}
type="text" style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
placeholder="" type="text"
disabled={true} placeholder=""
value={Number(tableMeta.rowData[6]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[6]), 1) : Number(tableMeta.rowData[6])} disabled={true}
/> value={fixNumber(Number(tableMeta.rowData[6]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[6]), 1)}
} />
/> }
</div> />
</div>
:
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[6]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[6]), 1) : Number(tableMeta.rowData[6])}
/>
}
/>
</div>
} }
</div> </div>
</div> </div>
...@@ -1001,22 +1019,40 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1001,22 +1019,40 @@ export default class FixedAssetsMovementMR extends Component {
{ {
tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ? tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 4 ?
null : null :
<div style={{ flex: 1 }}> this.state.get_for == 'view' ?
<FormControlLabel <div style={{ flex: 1 }}>
style={{ margin: 0 }} <FormControlLabel
value={value} style={{ margin: 0 }}
control={ value={value}
<NumberFormat control={
thousandSeparator={true} <NumberFormat
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }} thousandSeparator={true}
type="text" style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
placeholder="" type="text"
disabled={true} placeholder=""
value={Number(tableMeta.rowData[7]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[7]), 1) : Number(tableMeta.rowData[7])} disabled={true}
/> value={fixNumber(Number(tableMeta.rowData[7]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[7]), 1)}
} />
/> }
</div> />
</div>
:
<div style={{ flex: 1 }}>
<FormControlLabel
style={{ margin: 0 }}
value={value}
control={
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 90, backgroundColor: 'transparent' }}
type="text"
placeholder=""
disabled={true}
value={Number(tableMeta.rowData[7]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[7]), 1) : Number(tableMeta.rowData[7])}
/>
}
/>
</div>
} }
</div> </div>
</div> </div>
...@@ -1166,7 +1202,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1166,7 +1202,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[9]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[9]), 1) : Number(tableMeta.rowData[9])} value={fixNumber(Number(tableMeta.rowData[9]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[9]), 1)}
/> />
} }
/> />
...@@ -1251,7 +1287,7 @@ export default class FixedAssetsMovementMR extends Component { ...@@ -1251,7 +1287,7 @@ export default class FixedAssetsMovementMR extends Component {
type="text" type="text"
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(tableMeta.rowData[11]) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? fixNumber(Number(tableMeta.rowData[11]), 1) : Number(tableMeta.rowData[11])} value={fixNumber(Number(tableMeta.rowData[11]), 1) == 0 ? "0.0" : fixNumber(Number(tableMeta.rowData[11]), 1)}
/> />
} }
/> />
......
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