caipin 5 gadi atpakaļ
vecāks
revīzija
79f460ae01

+ 1 - 0
src/contact/company/index.js

@@ -313,6 +313,7 @@ const mapStateToProps = (state) => {
 const mapDispathToProps = (dispatch) => {
   return {
     handleCompanyData(pagination,filters,sorter) {
+      dispatch(actionCreators.changeLoading());
       dispatch(actionCreators.getCompanyLIst(pagination));
       //(list.size === 0) && dispatch(actionCreators.getCompanyLIst());
     },

+ 9 - 3
src/contact/company/store/actionCreators.js

@@ -22,11 +22,17 @@ import axios from '../../../common/axios_auth.js';
 //     }
 // };
 
-export const getCompanyLIst = (pagination) => {
+export const changeLoading = () => {
     return (dispatch) => {
+        dispatch({
+            type: constants.CHANGE_COMPANY_LOADING,
+            data: true,
+        });
+    }
+}
 
-        
-
+export const getCompanyLIst = (pagination) => {
+    return (dispatch) => {
         axios.get(config.CLD2API + '/contact/company', {
             params: {
                 current: pagination.current,

+ 1 - 0
src/contact/company/store/constants.js

@@ -1 +1,2 @@
 export const CHANGE_COMPANY_DATA = 'client/change_company_data';
+export const CHANGE_COMPANY_LOADING= 'client/change_company_loading';

+ 4 - 4
src/contact/company/store/reducer.js

@@ -44,19 +44,19 @@ export default (state = defaultState, action) => {
 		// 		}
 		// 	}
 		// 	return state.set('columnsData', fromJS(columnsData));
+		case constants.CHANGE_COMPANY_LOADING:
+			return state.set('loading', action.data);
 		case constants.CHANGE_COMPANY_DATA:
-			//console.log(action.data.data);
 			let pagination={
 				...action.pagination,
 				total:action.data.recordsTotal,
 			}
-
 			return state.merge({
 				pagination: fromJS(pagination),
-				companyList: fromJS(action.data.data)
+				companyList: fromJS(action.data.data),
+				loading: false
 			});
 
-			//return state.set('companyList', fromJS(action.data.data));
 		default:
 			return state;
 	}