服务记录

src/components/EditableForm/editableFormItem.jsx

@@ -50,10 +50,9 @@ const EditableFormItem = ({ label, dataIndex, record, dataId, span, editCellType
     toggleEdit()
   }
 
-  function handleSelectChange(value) {
-    console.log(`selected ${value}`)
-  }
-
+  // function handleSelectChange(value) {
+  //   console.log(`selected ${value}`)
+  // }
   // const handleOnChange = e => {
   //   setVal(value)
   //   const { value = '' } = e.currentTarget
@@ -78,7 +77,7 @@ const EditableFormItem = ({ label, dataIndex, record, dataId, span, editCellType
             defaultValue={val}
             ref={inputRef}
             // onBlur={save}
-            onChange={(value) => save({currentTarget: {value}})}
+            onChange={(value) => save({ currentTarget: { value } })}
             className="zh-width-100P"
           >
             {options}

src/components/PopContent/Contacts/AddRecord.jsx

@@ -1,6 +1,40 @@
-const AddRecord = () =>{
-  return(
-    <div>aa</div>
+import React from 'react'
+import { Modal, Form, Input, Select } from 'antd'
+import { useForm } from 'antd/lib/form/Form'
+
+const AddRecord = props => {
+  const [form] = useForm()
+  const { Option, OptGroup } = Select
+  const { visible, onCancel, onConfirm, loading } = props
+
+  return (
+    <div>
+      <Modal
+        visible={visible}
+        confirmLoading={loading}
+        onOk={() => {
+          form.validateFields().then(values => {
+            form.resetFields()
+            onConfirm(values)
+          })
+        }}
+        onCancel={onCancel}
+      >
+        <Form>
+          <Form.Item name="note" label="联系人">
+            <Select>
+              <OptGroup label="部门1">
+                <Option value="张三">张三</Option>
+              </OptGroup>
+              <OptGroup label="部门2">
+                <Option value="李四">李四</Option>
+              </OptGroup>
+            </Select>
+          </Form.Item>
+        </Form>
+      </Modal>
+    </div>
   )
 }
+
 export default AddRecord

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, servicelistName,collapsed } = props
+  const { log, servicelogList, collapsed } = props
   useEffect(() => {
     // console.log(log)
     // const servicelisData = () => {
@@ -15,7 +15,8 @@ const ContanctLowerList = props => {
     //   }) // 派发出这个action就会调用contact中的fetch函数，然后就会请求数据
     // }
     // servicelisData()
-  }, [log])
+  }, [])
+console.log(servicelogList)
   const { TabPane } = Tabs
   const needSubtractHeight = 48 + 48 + 48 + 64 + 24 // 需要被裁掉的高度
   // const needSubtractWidth = (collapsed ? 208 : 48) + 48 + 48 + 48 // 需要被裁掉的高度

src/components/PopContent/Contacts/ContanctTabList.jsx

@@ -1,9 +1,13 @@
 import { Tabs, Button, Table } from 'antd'
-import React, { useEffect } from 'react'
+import React, { useEffect,useState  } from 'react'
 import SvgIcon from '@/components/SvgIcon'
-import { connect } from 'umi'
+// import { connect } from 'umi'
 
 const ContanctTabList = props => {
+  const [addService, setAddService] = useState({
+    visible: false,
+    loading: false
+  })
   useEffect(() => {
     // const curinglisData = () => {
     //   const { dispatch } = props
@@ -55,7 +59,7 @@ const ContanctTabList = props => {
         {/* <Button type="primary" ghost>
           <SvgIcon type="icon-link" /> 绑定加密锁
         </Button> */}
-        <Button type="primary" ghost>
+        <Button type="primary" ghost onClick={() => setAddService({ ...addService, visible: true })}>
           <SvgIcon type="icon-plus" /> 添加服务记录
         </Button>
       </div>

src/components/PopContent/Contacts/index.jsx

@@ -19,16 +19,17 @@ const Popcontent = props => {
   const [clientWidth, setClientWidth] = useState(document.body.clientWidth * 0.75)
   const [state, setState] = useState({
     client: {},
-    log:[]
+    log:[],
+    servicelogList:[]
   })
 
   const initData = async () => {
     const {
-      data: { client = {},log = [] },
+      data: { client = {},log = [],servicelogList = [] },
       code = -1
     } = await apiContactDetail(id)
     if (code === consts.RET_CODE.SUCCESS) {
-      setState({ ...state, client, log })
+      setState({ ...state, client, log, servicelogList })
     }
   }
   useEffect(() => {

src/models/contact.js

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

src/pages/Customer/Contact/components/AddContact/index.jsx

@@ -48,8 +48,8 @@ const Addcontact = props => {
             <Col span={12}>
               <Form.Item label="性别" name="gender" rules={[{ message: '性别' }]}>
                 <Select onChange={handleChange}>
-                  <Option value="男">男</Option>
-                  <Option value="女">女</Option>
+                  <Option key="男" value="男">男</Option>
+                  <Option key="女" value="女">女</Option>
                 </Select>
               </Form.Item>
             </Col>

src/pages/Customer/Contact/index.jsx

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