fix

config/routes.js

@@ -128,15 +128,27 @@ export default [
             component: '../layouts/BlankLayout',
             routes: [
               {
-                path: '/recommend/recommendCustomer/list',
-                name: '推荐记录',
-                component: './recommend/recommendCustomer/index',
+                path: '/recommend/customer',
+                name: '客户推荐',
+                component: './recommend/customer',
+              },
+              {
+                path: '/recommend/customer/audit',
+                name: '客户审核',
+                hideInMenu: true,
+                component: './recommend/customer/audit',
+              },
+
+              {
+                path: '/recommend/channel',
+                name: '经纪人推荐',
+                component: './recommend/channel',
               },
               {
-                path: '/recommend/recommendCustomer/audit',
+                path: '/recommend/channel/audit',
                 name: '客户审核',
                 hideInMenu: true,
-                component: './recommend/recommendCustomer/audit',
+                component: './recommend/channel/audit',
               },
             ],
           },

src/components/SelectButton/consultantSelect.jsx

@@ -0,0 +1,45 @@
+import React, { useState, useEffect, useMemo } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const ChannelSelect = props => {
+  const [data, setData] = useState([])
+  useEffect(() => {
+    getChannelSelect({buildingId:props.buildingId});
+  }, [props.value,props.buildingId])
+
+
+
+  const getChannelSelect = params => {
+    request({ ...apis.customer.buildingConsultant, params: { ...params,pageNumber: 1, pageSize: 999 } }).then(data => {
+      setData(data.records)
+      // 默认选中第一个
+    })
+  }
+
+  return (
+    <Select
+      showSearch
+      value={props.value}
+      style={{ width: '250px' }}
+      placeholder="请选择置业顾问"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+      {data.map(Item => (
+        <Option key={Item.userId} value={Item.userId}> {Item.userName} </Option>
+      ))}
+    </Select>
+  )
+}
+export default ChannelSelect

src/pages/Live/LiveActivity/Edit/components/base.jsx

@@ -9,14 +9,11 @@ import {
   Radio,
   DatePicker,
   message,
-  Upload,
+  Switch,
   InputNumber,
 } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
-import styles from '../../../../style/GoodsList.less';
-import XForm, { FieldTypes, createForm } from '../../../../../components/XForm';
 import apis from '../../../../../services/apis';
 import BuildSelect2 from '../../../../../components/SelectButton/BuildSelect2';
 import LivePlatSelect from '../../../../../components/SelectButton/LivePlatSelect';
@@ -26,7 +23,6 @@ import request from '../../../../../utils/request';
 import Navigate from '@/components/Navigate';
 
 const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 let cityId = '';
 
@@ -177,6 +173,12 @@ const header = props => {
             />,
           )}
         </Form.Item>
+        <Form.Item label="是否新房">
+          {getFieldDecorator('isNewHouse', {
+            valuePropName: 'checked',
+            initialValue: liveActivityData.isNewHouse || false,
+          })(<Switch/>)}
+        </Form.Item>
         <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
             initialValue: liveActivityData.liveApp,

src/pages/Live/LiveActivity/add/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio, Upload, InputNumber } from 'antd';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio, Switch, InputNumber, Card } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import XForm, { FieldTypes } from '../../../../components/XForm';
 import router from 'umi/router';
