服务记录列表

src/components/PopContent/Contacts/ContanctLowerList.jsx

@@ -5,7 +5,7 @@ import useAutoTable from '@/hooks/useAutoTable'
 import { dayjsFormat } from '@/utils/utils'
 
 const ContanctLowerList = props => {
-  const { log, servicelogList, collapsed } = props
+  const { log, servicelist, collapsed } = props
   useEffect(() => {
     // console.log(log)
     // const servicelisData = () => {
@@ -16,7 +16,7 @@ const ContanctLowerList = props => {
     // }
     // servicelisData()
   }, [])
-console.log(servicelogList)
+// console.log(servicelist)
   const { TabPane } = Tabs
   const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
   // const needSubtractWidth = (collapsed ? 208 : 48) + 48 + 48 + 48 // 需要被裁掉的高度
@@ -26,13 +26,13 @@ console.log(servicelogList)
   const servicecolumns = [
     {
       title: '类型/时间',
-      dataIndex: 'typedate',
-      key: 'typedate'
+      dataIndex: 'staffName',
+      key: 'staffName'
     },
     {
       title: '服务内容',
-      dataIndex: 'servicecont',
-      key: 'servicecont'
+      dataIndex: 'mark',
+      key: 'mark'
     }
   ]
   return (
@@ -42,8 +42,9 @@ console.log(servicelogList)
           <TabPane tab="服务记录" key="服务记录">
             <div className="sheet-panel-record" style={{ height:y-250,overflowY:'auto' }}>
               <Table
+              rowKey={record => record.id}
               columns={servicecolumns}
-              // dataSource={servicelist}
+              dataSource={servicelist}
               pagination={false}
               />
             </div>

src/components/PopContent/Contacts/index.jsx

@@ -20,16 +20,16 @@ const Popcontent = props => {
   const [state, setState] = useState({
     client: {},
     log:[],
-    servicelogList:[]
+    serviceLog:[]
   })
 
   const initData = async () => {
     const {
-      data: { client = {},log = [],servicelogList = [] },
+      data: { client = {},log = [],serviceLog = [] },
       code = -1
     } = await apiContactDetail(id)
     if (code === consts.RET_CODE.SUCCESS) {
-      setState({ ...state, client, log, servicelogList })
+      setState({ ...state, client, log, serviceLog })
     }
   }
   useEffect(() => {
@@ -67,7 +67,7 @@ const Popcontent = props => {
             </Col>
             <Col span={12}>
               <ContanctTabList />
-              <ContanctLowerList  log={state.log} />
+              <ContanctLowerList  log={state.log} servicelist={state.serviceLog}/>
             </Col>
           </Row>
         </Drawer>

src/models/contact.js

@@ -31,7 +31,7 @@ export default {
         ...state,
         data: action.payload.client,
         journal: action.payload.log,
-        servicelist:action.payload.servicelogList,
+        servicelist:action.payload.serviceLog,
         total: action.payload.total
       }
     }

src/pages/Customer/Contact/index.jsx

@@ -22,7 +22,7 @@ const Contact = props => {
   const [state, setState] = useState({
     data: [],
     journal: [],
-    servicelist:[],
+    servicelog:[],
     total: 0,
     id: '',
     visible: false
@@ -46,10 +46,10 @@ const Contact = props => {
   const initData = async payload => {
     const {
       code = -1,
-      data: { client = [], log = [], servicelogList = [], total = 0 } = { client: [], log: [], servicelogList: [], total: 0 }
+      data: { client = [], log = [], serviceLog = [], total = 0 } = { client: [], log: [], serviceLog: [], total: 0 }
     } = await queryContact(payload)
     if (code === consts.RET_CODE.SUCCESS) {
-      setState({ ...state, data: client, journal: log, servicelist: servicelogList, total })
+      setState({ ...state, data: client, journal: log, servicelist: serviceLog, total })
     }
   }
   // 展示drawer