Merge branch 'didam' into 'master'

update

See merge request !498

src/api/index.js

@@ -137,8 +137,8 @@ const create = (type = "") => {
   const searchAM = (body) => api.post('/approval_matrix/search_approval_matrix', body)
   const createAM = (body) => api.post('/approval_matrix/create_approval_matrix', body)
   const updateAM = (body) => api.post('/approval_matrix/update_approval_matrix', body)
-  const updateVAM = (body) => api.post('/approval_matrix/visual_approval_matrix', body)
-  const checkUploadAM = (body) => api.post('/approval_matrix/check_import_approval_matrix', body)
+  const updateVAM = (body) => api.post('/approval_matrix/save_visualization', body)
+  const checkUploadAM = (body) => api.post('/approval_matrix/check_import', body)
   const uploadAM = (body) => api.post('approval_matrix/import_approval_matrix', body)
   const deleteAM = (id) => api.post(`approval_matrix/delete_approval_matrix/${id}`)
 

src/container/ApprovalMatrix/CreateApprovalMatrix.js

@@ -61,7 +61,7 @@ export default class CreateApprovalMatrix extends Component {
                         let userData = data.map((item) => {
                             return {
                                 user_id: item.user_id,
-                                fullname: item.fullname
+                                fullname: item.fullname == null? "(NO_NAME)" : item.fullname
                             }
                         })
                         // console.log(userData)

src/container/ApprovalMatrix/EditApprovalMatrix.js

@@ -97,7 +97,7 @@ export default class EditApprovalMatrix extends Component {
                         let userData = data.map((item) => {
                             return {
                                 user_id: item.user_id,
-                                fullname: item.fullname
+                                fullname: item.fullname == null? "(NO_NAME)" : item.fullname
                             }
                         })
                         let index = userData.findIndex((val) => val.user_id == this.state.getUserId)

src/container/OprIndicator/OperatingIndicatorDetail.js

@@ -426,6 +426,7 @@ export default class BalanceSheet extends Component {
         console.log(JSON.stringify(body))
         api.create('UPLOAD').uploadOperatingInd(body).then(response => {
             console.log(response);
+            this.setState({loading: false})
             if (response.data) {
                 if (response.data.status === "success") {
                     this.props.onClickClose()