fix

config/proxy.js

@@ -8,8 +8,8 @@
 export default {
   dev: {
     '/api/': {
-      // target: 'https://xlk.njyz.tech/',
-      target: 'http://localhost:8081/',
+      target: 'https://xlk.njyz.tech/',
+      // target: 'http://localhost:8081/',
       // target: 'https://xlj.newlandsh.com/',
       changeOrigin: true,
       pathRewrite: {

config/routes.js

@@ -473,27 +473,64 @@ export default [
           },
           {
             //帮我找房页面+
-            path: '/home',
+            path: '/findRoom',
             name: '帮我找房',
             component: '../layouts/BlankLayout',
             routes: [
               {
-                path: '/home/recommend',
+                path: '/findRoom/buyRoom',
                 name: '找房需求',
-                component: './home/recommend/index',
+                component: './findRoom/buyRoom',
               },
               {
-                path: '/home/recommend/audit',
+                path: '/findRoom/buyRoom/audit',
                 name: '回访确认',
                 hideInMenu: true,
-                component: './home/Recommend/audit',
+                component: './findRoom/buyRoom/audit',
+              },
+              
+
+              {
+                path: '/findRoom/rent',
+                name: '租房需求',
+                component: './findRoom/rent',
+              },
+              {
+                path: '/findRoom/rent/audit',
+                name: '回访确认',
+                hideInMenu: true,
+                component: './findRoom/rent/audit',
+              },
+
+              {
+                path: '/findRoom/overseas',
+                name: '海外需求',
+                component: './findRoom/overseas',
               },
               {
-                path: '/home/recommend/auditcopy',
+                path: '/findRoom/overseas/audit',
                 name: '回访确认',
                 hideInMenu: true,
-                component: './home/Recommend/auditCopy',
+                component: './findRoom/overseas/audit',
               },
+
+              {
+                path: '/findRoom/addedValueService',
+                name: '增值服务',
+                component: './findRoom/addedValueService',
+              },
+              {
+                path: '/findRoom/addedValueService/audit',
+                name: '回访确认',
+                hideInMenu: true,
+                component: './findRoom/addedValueService/audit',
+              },
+              // {
+              //   path: '/home/recommend/auditcopy',
+              //   name: '回访确认',
+              //   hideInMenu: true,
+              //   component: './home/Recommend/auditCopy',
+              // },
             ],
           },
           {

src/components/SelectButton/InstitutionSelect.jsx

@@ -11,7 +11,7 @@ const getTreeFrom = (arr) => {
     const key = it.institutionCode
     const node = {
       key,
-      value: key,
+      value: it.institutionId,
       title: it.institutionName,
       children: it.children,
       parent: it.parent,

src/pages/building/Developers/Edit.jsx

@@ -151,8 +151,13 @@ function Edit(props) {
             rules: [{ required: true, message: '请输入开发商索引' }],
           })(<Input style={{width:200}}/>)}
         </Form.Item>
-        <Form.Item label="品牌宣传图">
-          {getFieldDecorator('brandImg', {
+        <Form.Item label="品牌logo">
+          {getFieldDecorator('brandLogo', {
+            rules: [{ required: true, message: '请上传品牌logo' }],
+        })(<ImageUploader />)}
+        </Form.Item>
+        <Form.Item label="品牌宣传图" help="建议尺寸：750*750，比例1:1" >
+          {getFieldDecorator('brandImg', { 
             rules: [{ required: true, message: '请上传品牌宣传图' }],
         })(<ImageUploader />)}
         </Form.Item>

src/pages/building/Developers/tableColumns.js

@@ -22,6 +22,13 @@ export default ({page,getBrandData, onEdit, onDelete}) => [
     key: 'brandName',
     align: 'center',
   },
+  {
+    title: '品牌宣传图',
+    dataIndex: 'brandLogo',
+    key: 'brandLogo',
+    align: 'center',
+    render:(_,record)=> <img src={getImgURL(record.brandLogo)} style={{width:'100px',borderRadius:'5px'}}/>,
+  },
   {
     title: '品牌宣传图',
     dataIndex: 'brandImg',

src/pages/building/Edit/Apartment/Form.jsx

@@ -14,7 +14,7 @@ const updateData = fetch(apis.building.buildingApartmentUpdate);
 const saleType = [
   {
     id: '1',
-    name: '待售',
+    name: '未开盘',
   },
   {
     id: '2',

src/pages/building/Edit/Apartment/List.jsx

@@ -5,7 +5,7 @@ import moment from 'moment'
 const saleType = [
   {
     id: 1,
-    name: '待售',
+    name: '未开盘',
   },
   {
     id: 2,

src/pages/building/Edit/Basic/index.jsx

@@ -171,7 +171,7 @@ const BuildingBasic = React.forwardRef((props, ref) => {
           </Form.Item>
         </FormGroupItem>
         <Form.Item label="项目说明" >
-          {getFieldDecorator('dynamic')(<Input placeholder="项目动态等，不超过30个字" maxLength={30}/>)}
+          {getFieldDecorator('dynamic')(<Input placeholder="项目标签补充，不超过30个字" maxLength={30}/>)}
         </Form.Item>
         {/* <Form.Item label="物业类型" >
           {getFieldDecorator('propertyType')(<Input />)}

src/pages/building/List/searchFields.js

@@ -33,7 +33,7 @@ export default () => [
     placeholder: '请选择销售状态',
     type: 'select',
     options: [
-      {label: '待售', value: '待售'},
+      {label: '未开盘', value: '未开盘'},
       {label: '在售', value: '在售'},
       {label: '售罄', value: '售罄'},
       {label: '在租', value: '在租'},

src/pages/carouselFigure/editAdvertising.jsx

@@ -31,7 +31,7 @@ const createEditor = () => {
   let h5Visible = false;
   let buildingId = '';
   let cityId = '';
-  let isHaveActive = false;
+  let isHaveActive = true;
   let isCanChoose = true;
   let isHavePosition = false;
   let islet = true;
@@ -48,7 +48,7 @@ const createEditor = () => {
     if (data.showPosition == 'index') {
       isHavePosition = true;
     } else {
-      isHavePosition = false;
+      isHavePosition = true;
     }
 
     // if (data.contentType == 'h5' || data.contentType=='live') {
@@ -100,7 +100,7 @@ const createEditor = () => {
     if (data.showPosition == 'index') {
       isHavePosition = true;
     } else {
-      isHavePosition = false;
+      isHavePosition = true;
     }
 
     contentVisible = data.contentType === 'other';
@@ -152,23 +152,23 @@ const createEditor = () => {
     };
 
     const fields = [
-      // {
-      //   label: '是否关联项目',
-      //   name: 'isHaveActive',
-      //   type: FieldTypes.Switch,
-      //   value: isHaveActive,
-      //   hidden: () => !isCanChoose,
-      //   props: {
-      //     onChange: () => {
-      //       const type = formRef.current.props.form.getFieldValue('contentType');
-      //       if (formRef.current && type !== 'live' && type !== 'h5') {
-         
-      //         formRef.current.props.form.resetFields(['contentType', []]);
-      //       }
-      //     },
-      //   },
-      //   rules: [{ required: true, message: '是否城市活动' }],
-      // },
+      {
+        label: '是否关联项目',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value: isHaveActive,
+        hidden: () => !isCanChoose,
+        props: {
+          onChange: () => {
+            const type = formRef.current.props.form.getFieldValue('contentType');
+            if (formRef.current && type !== 'live' && type !== 'h5') {
+              console.log(formRef.current.props.form.getFieldValue('contentType'), '2222');
+              formRef.current.props.form.resetFields(['contentType', []]);
+            }
+          },
+        },
+        rules: [{ required: true, message: '是否城市活动' }],
+      },
       // {
       //   label: '发布位置',
       //   name: 'showPosition',
@@ -187,19 +187,19 @@ const createEditor = () => {
       //   value: data.showPosition,
       //   rules: [{ required: true, message: '请选择发布位置' }],
       // },
-      // {
-      //   label: '所属项目',
-      //   name: 'buildingId',
-      //   render: <BuildSelect />,
-      //   value: data.buildingId,
-      //   hidden: () => !isHaveActive && isHavePosition,
-      //   rules: [{ required: true, message: '请选择所属项目' }],
-      // },
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+        hidden: () => !isHaveActive && isHavePosition,
+        rules: [{ required: true, message: '请选择所属项目' }],
+      },
       {
         label: '展示城市',
         name: 'cityId',
         render: <CitySelect />,
-        // hidden: () => !isHavePosition || isHaveActive,
+        hidden: () => !isHavePosition || isHaveActive,
         value: data.cityId,
         rules: [{ required: true, message: '请选择展示城市' }],
       },
@@ -211,28 +211,28 @@ const createEditor = () => {
         help: '建议图片尺寸：640*960px，比例2:3,格式：jpg，用于开屏广告',
         rules: [{ required: true, message: '请上传图片' }],
       },
-      // {
-      //   label: '类型',
-      //   name: 'contentType',
-      //   type: FieldTypes.Select,
-      //   hidden: () => isHaveActive,
-      //   dict: [
-      //     // {
-      //     //   label: 'H5活动详情',
-      //     //   value: 'h5',
-      //     // },
-      //     {
-      //       label: '直播活动详情',
-      //       value: 'live',
-      //     },
-      //     {
-      //       label: '其它',
-      //       value: 'others',
-      //     },
-      //   ],
-      //   value: data.contentType,
-      //   rules: [{ required: true, message: '请选择类型' }],
-      // },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        hidden: () => isHaveActive,
+        dict: [
+          // {
+          //   label: 'H5活动详情',
+          //   value: 'h5',
+          // },
+          {
+            label: '直播活动详情',
+            value: 'live',
+          },
+          {
+            label: '无',
+            value: 'nothing',
+          },
+        ],
+        value: data.contentType,
+        rules: [{ required: true, message: '请选择类型' }],
+      },
       {
         label: '标题',
         name: 'title',
@@ -244,7 +244,7 @@ const createEditor = () => {
       {
         label: '类型',
         name: 'contentType',
-        // hidden: () => !isHaveActive,
+        hidden: () => !isHaveActive,
         type: FieldTypes.Select,
         dict: [
           {
@@ -371,15 +371,14 @@ const createEditor = () => {
 
     const handleSubmit = val => {
       val.showType = 'screen';
-      // if (!isHaveActive && val.targetId) {
-      //   if (!val.contentType) {
-      //     val.contentType = 'h5';
-      //   }
-      // }
-      // if (!isHaveActive && !val.targetId) {
-      //   val.contentType = '';
-      // }
-      val.showPosition='index'
+      if (!isHaveActive && val.targetId) {
+        if (!val.contentType) {
+          val.contentType = 'h5';
+        }
+      }
+      if (!isHaveActive && !val.targetId) {
+        val.contentType = '';
+      }
       if (contentId) {
         request({
           ...apis.carsuseFigure.updataExtendContent,
@@ -387,7 +386,6 @@ const createEditor = () => {
           data: val,
         })
           .then(data => {
-            message.info('操作成功');
             cancelPage();
           })
           .catch(err => {
@@ -396,7 +394,6 @@ const createEditor = () => {
       } else {
         request({ ...apis.carsuseFigure.addExtendContent, data: val })
           .then(data => {
-            message.info('操作成功');
             cancelPage();
           })
           .catch(err => {

src/pages/findRoom/addedValueService/audit.jsx

@@ -0,0 +1,203 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Card, Radio, notification, Select } 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';
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+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,type } = props.location.query;
+  const disabled= type==='detail'
+
+  useEffect(() => {
+    if (id !== '') {
+      getById(id);
+    }
+  }, [id]);
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.searchHouse.IdHouse, urlData: { id: currentId } }).then(res => {
+      // res.reportDate = moment(res.reportDate)
+      if (res) {
+        props.form.setFieldsValue({ ...res, reportDate: moment(res.reportDate) });
+        //包裹的没渲染完就执行set 导致在呈现字段之前无法设置表单字段
+      }
+    });
+  }
+
+  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 })
+      }
+    });
+  }
+
+  return (
+    <Card>
+      <Form
+        {...tailFormItemLayout}
+        onSubmit={e => handleSubmit(e)}
+        style={{ width: '800px', margin: 'auto' }}
+      >
+        {/* <Form.Item label="客户ID" style={{ display: 'none' }}>
+          {getFieldDecorator('customerId')(<Input placeholder="客户ID" />)}
+        </Form.Item> */}
+        {/* ············分割线............. */}
+        <Form.Item label="意向区域">
+          {getFieldDecorator('intention')(<Input placeholder="意向区域：" disabled={disabled}/>)}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name')(<Input placeholder="客户姓名" disabled={disabled}/>)}
+        </Form.Item>
+        <Form.Item label="客户电话">
+          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled={disabled}/>)}
+        </Form.Item>
+        <Form.Item label="客户性别">
+          {getFieldDecorator('sex')(
+            <Radio.Group disabled={disabled}>
+              <Radio value={1}>男</Radio>
+              <Radio value={2}>女</Radio>
+            </Radio.Group>,
+          )}
+        </Form.Item>
+        <Form.Item label="客户预算">
+          {getFieldDecorator('name')(<Input placeholder="客户预算" disabled={disabled} suffix="W"/>)}
+        </Form.Item>
+
+        <Form.Item label="房屋现状">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="房屋现状" disabled={disabled}>
+              <Option value="新房">毛坯</Option>
+              <Option value="旧房装修5年以内">旧房装修5年以内</Option>
+              <Option value="旧房装修5-10年">旧房装修5-10年</Option>
+              <Option value="旧房装修10年以上">旧房装修10年以上</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item label="房屋面积">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="房屋面积" disabled={disabled}>
+              <Option value="1">50m²</Option>
+              <Option value="1">50~70m²</Option>
+              <Option value="60~90m²">70~90m²</Option>
+              <Option value="6~90m²">90~110m²</Option>
+              <Option value="110~130m">110~130m²</Option>
+              <Option value="130~150m²">130~150m²</Option>  
+              <Option value="150~200m²">150~200m²</Option>  
+              <Option value="200m²以上">200m²以上</Option>     
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="家装模式">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="家装模式" disabled={disabled}>
+              <Option value="新房">只做设计</Option>
+              <Option value="二手房">材料全包</Option>
+              <Option value="不限">包工不包料</Option>
+              <Option value="二手房">施工包辅材不包主材</Option>
+              <Option value="不限">全包</Option>
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="家装侧重点">
+          {getFieldDecorator('more')(
+            <Checkbox.Group disabled={disabled}>
+              <Checkbox value="1">独卫</Checkbox>
+              <Checkbox value="2">近地铁</Checkbox>
+              <Checkbox value="3">拎包入住</Checkbox>
+              <Checkbox value="4">精装修</Checkbox>
+              <Checkbox value="5">独立阳台</Checkbox>
+              <Checkbox value="6">集中供暖</Checkbox>
+              <Checkbox value="7">押一付一</Checkbox>
+              <Checkbox value="8">双卫</Checkbox>
+              <Checkbox value="9">新上</Checkbox>
+              <Checkbox value="10">认证公寓</Checkbox>
+            </Checkbox.Group>,
+          )}
+        </Form.Item>
+  
+
+        <Form.Item label="客户备注" >
+          {getFieldDecorator('say')(<TextArea placeholder="客户描述" disabled={disabled} rows={7} />)}
+        </Form.Item>
+        <Form.Item label="回访备注">
+          {getFieldDecorator('describe', {
+            rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
+          })(<TextArea placeholder="回访备注" disabled={disabled} rows={7} />)}
+        </Form.Item>
+        <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
+          <Button type="primary" htmlType="submit">
+            有效
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>无效</Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}
+const HouseCopm = Form.create({ name: 'body' })(body);
+
+export default HouseCopm;

src/pages/findRoom/addedValueService/index.jsx

@@ -0,0 +1,213 @@
+import React, { PureComponent, useMemo, useState } from 'react';
+import { Avatar, Button } 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';
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+
+
+
+function Recommend() {
+  const [exportLoding, setExportLoding] = useState(false)
+  //详情页面弹窗配置
+  function toAudit(row,type) {
+    router.push({
+      pathname: '/findRoom/addedValueService/audit',
+      query: {
+        id: row.id,
+        type:type
+      },
+    })
+
+  }
+//   function toSee(cuurentId) {
+//     router.push({
+//       pathname: '/home/recommend/auditCopy',
+//       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: 'avatarurl',
+      key: 'avatarurl',
+      align: 'center',
+      render: (_, record) => <Avatar shape="square" src={record.avatarurl} size={64} />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      align: 'center',
+      // render: (_, record) => <><span>{record.name = '曹建芳'}</span></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '性别',
+      dataIndex: 'gender',
+      key: 'gender',
+      align: 'center',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '房屋现状',
+      dataIndex: 'intentArea',//意向区域
+      key: 'intentArea',
+      align: 'center',
+      // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
+
+    },
+    {
+      title: '装修预算',
+      dataIndex: 'intention',
+      key: 'intention',
+      align: 'center',
+      // render:(_,record)=><span>{record='香颂.蔚澜半岛'}</span>
+
+    },
+    {
+      title: '提交时间',
+      dataIndex: 'createdTime',
+      key: 'createdTime',
+      align: 'center',
+      render: (_, record) => <><span>{record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访' : record.verifyStatus === 2 ? '无效' : ''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+
+      render: (_, record) => (
+        <><Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>
+        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>
+        {/* <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} >
+          {record.verifyStatus === 0 ? <span onClick={() => toAudit(record.customerId)}>审核</span>
+            : record.verifyStatus === 1 ? <span onClick={() => toSee(record.customerId)}>查看详情</span>
+              : record.verifyStatus === 2 ? <span onClick={() => toSee(record.customerId)}>查看详情</span>
+                : ''}</span> */}
+        </>
+      ),
+    },
+  ]
+
+
+  const searchFields = [
+    {
+      name: 'name',
+      label: '姓名',
+      placeholder: '请输入姓名',
+    },
+    {
+      name: 'tel',
+      label: '电话',
+      placeholder: '请输入电话',
+    },
+    // {
+    //   name: 'types',
+    //   label: '类型',
+    //   placeholder: '类型',
+    //   type: 'select',
+    //   options: [
+    //     { label: '全部', value: '' },
+    //     { label: '买房', value: '1' },
+    //     { label: '租房', value: '2' },
+    //     { label: '海外', value: '3' }
+    //   ]
+    // },
+    {
+      name: 'verifyStatus',
+      label: '状态',
+      placeholder: '请选择状态',
+      type: 'select',
+      placeholder: '全部',//错误
+      options: [
+        { label: '全部', value: '' },
+        { label: '待回访', value: '0' },
+        { label: '已回访', value: '1' },
+        { label: '无效', value: '2' }
+      ]
+    },
+  ]
+  const actionRender = () => {
+    return (
+      <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+        导出
+      </Button>
+    );
+  };
+
+  return (
+    <>
+      <QueryTable
+        rowKey="recommendCustomer"
+        // recommendCustomer
+        api={apis.searchHouse.list}
+        searchFields={searchFields}
+        columns={columns}
+        actionRender={actionRender}
+      />
+
+    </>
+  );
+}
+
+export default Recommend

src/pages/findRoom/buyRoom/audit.jsx

@@ -0,0 +1,257 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Card, Radio, notification, Select } 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';
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+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,type } = props.location.query;
+  const disabled= type==='detail'
+
+  useEffect(() => {
+    if (id !== '') {
+      getById(id);
+    }
+  }, [id]);
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.searchHouse.IdHouse, urlData: { id: currentId } }).then(res => {
+      // res.reportDate = moment(res.reportDate)
+      if (res) {
+        props.form.setFieldsValue({ ...res, reportDate: moment(res.reportDate) });
+        //包裹的没渲染完就执行set 导致在呈现字段之前无法设置表单字段
+      }
+    });
+  }
+
+  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 })
+      }
+    });
+  }
+
+  return (
+    <Card>
+      <Form
+        {...tailFormItemLayout}
+        onSubmit={e => handleSubmit(e)}
+        style={{ width: '800px', margin: 'auto' }}
+      >
+        {/* <Form.Item label="客户ID" style={{ display: 'none' }}>
+          {getFieldDecorator('customerId')(<Input placeholder="客户ID" />)}
+        </Form.Item> */}
+        {/* ············分割线............. */}
+        <Form.Item label="意向区域">
+          {getFieldDecorator('intention')(<Input placeholder="意向区域：" disabled={disabled}/>)}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name')(<Input placeholder="客户姓名" disabled={disabled}/>)}
+        </Form.Item>
+        <Form.Item label="客户电话">
+          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled={disabled}/>)}
+        </Form.Item>
+        <Form.Item label="客户性别">
+          {getFieldDecorator('sex')(
+            <Radio.Group disabled={disabled}>
+              <Radio value={1}>男</Radio>
+              <Radio value={2}>女</Radio>
+            </Radio.Group>,
+          )}
+        </Form.Item>
+        <Form.Item label="客户预算">
+          {getFieldDecorator('name')(<Input placeholder="客户预算" disabled={disabled} suffix="W"/>)}
+        </Form.Item>
+        <Form.Item label="房屋类型">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="房屋类型" disabled={disabled}>
+              <Option value="新房">新房</Option>
+              <Option value="二手房">二手房</Option>
+              <Option value="不限">不限</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item label="意向居室">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="意向居室" disabled={disabled}>
+              <Option value="一居">一居</Option>
+              <Option value="二居">二居</Option>
+              <Option value="三居">三居</Option>
+              <Option value="四居">四居</Option>
+              <Option value="五居">五居</Option>
+              <Option value="五居以上">五居以上</Option>
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="购房目的">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="购房目的" disabled={disabled}>
+              <Option value="刚需">刚需</Option>
+              <Option value="结婚">结婚</Option>
+              <Option value="养老">养老</Option>
+              <Option value="改善">改善</Option>
+              <Option value="教育">教育</Option>
+              <Option value="投资">投资</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item label="侧重优势">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="侧重优势" disabled={disabled}>
+              <Option value="发展规划">发展规划</Option>
+              <Option value="学区">学区</Option>
+              <Option value="交通">交通</Option>
+              <Option value="配套">配套</Option>
+              <Option value="环境">环境</Option>
+            
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="社区要求">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="社区要求" disabled={disabled}>
+              <Option value="发展规划">楼栋管家</Option>
+              <Option value="学区">金钥匙服务</Option>
+              <Option value="交通">社区娱乐</Option>
+              <Option value="配套">会所功能</Option>     
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="面积要求">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="面积要求" disabled={disabled}>
+              <Option value="60m²">60m²</Option>
+              <Option value="60~90m²">60~90m²</Option>
+              <Option value="110~130m">110~130m²</Option>
+              <Option value="130~150m²">130~150m²</Option>  
+              <Option value="150~200m²">150~200m²</Option>  
+              <Option value="200m²以上">200m²以上</Option>     
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="朝向要求">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="朝向要求" disabled={disabled}>
+              <Option value="朝东">朝东</Option>
+              <Option value="朝南">朝南</Option>
+              <Option value="朝西">朝西</Option>
+              <Option value="朝北">朝北</Option>  
+              <Option value="南北通透">南北通透</Option>  
+                
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="楼层要求" >
+          {getFieldDecorator('housetype')(
+            <Select placeholder="楼层要求" disabled={disabled}>
+             <Option value="低楼层">低楼层</Option>
+              <Option value="中楼层">中楼层</Option>
+              <Option value="高楼层">高楼层</Option>
+              <Option value="底层">底层</Option>  
+              <Option value="顶层">顶层</Option>  
+                
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="楼龄要求">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="楼龄要求" disabled={disabled}>
+              <Option value="5年以内">5年以内</Option>
+              <Option value="10年以内">10年以内</Option>
+              <Option value="15年以内">15年以内</Option>
+              <Option value="20年以内">20年以内</Option>  
+              <Option value="20年以上">20年以上</Option>  
+                
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="客户备注" >
+          {getFieldDecorator('say')(<TextArea placeholder="客户描述" disabled={disabled} rows={7} />)}
+        </Form.Item>
+        <Form.Item label="回访备注">
+          {getFieldDecorator('describe', {
+            rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
+          })(<TextArea placeholder="回访备注" disabled={disabled} rows={7} />)}
+        </Form.Item>
+        <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
+          <Button type="primary" htmlType="submit">
+            有效
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>无效</Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}
+const HouseCopm = Form.create({ name: 'body' })(body);
+
+export default HouseCopm;

src/pages/findRoom/buyRoom/index.jsx

@@ -0,0 +1,213 @@
+import React, { PureComponent, useMemo, useState } from 'react';
+import { Avatar, Button } 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';
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+
+
+
+function Recommend() {
+  const [exportLoding, setExportLoding] = useState(false)
+  //详情页面弹窗配置
+  function toAudit(row,type) {
+    router.push({
+      pathname: '/findRoom/buyRoom/audit',
+      query: {
+        id: row.id,
+        type:type
+      },
+    })
+
+  }
+//   function toSee(cuurentId) {
+//     router.push({
+//       pathname: '/home/recommend/auditCopy',
+//       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: 'avatarurl',
+      key: 'avatarurl',
+      align: 'center',
+      render: (_, record) => <Avatar shape="square" src={record.avatarurl} size={64} />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      align: 'center',
+      // render: (_, record) => <><span>{record.name = '曹建芳'}</span></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '性别',
+      dataIndex: 'gender',
+      key: 'gender',
+      align: 'center',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '意向区域',
+      dataIndex: 'intentArea',//意向区域
+      key: 'intentArea',
+      align: 'center',
+      // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
+
+    },
+    {
+      title: '购房预算',
+      dataIndex: 'intention',
+      key: 'intention',
+      align: 'center',
+      // render:(_,record)=><span>{record='香颂.蔚澜半岛'}</span>
+
+    },
+    {
+      title: '提交时间',
+      dataIndex: 'createdTime',
+      key: 'createdTime',
+      align: 'center',
+      render: (_, record) => <><span>{record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访' : record.verifyStatus === 2 ? '无效' : ''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+
+      render: (_, record) => (
+        <><Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>
+        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>
+        {/* <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} >
+          {record.verifyStatus === 0 ? <span onClick={() => toAudit(record.customerId)}>审核</span>
+            : record.verifyStatus === 1 ? <span onClick={() => toSee(record.customerId)}>查看详情</span>
+              : record.verifyStatus === 2 ? <span onClick={() => toSee(record.customerId)}>查看详情</span>
+                : ''}</span> */}
+        </>
+      ),
+    },
+  ]
+
+
+  const searchFields = [
+    {
+      name: 'name',
+      label: '姓名',
+      placeholder: '请输入姓名',
+    },
+    {
+      name: 'tel',
+      label: '电话',
+      placeholder: '请输入电话',
+    },
+    // {
+    //   name: 'types',
+    //   label: '类型',
+    //   placeholder: '类型',
+    //   type: 'select',
+    //   options: [
+    //     { label: '全部', value: '' },
+    //     { label: '买房', value: '1' },
+    //     { label: '租房', value: '2' },
+    //     { label: '海外', value: '3' }
+    //   ]
+    // },
+    {
+      name: 'verifyStatus',
+      label: '状态',
+      placeholder: '请选择状态',
+      type: 'select',
+      placeholder: '全部',//错误
+      options: [
+        { label: '全部', value: '' },
+        { label: '待回访', value: '0' },
+        { label: '已回访', value: '1' },
+        { label: '无效', value: '2' }
+      ]
+    },
+  ]
+  const actionRender = () => {
+    return (
+      <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+        导出
+      </Button>
+    );
+  };
+
+  return (
+    <>
+      <QueryTable
+        rowKey="recommendCustomer"
+        // recommendCustomer
+        api={apis.searchHouse.list}
+        searchFields={searchFields}
+        columns={columns}
+        actionRender={actionRender}
+      />
+
+    </>
+  );
+}
+
+export default Recommend

