|
|
@@ -109,8 +109,7 @@ const Contact = props => {
|
|
|
title: '地区',
|
|
|
dataIndex: 'local',
|
|
|
key: 'local',
|
|
|
- width: 100,
|
|
|
- render: local => <a>{local}</a>
|
|
|
+ width: 100
|
|
|
},
|
|
|
{
|
|
|
title: '个人标签',
|
|
|
@@ -200,7 +199,8 @@ const Contact = props => {
|
|
|
title: '地址',
|
|
|
dataIndex: 'address',
|
|
|
key: 'address',
|
|
|
- width: 100
|
|
|
+ width: 100,
|
|
|
+ ellipsis: true
|
|
|
},
|
|
|
{
|
|
|
title: '乘车',
|
|
|
@@ -303,6 +303,11 @@ const Contact = props => {
|
|
|
}
|
|
|
options()
|
|
|
}, [])
|
|
|
+ const {
|
|
|
+ districtName
|
|
|
+ } = props
|
|
|
+ const districtlist = [ ...districtName.data ]
|
|
|
+ console.log(districtlist)
|
|
|
|
|
|
return (
|
|
|
// <PageHeaderWrapper></PageHeaderWrapper>
|
|
|
@@ -310,7 +315,9 @@ const Contact = props => {
|
|
|
<div className="zh-pd-24">
|
|
|
<Cascader onChange={onChange} />
|
|
|
</div>
|
|
|
+ <div className={styles.tableContent}>
|
|
|
<ProTable
|
|
|
+ // className={styles.tableContent}
|
|
|
rowKey={record => record.id}
|
|
|
size="middle"
|
|
|
columns={columns}
|
|
|
@@ -335,16 +342,18 @@ const Contact = props => {
|
|
|
</Button>
|
|
|
]}
|
|
|
/>
|
|
|
+ </div>
|
|
|
<Contacts onClose={hideDrawer} visible={visible} onCreate={onCreate} />
|
|
|
</div>
|
|
|
)
|
|
|
}
|
|
|
|
|
|
-export default connect(({ global, loading }) => ({
|
|
|
+export default connect(({ district, global, loading }) => ({
|
|
|
// export default connect(({ contact, global, loading })
|
|
|
// contactName: contact,
|
|
|
// data: contact.data,
|
|
|
// total: contact.total,
|
|
|
+ districtName: district,
|
|
|
collapsed: global.collapsed,
|
|
|
getlist: loading.effects['contact/fetch']
|
|
|
}))(Contact)
|