|
@@ -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;
|
|
|
}
|