src/pages/findRoom/overseas/audit.jsx

@@ -0,0 +1,170 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Card, Radio, notification, Select } 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';
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+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,type } = props.location.query;
+  const disabled= type==='detail'
+
+  useEffect(() => {
+    if (id !== '') {
+      getById(id);
+    }
+  }, [id]);
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.searchHouse.IdHouse, urlData: { id: currentId } }).then(res => {
+      // res.reportDate = moment(res.reportDate)
+      if (res) {
+        props.form.setFieldsValue({ ...res, reportDate: moment(res.reportDate) });
+        //包裹的没渲染完就执行set 导致在呈现字段之前无法设置表单字段
+      }
+    });
+  }
+
+  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 })
+      }
+    });
+  }
+
+  return (
+    <Card>
+      <Form
+        {...tailFormItemLayout}
+        onSubmit={e => handleSubmit(e)}
+        style={{ width: '800px', margin: 'auto' }}
+      >
+        {/* <Form.Item label="客户ID" style={{ display: 'none' }}>
+          {getFieldDecorator('customerId')(<Input placeholder="客户ID" />)}
+        </Form.Item> */}
+        {/* ············分割线............. */}
+        <Form.Item label="意向区域">
+          {getFieldDecorator('intention')(<Input placeholder="意向区域：" disabled={disabled}/>)}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name')(<Input placeholder="客户姓名" disabled={disabled}/>)}
+        </Form.Item>
+        <Form.Item label="客户电话">
+          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled={disabled}/>)}
+        </Form.Item>
+        <Form.Item label="客户性别">
+          {getFieldDecorator('sex')(
+            <Radio.Group disabled={disabled}>
+              <Radio value={1}>男</Radio>
+              <Radio value={2}>女</Radio>
+            </Radio.Group>,
+          )}
+        </Form.Item>
+        <Form.Item label="客户预算">
+          {getFieldDecorator('name')(<Input placeholder="客户预算" disabled={disabled} suffix="W"/>)}
+        </Form.Item>
+        <Form.Item label="房屋类型">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="房屋类型" disabled={disabled}>
+              <Option value="新房">新房</Option>
+              <Option value="二手房">二手房</Option>
+              <Option value="不限">不限</Option>
+            </Select>,
+          )}
+        </Form.Item>
+      
+
+        <Form.Item label="购房目的">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="购房目的" disabled={disabled}>
+              <Option value="刚需">投资</Option>
+              <Option value="结婚">移民</Option>
+              <Option value="养老">养老</Option>
+              <Option value="改善">留学</Option>
+              <Option value="教育">度假</Option>
+            </Select>,
+          )}
+        </Form.Item>
+      
+        <Form.Item label="客户备注" >
+          {getFieldDecorator('say')(<TextArea placeholder="客户描述" disabled={disabled} rows={7} />)}
+        </Form.Item>
+        <Form.Item label="回访备注">
+          {getFieldDecorator('describe', {
+            rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
+          })(<TextArea placeholder="回访备注" disabled={disabled} rows={7} />)}
+        </Form.Item>
+        <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
+          <Button type="primary" htmlType="submit">
+            有效
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>无效</Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}
+const HouseCopm = Form.create({ name: 'body' })(body);
+
+export default HouseCopm;

