Commit 23bdd5de authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

apdet

See merge request !750
parents a07b7ad9 f325b20e
...@@ -226,7 +226,7 @@ export default class CorporateAnnualTarget extends Component { ...@@ -226,7 +226,7 @@ export default class CorporateAnnualTarget extends Component {
} }
} }
}) })
// // console.log(dataTable) // console.log(dataTable)
this.setState({ dataTable, loading: false, dataReal: res, editable: true, dataCustomerPrs, dataInternalBsn }, () => { this.setState({ dataTable, loading: false, dataReal: res, editable: true, dataCustomerPrs, dataInternalBsn }, () => {
// // console.log(dataCustomerPrs) // // console.log(dataCustomerPrs)
}) })
...@@ -1271,7 +1271,11 @@ export default class CorporateAnnualTarget extends Component { ...@@ -1271,7 +1271,11 @@ export default class CorporateAnnualTarget extends Component {
if (idParent !== null) { if (idParent !== null) {
let indexsss = dataTable2.findIndex((val) => val[1] == idParent) let indexsss = dataTable2.findIndex((val) => val[1] == idParent)
if (dataTable2[indexsss][6] == 'FINANCIAL PERSPECTIVE') { if (dataTable2[indexsss][6] == 'FINANCIAL PERSPECTIVE') {
return true if (tableMeta.rowData[0] == 3) {
return false
} else {
return true
}
} else { } else {
return false return false
} }
...@@ -1744,11 +1748,11 @@ export default class CorporateAnnualTarget extends Component { ...@@ -1744,11 +1748,11 @@ export default class CorporateAnnualTarget extends Component {
control={ control={
<NumberFormat <NumberFormat
thousandSeparator={true} thousandSeparator={true}
style={{ color: "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }} style={{ color: "black", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
type="text" type="text"
placeholder="" placeholder=""
value={Number(value).toFixed(1)} value={Number(value).toFixed(1)}
disabled={this.props.isApprover ? true : ((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)} disabled={true}
decimalScale={1} decimalScale={1}
onBlur={(event) => { onBlur={(event) => {
// updateValue(event.target.value) // updateValue(event.target.value)
......
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