修改

src/pages/customer/customerlist/index.jsx

@@ -374,7 +374,8 @@ function body(props) {
       key: 'picture',
       align: 'center',
       width: '15%',
-      render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+      // render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+      render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={record.picture } size={64} icon="user" />,
     },
     {
       title: '姓名',
@@ -383,7 +384,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} >{customerType === 'private' ? record.name : record.nickname}</span></>,
+      // render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} >{customerType === 'private' ? record.name : record.nickname}</span></>,
     },
     {
       title: '电话',
@@ -392,6 +393,21 @@ function body(props) {
       align: 'center',
       width: '15%',
     },
+    {
+      title: '是否归属项目',
+      dataIndex: '',
+      key: '',
+      align: 'center',
+      width: '15%',
+      render: (_, record) => <><span>{record.buildingId != null ? '是' : '否'}</span></>,
+    },
+    {
+      title: '归属项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      width: '15%',
+    },
     {
       title: '推广人员',
       dataIndex: 'sharePersonName',
@@ -401,12 +417,12 @@ function body(props) {
     },
     {
       title: '性别',
-      dataIndex: 'gender',
-      key: 'gender',
+      dataIndex: 'sex',
+      key: 'sex',
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : (record.sex === 2 ? '女' : '未知')}</span></>,
     },
     {
       title: '操作',
@@ -467,7 +483,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : (record.sex === 2 ? '女' : '未知')}</span></>,
     },
     {
       title: '置业顾问',
@@ -484,6 +500,13 @@ function body(props) {
         </>
       ),
     },
+    {
+      title: '归属项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      width: '15%',
+    },
     {
       title: '推广人员',
       dataIndex: 'sharePersonName',
@@ -542,6 +565,14 @@ function body(props) {
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      {customerType === 'public' && <Form.Item>
+          {getFieldDecorator('belongStatus')(
+            <Select style={{ width: '180px' }} placeholder="是否归属项目" onChange={handleSelectChange}>
+              <Option value={1}>是</Option>
+              <Option value={0}>否</Option>
+            </Select>,
+          )}
+        </Form.Item>}
         <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
@@ -654,7 +685,7 @@ function body(props) {
           //     onClick: () => publicCustomerDetail(record),
           //   };
           // }}
-          dataSource={dataSource.records} columns={publicColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r => r.personId} />
+          dataSource={dataSource.records} columns={publicColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r => r.customerId} />
       }
 
       {/* 调整归属 */}