Skip to content

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

Merge branch 'dev/staging-riri' into 'ENV-STAGING' 

update locf

See merge request !1943
parents 5310ef9d 2b3c5ad7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 285 additions and 24 deletions
src/container/MonthlyReport/OperatingIndicatorMR.js
View file @ 648fa4f7
...@@ -1220,7 +1220,6 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1220,7 +1220,6 @@ export default class OperatingIndicatorMR extends Component {
fixedDecimalScale={1} fixedDecimalScale={1}
disabled={!this.props.permission.create || !this.props.permission.edit || this.state.get_for == 'view'} disabled={!this.props.permission.create || !this.props.permission.edit || this.state.get_for == 'view'}
value={Number(tableMeta.rowData[10]).toFixed(1)} value={Number(tableMeta.rowData[10]).toFixed(1)}
decimalScale={1}
onBlur={(event) => { onBlur={(event) => {
handleChange(event.target.value, tableMeta) handleChange(event.target.value, tableMeta)
}} }}
...@@ -1243,7 +1242,6 @@ export default class OperatingIndicatorMR extends Component { ...@@ -1243,7 +1242,6 @@ export default class OperatingIndicatorMR extends Component {
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
value={Number(handleFormula(val, tableMeta, 2)).toFixed(1)} value={Number(handleFormula(val, tableMeta, 2)).toFixed(1)}
decimalScale={1}
/> />
} }
/> />
......
src/container/MonthlyReport/ProfitLossMR.js
View file @ 648fa4f7
...@@ -1407,7 +1407,6 @@ export default class ProfitLossMR extends Component { ...@@ -1407,7 +1407,6 @@ export default class ProfitLossMR extends Component {
disabled={true} disabled={true}
decimalScale={1} decimalScale={1}
value={Number(tableMeta.rowData[10]).toFixed(1)} value={Number(tableMeta.rowData[10]).toFixed(1)}
decimalScale={1}
/> />
: :
tableMeta.rowData[0] === 3 ? tableMeta.rowData[0] === 3 ?
...@@ -1876,7 +1875,7 @@ export default class ProfitLossMR extends Component { ...@@ -1876,7 +1875,7 @@ export default class ProfitLossMR extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ color: 'red', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} // style={{ color: 'red', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
style={{ color: Number(tableMeta.rowData[18]).toFixed(1) < this.state.minValue || Number(tableMeta.rowData[18]).toFixed(1) > this.state.maxValue ? 'red' : '#000000b0', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: Number(tableMeta.rowData[18]).toFixed(1) < this.state.minValue || Number(tableMeta.rowData[18]).toFixed(1) > this.state.maxValue ? 'red' : '#000000b0', fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
......
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