Commit 5bb9ffbb authored by Dida Adams Arizona's avatar Dida Adams Arizona

Merge branch 'didam' into 'master'

apdet

See merge request !984
parents c57df8b8 c893bbed
...@@ -69,8 +69,6 @@ class HomePage extends Component { ...@@ -69,8 +69,6 @@ class HomePage extends Component {
this.getPermissionMR() this.getPermissionMR()
this.getApprMat() this.getApprMat()
// this.getListUserSubco() // this.getListUserSubco()
this.getDashboardMB()
this.getDashboard()
this.getMonth() this.getMonth()
} }
...@@ -370,6 +368,8 @@ class HomePage extends Component { ...@@ -370,6 +368,8 @@ class HomePage extends Component {
} }
this.setState({ isApproverMB, isApproverMR}) this.setState({ isApproverMB, isApproverMR})
this.getDashboardMB() this.getDashboardMB()
// this.getDashboardMB()
this.getDashboard()
// console.log(actAM) // console.log(actAM)
this.setState({loading: false}) this.setState({loading: false})
}) })
......
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