fix

src/pages/channel/Channel/List/index.jsx

@@ -71,7 +71,7 @@ export default function ChannelList(props) {
 
   const searchFields = [
     {
-      name: 'cityId',
+      name: 'channelId',
       label: '渠道名称',
       placeholder: '请选择渠道',
       render: () => <ChannelSelect style={{ width: 160 }} />,

src/pages/findRoom/addedValueService/audit.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Card, Radio, notification, Select } from 'antd';
+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';
@@ -42,7 +42,7 @@ function body(props) {
   const [dataSource, setDataSource] = useState({ picture: '' });
 
   const { id,type } = props.location.query;
-  const disabled= type==='detail'
+  const disabled= true
 
   useEffect(() => {
     if (id !== '') {
@@ -54,8 +54,30 @@ function body(props) {
     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 导致在呈现字段之前无法设置表单字段
+        const b = {};
+        JSON.parse(res?.questionnaire)?.map(x => {
+          
+          if (x.key === 'important' ||x.key === 'special' ||x.key === 'style'||x.key === 'mostImportant') { 
+            b[x.key] = [x.resultId];
+            return;
+          }
+          if (x.key === 'maxPrice') {
+            b[x.key] = x.result / 10000;
+            return;
+          }
+          if (x.type === 'checkbox') {
+            b[x.key] = x.resultId;
+          } else {
+            b[x.key] = x.result;
+          }
+        });
+
+        console.log(b, 'questionnaire');
+        props.form.setFieldsValue({
+          ...res,
+          reportDate: moment(res.reportDate),
+          ...b,
+        });
       }
     });
   }
@@ -64,11 +86,11 @@ function body(props) {
     // 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'),
+      ...apis.searchHouse.reply,
+      urlData: { id },
+      data: {
+        auditRemark: props.form.getFieldValue('auditRemark'),
+        status: params.status,
       },
     })
       .then(() => {
@@ -86,7 +108,7 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        submitDate({ verifyStatus: '1' });
+        submitDate({ status: '1' });
         // submitDate({ ...values })
       }
     });
@@ -99,100 +121,169 @@ function body(props) {
         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 label="客户姓名">
+          {getFieldDecorator('nickname')(<Input placeholder="客户姓名" disabled />)}
         </Form.Item>
         <Form.Item label="客户电话">
-          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled={disabled}/>)}
+          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled />)}
         </Form.Item>
         <Form.Item label="客户性别">
-          {getFieldDecorator('sex')(
-            <Radio.Group disabled={disabled}>
-              <Radio value={1}>男</Radio>
-              <Radio value={2}>女</Radio>
+          {getFieldDecorator('gender')(
+            <Radio.Group disabled>
+              <Radio value="1">男</Radio>
+              <Radio value="2">女</Radio>
             </Radio.Group>,
           )}
         </Form.Item>
         <Form.Item label="客户预算">
-          {getFieldDecorator('name')(<Input placeholder="客户预算" disabled={disabled} suffix="W"/>)}
+          {getFieldDecorator('maxPrice')(
+            <Input placeholder="客户预算" disabled={disabled} suffix="W" />,
+          )}
         </Form.Item>
 
         <Form.Item label="房屋现状">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('houseStatus')(
             <Select placeholder="房屋现状" disabled={disabled}>
-              <Option value="新房">毛坯</Option>
-              <Option value="旧房装修5年以内">旧房装修5年以内</Option>
-              <Option value="旧房装修5-10年">旧房装修5-10年</Option>
-              <Option value="旧房装修10年以上">旧房装修10年以上</Option>
+              <Option value={1}>毛坯</Option>
+              <Option value={2}>旧房装修5年以内</Option>
+              <Option value={3}>旧房装修5-10年</Option>
+              <Option value={4}>旧房装修10年以上</Option>
             </Select>,
           )}
         </Form.Item>
         <Form.Item label="房屋面积">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('area')(
             <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>     
+              <Option value={1}>50m²</Option>
+              <Option value={2}>50~70m²</Option>
+              <Option value={3}>70~90m²</Option>
+              <Option value={4}>90~110m²</Option>
+              <Option value={5}>110~130m²</Option>
+              <Option value={6}>130~150m²</Option>  
+              <Option value={7}>150~200m²</Option>  
+              <Option value={8}>200m²以上</Option>     
             </Select>,
           )}
         </Form.Item>
 
         <Form.Item label="家装模式">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('type')(
             <Select placeholder="家装模式" disabled={disabled}>
-              <Option value="新房">只做设计</Option>
-              <Option value="二手房">材料全包</Option>
-              <Option value="不限">包工不包料</Option>
-              <Option value="二手房">施工包辅材不包主材</Option>
-              <Option value="不限">全包</Option>
+              <Option value={1}>只做设计</Option>
+              <Option value={2}>材料全包</Option>
+              <Option value={3}>包工不包料</Option>
+              <Option value={4}>施工包辅材不包主材</Option>
+              <Option value={5}>全包</Option>
+             
             </Select>,
           )}
         </Form.Item>
 
         <Form.Item label="家装侧重点">