src/pages/findRoom/overseas/index.jsx

@@ -0,0 +1,213 @@
+import React, { PureComponent, useMemo, useState } from 'react';
+import { Avatar, Button } 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';
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+
+
+
+function Recommend() {
+  const [exportLoding, setExportLoding] = useState(false)
+  //详情页面弹窗配置
+  function toAudit(row,type) {
+    router.push({
+      pathname: '/findRoom/overseas/audit',
+      query: {
+        id: row.id,
+        type:type
+      },
+    })
+
+  }
+//   function toSee(cuurentId) {
+//     router.push({
+//       pathname: '/home/recommend/auditCopy',
+//       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: 'avatarurl',
+      key: 'avatarurl',
+      align: 'center',
+      render: (_, record) => <Avatar shape="square" src={record.avatarurl} size={64} />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      align: 'center',
+      // render: (_, record) => <><span>{record.name = '曹建芳'}</span></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '性别',
+      dataIndex: 'gender',
+      key: 'gender',
+      align: 'center',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '意向国家/区域',
+      dataIndex: 'intentArea',//意向区域
+      key: 'intentArea',
+      align: 'center',
+      // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
+
+    },
+    {
+      title: '购房预算',
+      dataIndex: 'intention',
+      key: 'intention',
+      align: 'center',
+      render:(x)=>x&&<span>{x}万</span>
+
+    },
+    {
+      title: '提交时间',
+      dataIndex: 'createdTime',
+      key: 'createdTime',
+      align: 'center',
+      render: (_, record) => <><span>{record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访' : record.verifyStatus === 2 ? '无效' : ''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+
+      render: (_, record) => (
+        <><Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>
+        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>
+        {/* <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} >
+          {record.verifyStatus === 0 ? <span onClick={() => toAudit(record.customerId)}>审核</span>
+            : record.verifyStatus === 1 ? <span onClick={() => toSee(record.customerId)}>查看详情</span>
+              : record.verifyStatus === 2 ? <span onClick={() => toSee(record.customerId)}>查看详情</span>
+                : ''}</span> */}
+        </>
+      ),
+    },
+  ]
+
+
+  const searchFields = [
+    {
+      name: 'name',
+      label: '姓名',
+      placeholder: '请输入姓名',
+    },
+    {
+      name: 'tel',
+      label: '电话',
+      placeholder: '请输入电话',
+    },
+    // {
+    //   name: 'types',
+    //   label: '类型',
+    //   placeholder: '类型',
+    //   type: 'select',
+    //   options: [
+    //     { label: '全部', value: '' },
+    //     { label: '买房', value: '1' },
+    //     { label: '租房', value: '2' },
+    //     { label: '海外', value: '3' }
+    //   ]
+    // },
+    {
+      name: 'verifyStatus',
+      label: '状态',
+      placeholder: '请选择状态',
+      type: 'select',
+      placeholder: '全部',//错误
+      options: [
+        { label: '全部', value: '' },
+        { label: '待回访', value: '0' },
+        { label: '已回访', value: '1' },
+        { label: '无效', value: '2' }
+      ]
+    },
+  ]
+  const actionRender = () => {
+    return (
+      <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+        导出
+      </Button>
+    );
+  };
+
+  return (
+    <>
+      <QueryTable
+        rowKey="recommendCustomer"
+        // recommendCustomer
+        api={apis.searchHouse.list}
+        searchFields={searchFields}
+        columns={columns}
+        actionRender={actionRender}
+      />
+
+    </>
+  );
+}
+
+export default Recommend

