Procházet zdrojové kódy

修改滚动条样式+调整联系人接口参数名称

outaozhen před 5 roky
rodič
revize
fe8475260a

+ 1 - 1
src/basic

@@ -1 +1 @@
-Subproject commit 2d00471abfbb3d80225c9b4702dbbabc2599f390
+Subproject commit 16620f6a764cd115598cfb3f422c71b4059e6d9f

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

@@ -8,12 +8,12 @@ const ContanctForm = props => {
   const { client } = props
   const columns = [
     {
-      dataIndex: 'clientname',
+      dataIndex: 'clientName',
       label: '姓名',
       span: 24
     },
     {
-      dataIndex: 'companyname',
+      dataIndex: 'companyName',
       label: '客户名称',
       span: 24
     },
@@ -24,7 +24,7 @@ const ContanctForm = props => {
       span: 12
     },
     {
-      dataIndex: 'nicename',
+      dataIndex: 'niceName',
       label: '昵称',
       span: 12
     },
@@ -113,7 +113,7 @@ const ContanctForm = props => {
     <div>
       <Row>
         <Col span={12}>
-          <h2>{client.clientname}</h2>
+          <h2>{client.clientName}</h2>
         </Col>
         {/* className={[ 'text-right', styles.textMuted ]} */}
         <Col span={12} className="zh-text-right zh-gray">

+ 0 - 8
src/components/PopContent/Contacts/ContanctLowerList.jsx

@@ -8,13 +8,6 @@ const ContanctLowerList = props => {
   const { log, servicelist, collapsed } = props
   useEffect(() => {
     // console.log(log)
-    // const servicelisData = () => {
-    //   const { dispatch } = props
-    //   dispatch({
-    //     type: 'servicelist/fetch'
-    //   }) // 派发出这个action就会调用contact中的fetch函数,然后就会请求数据
-    // }
-    // servicelisData()
   }, [])
 // console.log(servicelist)
   const { TabPane } = Tabs
@@ -22,7 +15,6 @@ const ContanctLowerList = props => {
   // const needSubtractWidth = (collapsed ? 208 : 48) + 48 + 48 + 48 // 需要被裁掉的高度
 
   const [x, y] = useAutoTable(collapsed, needSubtractHeight)
-  // const servicelist = [...servicelistName.lists]
   return (
     <div>
       <div className="zh-pd-left-15">

+ 8 - 7
src/pages/Customer/Contact/index.jsx

@@ -74,19 +74,19 @@ const Contact = props => {
   const columns = [
     {
       title: '联系人',
-      dataIndex: 'clientname',
-      key: 'clientname',
+      dataIndex: 'clientName',
+      key: 'clientName',
       width: 80,
       fixed: 'left',
-      render: (clientname, record) => <a onClick={() => showDrawer(record.id)}>{clientname}</a>
+      render: (clientName, record) => <a onClick={() => showDrawer(record.id)}>{clientName}</a>
     },
     {
       title: '客户名称',
-      dataIndex: 'companyname',
-      key: 'companyname',
+      dataIndex: 'companyName',
+      key: 'companyName',
       width: 420,
       ellipsis: true,
-      render: companyname => <a>{companyname}</a>
+      render: companyName => <a>{companyName}</a>
     },
     {
       title: '部门',
@@ -350,7 +350,8 @@ const Contact = props => {
       <div className={styles.tableContent}>
         <ProTable
           rowKey={record => record.id}
-          size="middle"
+          bordered
+          // size="middle"
           columns={columns}
           dataSource={state.data}
           pagination={{