Skip to content

T
Tia-dev
Commit 691f0545 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-dev(pc)' into 'master' 

lier aing

See merge request !575
parents fac49dad 0cfade73
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 29 deletions
src/container/BudgetTahunan/TaxPlanning.js
View file @ 691f0545
...@@ -204,7 +204,7 @@ export default class TaxPlanning extends Component { ...@@ -204,7 +204,7 @@ export default class TaxPlanning extends Component {
} }
} }
}) })
// console.log(dataTable) console.log(dataTable)
this.setState({ dataTable, loading: false, buttonError: true, editable: true }) this.setState({ dataTable, loading: false, buttonError: true, editable: true })
} else { } else {
this.setState({ dataTable, loading: false, buttonError: true, editable: true }) this.setState({ dataTable, loading: false, buttonError: true, editable: true })
...@@ -5828,6 +5828,7 @@ export default class TaxPlanning extends Component { ...@@ -5828,6 +5828,7 @@ export default class TaxPlanning extends Component {
/> />
: :
tableMeta.rowData[3] === 7 ? tableMeta.rowData[3] === 7 ?
(Number(handleTotal(tableMeta, 1)) >= Number(this.state.minValue) && Number(handleTotal(tableMeta, 1)) <= Number(this.state.maxValue)) ?
<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' }}
...@@ -5835,7 +5836,17 @@ export default class TaxPlanning extends Component { ...@@ -5835,7 +5836,17 @@ export default class TaxPlanning extends Component {
placeholder="" placeholder=""
disabled={true} disabled={true}
value={Number(handleTotal(tableMeta, 1)).toFixed(1)} value={Number(handleTotal(tableMeta, 1)).toFixed(1)}
/> :
<LightTooltip title={this.state.minValue === null ? `Value Should be 0` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
<NumberFormat
thousandSeparator={true}
style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent', color: 'red' }}
type="text"
placeholder=""
disabled={true}
value={Number(handleTotal(tableMeta, 1)).toFixed(1)}
/> />
</LightTooltip>
: :
null null
} }
......
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