|
|
@@ -28,6 +28,13 @@ const Popcontactform = props => {
|
|
|
}) // 派发出这个action就会调用contact中的fetch函数,然后就会请求数据
|
|
|
}
|
|
|
journallistData()
|
|
|
+ const servicelisData = () => {
|
|
|
+ const { dispatch } = props
|
|
|
+ dispatch({
|
|
|
+ type: 'servicelist/fetch'
|
|
|
+ }) // 派发出这个action就会调用contact中的fetch函数,然后就会请求数据
|
|
|
+ }
|
|
|
+ servicelisData()
|
|
|
window.addEventListener('resize', () => {
|
|
|
setClientWidth(document.body.clientWidth * 0.7)
|
|
|
})
|
|
|
@@ -39,10 +46,12 @@ const Popcontactform = props => {
|
|
|
visible,
|
|
|
onClose,
|
|
|
onCreate,
|
|
|
- journalName: { list }
|
|
|
+ journalName,
|
|
|
+ servicelistName
|
|
|
} = props
|
|
|
- const journallist = [ ...list ]
|
|
|
- // console.log(journallist)
|
|
|
+ const journallist = [ ...journalName.list ]
|
|
|
+ const servicelist = [ ...servicelistName.lists ]
|
|
|
+ // console.log(servicelist)
|
|
|
const [ form ] = Form.useForm()
|
|
|
const { TabPane } = Tabs
|
|
|
// function callback(key) {
|
|
|
@@ -324,18 +333,9 @@ const Popcontactform = props => {
|
|
|
<TabPane tab="服务记录" key="服务记录">
|
|
|
<Table
|
|
|
columns={servicecolumns}
|
|
|
- // dataSource={data}
|
|
|
+ dataSource={servicelist}
|
|
|
+ pagination={false}
|
|
|
/>
|
|
|
- {/* <List
|
|
|
- // dataSource={servicedata}
|
|
|
- split={false}
|
|
|
- renderItem={item => (
|
|
|
- <List.Item>
|
|
|
- <Typography.Text mark />
|
|
|
- {item}
|
|
|
- </List.Item>
|
|
|
- )}
|
|
|
- /> */}
|
|
|
</TabPane>
|
|
|
<TabPane tab="日志" key="日志">
|
|
|
<List
|
|
|
@@ -363,7 +363,8 @@ const Popcontactform = props => {
|
|
|
}
|
|
|
|
|
|
// export default Popcontactform
|
|
|
-export default connect(({ journallist, loading }) => ({
|
|
|
+export default connect(({ journallist, servicelist, loading }) => ({
|
|
|
journalName: journallist,
|
|
|
+ servicelistName:servicelist,
|
|
|
getlist: loading.effects['journallist/fetch']
|
|
|
}))(Popcontactform)
|