|
@@ -16,7 +16,7 @@ const { Search } = Input;
|
|
|
|
|
|
class lock_store extends PureComponent {
|
|
|
render() {
|
|
|
- const {dataSource,columns,pagination,handleLockstoreList,handleSearch,columnsData,columnsNum,handleInputChange,handleColumnsShow} = this.props;
|
|
|
+ const {dataSource,columns,pagination,handleLockstoreList,handleSearch,columnsData,columnsNum,handleInputChange,handleColumnsShow,sortField,sort,handleLockstoreSortField,handleLockstoreSort} = this.props;
|
|
|
|
|
|
return (
|
|
|
<div>
|
|
@@ -64,11 +64,11 @@ class lock_store extends PureComponent {
|
|
|
<ul className="list-unstyled px-3 pt-2 mb-0">
|
|
|
<li className="mb-2">
|
|
|
{/* <Radio.Group onChange={this.onChange} value={value}> */}
|
|
|
- <Radio.Group onChange={this.onChange}>
|
|
|
- <Radio style={radioStyle} value={1}>
|
|
|
+ <Radio.Group onChange={(e) => handleLockstoreSortField(pagination.toJS(), this.props, e)}value={sortField}>
|
|
|
+ <Radio style={radioStyle} value='KEYNUM'>
|
|
|
锁号
|
|
|
</Radio>
|
|
|
- <Radio style={radioStyle} value={2}>
|
|
|
+ <Radio style={radioStyle} value='UPDATETIME'>
|
|
|
出库时间
|
|
|
</Radio>
|
|
|
</Radio.Group>
|
|
@@ -76,11 +76,11 @@ class lock_store extends PureComponent {
|
|
|
</ul>
|
|
|
<ul className="list-unstyled px-3 pt-2 mb-0 border-top">
|
|
|
<li className="mb-2">
|
|
|
- <Radio.Group onChange={this.onChange}>
|
|
|
- <Radio style={radioStyle} value={3}>
|
|
|
+ <Radio.Group onChange={(e) => handleLockstoreSort(pagination.toJS(), this.props, e)} value={sort}>
|
|
|
+ <Radio style={radioStyle} value='DESC'>
|
|
|
降序
|
|
|
</Radio>
|
|
|
- <Radio style={radioStyle} value={4}>
|
|
|
+ <Radio style={radioStyle} value='ASC'>
|
|
|
升序
|
|
|
</Radio>
|
|
|
</Radio.Group>
|
|
@@ -92,7 +92,7 @@ class lock_store extends PureComponent {
|
|
|
<div className="panel-container show">
|
|
|
<div className="panel-content">
|
|
|
<Table
|
|
|
- onChange={(pagination) => handleLockstoreList(pagination,this.props)}
|
|
|
+ onChange={(pagination) => handleLockstoreList(pagination,this.props)}
|
|
|
pagination={pagination.toJS()}
|
|
|
bordered
|
|
|
dataSource={dataSource.toJS()}
|
|
@@ -132,6 +132,8 @@ const mapStateToProps = (state) => {
|
|
|
searchValue: state.getIn(['lockstore', 'searchValue']),
|
|
|
columnsData: state.getIn(['lockstore', 'columnsData']),
|
|
|
columnsNum:state.getIn(['lockstore', 'columnsNum']),
|
|
|
+ sortField: state.getIn(['lockstore', 'sortField']),
|
|
|
+ sort: state.getIn(['lockstore', 'sort']),
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -151,6 +153,16 @@ const mapDispathToProps = (dispatch) => {
|
|
|
handleLockstoreList(pagination,support){
|
|
|
dispatch(actionCreators.getLockstoreList(pagination,support));
|
|
|
},
|
|
|
+ //排序设置
|
|
|
+ handleLockstoreSortField(pagination, support, e) {
|
|
|
+ dispatch(actionCreators.changeSortField(e.target.value));
|
|
|
+
|
|
|
+ dispatch(actionCreators.getLockstoreList(pagination, support));//,{sortField:e.target.value,sort:props.sort}
|
|
|
+ },
|
|
|
+ handleLockstoreSort(pagination, support, e) {
|
|
|
+ dispatch(actionCreators.changeSort(e.target.value));
|
|
|
+ dispatch(actionCreators.getLockstoreList(pagination, support));//,{sortField:props.sortField,sort:e.target.value}
|
|
|
+ },
|
|
|
handleSearch(pagination,support,searchValue,keyup){
|
|
|
if(keyup === 'keyup'){
|
|
|
if(delaySwitch != null){
|