-          {getFieldDecorator('more')(
+          {getFieldDecorator('important')(
             <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 value={1}>家装价格</Checkbox>
+              <Checkbox value={2}>施工品质</Checkbox>
+              <Checkbox value={3}>设计感</Checkbox>
+              <Checkbox value={4}>环保</Checkbox>
+              <Checkbox value={5}>舒适度</Checkbox>
+              <Checkbox value={6}>实用度</Checkbox>
+            </Checkbox.Group>,
+          )}
+        </Form.Item>
+         <Form.Item label="家装风格">
+          {getFieldDecorator('style')(
+            <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 value={11}>混搭风格</Checkbox>
             </Checkbox.Group>,
           )}
         </Form.Item>
-  
 
-        <Form.Item label="客户备注" >
-          {getFieldDecorator('say')(<TextArea placeholder="客户描述" disabled={disabled} rows={7} />)}
+        <Form.Item label="关键诉求">
+          {getFieldDecorator('mostImportant')(
+            <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.Group>,
+          )}
         </Form.Item>
+
+        <Form.Item label="特殊功能区">
+          {getFieldDecorator('special')(
+            <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('samrt')(
+            <Select placeholder="是否智能家居" disabled={disabled}>
+              <Option value={1}>会</Option>
+              <Option value={2}>非常实用高效</Option>
+              <Option value={3}>会选择感兴趣部分</Option>
+              <Option value={4}>不会选择</Option>
+              <Option value={5}>新奇过多实用</Option>
+              <Option value={4}>暂时不了解智能家居</Option>
+              <Option value={5}>其他</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        {/* <Form.Item label="家装侧重点">
+          {getFieldDecorator('important')(
+            <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('describe', {
+          {getFieldDecorator('auditRemark', {
             rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
-          })(<TextArea placeholder="回访备注" disabled={disabled} rows={7} />)}
+          })(<TextArea placeholder="回访备注" disabled={type === 'detail'} rows={7} />)}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" htmlType="submit">
+         {type === 'detail'?<Button onClick={()=>{router.go('-1')}}>
+            返回
+          </Button>:<> <Button type="primary" htmlType="submit">
             有效
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => submitDate({ verifyStatus: '2' })}>无效</Button>
+          <Button onClick={() => submitDate({ status: '2' })}>无效</Button></>}
         </Form.Item>
       </Form>
     </Card>

src/pages/findRoom/addedValueService/index.jsx

@@ -106,15 +106,15 @@ function Recommend() {
       key: 'intentArea',
       align: 'center',
       // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
+      render: (_, record) => <><span>{JSON.parse(record.questionnaire)?.filter(x=>x.key=='houseStatus')[0]?.result}</span></>,
 
     },
     {
       title: '装修预算',
-      dataIndex: 'intention',
-      key: 'intention',
+      dataIndex: 'maxPrice',
+      key: 'maxPrice',
       align: 'center',
-      // render:(_,record)=><span>{record='香颂.蔚澜半岛'}</span>
-
+     
     },
     {
       title: '提交时间',
@@ -128,7 +128,7 @@ function Recommend() {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访' : record.verifyStatus === 2 ? '无效' : ''}</span></>,
+      render: (_, record) => <><span>{record.status == '0' ? '待回访' : record.status == '1' ? '已回访' : record.status == '2' ? '无效' : ''}</span></>,
     },
     {
       title: '操作',
@@ -137,13 +137,8 @@ function Recommend() {
       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> */}
+        <>{record.status == '0'?<Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>:
+        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>}
         </>
       ),
     },
@@ -208,7 +203,7 @@ function Recommend() {
           data.type='4'
           return data;
         }}
-        actionRender={actionRender}
+        // actionRender={actionRender}
       />
 
     </>

src/pages/findRoom/buyRoom/audit.jsx

@@ -19,7 +19,7 @@ const tailFormItemLayout = {
     sm: { span: 16 },
   },
 };
-
+const questionnaire = `[{"question":"你的购房预算是多少？","key":"minPrice","type":"range","result":1000000,"resultId":null,"options":[100,500]},{"question":"你的购房预算是多少？","key":"maxPrice","type":"range","result":2910000,"resultId":null,"options":[100,500]},{"question":"你想购买的是新房还是二手房？","key":"isNew","type":"checkbox","result":"新房","resultId":1,"options":[{"name":"新房","id":1},{"name":"二手房","id":2},{"name":"不限","id":3}]},{"question":"你想住几居室的房子？","key":"layout","type":"checkbox","result":"三室二厅","resultId":5,"options":[{"name":"一室一厅","id":1},{"name":"二室一厅","id":2},{"name":"二室二厅","id":3},{"name":"三室一厅","id":4},{"name":"三室二厅","id":5},{"name":"四室一厅","id":6},{"name":"四室二厅","id":7},{"name":"五室及以上","id":8}]},{"question":"你的购房目的？","key":"purpose","type":"checkbox","result":"教育","resultId":5,"options":[{"name":"刚需","id":1},{"name":"结婚","id":2},{"name":"养老","id":3},{"name":"改善","id":4},{"name":"教育","id":5},{"name":"投资","id":6}]},{"question":"你更注重项目的哪些优势？","key":"advantage","type":"checkbox","result":"学区","resultId":2,"options":[{"name":"发展规划","id":1},{"name":"学区","id":2},{"name":"交通","id":3},{"name":"配套","id":4},{"name":"环境","id":5}]},{"question":"你对小区物业管理和社区设施有什么要求？","key":"facility","type":"checkbox","result":"楼栋管家","resultId":1,"remark":"","options":[{"name":"楼栋管家","id":1},{"name":"金钥匙服务","id":2},{"name":"社区娱乐","id":3},{"name":"会所功能","id":4}]},{"question":"你想买多大面积？","key":"area","type":"checkbox","result":"110-130㎡","resultId":4,"options":[{"name":"60㎡以下","id":1},{"name":"60-90㎡","id":2},{"name":"90-110㎡","id":3},{"name":"110-130㎡","id":4},{"name":"130-150㎡","id":5},{"name":"150-200㎡","id":6},{"name":"200㎡以上","id":7}]},{"question":"你更喜欢的朝向？","key":"orientation","type":"checkbox","result":"朝南","resultId":2,"options":[{"name":"朝东","id":1},{"name":"朝南","id":2},{"name":"朝西","id":3},{"name":"朝北","id":4},{"name":"南北通透","id":5}]},{"question":"你想住高楼层还是低楼层？","key":"isHigh","type":"checkbox","result":"低楼层","resultId":1,"options":[{"name":"低楼层","id":1},{"name":"中楼层","id":2},{"name":"高楼层","id":3},{"name":"低层","id":4},{"name":"顶层","id":5}]},{"question":"你对楼龄的要求是？","key":"buildingAge","type":"checkbox","result":"5年以内","resultId":1,"options":[{"name":"5年以内","id":1},{"name":"10年以内","id":2},{"name":"15年以内","id":3},{"name":"20年以内","id":4},{"name":"20年以上","id":5}]},{"result":null,"key":"intentArea","question":"意向区域"},{"question":"创建人小程序人员","result":"b47e82b90071ba6142c07436c80be81f","key":"personId"}]`;
 const openNotificationWithIcon = (type, message) => {
   notification[type]({
     message,
@@ -41,8 +41,8 @@ function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ picture: '' });
 
-  const { id,type } = props.location.query;
-  const disabled= type==='detail'
+  const { id, type } = props.location.query;
+  const disabled = true;
 
   useEffect(() => {
     if (id !== '') {
@@ -54,7 +54,31 @@ function body(props) {
     request({ ...apis.searchHouse.IdHouse, urlData: { id: currentId } }).then(res => {
       // res.reportDate = moment(res.reportDate)
       if (res) {
-        props.form.setFieldsValue({ ...res, reportDate: moment(res.reportDate) });
+
+        const b = {};
+        JSON.parse(res?.questionnaire)?.map(x => {
+          if (x.key === 'intentArea') {
+          
+            return;
+          }
+          if (x.key === 'maxPrice') {
+            b[x.key] = x.result / 10000;
+            return;
+          }
+          if (x.type === 'checkbox') {
+            b[x.key] = x.resultId;
+          } else {
+            b[x.key] = x.result;
+          }
+        });
+
+        // console.log(b, 'questionnaire');
+        props.form.setFieldsValue({
+          ...res,
+          reportDate: moment(res.reportDate),
+          ...b,
+          intentArea: res.intentArea,
+        });
         //包裹的没渲染完就执行set 导致在呈现字段之前无法设置表单字段
       }
     });
@@ -64,11 +88,11 @@ function body(props) {
     // 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'),
+      ...apis.searchHouse.reply,
+      urlData: { id },
+      data: {
+        auditRemark: props.form.getFieldValue('auditRemark'),
+        status: params.status,
       },
     })
       .then(() => {
@@ -86,7 +110,7 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        submitDate({ verifyStatus: '1' });
+        submitDate({ status: '1' });
         // submitDate({ ...values })
       }
     });
@@ -104,149 +128,153 @@ function body(props) {
         </Form.Item> */}
         {/* ············分割线............. */}
         <Form.Item label="意向区域">
-          {getFieldDecorator('intention')(<Input placeholder="意向区域：" disabled={disabled}/>)}
+          {getFieldDecorator('name')(<Input placeholder="意向区域" disabled={disabled} />)}
         </Form.Item>
         <Form.Item label="客户姓名">
-          {getFieldDecorator('name')(<Input placeholder="客户姓名" disabled={disabled}/>)}
+          {getFieldDecorator('nickname')(<Input placeholder="客户姓名" disabled />)}
         </Form.Item>
         <Form.Item label="客户电话">
-          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled={disabled}/>)}
+          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled />)}
         </Form.Item>
         <Form.Item label="客户性别">
