Commit 858a3bd4 authored by syadziy's avatar syadziy

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev

parents c8fafa86 53dc72f8
......@@ -229,7 +229,7 @@ export default class BudgetTahunan extends Component {
indexID = companyData.findIndex((val) => val.company_id == this.state.rawData.company_id)
}
this.setState({ listCompany: defaultProps, company: indexID == null ? companyData[0] : companyData[indexID] }, () => {
this.setState({ listCompany: defaultProps, company: indexID == null ? (this.state.company !== null ? this.state.company : companyData[0]) : companyData[indexID] }, () => {
// // // console.log(response.data.data);
if (response.data.data.length > 0) {
this.getRevision()
......@@ -480,7 +480,7 @@ export default class BudgetTahunan extends Component {
// console.log(periodeData)
// // // console.log(index)
this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index] }, () => {
if (this.state.isApprover === true && this.state.checkApprover == true) {
if (this.state.isApprover === true) {
this.getCompanySubmitted()
} else {
this.getRevision()
......
......@@ -564,7 +564,7 @@ export default class BalanceSheetOLPA extends Component {
err = true
} else if (Number(i[18].value) < this.state.minValue || Number(i[18].value) > this.state.maxValue) {
err = true
} else if (Number(i[19]) < this.state.minValue || Number(i[19]) > this.state.maxValue) {
} else if (Number(i[19]).toFixed(1) < this.state.minValue || Number(i[19]).toFixed(1) > this.state.maxValue) {
err = true
}
}
......
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