|
@@ -10,8 +10,8 @@ const defaultState = fromJS({
|
|
|
showSizeChanger: false
|
|
|
},
|
|
|
loading: false,
|
|
|
- sortField:'CREATETIME',
|
|
|
- sort:'DESC',
|
|
|
+ sortField: 'CREATETIME',
|
|
|
+ sort: 'DESC',
|
|
|
columns: [
|
|
|
{
|
|
|
title: '客户名称',
|
|
@@ -100,8 +100,8 @@ export default (state = defaultState, action) => {
|
|
|
columnsVisible[action.data].columnsValue = !columnsVisible[action.data].columnsValue;
|
|
|
//存储
|
|
|
localStorage.setItem('contact_company_Column_' + action.data, columnsVisible[action.data].columnsValue);
|
|
|
- var columnsBak=refreshColumns(columnsVisible,columns);
|
|
|
-
|
|
|
+ var columnsBak = refreshColumns(columnsVisible, columns);
|
|
|
+
|
|
|
return state.merge({
|
|
|
columnsVisible: fromJS(columnsVisible),
|
|
|
columns: fromJS(columnsBak)
|
|
@@ -122,6 +122,8 @@ export default (state = defaultState, action) => {
|
|
|
//设置列表排序
|
|
|
case constants.CHANGE_COMPANY_SORTFIELD:
|
|
|
return state.set('sortField', action.data);
|
|
|
+ case constants.CHANGE_COMPANY_SORT:
|
|
|
+ return state.set('sort', action.data);
|
|
|
//读取锁定-获得客户data
|
|
|
case constants.CHANGE_COMPANY_LOADING:
|
|
|
return state.set('loading', action.data);
|
|
@@ -136,13 +138,13 @@ export default (state = defaultState, action) => {
|
|
|
total: action.data.recordsTotal,
|
|
|
}
|
|
|
|
|
|
- for (var i = 0,ci=1; i <= columnsVisible.length; i++,ci++) {
|
|
|
+ for (var i = 0, ci = 1; i <= columnsVisible.length; i++, ci++) {
|
|
|
var isAccept = localStorage.getItem("contact_company_Column_" + i);
|
|
|
if (isAccept === 'false') {
|
|
|
columnsVisible[i].columnsValue = false;
|
|
|
}
|
|
|
}
|
|
|
- var columnsBak=refreshColumns(columnsVisible,columns);
|
|
|
+ var columnsBak = refreshColumns(columnsVisible, columns);
|
|
|
return state.merge({
|
|
|
pagination: fromJS(pagination),
|
|
|
companyList: fromJS(action.data.data),
|
|
@@ -155,11 +157,11 @@ export default (state = defaultState, action) => {
|
|
|
}
|
|
|
|
|
|
|
|
|
-function refreshColumns(columnsVisible,columns){
|
|
|
- let columnsBak=[];
|
|
|
+function refreshColumns(columnsVisible, columns) {
|
|
|
+ let columnsBak = [];
|
|
|
columnsBak.push(columns[0]);
|
|
|
for (var i = 0; i < columnsVisible.length; i++) {
|
|
|
- if(columnsVisible[i].columnsValue){
|
|
|
+ if (columnsVisible[i].columnsValue) {
|
|
|
columnsBak.push({
|
|
|
title: columnsVisible[i].columnsName,
|
|
|
dataIndex: columnsVisible[i].dataKey,
|