Merge branch 'faisal' into 'master'

upload lg

See merge request !964

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -297,7 +297,6 @@ export default class FixedAssetsMovementMR extends Component {
             console.log(response)
             if (response.data) {
                 if (response.data.status === 'success') {
-                    this.setState({ visibleUpload: false, loading: true, visibleFAMMR: false, refresh: true })
                     let dataTable = response.data.data.map((item, index) => {
                         return [
                             item.type_report_id,
@@ -318,6 +317,7 @@ export default class FixedAssetsMovementMR extends Component {
                             item.error
                         ]
                     })
+                    this.setState({ visibleUpload: false, loading: true, visibleFAMMR: false, refresh: true })
                     // console.log(dataTable)
                     this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, refresh: false }, () => {
                         this.state.dataTable.map(item => {