合并

src/common/popups/index.js

@@ -41,7 +41,7 @@ class popups extends PureComponent {
 
                     {mainView === 'client' && <Client />}
                     {mainView === 'company' && <Company />}
-                    {mainView === 'lockDetail' && <LockDetail />}
+
 
 
 

src/product/lock_store/index.js

@@ -5,6 +5,7 @@ import StaffHeader from '../../common/staffHeader'
 import { Table, Input,Radio } from 'antd';
 import 'antd/dist/antd.css';
 import { actionCreators } from './store';
+import Popups from '../../common/popups';
 //import { AudioOutlined } from '@ant-design/icons';
 
 const radioStyle = {
@@ -13,6 +14,7 @@ const radioStyle = {
   lineHeight: '30px',
 };
 const { Search } = Input;
+let popupsObj = null;
 
 class lock_store extends PureComponent {
     render() {
@@ -92,7 +94,7 @@ class lock_store extends PureComponent {
                 <div className="panel-container show">
                   <div className="panel-content">
                    <Table
-                    onChange={(pagination) => handleLockstoreList(pagination,this.props)}
+                    onChange={(pagination,sorter) => handleLockstoreList(pagination,sorter,this.props)}
                     pagination={pagination.toJS()}
                     bordered
                     dataSource={dataSource.toJS()}
@@ -104,7 +106,7 @@ class lock_store extends PureComponent {
             </div>
           </div>
         </main>
-        {/* <Popups mainView={'lock_store'} onRef={(ref) => popupsObj = ref} /> */}
+        <Popups mainView={'lockDetail'}   onRef={(ref) => popupsObj = ref} />
         {/* <LockDetail /> */}
             </div>
         );
@@ -134,6 +136,7 @@ const mapStateToProps = (state) => {
       columnsNum:state.getIn(['lockstore', 'columnsNum']),
       sortField: state.getIn(['lockstore', 'sortField']),
       sort: state.getIn(['lockstore', 'sort']),
+      // locksotreDetail: state.getIn(['popups', 'locksotreDetail']),
     }
 }
 
@@ -149,6 +152,7 @@ const mapDispathToProps = (dispatch) => {
       },
       initData(){
         dispatch(actionCreators.toggleColumnsAll());
+        dispatch(actionCreators.toggleSorter());
       },
       handleLockstoreList(pagination,support){
         dispatch(actionCreators.getLockstoreList(pagination,support));
@@ -156,12 +160,11 @@ const mapDispathToProps = (dispatch) => {
       //排序设置
     handleLockstoreSortField(pagination, support, e) {
       dispatch(actionCreators.changeSortField(e.target.value));
-      
-      dispatch(actionCreators.getLockstoreList(pagination, support));//,{sortField:e.target.value,sort:props.sort}
+      dispatch(actionCreators.getLockstoreList(pagination, support));
     },
     handleLockstoreSort(pagination, support, e) {
       dispatch(actionCreators.changeSort(e.target.value));
-      dispatch(actionCreators.getLockstoreList(pagination, support));//,{sortField:props.sortField,sort:e.target.value}
+      dispatch(actionCreators.getLockstoreList(pagination, support));
     },
       handleSearch(pagination,support,searchValue,keyup){
         if(keyup === 'keyup'){
@@ -180,9 +183,11 @@ const mapDispathToProps = (dispatch) => {
         // dispatch(actionCreators.changeInputValue(columnsNum));
         // dt.handleColumnVisible(index, e.target.value);
       },
-      // handleColumnsAllShow() {
-      //   dispatch(actionCreators.toggleColumnsAll(dt));
-      // },
+      handleLockstorePopups(key) {
+        popupsObj.handleLockstorePopups(key);
+        // console.log('kjjj');
+        // console.log(255);
+      },
     }
 }
 

src/product/lock_store/store/reducer.js

@@ -1,5 +1,5 @@
 import * as constants from './constants';
-// import React from 'react';
+import React from 'react';
 //锁定state不可修改，导致错误y
 import { fromJS } from 'immutable';
 
@@ -15,6 +15,9 @@ const defaultState = fromJS({
 	dataSource: [],
 	sortField: 'KEYNUM',
 	sort: 'DESC',
+	LockstorePopupDetail: {
+		locksotreDetail: {},
+	},
 	columns: [
 		{
 			title: '锁号',
@@ -135,6 +138,12 @@ export default (state = defaultState, action) => {
 			return state.set('sort', action.data);
 		//表格
 		case constants.CHANGE_LOCKSTORE_DATA:
+			let columnsDetail={
+				...columns[0],
+				render: (text, record) => <a onClick={() => action.props.handleLockstorePopups(record.key)} href="#lockDetail" data-toggle="modal" data-target="#lockDetail"  >{text}</a>,
+			}
+			columns[0] = columnsDetail;
+			// console.log(columnsDetail);
 			let pagination = {
 				...action.pagination,
 				total: action.recordsTotal,
@@ -145,14 +154,15 @@ export default (state = defaultState, action) => {
 					columnsData[i].columnsValue = false;
 				}
 			}
-			var columnsBak = refreshColumns(columnsData, columns);
-			// console.log(pagination);
+			//var columnsBak = refreshColumns(columnsData, columns);
+			// console.log(columnsBak);
 			// return state.set('dataSource', action.data);
 			return state.merge({
 				pagination: fromJS(pagination),
 				dataSource: fromJS(action.data),
 				searchValue: action.searchValue,
-				columns: fromJS(columnsBak),
+				// columns: fromJS(columnsBak),
+				columns: fromJS(columns),
 			});
 		default:
 			return state;
@@ -160,7 +170,7 @@ export default (state = defaultState, action) => {
 }
 function refreshColumns(columnsData) {
 	let columnsBak = [];
-	//columnsBak.push(columns[0]);
+	//columnsBak.push(columns[0]);//默认加载第一列
 	for (var i = 0; i < columnsData.length; i++) {
 		if (columnsData[i].columnsValue) {
 			columnsBak.push({