Merge branch 'faisal' into 'master'

!refresh again

See merge request !963

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -297,7 +297,7 @@ 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 })
+                    this.setState({ visibleUpload: false, loading: true, visibleFAMMR: false, refresh: true })
                     let dataTable = response.data.data.map((item, index) => {
                         return [
                             item.type_report_id,
@@ -319,7 +319,7 @@ export default class FixedAssetsMovementMR extends Component {
                         ]
                     })
                     // console.log(dataTable)
-                    this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true }, () => {
+                    this.setState({ dataTable, dataLoaded: true, loading: false, buttonError: false, editable: true, refresh: false }, () => {
                         this.state.dataTable.map(item => {
                             if (item[15].length > 0) {
                                 console.log('masuk')