Merge branch 'master' of http://192.168.1.41:3000/caipin/cld2_react

src/product/lock_store/index.js

@@ -6,9 +6,11 @@ import DataTable from '../../common/dataTable';
 
 import { actionCreators } from './store';
 
+let dt = null;
+
 class lock_store extends PureComponent {
     render() {
-        const {columns, columnsData} = this.props;
+        const {columns, columnsData,handleColumnBindEvent} = this.props;
         return (
             <div>
         <StaffHeader />
@@ -121,7 +123,7 @@ class lock_store extends PureComponent {
                   {/* <!--数据内容区--> */}
                   <div className="panel-content">
                   {/* 接口路径 */}
-                  <DataTable onRef={(ref) => dt = ref} url={`/contact/client`} columnsData={columnsData}/>
+                  <DataTable onRef={(ref) => dt = ref} url={`/contact/client`} columnBindEvent={handleColumnBindEvent} columnsData={columnsData} columns={columns.toJS()}/>
                     {/* <table className="table table-bordered table-hover table-striped">
                       <thead>
                         <tr>
@@ -172,7 +174,7 @@ class lock_store extends PureComponent {
 
     //组件即将要被挂在的时候执行的方法--
     componentDidMount(){
-      this.props.handleColumnsAllShow();
+      //this.props.handleColumnsAllShow();
       // const { lockStore,a } = this.props;
       // a(lockStore);
     }
@@ -211,16 +213,17 @@ const mapDispathToProps = (dispatch) => {
             (list.size === 0) && dispatch(actionCreators.getList());
             dispatch(actionCreators.searchFocus());
         },
-        handleInputChange(e, index){
-          // dispatch(actionCreators.changeInputValue(ivalueElem.value));
-          dt.handleColumnVisible(index, e.target.value);
-        },
-        handleColumnsShow(index) {
-          dispatch(actionCreators.toggleColumns(index));
-        },
-        handleColumnsAllShow() {
-          dispatch(actionCreators.toggleColumnsAll(dt));
-        },
+
+        // handleInputChange(e, index){
+        //   // dispatch(actionCreators.changeInputValue(ivalueElem.value));
+        //   dt.handleColumnVisible(index, e.target.value);
+        // },
+        // handleColumnsShow(index) {
+        //   dispatch(actionCreators.toggleColumns(index));
+        // },
+        // handleColumnsAllShow() {
+        //   dispatch(actionCreators.toggleColumnsAll(dt));
+        // },
         handleColumnBindEvent(res) {
           console.log(this);
           for (var i = 0 ; i < res.data.length; i++) {

src/product/lock_store/store/reducer.js

@@ -14,7 +14,6 @@ const defaultState = fromJS({
 		{ data: "department" },
 		{ data: "position" },
 		{ data: "office" },
-		{ data: "local" },
 	],
 	columnsData:[
 		{columnsName:'锁号',columnsValue:true},
@@ -25,6 +24,7 @@ const defaultState = fromJS({
 		{columnsName:'责任人',columnsValue:true},
 		{columnsName:'状态',columnsValue:true},
 		{columnsName:'联系人',columnsValue:true},
+
 	],