-          {getFieldDecorator('sex')(
-            <Radio.Group disabled={disabled}>
-              <Radio value={1}>男</Radio>
-              <Radio value={2}>女</Radio>
+          {getFieldDecorator('gender')(
+            <Radio.Group disabled>
+              <Radio value="1">男</Radio>
+              <Radio value="2">女</Radio>
             </Radio.Group>,
           )}
         </Form.Item>
         <Form.Item label="客户预算">
-          {getFieldDecorator('name')(<Input placeholder="客户预算" disabled={disabled} suffix="W"/>)}
+          {getFieldDecorator('maxPrice')(
+            <Input placeholder="客户预算" disabled={disabled} suffix="W" />,
+          )}
         </Form.Item>
         <Form.Item label="房屋类型">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('isNew')(
             <Select placeholder="房屋类型" disabled={disabled}>
-              <Option value="新房">新房</Option>
-              <Option value="二手房">二手房</Option>
-              <Option value="不限">不限</Option>
+              <Option value={1}>新房</Option>
+              <Option value={2}>二手房</Option>
+              <Option value={3}>不限</Option>
             </Select>,
           )}
         </Form.Item>
         <Form.Item label="意向居室">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('layout')(
             <Select placeholder="意向居室" disabled={disabled}>
-              <Option value="一居">一居</Option>
-              <Option value="二居">二居</Option>
-              <Option value="三居">三居</Option>
-              <Option value="四居">四居</Option>
-              <Option value="五居">五居</Option>
-              <Option value="五居以上">五居以上</Option>
+              <Option value={1}>一室一厅</Option>
+              <Option value={2}>二室一厅</Option>
+              <Option value={3}>二室二厅</Option>
+              <Option value={4}>三室一厅</Option>
+              <Option value={5}>三室二厅</Option>
+              <Option value={6}>四室一厅</Option>
+              <Option value={7}>四室二厅</Option>
+              <Option value={8}>四室二五室及以上厅</Option>
             </Select>,
           )}
         </Form.Item>