@@ -77,7 +77,7 @@ const header = props => {
   const { getFieldDecorator } = props.form;
 
   return (
-    <>
+    <Card>
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="所属城市">
           {getFieldDecorator('cityId', {
@@ -112,15 +112,23 @@ const header = props => {
                 ],
               })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
         </Form.Item>
+
+        <Form.Item label="是否新房">
+          {getFieldDecorator('isNewHouse', {
+            valuePropName: 'checked',
+            initialValue:  false,
+          })(<Switch defaultChecked={false}/>)}
+        </Form.Item>
+
         <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
               rules: [{ required: true, message: '请选择直播小程序' }],
-            })((<LivePlatSelect />))}
+            })((<LivePlatSelect value={1} />))}
         </Form.Item>
         <Form.Item label="房间参数">
           {getFieldDecorator('liveRoomParam', {
-            rules: [{ required: true, message: '请输入房间参数' }],
-          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
+            rules: [{ required: true, message: '请输入房间号' }],
+          })(<Input maxLength={1000} placeholder="请输入房间号" style={{width:'680px'}}/>)}
         </Form.Item>
         <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
               {getFieldDecorator('listImg', {
@@ -167,7 +175,7 @@ const header = props => {
           </Button>
         </Form.Item>
       </Form>
-    </>
+    </Card>
   )
 }
 

src/pages/Live/video/Edit/index.jsx

@@ -9,7 +9,7 @@ import {
   Radio,
   DatePicker,
   message,
-  Upload,
+  Switch,
   InputNumber,
 } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
@@ -25,7 +25,6 @@ import ImageUpload from '@/components/XForm/ImageUpload';
 import request from '@/utils/request';
 import Navigate from '@/components/Navigate';
 
-
 const header = props => {
   console.log(props);
 
@@ -51,13 +50,13 @@ const header = props => {
     router.go('-1');
   };
 
-
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       console.log(values, 'values');
       if (!err) {
         values.videoUrl = values?.videoUrl[0];
+        // values.isNewHouse =  values.isNewHouse?1:0
         if (id) {
           request({
             ...apis.video.updata,
@@ -133,6 +132,13 @@ const header = props => {
           })(<Input maxLength={20} placeholder="请输入视频标题" />)}
         </Form.Item>
 
+        <Form.Item label="是否新房">
+          {getFieldDecorator('isNewHouse', {
+            valuePropName: 'checked',
+            initialValue: data.isNewHouse || false,
+          })(<Switch />)}
+        </Form.Item>
+
         <Form.Item label="简介">
           {getFieldDecorator('remark', {
             initialValue: data.remark,

src/pages/recommend/recommendCustomer/audit.jsx → src/pages/recommend/channel/audit.jsx

@@ -4,15 +4,10 @@ import ImageUpload from '../../../components/XForm/ImageUpload';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
-import Styles from './style.less';
 import { router } from 'umi';
 
 import Attribution from './components/attribution'
 
-const { Option } = Select;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const { Meta } = Card;
-
 const { TextArea } = Input;
 
 const tailFormItemLayout = {
@@ -55,8 +50,11 @@ function body(props) {
   // 获取详情信息
   function getById(currentId) {
     request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
-      res.reportDate = moment(res.reportDate)
-      props.form.setFieldsValue(res)
+      // res.reportDate = moment(res.reportDate)
+      if(res){
+        props.form.setFieldsValue({...res,reportDate:moment(res.reportDate)})
+      }
+    
     })
   }
 
@@ -107,8 +105,8 @@ function body(props) {
   }
 
   return (
-    <>
-      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ width: '800px', margin: 'auto' }}>
+    <Card>
+      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ maxWidth: '1000px' }}>
         <Form.Item label="客户ID" style={{ display: 'none' }}>
           {getFieldDecorator('customerId')(
             <Input
@@ -218,19 +216,21 @@ function body(props) {
           </Row>
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" className={Styles.SubmitButton} htmlType="submit" >
+          <Button type="primary" htmlType="submit" >
             审核通过
           </Button>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => submitDate({ verifyStatus: '2' })}>
+          <Button type="danger" ghost style={{marginLeft: '4em'}} onClick={() => submitDate({ verifyStatus: '2' })}>
             驳回
           </Button>
+          <Button style={{marginLeft: '4em'}} onClick={() => router.goBack(-1)}>
+            取消
+          </Button>
         </Form.Item>
       </Form>
 
       {/* 选择置业顾问 */}
       <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} />
-    </>
+    </Card>
   );
 }
 const WrappedBody = Form.create({ name: 'body' })(body);

src/pages/recommend/recommendCustomer/components/attribution.jsx → src/pages/recommend/channel/components/attribution.jsx

@@ -3,7 +3,7 @@ import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Paginati
 import moment from 'moment';
 import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
-import Styles from '../style.less';
+
 
 
 const { Option } = Select;

src/pages/recommend/channel/index.jsx

@@ -0,0 +1,207 @@
+import React, { useState } from 'react';
+import {  Avatar, Button,message } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import QueryTable from '@/components/QueryTable'
+import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function Recommend(props) {
+  const [exportLoding,setExportLoding] = useState(false)
+
+  function toAudit(cuurentId) {
+    router.push({
+      pathname: '/customer/recommend/audit',
+      query: {
+        id: cuurentId,
+      },
+    })
+  }
+
+
+  /**
+   *导出数据（推荐用户）
+   *
+   */
+  function exportRecommendCustomer() {
+    setExportLoding(true)
+    request({
+      ...apis.customer.customerRecommendRecommenderExport,
+      responseType: 'blob',
+    }).then(response => {
+      console.log('exportRecommendCustomer: ', response)
+      download(response)
+    }).catch(error => {
+
+    })
+  }
+
+  function download(data) {
+    if (!data) {
+      return
+    }
+    const url = window.URL.createObjectURL(new Blob([data]))
+    const link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', '推荐客户.xlsx')
+    document.body.append(link)
+    link.click()
+    setExportLoding(false)
+  }
+
+  const columns = [
+    // {
+    //   title: '头像',
+    //   dataIndex: 'picture',
+    //   key: 'picture',
+    //   render: (_, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+    // },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '意向项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+    },
+    {
+      title: '推荐人',
+      dataIndex: 'recommendPersonName',
+      key: 'recommendPersonName',
+      render: (_, record) => <><span>{(record.recommendPersonName  ? record.recommendPersonName : '') + " " + (record.recommendPhone  ? record.recommendPhone : '')}</span></>,
+    },
+    {
+      title: '推荐时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD')}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: (_, record) => <><span>{record.status === '1' ? '待审核' : record.status === '2' ? '已通过' : record.status === '3' ? '已驳回' : ''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      render: (_, record) => (
+        <>{record.status === '1' ?<Button type='link' onClick={() => {
+          toAudit(record.channelCustomerId)
+          }}>审核</Button>:
+          <Button type='link' onClick={() => {
+            toAudit(record.channelCustomerId)
+            }}>查看详情</Button>
+          }
+          {/* {
+            <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
+              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
+            </AuthButton>
+          } */}
+        </>
+      ),
+    },
+  ]
+
+  // const searchFields = [
+  //   {
+  //     name: 'sceneType',
+  //     label: '用户来源',
+  //     placeholder: '请选择用户来源',
+  //     render: () => <WxDictSelect style={{width: 160}} />
+  //   },
+  // ]
+ const searchFields=[
+     {
+      name: 'buildingId',
+      label: '项目',
+      placeholder: '项目',
+      render: () => <BuildingSelect style={{width: 160}} />
+    },
+  {
+    name: 'name',
+    label: '姓名',
+    placeholder: '请输入姓名',
+  },
+  {
+    name: 'phone',
+    label: '电话',
+    placeholder: '请输入电话',
+  },
+  {
+    name: 'recommendPersonName',
+    label: '推荐人',
+    placeholder: '请输入推荐人姓名',
+  },
+  {
+    name: 'recommendPhone',
+    label: '推荐人电话',
+    placeholder: '请输入推荐人电话电话',
+  },
+  {
+    name: 'status',
+    label: '状态',
+    placeholder: '请选择状态',
+    type: 'select',
+    options: [
+      {label: '未通过', value: '1'},
+      {label: '已通过', value: '2'},
+      {label: '已驳回', value: '3'}
+    ]
+  },
+ ]
+
+ const actionRender = () => {
+    
+  return (
+    <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+      导出
+    </Button>
+  );
+};
+
+  return (
+    <>
+      <QueryTable
+          rowKey="recommendCustomer"
+          api={apis.customer.recommender}
+          searchFields={searchFields}
+          columns={columns}
+          postData={data => {
+            data.type='channel'
+            return data;
+          }}
+          actionRender={actionRender}
+        />
+    
+    </>
+  );
+}
+
+export default Recommend

src/pages/recommend/customer/audit.jsx

@@ -0,0 +1,210 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Upload, message, notification } from 'antd';
+import ImageUpload from '../../../components/XForm/ImageUpload';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import { router } from 'umi';
+
+import Attribution from './components/attribution'
+import BuildingSelect from '@/components/SelectButton/BuildSelect2';
+import ConsultantSelect from '@/components/SelectButton/consultantSelect';
+
+const { TextArea } = Input;
+
+const tailFormItemLayout = {
+  labelCol: {
+    xs: { span: 20 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 20 },
+    sm: { span: 16 },
+  },
+};
+
+const openNotificationWithIcon = (type, message) => {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ picture: '' })
+
+  const { id } = props.location.query;
+
+  if (id !== '') {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      getById(id)
+    }, [])
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.customer.getDetail, urlData: { id: currentId } }).then(res => {
+      // res.reportDate = moment(res.reportDate)
+      if(res){
+        props.form.setFieldsValue({...res,reportDate:moment(res.reportDate)})
+      }
+    
+    })
+  }
+
+  function submitDate(params) {
+    // props.form.setFieldsValue(res)
+    console.log(params, 'params')
+    request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('success', '操作成功')
+      router.go(-1)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        submitDate({ verifyStatus: '1' })
+        // submitDate({ ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 显示选择置业顾问的窗口
+  function showConsultant() {
+    setVisibleData({ visible: true, customerId: props.form.getFieldValue('customerId'), realtyConsultant: props.form.getFieldValue('realtyConsultant'), buildingId: props.form.getFieldValue('buildingId') })
+  }
+
+  // 关闭选择置业顾问的窗口
+  function closeConsultant() {
+    setVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+  }
+
+  // 选择置业顾问弹窗
+  function consultantSuccess(e) {
+    console.log(e)
+    props.form.setFieldsValue({ realtyConsultant: e.realtyConsultant, consultantName: e.name })
+  }
+
+  return (
+    <Card>
+      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ maxWidth: '1000px' }}>
+        {/* <Form.Item label="客户ID" style={{ display: 'none' }}>
+          {getFieldDecorator('customerId')(
+            <Input
+              placeholder="客户ID"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="项目ID" style={{ display: 'none' }}>
+          {getFieldDecorator('buildingId')(
+            <Input
+              placeholder="项目ID"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="归属人" style={{ display: 'none' }}>
+          {getFieldDecorator('realtyConsultant')(
+            <Input
+              placeholder="归属人"
+            />,
+          )}
+        </Form.Item> */}
+        <Form.Item label="意向项目：">
+          {getFieldDecorator('buildingId')(
+            <BuildingSelect
+              placeholder="意向项目"
+              style={{width:'100%'}}
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name')(
+            <Input placeholder="客户姓名" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户电话">
+          {getFieldDecorator('phone')(
+            <Input placeholder="客户电话" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户性别">
+          {getFieldDecorator('sex')(
+            <Radio.Group>
+              <Radio value={1}>男</Radio>
+              <Radio value={2}>女</Radio>
+            </Radio.Group>,
+          )}
+        </Form.Item>
+        <Form.Item label="客户描述">
+          {getFieldDecorator('describe')(
+            <TextArea placeholder="客户描述" rows={10} />,
+          )}
+        </Form.Item>
+        <Form.Item label="归属置业顾问">
+          {getFieldDecorator('describe11')(
+            <ConsultantSelect placeholder="归属置业顾问" buildingId={props.form.getFieldValue('buildingId')} />,
+          )}
+        </Form.Item>
+
+        
+
+        {/* <Form.Item label="归属置业顾问"
+      >
+          <Row gutter={8}>
+            <Col span={12}>
+              {getFieldDecorator('consultantName', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择置业顾问',
+                  },
+                ],
+              })(<Input placeholder="请选择置业顾问" />)}
+            </Col>
+            <Col span={12}>
+              <Button onClick={() => showConsultant()}>选择</Button>
+            </Col>
+          </Row>
+        </Form.Item> */}
+        <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
+          <Button type="primary" htmlType="submit" >
+            审核通过
+          </Button>
+          <Button type="danger" ghost style={{marginLeft: '4em'}} onClick={() => submitDate({ status: '2' })}>
+            驳回
+          </Button>
+          <Button style={{marginLeft: '4em'}} onClick={() => router.goBack(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+
+      {/* 选择置业顾问 */}
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} />
+    </Card>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/recommend/customer/components/attribution.jsx

@@ -0,0 +1,151 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+/**
+ * 调整归属
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalAttribution extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: '', realtyConsultant: '', buildingId: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.visibleData.buildingId })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  getList(params) {
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.props.visibleData.buildingId })
+  }
+
+  // 提交
+  submitGm(record) {
+
+    console.log('传递之前：', record)
+    this.handleCancel()
+    this.props.onSuccess({ realtyConsultant: record.userId, name: record.userName })
+
+
+    // // 网路请求
+    // request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
+    //   // eslint-disable-next-line no-unused-expressions
+    //   this.openNotificationWithIcon('success', '操作成功')
+    //   this.handleCancel()
+    //   this.props.onSuccess({ realtyConsultant: record.personId, name: record.name })
+    // }).catch(err => {
+    //   // eslint-disable-next-line no-unused-expressions
+    //   // this.openNotificationWithIcon('error', err)
+    // })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'personId',
+      //   key: 'personId',
+      // },
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{ this.props.visibleData.realtyConsultant !== record.userId && <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+            title="选择置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            // onOk={() => this.handleOk()}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <Table rowKey="attribution" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5,total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/recommend/customer/index.jsx

@@ -0,0 +1,199 @@
+import React, { useState } from 'react';
+import {  Avatar, Button,message } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import QueryTable from '@/components/QueryTable'
+import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function Recommend(props) {
+  const [exportLoding,setExportLoding] = useState(false)
+
+  function toAudit(cuurentId) {
+    router.push({
+      pathname: '/recommend/customer/audit',
+      query: {
+        id: cuurentId,
+      },
+    })
+  }
+
+
+  /**
+   *导出数据（推荐用户）
+   *
+   */
+  function exportRecommendCustomer() {
+    setExportLoding(true)
+    request({
+      ...apis.customer.customerRecommendRecommenderExport,
+      responseType: 'blob',
+    }).then(response => {
+      console.log('exportRecommendCustomer: ', response)
+      download(response)
+    }).catch(error => {
+
+    })
+  }
+
+  function download(data) {
+    if (!data) {
+      return
+    }
+    const url = window.URL.createObjectURL(new Blob([data]))
+    const link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', '推荐客户.xlsx')
+    document.body.append(link)
+    link.click()
+    setExportLoding(false)
+  }
+
+  const columns = [
+    // {
+    //   title: '头像',
+    //   dataIndex: 'picture',
+    //   key: 'picture',
+    //   render: (_, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+    // },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '意向项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+    },
+    {
+      title: '推荐人',
+      dataIndex: 'recommendPersonName',
+      key: 'recommendPersonName',
+      render: (_, record) => <><span>{(record.recommendPersonName  ? record.recommendPersonName : '') + " " + (record.recommendPhone  ? record.recommendPhone : '')}</span></>,
+    },
+    {
+      title: '推荐时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD')}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: (_, record) => <><span>{record.status === '1' ? '待审核' : record.status === '2' ? '已通过' : record.status === '3' ? '已驳回' : ''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      render: (_, record) => (
+        <>{record.status === '1' ?<Button type='link' onClick={() => {
+          toAudit(record.channelCustomerId)
+          }}>审核</Button>:
+          <Button type='link' onClick={() => {
+            toAudit(record.channelCustomerId)
+            }}>查看详情</Button>
+          }
+          {/* {
+            <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
+              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
+            </AuthButton>
+          } */}
+        </>
+      ),
+    },
+  ]
+
+ const searchFields=[
+     {
+      name: 'buildingId',
+      label: '项目',
+      placeholder: '项目',
+      render: () => <BuildingSelect style={{width: 160}} />
+    },
+  {
+    name: 'name',
+    label: '姓名',
+    placeholder: '请输入姓名',
+  },
+  {
+    name: 'phone',
+    label: '电话',
+    placeholder: '请输入电话',
+  },
+  {
+    name: 'recommendPersonName',
+    label: '推荐人',
+    placeholder: '请输入推荐人姓名',
+  },
+  {
+    name: 'recommendPhone',
+    label: '推荐人电话',
+    placeholder: '请输入推荐人电话电话',
+  },
+  {
+    name: 'status',
+    label: '状态',
+    placeholder: '请选择状态',
+    type: 'select',
+    options: [
+      {label: '未通过', value: '1'},
+      {label: '已通过', value: '2'},
+      {label: '已驳回', value: '3'}
+    ]
+  },
+ ]
+
+ const actionRender = () => {
+    
+  return (
+    <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+      导出
+    </Button>
+  );
+};
+
+  return (
+    <>
+      <QueryTable
+          rowKey="recommendCustomer"
+          api={apis.customer.recommender}
+          searchFields={searchFields}
+          columns={columns}
+          postData={data => {
+            data.type='customer'
+            return data;
+          }}
+          actionRender={actionRender}
+        />
+    
+    </>
+  );
+}
+
+export default Recommend

src/pages/recommend/recommendCustomer/index.jsx

@@ -1,252 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar } from 'antd';
-import moment from 'moment';
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
-import Styles from './style.less';
-import { router } from 'umi';
-import AuthButton from '@/components/AuthButton';
-import BuildingSelect from '@/components/SelectButton/BuildSelect';
-
-
-const { Option } = Select;
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const { Meta } = Card;
-
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-function body(props) {
-  const { getFieldDecorator } = props.form
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useEffect(() => {
-    getList({ pageNumber: 1, pageSize: 10 })
-  }, [])
-
-  function getList(params) {
-    // 网路请求
-    request({ ...apis.customer.recommender, params: { ...params } }).then(res => {
-      setDataSource(res)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-  // 提交事件
-  function handleSubmit(e) {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  // Change 事件
-  function handleSelectChange(e) {
-    // eslint-disable-next-line no-console
-    console.log(e)
-  }
-
-  // 分页
-  function onChange(pageNum) {
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        getList({ pageNumber: pageNum, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  function toAudit(cuurentId) {
-    router.push({
-      pathname: '/recommend/recommendCustomer/audit',
-      query: {
-        id: cuurentId,
-      },
-    })
-  }
-
-
-  /**
-    * 重置搜索
-    */
-  function handleReset() {
-    props.form.resetFields();
-  }
-
-  /**
-   *导出数据（推荐用户）
-   *
-   */
-  function exportRecommendCustomer() {
-    request({
-      ...apis.customer.customerRecommendRecommenderExport,
-      responseType: 'blob',
-    }).then(response => {
-      console.log('exportRecommendCustomer: ', response)
-      download(response)
-    }).catch(error => {
-
-    })
-  }
-
-  function download(data) {
-    if (!data) {
-      return
-    }
-    const url = window.URL.createObjectURL(new Blob([data]))
-    const link = document.createElement('a')
-    link.style.display = 'none'
-    link.href = url
-    link.setAttribute('download', '推荐客户.xlsx')
-    document.body.append(link)
-    link.click()
-  }
-
-  const columns = [
-    {
-      title: '头像',
-      dataIndex: 'picture',
-      key: 'picture',
-      render: (_, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
-    },
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '性别',
-      dataIndex: 'sex',
-      key: 'sex',
-      // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
-    },
-    {
-      title: '意向项目',
-      dataIndex: 'intention',
-      key: 'intention',
-    },
-    {
-      title: '推荐人',
-      dataIndex: 'consultantName',
-      key: 'consultantName',
-      render: (_, record) => <><span>{(record.recommendName !== null ? record.recommendName : '') + " " + (record.recommendTel !== null ? record.recommendTel : '')}</span></>,
-    },
-    {
-      title: '推荐时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD')}</span></>,
-    },
-    {
-      title: '状态',
-      dataIndex: 'verifyStatus',
-      key: 'verifyStatus',
-      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待审核' : record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : ''}</span></>,
-    },
-    {
-      title: '操作',
-      dataIndex: 'customerId',
-      key: 'customerId',
-      render: (_, record) => (
-        <>
-          {
-            <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
-              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
-            </AuthButton>
-          }
-        </>
-      ),
-    },
-  ]
-
-  return (
-    <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex' }}>
-        <Form.Item>
-          {getFieldDecorator('name')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="姓名"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('tel')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="电话"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('consultName')(
-            <Input placeholder="推荐人" />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('consultTel')(
-            <Input placeholder="推荐人电话" />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('verifyStatus')(
-            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
-              <Option value={0}>未通过</Option>
-              <Option value={1}>已通过</Option>
-              <Option value={2}>已驳回</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildingSelect />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <AuthButton name="admin.recommend.search" noRight={null}>
-            <Button type="primary" htmlType="submit" >
-              搜索
-              </Button>
-          </AuthButton>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-            重置
-            </Button>
-        </Form.Item>
-      </Form>
-      {/* style={{float:'right',margin:'20px 0'}} */}
-      <div style={{ textAlign: 'right', padding: '10px 0' }}>
-        <AuthButton name="admin.recommend.import" noRight={null} >
-          <Button type="primary" onClick={() => exportRecommendCustomer()}>
-            导出
-        </Button>
-        </AuthButton>
-      </div>
-      <Table rowKey="recommendCustomer" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
-    </>
-  );
-}
-const WrappedBody = Form.create({ name: 'body' })(body);
-
-export default WrappedBody

src/pages/recommend/recommendCustomer/style.css

@@ -1,54 +0,0 @@
-.SubmitButton {
-  background: #ef273a;
-  border-radius: 7px;
-  border: 0px;
-}
-.SelectFrom {
-  width: 180px;
-  background: #ffffff;
-  border-radius: 7px;
-  border: 1px solid #dbdbdb;
-}
-.addButton {
-  background: #50be00;
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
-.cardText {
-  font-size:  0.106rem;
-  color: #333;
-  line-height: 24px;
-  display: flex;
-  align-items: center;
-  position: relative;
-}
-.cardItem {
-  font-size:  0.106rem;
-  font-weight: 400;
-  color: #666;
-  line-height: 24px;
-  display: flex;
-  align-items: center;
-}
-.ediText {
-  font-size:  0.106rem;
-  color: #ff925c;
-  line-height: 24px;
-  position: absolute;
-  right: 0;
-}
-.title {
-  display: inline-block;
-  width:  0.54rem;
-  justify-content: space-between;
-  text-align: justify;
-  text-align-last: justify;
-}
-.address {
-  width: 400px;
-  height: 24px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}

src/pages/recommend/recommendCustomer/style.less

@@ -1,58 +0,0 @@
-.SubmitButton {
-  background: rgba(239,39,58,1);
-  border-radius: 7px;
-  border: 0px;
-}
-.SelectFrom {
-  width: 180px;
-  background: #ffffff;
-  border-radius: 7px;
-  border: 1px solid #dbdbdb;
-}
-.addButton {
-  background: #50be00;
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
-.cardText {
-  color: #333;
-  display: flex;
-  align-items: center;
-  position: relative;
-  line-height: 1.5;
-  font-size: 0.106rem;
-  margin-bottom: 0.08rem;
-
-}
-.cardItem{
-  font-size: 0.106rem;
-  font-weight: 400;
-  color: #666;
-  line-height: 24px;
-  display: flex;
-  align-items: center;  
-}
-.ediText {
-  font-size:  0.106rem;
-  color: #ff925c;
-  line-height: 24px;
-  position: absolute;
-  right: 0;
-}
-.title{
-  display: inline-block;
-  width:  0.54rem;
-  justify-content: space-between;
-  text-align: justify;
-  text-align-last:justify
-}
-
-.address { 
-  width: 400px;
-  height: 24px; 
-  text-overflow: ellipsis; 
-  white-space: nowrap;
-  overflow: hidden;
-}
-

src/pages/recommend/recommendCustomer/style.wxss

@@ -1,54 +0,0 @@
-.SubmitButton {
-  background: #ef273a;
-  border-radius: 7px;
-  border: 0px;
-}
-.SelectFrom {
-  width: 180px;
-  background: #ffffff;
-  border-radius: 7px;
-  border: 1px solid #dbdbdb;
-}
-.addButton {
-  background: #50be00;
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
-.cardText {
-  font-size:  0.106rem;
-  color: #333;
-  line-height: 24px;
-  display: flex;
-  align-items: center;
-  position: relative;
-}
-.cardItem {
-  font-size:  0.106rem;
-  font-weight: 400;
-  color: #666;
-  line-height: 24px;
-  display: flex;
-  align-items: center;
-}
-.ediText {
-  font-size:  0.106rem;
-  color: #ff925c;
-  line-height: 24px;
-  position: absolute;
-  right: 0;
-}
-.title {
-  display: inline-block;
-  width:  0.54rem;
-  justify-content: space-between;
-  text-align: justify;
-  text-align-last: justify;
-}
-.address {
-  width: 400px;
-  height: 24px;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}

src/services/apis.js

@@ -368,6 +368,11 @@ export default {
       url: `${prefix}/channelCustomer`,
       action: 'admin.customer.recommend.recommender.get',
     },
+    getDetail: {
+      method: 'GET',
+      url: `${prefix}/channelCustomer/:id`,
+      action: 'admin.customer.recommend.recommender.get',
+    },
     auto: {
       method: 'PUT',
       url: `${prefix}/customer/recommend/verify/:id`,