caipin 5 лет назад
Родитель
Сommit
f68cb1cb70

+ 8 - 4
src/contact/client/index.js

@@ -137,7 +137,7 @@ class client extends PureComponent {
 
 
   render() {
-    const { columns,  columnsData, handleSearch, handleColumnsShow } = this.props;
+    const { clientList,columns,  columnsData, handleSearch, handleColumnsShow } = this.props;
 
     return (
       <Fragment>
@@ -294,7 +294,8 @@ value={searchValue} onChange={handleInputSearchValue}
                       <tbody>
 
                          {
-                          clientList.map((item) => {
+                           
+                          this.props.clientList.map((item) => {
                             return (
                               <tr key={item.get('id')} >
                                 <td><a href="#detail" data-toggle="modal" data-target="#detail">{item.get('clientname')}</a></td>
@@ -353,8 +354,9 @@ value={searchValue} onChange={handleInputSearchValue}
 
   //组件即将要被挂在的时候执行的方法
   componentDidMount() {
-    //const { clientList } = this.props;
-    //this.props.handleClientData(clientList);
+   
+    // const { clientList } = this.props;
+    // this.props.handleClientData(clientList);
   }
 
 
@@ -373,6 +375,7 @@ let delaySwitch = null;//延迟检索开关
  */
 const mapStateToProps = (state) => {
   return {
+    clientList:state.getIn(['contact', 'clientList']),
     columns: state.getIn(['contact', 'columns']),
     columnsData: state.getIn(['contact', 'columnsData']),
   }
@@ -391,6 +394,7 @@ const mapDispathToProps = (dispatch) => {
     //检索联系人
     handleSearch(serchValue) {
       //e.target --可以获得dom
+
       if (delaySwitch != null) {
         clearTimeout(delaySwitch);
       }

+ 13 - 2
src/contact/client/store/actionCreators.js

@@ -24,14 +24,25 @@ export const toggleColumns = (index) => {
 
 export const getClientLIst = () => {
     return (dispatch) => {
+        
         axios.get(config.CLD2API+'/contact/client').then((res) => {
             const data = res.data;
+            
             if(data.code===200){
-                dispatch(changeList(JSON.parse(data.list)));
+
+                //let d2=JSON.parse(data.list);
+console.log(data.data);
+dispatch(changeList(data.data));
+                //dispatch(changeList(JSON.parse(data.list)));
+                // dispatch({
+                //     type: constants.CHANGE_CLIENT_DATA,
+                //     data: fromJS(d2),
+                // });
             }else{
                 console.log(data);
             }
-        }).catch(() => {
+        }).catch((e) => {
+            console.log(e);
             console.log('error');
         })
     }

+ 2 - 0
src/contact/client/store/reducer.js

@@ -58,6 +58,8 @@ export default (state = defaultState, action) => {
 		case constants.TOGGLE_COLUMNS:
 			let columnsData=state.get('columnsData').toJS();
 			columnsData[action.data].columnsValue=!columnsData[action.data].columnsValue;
+			//存储
+			localStorage.setItem('contact_client_Column_'+action.data, columnsData[action.data].columnsValue);
 			return state.set('columnsData', fromJS(columnsData));
 		case constants.CHANGE_CLIENT_DATA:
 			return state.set('clientList', action.data);