-
+ 
         <Form.Item label="购房目的">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('purpose')(
             <Select placeholder="购房目的" disabled={disabled}>
-              <Option value="刚需">刚需</Option>
-              <Option value="结婚">结婚</Option>
-              <Option value="养老">养老</Option>
-              <Option value="改善">改善</Option>
-              <Option value="教育">教育</Option>
-              <Option value="投资">投资</Option>
+              <Option value={1}>刚需</Option>
+              <Option value={2}>结婚</Option>
+              <Option value={3}>养老</Option>
+              <Option value={4}>改善</Option>
+              <Option value={5}>教育</Option>
+              <Option value={6}>投资</Option>
             </Select>,
           )}
         </Form.Item>
         <Form.Item label="侧重优势">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('advantage')(
             <Select placeholder="侧重优势" disabled={disabled}>
-              <Option value="发展规划">发展规划</Option>
-              <Option value="学区">学区</Option>
-              <Option value="交通">交通</Option>
-              <Option value="配套">配套</Option>
-              <Option value="环境">环境</Option>
-            
+              <Option value={1}>发展规划</Option>
+              <Option value={2}>学区</Option>
+              <Option value={3}>交通</Option>
+              <Option value={4}>配套</Option>
+              <Option value={5}>环境</Option>
             </Select>,
           )}
         </Form.Item>
 
         <Form.Item label="社区要求">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('facility')(
             <Select placeholder="社区要求" disabled={disabled}>
-              <Option value="发展规划">楼栋管家</Option>
-              <Option value="学区">金钥匙服务</Option>
-              <Option value="交通">社区娱乐</Option>
-              <Option value="配套">会所功能</Option>     
+              <Option value={1}>楼栋管家</Option>
+              <Option value={2}>金钥匙服务</Option>
+              <Option value={3}>社区娱乐</Option>
+              <Option value={4}>会所功能</Option>
             </Select>,
           )}
         </Form.Item>
 
         <Form.Item label="面积要求">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('area')(
             <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>     
+              <Option value={1}>60m²</Option>
+              <Option value={2}>60~90m²</Option>
+              <Option value={3}>110~130m²</Option>
+              <Option value={4}>130~150m²</Option>
+              <Option value={5}>150~200m²</Option>
+              <Option value={6}>200m²以上</Option>
             </Select>,
           )}
         </Form.Item>
 
         <Form.Item label="朝向要求">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('orientation')(
             <Select placeholder="朝向要求" disabled={disabled}>
-              <Option value="朝东">朝东</Option>
-              <Option value="朝南">朝南</Option>
-              <Option value="朝西">朝西</Option>
-              <Option value="朝北">朝北</Option>  
-              <Option value="南北通透">南北通透</Option>  
-                
+              <Option value={1}>朝东</Option>
+              <Option value={2}>朝南</Option>
+              <Option value={3}>朝西</Option>
+              <Option value={4}>朝北</Option>
+              <Option value={5}>南北通透</Option>
             </Select>,
           )}
         </Form.Item>
 