src/pages/findRoom/rent/audit.jsx

@@ -0,0 +1,188 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Card, Radio, notification, Select,Checkbox } 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';
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+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, type } = props.location.query;
+  const disabled = type === 'detail';
+
+  useEffect(() => {
+    if (id !== '') {
+      getById(id);
+    }
+  }, [id]);
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.searchHouse.IdHouse, urlData: { id: currentId } }).then(res => {
+      // res.reportDate = moment(res.reportDate)
+      if (res) {
+        props.form.setFieldsValue({ ...res, reportDate: moment(res.reportDate) });
+        //包裹的没渲染完就执行set 导致在呈现字段之前无法设置表单字段
+      }
+    });
+  }
+
+  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 })
+      }
+    });
+  }
+
+  return (
+    <Card>
+      <Form
+        {...tailFormItemLayout}
+        onSubmit={e => handleSubmit(e)}
+        style={{ width: '800px', margin: 'auto' }}
+      >
+        {/* <Form.Item label="客户ID" style={{ display: 'none' }}>
+          {getFieldDecorator('customerId')(<Input placeholder="客户ID" />)}
+        </Form.Item> */}
+        {/* ············分割线............. */}
+        <Form.Item label="意向区域">
+          {getFieldDecorator('intention')(<Input placeholder="意向区域：" disabled={disabled} />)}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name')(<Input placeholder="客户姓名" disabled={disabled} />)}
+        </Form.Item>
+        <Form.Item label="客户电话">
+          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled={disabled} />)}
+        </Form.Item>
+        <Form.Item label="客户性别">
+          {getFieldDecorator('sex')(
+            <Radio.Group disabled={disabled}>
+              <Radio value={1}>男</Radio>
+              <Radio value={2}>女</Radio>
+            </Radio.Group>,
+          )}
+        </Form.Item>
+        <Form.Item label="客户预算">
+          {getFieldDecorator('name')(<Input placeholder="客户预算" disabled={disabled} suffix="元/月"/>)}
+        </Form.Item>
+        <Form.Item label="房屋类型">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="房屋类型" disabled={disabled}>
+              <Option value="新房">新房</Option>
+              <Option value="二手房">二手房</Option>
+              <Option value="不限">不限</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item label="意向居室">
+          {getFieldDecorator('housetype')(
+            <Select placeholder="意向居室" disabled={disabled}>
+              <Option value="一居">一居</Option>
+              <Option value="二居">二居</Option>
+              <Option value="三居">三居</Option>
+              <Option value="四居">四居</Option>
+              <Option value="五居">五居</Option>
+              <Option value="五居以上">五居以上</Option>
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="意向居室">
+          {getFieldDecorator('more')(
+            <Checkbox.Group disabled={disabled}>
+              <Checkbox value="1">独卫</Checkbox>
+              <Checkbox value="2">近地铁</Checkbox>
+              <Checkbox value="3">拎包入住</Checkbox>
+              <Checkbox value="4">精装修</Checkbox>
+              <Checkbox value="5">独立阳台</Checkbox>
+              <Checkbox value="6">集中供暖</Checkbox>
+              <Checkbox value="7">押一付一</Checkbox>
+              <Checkbox value="8">双卫</Checkbox>
+              <Checkbox value="9">新上</Checkbox>
+              <Checkbox value="10">认证公寓</Checkbox>
+            </Checkbox.Group>,
+          )}
+        </Form.Item>
+
+        <Form.Item label="客户备注">
+          {getFieldDecorator('say')(
+            <TextArea placeholder="客户描述" disabled={disabled} rows={7} />,
+          )}
+        </Form.Item>
+        <Form.Item label="回访备注">
+          {getFieldDecorator('describe', {
+            rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
+          })(<TextArea placeholder="回访备注" disabled={disabled} rows={7} />)}
+        </Form.Item>
+        <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
+          <Button type="primary" htmlType="submit">
+            有效
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>无效</Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}
+const HouseCopm = Form.create({ name: 'body' })(body);
+
+export default HouseCopm;

src/pages/findRoom/rent/index.jsx

@@ -0,0 +1,213 @@
+import React, { PureComponent, useMemo, useState } from 'react';
+import { Avatar, Button } 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';
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+
+
+
+
+function Recommend() {
+  const [exportLoding, setExportLoding] = useState(false)
+  //详情页面弹窗配置
+  function toAudit(row,type) {
+    router.push({
+      pathname: '/findRoom/rent/audit',
+      query: {
+        id: row.id,
+        type:type
+      },
+    })
+
+  }
+//   function toSee(cuurentId) {
+//     router.push({
+//       pathname: '/home/recommend/auditCopy',
+//       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: 'avatarurl',
+      key: 'avatarurl',
+      align: 'center',
+      render: (_, record) => <Avatar shape="square" src={record.avatarurl} size={64} />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      align: 'center',
+      // render: (_, record) => <><span>{record.name = '曹建芳'}</span></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '性别',
+      dataIndex: 'gender',
+      key: 'gender',
+      align: 'center',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '意向区域',
+      dataIndex: 'intentArea',//意向区域
+      key: 'intentArea',
+      align: 'center',
+      // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
+
+    },
+    {
+      title: '租房预算（元/月）',
+      dataIndex: 'intention',
+      key: 'intention',
+      align: 'center',
+      // render:(_,record)=><span>{record='香颂.蔚澜半岛'}</span>
+
+    },
+    {
+      title: '提交时间',
+      dataIndex: 'createdTime',
+      key: 'createdTime',
+      align: 'center',
+      render: (_, record) => <><span>{record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访' : record.verifyStatus === 2 ? '无效' : ''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align: 'center',
+
+      render: (_, record) => (
+        <><Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>
+        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>
+        {/* <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} >
+          {record.verifyStatus === 0 ? <span onClick={() => toAudit(record.customerId)}>审核</span>
+            : record.verifyStatus === 1 ? <span onClick={() => toSee(record.customerId)}>查看详情</span>
+              : record.verifyStatus === 2 ? <span onClick={() => toSee(record.customerId)}>查看详情</span>
+                : ''}</span> */}
+        </>
+      ),
+    },
+  ]
+
+
+  const searchFields = [
+    {
+      name: 'name',
+      label: '姓名',
+      placeholder: '请输入姓名',
+    },
+    {
+      name: 'tel',
+      label: '电话',
+      placeholder: '请输入电话',
+    },
+    // {
+    //   name: 'types',
+    //   label: '类型',
+    //   placeholder: '类型',
+    //   type: 'select',
+    //   options: [
+    //     { label: '全部', value: '' },
+    //     { label: '买房', value: '1' },
+    //     { label: '租房', value: '2' },
+    //     { label: '海外', value: '3' }
+    //   ]
+    // },
+    {
+      name: 'verifyStatus',
+      label: '状态',
+      placeholder: '请选择状态',
+      type: 'select',
+      placeholder: '全部',//错误
+      options: [
+        { label: '全部', value: '' },
+        { label: '待回访', value: '0' },
+        { label: '已回访', value: '1' },
+        { label: '无效', value: '2' }
+      ]
+    },
+  ]
+  const actionRender = () => {
+    return (
+      <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+        导出
+      </Button>
+    );
+  };
+
+  return (
+    <>
+      <QueryTable
+        rowKey="recommendCustomer"
+        // recommendCustomer
+        api={apis.searchHouse.list}
+        searchFields={searchFields}
+        columns={columns}
+        actionRender={actionRender}
+      />
+
+    </>
+  );
+}
+
+export default Recommend

src/pages/staff/staff/Edit/index.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { Input, Card, message, Select } from 'antd';
-import OrganizationSelect from '@/components/SelectButton/OrganizationSelect';
+import InstitutionSelect from '@/components/SelectButton/InstitutionSelect';
 import router from 'umi/router';
 import { FieldTypes, createForm } from '@/components/XForm';
 import apis from '@/services/apis';
@@ -70,6 +70,7 @@ const StaffEdit = props => {
   }, []);
 
   const handleSubmit = val => {
+    // val.institutionIdLis =  val.institutionIdLis.join(',')
     if (userId) {
       request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val })
         .then(data => {
@@ -200,8 +201,8 @@ const StaffEdit = props => {
     },
     {
       label: '组织机构',
-      name: 'institutionId',
-      render: <OrganizationSelect />,
+      name: 'institutionIdLis',
+      render: <InstitutionSelect multiple/>,
       value: userData.institutionId,
       rules: [{ required: true, message: '组织机构' }],
     },