清除内容

src/product/lock_store/index.js

@@ -4,6 +4,7 @@ import { connect } from 'react-redux';
 import StaffHeader from '../../common/staffHeader'
 // import DataTable from '../../common/dataTable';
 import { Table } from 'antd';
+import 'antd/dist/antd.css';
 
 import { actionCreators } from './store';
 
@@ -11,7 +12,8 @@ let dt = null;
 
 class lock_store extends PureComponent {
     render() {
-        const { handleInputChange,handleLockstoreDate, handleSearch, columns, columnsData, pagination,loading,handleColumnsShow,columnsNum,companyList} = this.props;
+        const { handleInputChange,handleLockstoreDate, handleSearch, columns, columnsData, pagination,loading,handleColumnsShow,columnsNum,lockStore} = this.props;
+       
         return (
             <div>
         <StaffHeader />
@@ -85,14 +87,14 @@ class lock_store extends PureComponent {
                 <div className="panel-container show">
                   {/* <!--数据内容区--> */}
                   <div className="panel-content">
-                  <Table
+                   <Table
                       onChange={(pagination, filters, sorter) => handleLockstoreDate(pagination, filters, sorter, this.props)}
                       pagination={pagination.toJS()}
                       loading={loading}
                       bordered
                       columns={columns.toJS()}
-                      dataSource={companyList.toJS()}
-                  />
+                      dataSource={lockStore.toJS()}
+                  /> 
                   {/* 接口路径 */}
                   {/* <DataTable onRef={(ref) => dt = ref} url={`/contact/client`} columnBindEvent={handleColumnBindEvent} columnsData={columnsData} columns={columns.toJS()}/> */}
                   </div>
@@ -101,7 +103,7 @@ class lock_store extends PureComponent {
             </div>
           </div>
         </main>
-        <Popups mainView={'lock_store'} onRef={(ref) => popupsObj = ref} />
+        {/* <Popups mainView={'lock_store'} onRef={(ref) => popupsObj = ref} /> */}
         {/* <LockDetail /> */}
             </div>
         );
@@ -111,6 +113,7 @@ class lock_store extends PureComponent {
     componentDidMount(){
       const {handleLockstoreDate,handleColumnsAllShow, pagination} = this.props;
       handleColumnsAllShow();
+     
       handleLockstoreDate(pagination.toJS(), {}, {}, this.props);
     }
 
@@ -128,6 +131,9 @@ const mapStateToProps = (state) => {
       loading: state.getIn(['lockstore', 'loading']),
       columns: state.getIn(['lockstore', 'columns']),
       columnsData: state.getIn(['lockstore', 'columnsData']),
+      lockStore: state.getIn(['lockstore', 'lockStore']),
+
+      
     }
 }
 

src/product/lock_store/store/reducer.js

@@ -149,7 +149,7 @@ export default (state = defaultState, action) => {
 			}
 			return state.merge({
 				pagination: fromJS(pagination),
-				companyList: fromJS(action.data.data),
+				lockStore: fromJS(action.data.data),
 				loading: false,
 				columns: fromJS(columns)
 			});
@@ -157,6 +157,19 @@ export default (state = defaultState, action) => {
 		default:
 			return state;
 	}
-    
-    return state;
-}
+}
+
+function refreshColumns(columnsData,columns){
+	let columnsBak=[];
+	columnsBak.push(columns[1]);
+	for (var i = 0; i < columnsData.length; i++) {
+		if(columnsData[i].columnsValue){
+			columnsBak.push({
+				title: columnsData[i].columnsName,
+				dataIndex: columnsData[i].dataKey,
+				key: columnsData[i].dataKey,
+			});
+		}
+	}
+	return columnsBak;
+};