-        <Form.Item label="楼层要求" >
-          {getFieldDecorator('housetype')(
+        <Form.Item label="楼层要求">
+          {getFieldDecorator('isHigh')(
             <Select placeholder="楼层要求" disabled={disabled}>
-             <Option value="低楼层">低楼层</Option>
-              <Option value="中楼层">中楼层</Option>
-              <Option value="高楼层">高楼层</Option>
-              <Option value="底层">底层</Option>  
-              <Option value="顶层">顶层</Option>  
-                
+              <Option value={1}>低楼层</Option>
+              <Option value={2}>中楼层</Option>
+              <Option value={3}>高楼层</Option>
+              <Option value={4}>底层</Option>
+              <Option value={5}>顶层</Option>
             </Select>,
           )}
         </Form.Item>
 
         <Form.Item label="楼龄要求">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('buildingAge')(
             <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>  
-                
+              <Option value={1}>5年以内</Option>
+              <Option value={2}>10年以内</Option>
+              <Option value={3}>15年以内</Option>
+              <Option value={4}>20年以内</Option>
+              <Option value={5}>20年以上</Option>
             </Select>,
           )}
         </Form.Item>
 
-        <Form.Item label="客户备注" >
-          {getFieldDecorator('say')(<TextArea placeholder="客户描述" disabled={disabled} rows={7} />)}
+        <Form.Item label="客户备注">
+          {getFieldDecorator('remark')(
+            <TextArea placeholder="客户描述" disabled={disabled} rows={7} />,
+          )}
         </Form.Item>
         <Form.Item label="回访备注">
-          {getFieldDecorator('describe', {
+          {getFieldDecorator('auditRemark', {
             rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
-          })(<TextArea placeholder="回访备注" disabled={disabled} rows={7} />)}
+          })(<TextArea placeholder="回访备注" disabled={type === 'detail'} rows={7} />)}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" htmlType="submit">
+         {type === 'detail'?<Button onClick={()=>{router.go('-1')}}>
+            返回
+          </Button>:<> <Button type="primary" htmlType="submit">
             有效
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => submitDate({ verifyStatus: '2' })}>无效</Button>
+          <Button onClick={() => submitDate({ status: '2' })}>无效</Button></>}
         </Form.Item>
       </Form>
     </Card>

src/pages/findRoom/buyRoom/index.jsx

@@ -102,18 +102,18 @@ function Recommend() {
     },
     {
       title: '意向区域',
-      dataIndex: 'intentArea',//意向区域
-      key: 'intentArea',
+      dataIndex: 'name',//意向区域
+      key: 'name',
       align: 'center',
       // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
 
     },
     {
       title: '购房预算',
-      dataIndex: 'intention',
-      key: 'intention',
+      dataIndex: 'maxPrice',
+      key: 'maxPrice',
       align: 'center',
-      // render:(_,record)=><span>{record='香颂.蔚澜半岛'}</span>
+      render:(x)=>x&&<span>{x/10000}万</span>
 
     },
     {
@@ -128,7 +128,7 @@ function Recommend() {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访' : record.verifyStatus === 2 ? '无效' : ''}</span></>,
+      render: (_, record) => <><span>{record.status == '0' ? '待回访' : record.status == '1' ? '已回访' : record.status == '2' ? '无效' : ''}</span></>,
     },
     {
       title: '操作',
@@ -137,13 +137,8 @@ function Recommend() {
       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> */}
+        <>{record.status == '0'?<Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>:
+        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>}
         </>
       ),
     },
@@ -157,7 +152,7 @@ function Recommend() {
       placeholder: '请输入姓名',
     },
     {
-      name: 'tel',
+      name: 'phone',
       label: '电话',
       placeholder: '请输入电话',
     },
@@ -174,7 +169,7 @@ function Recommend() {
     //   ]
     // },
     {
-      name: 'verifyStatus',
+      name: 'status',
       label: '状态',
       placeholder: '请选择状态',
       type: 'select',
@@ -209,7 +204,7 @@ function Recommend() {
           return data;
         }}
         columns={columns}
-        actionRender={actionRender}
+        // actionRender={actionRender}
       />
 
     </>

src/pages/findRoom/overseas/audit.jsx

@@ -41,8 +41,8 @@ function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ picture: '' });
 
