日志接口

src/components/PopContent/Contacts/ContanctForm.jsx

@@ -9,7 +9,7 @@ const ContanctForm = props => {
   const { client } = props
 
   useEffect(() => {
-    console.log(client)
+    // console.log(client)
     form.setFieldsValue(client)
   }, [client])
   const residences = [

src/components/PopContent/Contacts/ContanctLowerList.jsx

@@ -4,7 +4,9 @@ import { connect } from 'umi'
 import useAutoTable from '@/hooks/useAutoTable'
 
 const ContanctLowerList = props => {
+  const { log, servicelistName,collapsed } = props
   useEffect(() => {
+    console.log(log)
     // const journallistData = () => {
     //   const { dispatch } = props
     //   dispatch({
@@ -19,15 +21,14 @@ const ContanctLowerList = props => {
     //   }) // 派发出这个action就会调用contact中的fetch函数，然后就会请求数据
     // }
     // servicelisData()
-  }, [])
+  }, [log])
   const { TabPane } = Tabs
-  const { journalName, servicelistName,collapsed } = props
   const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
   // const needSubtractWidth = (collapsed ? 208 : 48) + 48 + 48 + 48 // 需要被裁掉的高度
 
   const [x, y] = useAutoTable(collapsed, needSubtractHeight)
-  const journallist = [...journalName.list]
-  const servicelist = [...servicelistName.lists]
+  // const journallist = [...journalName.list]
+  // const servicelist = [...servicelistName.lists]
   const servicecolumns = [
     {
       title: '类型/时间',
@@ -46,13 +47,17 @@ const ContanctLowerList = props => {
         <Tabs type="card">
           <TabPane tab="服务记录" key="服务记录">
             <div className="sheet-panel-record" style={{ height:y-230,overflowY:'auto' }}>
-              <Table columns={servicecolumns} dataSource={servicelist} pagination={false} />
+              <Table
+              columns={servicecolumns}
+              // dataSource={servicelist}
+              pagination={false}
+              />
             </div>
           </TabPane>
           <TabPane tab="日志" key="日志">
             <div className="sheet-panel-record" style={{ height:y-230,overflowY:'auto' }}>
               <List
-                dataSource={journallist}
+                dataSource={log}
                 split={false}
                 renderItem={item => (
                   <List.Item>
@@ -72,10 +77,10 @@ const ContanctLowerList = props => {
   )
 }
 
-// export default ContanctLowerList
+export default ContanctLowerList
 
-export default connect(({ journallist, servicelist, loading }) => ({
-  journalName: journallist,
-  servicelistName: servicelist,
-  getlist: loading.effects['journallist/fetch']
-}))(ContanctLowerList)
+// export default connect(({ journallist, servicelist, loading }) => ({
+//   journalName: journallist,
+//   servicelistName: servicelist,
+//   getlist: loading.effects['journallist/fetch']
+// }))(ContanctLowerList)

src/models/contact.js

@@ -5,6 +5,7 @@ export default {
   namespace: 'contact',
   state: {
     data: [],
+    journal:[],
     total: 0
   },
   // 用于处理异步操作和业务逻辑，由action触发，但不能修改state
@@ -28,6 +29,7 @@ export default {
       return {
         ...state,
         data: action.payload.client,
+        journal: action.payload.log,
         total: action.payload.total
       }
     }

src/pages/Customer/Contact/index.jsx

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