outaozhen пре 5 година
родитељ
комит
5672a82260

+ 2 - 2
src/components/PopContent/Companys/CompanyForm.jsx

@@ -63,10 +63,10 @@ const CompanyForm = props => {
   return (
     <div>
       <Row>
-        <Col span={12}>
+        <Col span={16}>
           <h2>{customer.companyName}</h2>
         </Col>
-        <Col span={12} className="zh-text-right zh-gray">
+        <Col span={8} className="zh-text-right zh-gray">
         {customer.staffName} 创建于 {customer.createTime}
         </Col>
       </Row>

+ 1 - 1
src/components/PopContent/Companys/CompanyLowerList.jsx

@@ -18,7 +18,7 @@ const CompanyLowerList = props => {
                 split={false}
                 renderItem={item => (
                   <List.Item>
-                    <a>@{item.clientName}</a>{item.content}
+                    <a>@{item.operatorName}</a> {item.content}
                     <List.Item.Meta
                       // avatar=
                       // title=

+ 2 - 2
src/components/PopContent/Contacts/ContanctForm.jsx

@@ -112,11 +112,11 @@ const ContanctForm = props => {
   return (
     <div>
       <Row>
-        <Col span={12}>
+        <Col span={16}>
           <h2>{client.clientName}</h2>
         </Col>
         {/* className={[ 'text-right', styles.textMuted ]} */}
-        <Col span={12} className="zh-text-right zh-gray">
+        <Col span={8} className="zh-text-right zh-gray">
           {client.staffName} 创建于{client.createTime}
         </Col>
       </Row>

+ 23 - 25
src/pages/Customer/Company/index.jsx

@@ -2,9 +2,9 @@ import React, { useState, useEffect } from 'react'
 import ProTable from '@ant-design/pro-table'
 import useAutoTable from '@/hooks/useAutoTable'
 import SvgIcon from '@/components/SvgIcon'
-import { Button } from 'antd'
+import { Button, message } from 'antd'
 import consts from '@/consts'
-import { queryCompany } from '@/services/company'
+import { queryCompany, apiAddCompany } from '@/services/company'
 import LazyCascader from '@/components/LazyCascader'
 import Companys from '@/components/PopContent/Companys'
 import AddCompany from '@/pages/Customer/Company/AddCompany'
@@ -22,21 +22,10 @@ const Company = props => {
     id: '',
     visible: false
   })
-  const [addClient, setAddClient] = useState({
+  const [addCompany, setAddCompany] = useState({
     visible: false,
     loading: false
   })
-  // const handleAddCompany = async values => {
-  //   setAddCompany({ ...addCompany, loading: true })
-  //   const { code = -1 } = await apiAddCompany(values)
-  //   if (code === consts.RET_CODE.SUCCESS) {
-  //     message.success('新增成功')
-  //     setState({ ...state, data: values })
-  //   }
-  //   // 请求完了
-  //   setAddCompany({ ...addCompany, loading: false, visible: false })
-  //   await initData()
-  // }
   const initData = async payload => {
     const {
       code = -1,
@@ -46,11 +35,17 @@ const Company = props => {
       setState({ ...state, data: customer, total })
     }
   }
-  useEffect(() => {
-    // props.getlist();
-    initData()
-  }, [])
-
+  const handleAddCompany = async values => {
+    setAddCompany({ ...addCompany, loading: true })
+    const { code = -1 } = await apiAddCompany(values)
+    if (code === consts.RET_CODE.SUCCESS) {
+      message.success('新增成功')
+      setState({ ...state, data: values })
+    }
+    // 请求完了
+    setAddCompany({ ...addCompany, loading: false, visible: false })
+    await initData()
+  }
   const handleSearch = value => {
     initData({ search: value })
   }
@@ -68,7 +63,10 @@ const Company = props => {
   const hideDrawer = () => {
     setState({ ...state, visible: false, id: '' })
   }
-
+  useEffect(() => {
+    // props.getlist();
+    initData()
+  }, [])
   const onCreate = values => {
     console.log(values)
   }
@@ -197,7 +195,7 @@ const Company = props => {
             <Button
               key="button"
               type="primary"
-              onClick={() => setAddClient({ ...addClient, visible: true })}
+              onClick={() => setAddCompany({ ...addCompany, visible: true })}
             >
               <SvgIcon type="icon-plus" />
               客户
@@ -216,10 +214,10 @@ const Company = props => {
         }}
       />
       <AddCompany
-        // onConfirm={handleAddCompany}
-        loading={addClient.loading}
-        visible={addClient.visible}
-        onCancel={() => setAddClient({ ...addClient, visible: false })}
+        onConfirm={handleAddCompany}
+        loading={addCompany.loading}
+        visible={addCompany.visible}
+        onCancel={() => setAddCompany({ ...addCompany, visible: false })}
       />
       <Companys onClose={hideDrawer} visible={state.visible} onCreate={onCreate} id={state.id} />
     </div>