-  const { id,type } = props.location.query;
-  const disabled= type==='detail'
+  const { id, type } = props.location.query;
+  const disabled = true;
 
   useEffect(() => {
     if (id !== '') {
@@ -54,8 +54,26 @@ function body(props) {
     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 导致在呈现字段之前无法设置表单字段
+        const b = {};
+        JSON.parse(res?.questionnaire)?.map(x => {
+         
+          if (x.key === 'maxPrice') {
+            b[x.key] = x.result / 10000;
+            return;
+          }
+          if (x.type === 'checkbox') {
+            b[x.key] = x.resultId;
+          } else {
+            b[x.key] = x.result;
+          }
+        });
+
+        console.log(b, 'questionnaire');
+        props.form.setFieldsValue({
+          ...res,
+          reportDate: moment(res.reportDate),
+          ...b,
+        });
       }
     });
   }
@@ -64,11 +82,11 @@ function body(props) {
     // 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'),
+      ...apis.searchHouse.reply,
+      urlData: { id },
+      data: {
+        auditRemark: props.form.getFieldValue('auditRemark'),
+        status: params.status,
       },
     })
       .then(() => {
@@ -86,7 +104,7 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        submitDate({ verifyStatus: '1' });
+        submitDate({ status: '1' });
         // submitDate({ ...values })
       }
     });
@@ -104,62 +122,77 @@ function body(props) {
         </Form.Item> */}
         {/* ············分割线............. */}
         <Form.Item label="意向区域">
-          {getFieldDecorator('intention')(<Input placeholder="意向区域：" disabled={disabled}/>)}
+          {getFieldDecorator('intentArea')(<Input placeholder="意向区域：" disabled={disabled} />)}
         </Form.Item>
         <Form.Item label="客户姓名">
-          {getFieldDecorator('name')(<Input placeholder="客户姓名" disabled={disabled}/>)}
+          {getFieldDecorator('nickname')(<Input placeholder="客户姓名" disabled={disabled} />)}
         </Form.Item>
         <Form.Item label="客户电话">
-          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled={disabled}/>)}
+          {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>
+          {getFieldDecorator('gender')(
+            <Radio.Group disabled>
+              <Radio value="1">男</Radio>
+              <Radio value="2">女</Radio>
             </Radio.Group>,
           )}
         </Form.Item>
         <Form.Item label="客户预算">
-          {getFieldDecorator('name')(<Input placeholder="客户预算" disabled={disabled} suffix="W"/>)}
+          {getFieldDecorator('maxPrice')(
+            <Input placeholder="客户预算" disabled={disabled} suffix="W" />,
+          )}
         </Form.Item>
         <Form.Item label="房屋类型">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('isNew')(
             <Select placeholder="房屋类型" disabled={disabled}>
-              <Option value="新房">新房</Option>
-              <Option value="二手房">二手房</Option>
-              <Option value="不限">不限</Option>
+              <Option value={1}>新房</Option>
+              <Option value={2}>二手房</Option>
+              <Option value={3}>不限</Option>
             </Select>,
           )}
         </Form.Item>
-      
 
         <Form.Item label="购房目的">
-          {getFieldDecorator('housetype')(
+          {getFieldDecorator('layout')(
             <Select placeholder="购房目的" disabled={disabled}>
-              <Option value="刚需">投资</Option>
-              <Option value="结婚">移民</Option>
-              <Option value="养老">养老</Option>
-              <Option value="改善">留学</Option>
-              <Option value="教育">度假</Option>
+              <Option value={1}>投资</Option>
+              <Option value={2}>移民</Option>
+              <Option value={3}>养老</Option>
+              <Option value={4}>留学</Option>
+              <Option value={5}>度假</Option>
             </Select>,
           )}
         </Form.Item>
-      
-        <Form.Item label="客户备注" >
-          {getFieldDecorator('say')(<TextArea placeholder="客户描述" disabled={disabled} rows={7} />)}
+
+        <Form.Item label="客户备注">
+          {getFieldDecorator('remark')(
+            <TextArea placeholder="客户描述" disabled={disabled} rows={7} />,
+          )}
         </Form.Item>
         <Form.Item label="回访备注">
-          {getFieldDecorator('describe', {
+          {getFieldDecorator('auditRemark', {
             rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
-          })(<TextArea placeholder="回访备注" disabled={disabled} rows={7} />)}
+          })(<TextArea placeholder="回访备注" disabled={type === 'detail'} 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>
+          {type === 'detail' ? (
+            <Button
+              onClick={() => {
+                router.go('-1');
+              }}
+            >
+              返回
+            </Button>
+          ) : (
+            <>
+              <Button type="primary" htmlType="submit">
+                有效
+              </Button>
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <Button onClick={() => submitDate({ status: '2' })}>无效</Button>
+            </>
+          )}
         </Form.Item>
       </Form>
     </Card>

src/pages/findRoom/overseas/index.jsx

@@ -105,15 +105,15 @@ function Recommend() {
       dataIndex: 'intentArea',//意向区域
       key: 'intentArea',
       align: 'center',
-      // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
+      render: (_, record) => <><span>{JSON.parse(record.questionnaire)?.filter(x=>x.key=='intentArea')[0]?.result}</span></>,
 
     },
     {
       title: '购房预算',
-      dataIndex: 'intention',
-      key: 'intention',
+      dataIndex: 'maxPrice',
+      key: 'maxPrice',
       align: 'center',
-      render:(x)=>x&&<span>{x}万</span>
+      render:(x)=>x&&<span>{x/10000}万</span>
 
     },
     {
@@ -128,7 +128,7 @@ function Recommend() {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访' : record.verifyStatus === 2 ? '无效' : ''}</span></>,
+      render: (_, record) => <><span>{record.status == '0' ? '待回访' : record.status == '1' ? '已回访' : record.status == '2' ? '无效' : ''}</span></>,
     },
     {
       title: '操作',
@@ -137,13 +137,8 @@ function Recommend() {
       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> */}
+        <>{record.status == '0'?<Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>:
+        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>}
         </>
       ),
     },
@@ -208,7 +203,7 @@ function Recommend() {
           data.type='3'
           return data;
         }}
-        actionRender={actionRender}
+        // actionRender={actionRender}
       />
 
     </>

src/pages/findRoom/rent/audit.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Card, Radio, notification, Select,Checkbox } from 'antd';
+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';
@@ -26,7 +26,7 @@ const openNotificationWithIcon = (type, message) => {
     description: '',
   });
 };
