Skip to content

T
Tia-dev
Commit 5b42a6f6 authored by Deni Rinaldi's avatar Deni Rinaldi
Browse files
Options

Merge branch 'deni-' into 'master' 

bs

See merge request !793
parents d22af569 12aa65ad
Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 63 deletions
src/container/MonthlyReport/BalanceSheetMR.js
View file @ 5b42a6f6
...@@ -314,9 +314,9 @@ export default class BalanceSheetMR extends Component { ...@@ -314,9 +314,9 @@ export default class BalanceSheetMR extends Component {
0, 0,
0, 0,
0, 0,
item.mtd_vs_previous_month === "" ? "0" : item.mtd_vs_previous_month, item.mtd_vs_previous_month === "" ? "" : item.mtd_vs_previous_month,
item.mtd_vs_mb === "" ? "0" : item.mtd_vs_mb, item.mtd_vs_mb === "" ? "" : item.mtd_vs_mb,
item.mtd_vs_rb === "" ? "0" : item.mtd_vs_rb === null ? '0' : item.mtd_vs_rb, item.mtd_vs_rb === "" ? "" : item.mtd_vs_rb === null ? '' : item.mtd_vs_rb,
item.actual_formula, item.actual_formula,
item.order, item.order,
item.error item.error
...@@ -1501,15 +1501,17 @@ export default class BalanceSheetMR extends Component { ...@@ -1501,15 +1501,17 @@ export default class BalanceSheetMR extends Component {
control={ control={
<Input <Input
disableUnderline={true} disableUnderline={true}
style={{ color: "#5198ea", 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={Number(tableMeta.rowData[12]) <= this.state.minValue || Number(tableMeta.rowData[12]) >= this.state.maxValue ? false : true} disabled={Number(tableMeta.rowData[12]) <= this.state.minValue || Number(tableMeta.rowData[12]) >= this.state.maxValue ? false : true}
defaultValue={tableMeta.rowData[17]} defaultValue={tableMeta.rowData[17]}
inputProps={{style: { inputProps={{
color: "#5198ea", style: {
color: Number(tableMeta.rowData[12]) <= this.state.minValue || Number(tableMeta.rowData[12]) >= this.state.maxValue ? "#5198ea" : 'black',
textAlign: 'right' textAlign: 'right'
}}} }
}}
onBlur={(event) => { onBlur={(event) => {
handleText(event.target.value, tableMeta, 17) handleText(event.target.value, tableMeta, 17)
}} }}
...@@ -1529,15 +1531,17 @@ export default class BalanceSheetMR extends Component { ...@@ -1529,15 +1531,17 @@ export default class BalanceSheetMR extends Component {
control={ control={
<Input <Input
disableUnderline={true} disableUnderline={true}
style={{ color: "#5198ea", 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={Number(tableMeta.rowData[14]) <= this.state.minValue || Number(tableMeta.rowData[14]) >= this.state.maxValue ? false : true} disabled={Number(tableMeta.rowData[14]) <= this.state.minValue || Number(tableMeta.rowData[14]) >= this.state.maxValue ? false : true}
defaultValue={tableMeta.rowData[18]} defaultValue={tableMeta.rowData[18]}
inputProps={{style: { inputProps={{
color: "#5198ea", style: {
color: Number(tableMeta.rowData[14]) <= this.state.minValue || Number(tableMeta.rowData[14]) >= this.state.maxValue ? "#5198ea" : 'black',
textAlign: 'right' textAlign: 'right'
}}} }
}}
onBlur={(event) => { onBlur={(event) => {
handleText(event.target.value, tableMeta, 18) handleText(event.target.value, tableMeta, 18)
}} }}
...@@ -1557,15 +1561,17 @@ export default class BalanceSheetMR extends Component { ...@@ -1557,15 +1561,17 @@ export default class BalanceSheetMR extends Component {
control={ control={
<Input <Input
disableUnderline={true} disableUnderline={true}
style={{ color: "#5198ea", 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={Number(tableMeta.rowData[16]) <= this.state.minValue || Number(tableMeta.rowData[16]) >= this.state.maxValue ? false : true} disabled={Number(tableMeta.rowData[16]) <= this.state.minValue || Number(tableMeta.rowData[16]) >= this.state.maxValue ? false : true}
defaultValue={tableMeta.rowData[19]} defaultValue={tableMeta.rowData[19]}
inputProps={{style: { inputProps={{
color: "#5198ea", style: {
color: Number(tableMeta.rowData[16]) <= this.state.minValue || Number(tableMeta.rowData[16]) >= this.state.maxValue ? "#5198ea" : 'black',
textAlign: 'right' textAlign: 'right'
}}} }
}}
onBlur={(event) => { onBlur={(event) => {
handleText(event.target.value, tableMeta, 19) handleText(event.target.value, tableMeta, 19)
}} }}
......
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