|
@@ -5,11 +5,15 @@ import useAutoTable from '@/hooks/useAutoTable'
|
|
|
import { dayjsFormat } from '@/utils/utils'
|
|
import { dayjsFormat } from '@/utils/utils'
|
|
|
|
|
|
|
|
const ContanctLowerList = props => {
|
|
const ContanctLowerList = props => {
|
|
|
- const { log, servicelist, collapsed } = props
|
|
|
|
|
|
|
+ const {
|
|
|
|
|
+ log: { log: logs = [], total = 0 },
|
|
|
|
|
+ servicelist,
|
|
|
|
|
+ collapsed
|
|
|
|
|
+ } = props
|
|
|
useEffect(() => {
|
|
useEffect(() => {
|
|
|
// console.log(log)
|
|
// console.log(log)
|
|
|
}, [])
|
|
}, [])
|
|
|
-// console.log(servicelist)
|
|
|
|
|
|
|
+ // console.log(servicelist)
|
|
|
const { TabPane } = Tabs
|
|
const { TabPane } = Tabs
|
|
|
const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
|
|
const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
|
|
|
// const needSubtractWidth = (collapsed ? 208 : 48) + 48 + 48 + 48 // 需要被裁掉的高度
|
|
// const needSubtractWidth = (collapsed ? 208 : 48) + 48 + 48 + 48 // 需要被裁掉的高度
|
|
@@ -20,7 +24,7 @@ const ContanctLowerList = props => {
|
|
|
<div className="zh-pd-left-15">
|
|
<div className="zh-pd-left-15">
|
|
|
<Tabs>
|
|
<Tabs>
|
|
|
<TabPane tab="服务记录" key="服务记录">
|
|
<TabPane tab="服务记录" key="服务记录">
|
|
|
- <div className="sheet-panel-record" style={{ height:y-310,overflowY:'auto' }}>
|
|
|
|
|
|
|
+ <div className="sheet-panel-record" style={{ height: y - 310, overflowY: 'auto' }}>
|
|
|
<Row>
|
|
<Row>
|
|
|
<Col span="8">类型/时间</Col>
|
|
<Col span="8">类型/时间</Col>
|
|
|
<Col span="16">服务内容</Col>
|
|
<Col span="16">服务内容</Col>
|
|
@@ -33,9 +37,7 @@ const ContanctLowerList = props => {
|
|
|
<Row className="zh-width-100P">
|
|
<Row className="zh-width-100P">
|
|
|
<Col span="8">
|
|
<Col span="8">
|
|
|
<a>@{item.staffName}</a> {item.status}上门服务
|
|
<a>@{item.staffName}</a> {item.status}上门服务
|
|
|
- <List.Item.Meta
|
|
|
|
|
- description={ dayjsFormat(item.date, 'MM-DD HH:mm:ss')}
|
|
|
|
|
- />
|
|
|
|
|
|
|
+ <List.Item.Meta description={dayjsFormat(item.date, 'MM-DD HH:mm:ss')} />
|
|
|
</Col>
|
|
</Col>
|
|
|
<Col span="16">{item.remarks}</Col>
|
|
<Col span="16">{item.remarks}</Col>
|
|
|
</Row>
|
|
</Row>
|
|
@@ -45,9 +47,9 @@ const ContanctLowerList = props => {
|
|
|
</div>
|
|
</div>
|
|
|
</TabPane>
|
|
</TabPane>
|
|
|
<TabPane tab="日志" key="日志">
|
|
<TabPane tab="日志" key="日志">
|
|
|
- <div className="sheet-panel-record" style={{ height:y-310,overflowY:'auto' }}>
|
|
|
|
|
|
|
+ <div className="sheet-panel-record" style={{ height: y - 310, overflowY: 'auto' }}>
|
|
|
<List
|
|
<List
|
|
|
- dataSource={log}
|
|
|
|
|
|
|
+ dataSource={logs}
|
|
|
split={false}
|
|
split={false}
|
|
|
renderItem={item => (
|
|
renderItem={item => (
|
|
|
<List.Item>
|
|
<List.Item>
|
|
@@ -56,7 +58,7 @@ const ContanctLowerList = props => {
|
|
|
// avatar=
|
|
// avatar=
|
|
|
// title=
|
|
// title=
|
|
|
// description={ dayjsFormat(item.createTime, 'YYYY-MM-DD')}
|
|
// description={ dayjsFormat(item.createTime, 'YYYY-MM-DD')}
|
|
|
- description={ dayjsFormat(item.createTime)}
|
|
|
|
|
|
|
+ description={dayjsFormat(item.createTime)}
|
|
|
/>
|
|
/>
|
|
|
</List.Item>
|
|
</List.Item>
|
|
|
)}
|
|
)}
|