-
+const questionnaire = `[{"question":"你的租房预算是多少/月？","key":"minPrice","type":"range","result":500,"resultId":null,"options":[500,4500]},{"question":"你的租房预算是多少/月？","key":"maxPrice","type":"range","result":3016,"resultId":null,"options":[500,4500]},{"question":"你的租房偏好？","key":"preference","type":"checkbox","result":"整租","resultId":1,"options":[{"name":"整租","id":1},{"name":"合租","id":2},{"name":"不限","id":3}]},{"question":"你想租几居室的房子？","key":"layout","type":"checkbox","result":"二室","resultId":2,"options":[{"name":"一室","id":1},{"name":"二室","id":2},{"name":"三室","id":3},{"name":"四室","id":4},{"name":"五室及以上","id":5}]},{"question":"其他要求？","key":"purpose","type":"checkbox","result":"独立阳台","resultId":5,"options":[{"name":"独卫","id":1},{"name":"近地铁","id":2},{"name":"拎包入住","id":3},{"name":"精装修","id":4},{"name":"独立阳台","id":5},{"name":"集中供暖","id":6},{"name":"押一付一","id":7},{"name":"双卫","id":8},{"name":"新上","id":9},{"name":"认证公寓","id":10}]},{"question":"您还有哪些特殊要求？","key":"remark","type":"textarea","result":"12","resultId":null},{"result":null,"key":"intentArea","question":"意向区域"},{"question":"创建人小程序人员","result":"b47e82b90071ba6142c07436c80be81f","key":"personId"}]`;
 function body(props) {
   const { getFieldDecorator } = props.form;
 
@@ -42,7 +42,7 @@ function body(props) {
   const [dataSource, setDataSource] = useState({ picture: '' });
 
   const { id, type } = props.location.query;
-  const disabled = type === 'detail';
+  const disabled = true;
 
   useEffect(() => {
     if (id !== '') {
@@ -54,7 +54,37 @@ function body(props) {
     request({ ...apis.searchHouse.IdHouse, urlData: { id: currentId } }).then(res => {
       // res.reportDate = moment(res.reportDate)
       if (res) {
-        props.form.setFieldsValue({ ...res, reportDate: moment(res.reportDate) });
+        const b = {};
+      
+        JSON.parse(res.questionnaire)?.map(x => {
+          if (x.key === 'intentArea') {
+            // b[x.key] = [x.resultId];
+            return;
+          }
+          if (x.key === 'purpose') {
+            b[x.key] = [x.resultId];
+         
+            return;
+          }
+          if (x.key === 'maxPrice') {
+            b[x.key] = x.result;
+            return;
+          }
+          if (x.type === 'checkbox') {
+            b[x.key] = x.resultId;
+          } else {
+            b[x.key] = x.result;
+          }
+        });
+
+        // console.log(b, 'questionnaire');
+        props.form.setFieldsValue({
+          ...res,
+          reportDate: moment(res.reportDate),
+          ...b,
+          intentArea: res.intentArea,
+        });
+        // props.form.setFieldsValue({ ...res, reportDate: moment(res.reportDate) });
         //包裹的没渲染完就执行set 导致在呈现字段之前无法设置表单字段
       }
     });
@@ -64,11 +94,11 @@ function body(props) {
     // 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'),
+      ...apis.searchHouse.reply,
+      urlData: { id },
+      data: {
+        auditRemark: props.form.getFieldValue('auditRemark'),
+        status: params.status,
       },
     })
       .then(() => {
@@ -86,7 +116,7 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        submitDate({ verifyStatus: '1' });
+        submitDate({ status: '1' });
         // submitDate({ ...values })
       }
     });
@@ -104,80 +134,84 @@ function body(props) {
         </Form.Item> */}
         {/* ············分割线............. */}
         <Form.Item label="意向区域">
-          {getFieldDecorator('intention')(<Input placeholder="意向区域：" disabled={disabled} />)}
+          {getFieldDecorator('name')(<Input placeholder="意向区域" disabled={disabled} />)}
         </Form.Item>
         <Form.Item label="客户姓名">
-          {getFieldDecorator('name')(<Input placeholder="客户姓名" disabled={disabled} />)}
+          {getFieldDecorator('nickname')(<Input placeholder="客户姓名" disabled />)}
         </Form.Item>
         <Form.Item label="客户电话">
-          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled={disabled} />)}
+          {getFieldDecorator('phone')(<Input placeholder="客户电话" disabled />)}
         </Form.Item>
         <Form.Item label="客户性别">
-          {getFieldDecorator('sex')(
-            <Radio.Group disabled={disabled}>
-              <Radio value={1}>男</Radio>
-              <Radio value={2}>女</Radio>
+          {getFieldDecorator('gender')(
+            <Radio.Group disabled>
+              <Radio value="1">男</Radio>
+              <Radio value="2">女</Radio>
             </Radio.Group>,
           )}
         </Form.Item>
         <Form.Item label="客户预算">
-          {getFieldDecorator('name')(<Input placeholder="客户预算" disabled={disabled} suffix="元/月"/>)}
+          {getFieldDecorator('maxPrice')(
+            <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>
+        <Form.Item label="租房偏好">
+          {getFieldDecorator('preference')(
+            <Select placeholder="租房偏好" disabled={disabled}>
+              <Option value={1}>整租</Option>
+              <Option value={2}>合租</Option>
+              <Option value={3}>不限</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>
+        <Form.Item label="居室要求">
+          {getFieldDecorator('layout')(
+            <Select placeholder="居室要求" disabled={disabled}>
+              <Option value={1}>一居</Option>
+              <Option value={2}>二居</Option>
+              <Option value={3}>三居</Option>
+              <Option value={4}>四居</Option>
+              <Option value={5}>五居</Option>
+              <Option value={6}>五居以上</Option>
             </Select>,
           )}
         </Form.Item>
 
-        <Form.Item label="意向居室">
-          {getFieldDecorator('more')(
+        <Form.Item label="其他要求">
+          {getFieldDecorator('purpose')(
             <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 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')(
+          {getFieldDecorator('remark')(
             <TextArea placeholder="客户描述" disabled={disabled} rows={7} />,
           )}
         </Form.Item>
         <Form.Item label="回访备注">
-          {getFieldDecorator('describe', {
+          {getFieldDecorator('auditRemark', {
             rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
-          })(<TextArea placeholder="回访备注" disabled={disabled} rows={7} />)}
+          })(<TextArea placeholder="回访备注" disabled={type === 'detail'} rows={7} />)}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" htmlType="submit">
+         {type === 'detail'?<Button onClick={()=>{router.go('-1')}}>
+            返回
+          </Button>:<> <Button type="primary" htmlType="submit">
             有效
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => submitDate({ verifyStatus: '2' })}>无效</Button>
+          <Button onClick={() => submitDate({ status: '2' })}>无效</Button></>}
         </Form.Item>
       </Form>
     </Card>

src/pages/findRoom/rent/index.jsx

@@ -102,16 +102,16 @@ function Recommend() {
     },
     {
       title: '意向区域',
-      dataIndex: 'intentArea',//意向区域
-      key: 'intentArea',
+      dataIndex: 'name',//意向区域
+      key: 'name',
       align: 'center',
       // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
 
     },
     {
       title: '租房预算（元/月）',
-      dataIndex: 'intention',
-      key: 'intention',
+      dataIndex: 'maxPrice',
+      key: 'maxPrice',
       align: 'center',
       // render:(_,record)=><span>{record='香颂.蔚澜半岛'}</span>
 
@@ -128,7 +128,7 @@ function Recommend() {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访' : record.verifyStatus === 2 ? '无效' : ''}</span></>,
+      render: (_, record) => <><span>{record.status == 0 ? '待回访' : record.status == 1 ? '已回访' : record.status == 2 ? '无效' : ''}</span></>,
     },
     {
       title: '操作',
@@ -137,13 +137,8 @@ function Recommend() {
       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> */}
+        <>{record.status == '0'?<Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>:
+        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>}
         </>
       ),
     },
@@ -208,7 +203,7 @@ function Recommend() {
           return data;
         }}
         columns={columns}
-        actionRender={actionRender}
+        // actionRender={actionRender}
       />
 
     </>

src/services/apis.js

@@ -332,9 +332,10 @@ export default {
       action: 'admin.searchHouse.id.put',
     },
     //回访
-    savingHouse: {
-      method: 'POST',
-      url: `${prefix}/searchHouse`,
+    reply: {
+      
+      method: 'PUT',
+      url: `${prefix}/reply/:id`,
       action: '',
     },
   },