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

@@ -97,6 +97,13 @@ export default [
                 hideInMenu: true,
                 component: './customer/customerlist/customerDetail',
               },
+              {
+                path: '/customer/customer/StatusChange',
+                name: '状态变更',
+                hideInMenu: true,
+                component: './customer/Customer/StatusChange',
+              },
+              
               // {
               //   path: '/customer/drift/list',
               //   name: '游客列表',
@@ -136,36 +143,36 @@ export default [
             ],
           },
 
-          {
-            path: '/recommend',
-            name: '推荐客户',
-            component: '../layouts/BlankLayout',
-            routes: [
-              {
-                path: '/recommend/customer',
-                name: '客户推荐',
-                component: './recommend/customer',
-              },
-              {
-                path: '/recommend/customer/audit',
-                name: '客户审核',
-                hideInMenu: true,
-                component: './recommend/customer/audit',
-              },
+          // {
+          //   path: '/recommend',
+          //   name: '推荐客户',
+          //   component: '../layouts/BlankLayout',
+          //   routes: [
+          //     {
+          //       path: '/recommend/customer',
+          //       name: '客户推荐',
+          //       component: './recommend/customer',
+          //     },
+          //     {
+          //       path: '/recommend/customer/audit',
+          //       name: '客户审核',
+          //       hideInMenu: true,
+          //       component: './recommend/customer/audit',
+          //     },
 
-              {
-                path: '/recommend/channel',
-                name: '经纪人推荐',
-                component: './recommend/channel',
-              },
-              {
-                path: '/recommend/channel/audit',
-                name: '客户审核',
-                hideInMenu: true,
-                component: './recommend/channel/audit',
-              },
-            ],
-          },
+          //     {
+          //       path: '/recommend/channel',
+          //       name: '经纪人推荐',
+          //       component: './recommend/channel',
+          //     },
+          //     {
+          //       path: '/recommend/channel/audit',
+          //       name: '客户审核',
+          //       hideInMenu: true,
+          //       component: './recommend/channel/audit',
+          //     },
+          //   ],
+          // },
           {
             path: '/staff',
             name: '员工管理',

src/pages/customer/Customer/PrivateCustomer/index.jsx

@@ -119,8 +119,8 @@ const PrivateCustomer = () => {
       },
       {
         title: '推广人员',
-        dataIndex: 'sharePersonName',
-        key: 'sharePersonName',
+        dataIndex: 'recommendName',
+        key: 'recommendName',
         align: 'center',
         width: '10%',
       },
@@ -139,11 +139,17 @@ const PrivateCustomer = () => {
             return '到访';
           }
           if (records.status === 3) {
-            return '认购';
+            return '认筹';
           }
           if (records.status === 4) {
             return '签约';
           }
+          if (records.status === 5) {
+            return '结佣';
+          }
+          // if (records.status === 6) {
+          //   return '报废';
+          // }
         },
       },
       {
@@ -153,30 +159,35 @@ const PrivateCustomer = () => {
         align: 'center',
         width: '20%',
         render: withActions((_, record) => [
-          <Button  type="link" onClick={() => toCustomerDateil(record)}>
+          <Button type="link" onClick={() => toCustomerDateil(record)}>
             查看详情
           </Button>,
           // <EditIcon color="#FF4A4A" text="查看详情" onClick={() => toCustomerDateil(record)} />,
           <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
             <Button
-            
               type="link"
-              onClick={() => handShowModel(record, actionList.changeStatus)}
+              onClick={() => {
+                router.push({
+                  pathname: '/customer/customer/StatusChange',
+                  query: {
+                    id: record.customerId,
+                    buildingId:record.buildingId
+                  },
+                });
+              }}
+
+              // });
+              // onClick={() => handShowModel(record, actionList.changeStatus)}
             >
               变更状态
             </Button>
           </AuthButton>,
 
           <AuthButton name="admin.customer.recommend.belong" noRight={null}>
-            <Button
-            
-              type="link"
-              onClick={() => handShowModel(record, actionList.attribution)}
-            >
+            <Button type="link" onClick={() => handShowModel(record, actionList.attribution)}>
               调整归属
             </Button>
           </AuthButton>,
-
         ]),
       },
     ];
@@ -224,7 +235,6 @@ const PrivateCustomer = () => {
   };
 
   const actionRender = () => {
-    
     return (
       <Button type="danger" loading={exportLoding} onClick={() => exportCustomer()}>
         导出

src/pages/customer/Customer/PrivateCustomer/searchFields.js

@@ -27,7 +27,9 @@ export default () => [
       {label: '报备', value: 1},
       {label: '到访', value: 2},
       {label: '认筹', value: 3},
-      {label: '签约', value: 4}
+      {label: '签约', value: 4},
+      {label: '结佣', value: 5},
+      // {label: '作废', value: 6}
     ]
   },
   {

src/pages/customer/Customer/PublicCustomer/components/AssistConsultant.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Table, Modal, notification } from 'antd';
+import { Table, Modal, notification,Button } from 'antd';
 import request from '@/utils/request';
 import apis from '@/services/apis';
 import BuildSelect from '../../../../../components/SelectButton/BuildSelect';
@@ -44,7 +44,7 @@ const AssistConsultant = props => {
 
   useEffect(() => {
     if (visible) {
-      getList({ pageNumber: 1, pageSize: 5 });
+      getList({ pageNumber: 1, pageSize: 5,buildingId: data.buildingId });
     } else {
       setTableData({});
     }
@@ -133,13 +133,13 @@ const AssistConsultant = props => {
 
         {data && (
           <>
-            {data.customerId?.length > 0 && (
+            {/* {data.customerId?.length > 0 && (
               <>
                 <span>你正在为{data.customerId.length}位公客分配置业顾问</span>
                 <br />
                 <br />
               </>
-            )}
+            )} */}
             {data?.buildingId == null && (
               <BuildSelect onChange={e => changBuilding(e)} value={data?.buildingName} />
             )}
@@ -147,6 +147,7 @@ const AssistConsultant = props => {
               dataSource={tableData.records}
               columns={columns}
               loading={loading}
+              key={'userId'}
               pagination={{
                 pageSize: tableData.pageSize,
                 total: tableData.total,

src/pages/customer/Customer/PublicCustomer/index.jsx

@@ -200,7 +200,7 @@ const PublicCustomer = () => {
       <Button type="danger" loading={exportLoding} onClick={() => exportCustomer()}>
           导出
         </Button>
-        <AuthButton name="admin.customer.import" noRight={null}>
+        {/* <AuthButton name="admin.customer.import" noRight={null}>
           <Button
             type="primary"
             onClick={() => batchAssistConsultant()}
@@ -208,7 +208,7 @@ const PublicCustomer = () => {
           >
             批量分配置业顾问
           </Button>
-        </AuthButton>
+        </AuthButton> */}
         
       </>
     );
@@ -230,7 +230,7 @@ const PublicCustomer = () => {
     <>
       <QueryTable
         ref={ref}
-        rowSelection={rowSelection}
+        // rowSelection={rowSelection}
         rowKey="customerId"
         api={apis.customer.customerRecommend}
         searchFields={searchFields}

src/pages/customer/Customer/statusChange.jsx

@@ -0,0 +1,280 @@
+import React, { useState, useEffect } from 'react';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Select,
+  Card,
+  Radio,
+  DatePicker,
+  message,
+  Switch,
+  InputNumber,
+} from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import FileUpload from '@/components/XForm/FileUpload';
+import XForm, { FieldTypes, createForm } from '@/components/XForm';
+import apis from '@/services/apis';
+import BuildSelect2 from '@/components/SelectButton/BuildSelect2';
+import LivePlatSelect from '@/components/SelectButton/LivePlatSelect';
+import CitySelect3 from '@/components/SelectButton/CitySelect3';
+import ImageUpload from '@/components/XForm/ImageUpload';
+import request from '@/utils/request';
+import Navigate from '@/components/Navigate';
+import ConsultantSelect from '@/components/SelectButton/consultantSelect';
+import ChannelSelect from '@/components/SelectButton/channelSelect';
+
+const { Option } = Select;
+const { TextArea } = Input;
+
+const header = props => {
+  console.log(props);
+
+  const { id, buildingId } = props.location.query;
+
+const [loading,setLoading] = useState(false)
+  const [data, setData] = useState({});
+  const [apartmentTypeList, setApartmentTypeList] = useState([]);
+
+  // 查询详情
+  const getData = () => {
+    request({ ...apis.customer.getStatusChange, urlData: { id } }).then(res => {
+      //   data.videoUrl = [data.videoUrl];
+      if (res.channelCustomer) {
+        res.channelId = res.channelCustomer.channelId;
+      }
+
+      setData({ ...res });
+    });
+  };
+
+  const getApartmentType = () => {
+    const params = { apartmentType: 'apart' };
+    request({
+      ...apis.building.buildingApartment,
+      urlData: { id: buildingId },
+      params,
+    })
+      .then(data => {
+        setApartmentTypeList(data || []);
+      })
+      .catch(err => {
+        message.info(err.msg || err.message);
+      });
+  };
+  useEffect(() => {
+    getApartmentType();
+    if (id) {
+      getData(id);
+    }
+  }, []);
+
+  const cancelPage = () => {
+    router.go('-1');
+  };
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      console.log(values, 'values');
+      if (!err) {
+        const { status } = values;
+        // values.isNewHouse =  values.isNewHouse?1:0
+setLoading(true)
+        if (status == 3) {
+          //认筹
+          const params = {
+            customerId: id,
+            customerPreparatory: {
+              ...values,
+              customerId: id,
+            },
+          };
+          request({
+            ...apis.customer.preparatory,
+            data: params,
+          })
+            .then(data => {
+              message.info('认筹成功');
+              setLoading(false)
+                cancelPage();
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        } else if (status == 4) {
+          const params = {
+            customerId: id,
+            customerSignatory: {
+              ...values,
+              customerId: id,
+            },
+          };
+          request({
+            ...apis.customer.signatory,
+            data: params,
+          })
+            .then(data => {
+              message.info('认筹成功');
+              setLoading(false)
+                cancelPage();
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        }else if (status == 5) {
+            const params = {
+              customerId: id,
+              customerSignatory: {
+                ...values,
+                customerId: id,
+              },
+            };
+            request({
+              ...apis.customer.commission,
+              data: params,
+            })
+              .then(data => {
+                message.info('结佣成功');
+                setLoading(false)
+                  cancelPage();
+              })
+              .catch(err => {
+                message.info(err.msg || err.message);
+              });
+          }
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <Card>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="变更状态为">
+          {getFieldDecorator('status', {
+            // initialValue: data.status,
+            rules: [{ required: true, message: ' 请选择变更状态' }],
+          })(
+            <Select>
+              <Option value={3}>认筹</Option>
+              <Option value={4}>签约</Option>
+              <Option value={5}>结佣</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name', {
+            initialValue: data.name,
+          })(<Input placeholder="客户姓名" />)}
+        </Form.Item>
+        {data.channelId && (
+          <Form.Item label="归属渠道">
+            {getFieldDecorator('channelId', {
+              initialValue: data.channelId,
+            })(<ChannelSelect placeholder="归属渠道" disabled />)}
+          </Form.Item>
+        )}
+        <Form.Item label="内场接待">
+          {getFieldDecorator('realtyConsultant', {
+            initialValue: data.realtyConsultant,
+          })(<ConsultantSelect placeholder="内场接待" buildingId={buildingId} />)}
+        </Form.Item>
+
+        {props.form.getFieldValue('status') == 3 && (
+          <>
+            <Form.Item label="认筹日期">
+              {getFieldDecorator('preparatoryData')(<DatePicker />)}
+            </Form.Item>
+            <Form.Item label="备注">
+              {getFieldDecorator('remark')(<TextArea placeholder="客户描述" rows={10} />)}
+            </Form.Item>
+          </>
+        )}
+
+        {props.form.getFieldValue('status') == 4 && (
+          <>
+            <Form.Item label="业绩分成人">
+              {getFieldDecorator('dividendsName', {})(<Input placeholder="业绩分成人" />)}
+            </Form.Item>
+            <Form.Item label="比例">
+              {getFieldDecorator('proportion', {})(<Input placeholder="比例" />)}
+            </Form.Item>
+            <Form.Item label="户型">
+              {getFieldDecorator('houseType', {
+                // rules: [{ required: true, message: ' 请选择户型' }],
+              })(
+                <Select>
+                  {apartmentTypeList?.map(x => {
+                    return <Option key={x.apartmentId} value={x.apartmentId}>{x.apartmentName}</Option>;
+                  })}
+                </Select>,
+              )}
+            </Form.Item>
+            <Form.Item label="房号">
+              {getFieldDecorator('houseInfo', {})(<Input placeholder="房号" />)}
+            </Form.Item>
+            <Form.Item label="签约日期">
+              {getFieldDecorator('successDate', {})(<DatePicker />)}
+            </Form.Item>
+            <Form.Item label="成交金额">
+              {getFieldDecorator('price', {})(<Input suffix="万" />)}
+            </Form.Item>
+            <Form.Item label="备注">
+              {getFieldDecorator('remark')(<TextArea placeholder="客户描述" rows={10} />)}
+            </Form.Item>
+          </>
+        )}
+
+{props.form.getFieldValue('status') == 5 && (
+          <>
+            <Form.Item label="业绩分成人">
+              {getFieldDecorator('dividendsName', {})(<Input placeholder="业绩分成人" />)}
+            </Form.Item>
+            <Form.Item label="比例">
+              {getFieldDecorator('proportion', {})(<Input placeholder="比例" />)}
+            </Form.Item>
+            <Form.Item label="户型">
+              {getFieldDecorator('houseType', {
+                // rules: [{ required: true, message: ' 请选择户型' }],
+              })(
+                <Select>
+                  {apartmentTypeList?.map(x => {
+                    return <Option key={x.apartmentId} value={x.apartmentId}>{x.apartmentName}</Option>;
+                  })}
+                </Select>,
+              )}
+            </Form.Item>
+            <Form.Item label="房号">
+              {getFieldDecorator('houseInfo', {})(<Input placeholder="房号" />)}
+            </Form.Item>
+            <Form.Item label="结佣日期">
+              {getFieldDecorator('successDate', {})(<DatePicker />)}
+            </Form.Item>
+            <Form.Item label="成交金额">
+              {getFieldDecorator('price', {})(<Input suffix="万" />)}
+            </Form.Item>
+            <Form.Item label="备注">
+              {getFieldDecorator('remark')(<TextArea placeholder="客户描述" rows={10} />)}
+            </Form.Item>
+          </>
+        )}
+
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit" loading={loading} style={{ marginRight: '20px' }}>
+            确定
+          </Button>
+          <Button onClick={() => router.go(-1)}>取消</Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+};
+
+const statusChange = Form.create({ name: 'header' })(header);
+
+export default statusChange;

src/pages/recommend/channel/audit.jsx

@@ -1,17 +1,34 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Upload, message, notification } from 'antd';
+import {
+  Form,
+  Icon,
+  Input,
+  Button,
+  DatePicker,
+  Select,
+  Card,
+  Row,
+  Col,
+  Pagination,
+  Alert,
+  Table,
+  Avatar,
+  Radio,
+  Upload,
+  message,
+  notification,
+} from 'antd';
 import ImageUpload from '@/components/XForm/ImageUpload';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import { router } from 'umi';
 
-import Attribution from './components/attribution'
+import Attribution from './components/attribution';
 import BuildingSelect from '@/components/SelectButton/BuildSelect2';
 import ConsultantSelect from '@/components/SelectButton/consultantSelect';
 import ChannelSelect from '@/components/SelectButton/channelSelect';
 
-
 const { TextArea } = Input;
 
 const tailFormItemLayout = {
@@ -28,93 +45,95 @@ const tailFormItemLayout = {
 const openNotificationWithIcon = (type, message) => {
   notification[type]({
     message,
-    description:
-      '',
+    description: '',
   });
-}
+};
 
 function body(props) {
-  const { getFieldDecorator } = props.form
+  const { getFieldDecorator } = props.form;
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+  const [visibleData, setVisibleData] = useState({
+    visible: false,
+    customerId: '',
+    realtyConsultant: '',
+    buildingId: '',
+  });
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState({})
+  const [data, setData] = useState({});
 
   const { id } = props.location.query;
 
   if (id !== '') {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
-      getById(id)
-    }, [])
+      getById(id);
+    }, []);
   }
 
   // 获取详情信息
   function getById(currentId) {
     request({ ...apis.customer.getDetail, urlData: { id: currentId } }).then(res => {
       // res.reportDate = moment(res.reportDate)
-      if(res){
-        let channelCustomer = {}
-        if(res.channelCustomer){
-          channelCustomer.channelId=res.channelCustomer.channelId
-          channelCustomer.remark=res.channelCustomer.remark
-          
+      if (res) {
+        let channelCustomer = {};
+        if (res.channelCustomer) {
+          channelCustomer.channelId = res.channelCustomer.channelId;
+          channelCustomer.remark = res.channelCustomer.remark;
         }
-        if(res.customerVisit){
-          channelCustomer.imageUrl=res.customerVisit.imageUrl
+        if (res.customerVisit) {
+          channelCustomer.imageUrl = res.customerVisit.imageUrl;
           // channelCustomer.remark=res.channelCustomer.remark
-          
         }
-        
-        setData(res)
-        props.form.setFieldsValue({...res,...channelCustomer})
+
+        setData(res);
+        props.form.setFieldsValue({ ...res, ...channelCustomer });
       }
-    
-    })
+    });
   }
 
   function submitDate(data) {
     // props.form.setFieldsValue(res)
-    console.log(data, 'data')
-    const params ={
-      auditResult:data.status,
-      channelCustomerId:id,
-      realtyConsultant:props.form.getFieldValue('realtyConsultant'),
-      name:props.form.getFieldValue('name'),
-      customerVisit:{ 
-        imageUrl:props.form.getFieldValue('imageUrl'),
-      },
-      remark:props.form.getFieldValue('remark'),
+    console.log(data, 'data');
+    if (data.status == 1) {
+      const params = {
+        auditResult: data.status,
+        channelCustomerId: id,
+        realtyConsultant: props.form.getFieldValue('realtyConsultant'),
+        name: props.form.getFieldValue('name'),
+        customerVisit: {
+          imageUrl: props.form.getFieldValue('imageUrl'),
+        },
+        remark: props.form.getFieldValue('remark'),
+      };
+
+      request({ ...apis.customer.auto, urlData: { id: id }, data: { ...params } })
+        .then(() => {
+          // eslint-disable-next-line no-unused-expressions
+          openNotificationWithIcon('success', '操作成功');
+          router.go(-1);
+        })
+        .catch(err => {
+          // eslint-disable-next-line no-unused-expressions
+        });
+    } else {
+      const params = {
+        id:id,
+        type:'report'
+      };
+
+      request({ ...apis.customer.invalidCustomer,  data: { ...params } })
+      .then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        router.go(-1);
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+      });
+      ;
     }
-    // {
-    //   "auditResult": "string",
-    //   "channelCustomerId": "string",
-    //   "customerVisit": {
-    //     "buildingId": "string",
-    //     "createDate": "2021-07-31T16:56:21.899Z",
-    //     "customerId": "string",
-    //     "customerVisitId": "string",
-    //     "imageUrl": "string",
-    //     "name": "string",
-    //     "orgId": 0,
-    //     "realtyConsultant": "string",
-    //     "realtyConsultantName": "string",
-    //     "recommendName": "string",
-    //     "recommendPerson": "string",
-    //     "remark": "string"
-    //   },
-    //   "realtyConsultant": "string"
-    // }
-    request({ ...apis.customer.auto, urlData: { id: id }, data: { ...params }}).then(() => {
-      // eslint-disable-next-line no-unused-expressions
-      openNotificationWithIcon('success', '操作成功')
-      router.go(-1)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-
-    })
   }
 
   // 提交事件
@@ -122,16 +141,12 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        submitDate({ status: '1' })
+        submitDate({ status: '1' });
         // submitDate({ ...values })
       }
     });
   }
 
-
-
-
-
   return (
     <Card>
       <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ maxWidth: '1000px' }}>
@@ -143,86 +158,55 @@ function body(props) {
           )}
         </Form.Item>*/}
         <Form.Item label="项目ID" style={{ display: 'none' }}>
-          {getFieldDecorator('buildingId')(
-            <Input
-              placeholder="项目ID"
-            />,
-          )}
+          {getFieldDecorator('buildingId')(<Input placeholder="项目ID" />)}
         </Form.Item>
         <Form.Item label="意向项目：">
           {getFieldDecorator('buildingId')(
-            <BuildingSelect
-            disabled
-              placeholder="意向项目"
-              style={{width:'100%'}}
-            />,
+            <BuildingSelect disabled placeholder="意向项目" style={{ width: '100%' }} />,
           )}
-        </Form.Item> 
+        </Form.Item>
         <Form.Item label="客户姓名">
-          {getFieldDecorator('name')(
-            <Input placeholder="客户姓名" />,
-          )}
+          {getFieldDecorator('name')(<Input placeholder="客户姓名" />)}
         </Form.Item>
         <Form.Item label="归属渠道">
-          {getFieldDecorator('channelId')(
-            <ChannelSelect placeholder="归属渠道" disabled/>,
-          )}
+          {getFieldDecorator('channelId')(<ChannelSelect placeholder="归属渠道" disabled />)}
         </Form.Item>
         <Form.Item label="归属置业顾问">
           {getFieldDecorator('realtyConsultant')(
-            <ConsultantSelect placeholder="归属置业顾问" buildingId={props.form.getFieldValue('buildingId')} />,
-          )}
-        </Form.Item>
-        <Form.Item label="到访照片">
-          {getFieldDecorator('imageUrl')(
-            <ImageUpload />,
+            <ConsultantSelect
+              placeholder="归属置业顾问"
+              buildingId={props.form.getFieldValue('buildingId')}
+            />,
           )}
         </Form.Item>
+        <Form.Item label="到访照片">{getFieldDecorator('imageUrl')(<ImageUpload />)}</Form.Item>
         <Form.Item label="备注">
-          {getFieldDecorator('remark')(
-            <TextArea placeholder="客户描述" rows={10} />,
-          )}
+          {getFieldDecorator('remark')(<TextArea placeholder="客户描述" rows={10} />)}
         </Form.Item>
-       
-
-        
-
-        {/* <Form.Item label="归属置业顾问"
-      >
-          <Row gutter={8}>
-            <Col span={12}>
-              {getFieldDecorator('consultantName', {
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择置业顾问',
-                  },
-                ],
-              })(<Input placeholder="请选择置业顾问" />)}
-            </Col>
-            <Col span={12}>
-              <Button onClick={() => showConsultant()}>选择</Button>
-            </Col>
-          </Row>
-        </Form.Item> */}
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          {data.status==='1'&&<><Button type="primary" htmlType="submit" >
-            审核通过
-          </Button>
-          <Button type="danger" ghost style={{marginLeft: '4em'}} onClick={() => submitDate({ status: '2' })}>
-            驳回
-          </Button></>}
-          <Button style={{marginLeft: '4em'}} onClick={() => router.goBack(-1)}>
+          {data.status === '1' && (
+            <>
+              <Button type="primary" htmlType="submit">
+                确定
+              </Button>
+              <Button
+                type="danger"
+                ghost
+                style={{ marginLeft: '4em' }}
+                onClick={() => submitDate({ status: '2' })}
+              >
+                无效
+              </Button>
+            </>
+          )}
+          <Button style={{ marginLeft: '4em' }} onClick={() => router.goBack(-1)}>
             取消
           </Button>
         </Form.Item>
       </Form>
-
-      {/* 选择置业顾问 */}
-      {/* <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} /> */}
     </Card>
   );
 }
 const WrappedBody = Form.create({ name: 'body' })(body);
 
-export default WrappedBody
+export default WrappedBody;

src/pages/recommend/channel/index.jsx

@@ -170,9 +170,9 @@ function Recommend(props) {
     placeholder: '请选择状态',
     type: 'select',
     options: [
-      {label: '未通过', value: '1'},
-      {label: '已通过', value: '2'},
-      {label: '已驳回', value: '3'}
+      {label: '未到访', value: '1'},
+      {label: '已到访', value: '2'},
+      {label: '无效', value: '3'}
     ]
   },
  ]
@@ -189,7 +189,7 @@ function Recommend(props) {
   return (
     <>
       <QueryTable
-          rowKey="recommendCustomer"
+          rowKey="channelCustomerId"
           api={apis.customer.recommender}
           searchFields={searchFields}
           columns={columns}

src/pages/recommend/customer/audit.jsx

@@ -1,32 +1,16 @@
 import React, { useState, useEffect } from 'react';
-import {
-  Form,
-  Icon,
-  Input,
-  Button,
-  DatePicker,
-  Select,
-  Card,
-  Row,
-  Col,
-  Pagination,
-  Alert,
-  Table,
-  Avatar,
-  Radio,
-  Upload,
-  message,
-  notification,
-} from 'antd';
-import ImageUpload from '../../../components/XForm/ImageUpload';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Upload, message, notification } from 'antd';
+import ImageUpload from '@/components/XForm/ImageUpload';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import { router } from 'umi';
 
-import Attribution from './components/attribution';
+import Attribution from './components/attribution'
 import BuildingSelect from '@/components/SelectButton/BuildSelect2';
 import ConsultantSelect from '@/components/SelectButton/consultantSelect';
+import ChannelSelect from '@/components/SelectButton/channelSelect';
+
 
 const { TextArea } = Input;
 
@@ -44,42 +28,84 @@ const tailFormItemLayout = {
 const openNotificationWithIcon = (type, message) => {
   notification[type]({
     message,
-    description: '',
+    description:
+      '',
   });
-};
+}
 
 function body(props) {
-  const { getFieldDecorator } = props.form;
+  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 [data, setData] = useState({})
 
   const { id } = props.location.query;
 
-  useEffect(() => {
-    if (id !== '') {
-      getById(id);
-    }
-  }, []);
+  if (id !== '') {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      getById(id)
+    }, [])
+  }
 
   // 获取详情信息
   function getById(currentId) {
     request({ ...apis.customer.getDetail, urlData: { id: currentId } }).then(res => {
       // res.reportDate = moment(res.reportDate)
-      if (res) {
-        props.form.setFieldsValue({ ...res, reportDate: moment(res.reportDate) });
+      if(res){
+        let channelCustomer = {}
+        if(res.channelCustomer){
+          // channelCustomer.channelId=res.channelCustomer.channelId
+          channelCustomer.remark=res.channelCustomer.remark
+          
+        }
+        if(res.customerVisit){
+          channelCustomer.imageUrl=res.customerVisit.imageUrl
+          // channelCustomer.remark=res.channelCustomer.remark
+          
+        }
+        
+        setData(res)
+        props.form.setFieldsValue({...res,...channelCustomer})
       }
-    });
+    
+    })
   }
 
-  function submitDate(params) {
+  function submitDate(data) {
     // props.form.setFieldsValue(res)
-    console.log(params, 'params');
-    request({
-      ...apis.customer.auto,
-      urlData: { id: id },
-      params: {
-        status: params.status,
+    console.log(data, 'data');
+    if (data.status == 1) {
+      const params = {
+        auditResult: data.status,
+        channelCustomerId: id,
         realtyConsultant: props.form.getFieldValue('realtyConsultant'),
-      },
-    })
+        name: props.form.getFieldValue('name'),
+        customerVisit: {
+          imageUrl: props.form.getFieldValue('imageUrl'),
+        },
+        remark: props.form.getFieldValue('remark'),
+      };
+
+      request({ ...apis.customer.auto, urlData: { id: id }, data: { ...params } })
+        .then(() => {
+          // eslint-disable-next-line no-unused-expressions
+          openNotificationWithIcon('success', '操作成功');
+          router.go(-1);
+        })
+        .catch(err => {
+          // eslint-disable-next-line no-unused-expressions
+        });
+    } else {
+      const params = {
+        id:id,
+        type:'report'
+      };
+
+      request({ ...apis.customer.invalidCustomer,  data: { ...params } })
       .then(() => {
         // eslint-disable-next-line no-unused-expressions
         openNotificationWithIcon('success', '操作成功');
@@ -88,6 +114,8 @@ function body(props) {
       .catch(err => {
         // eslint-disable-next-line no-unused-expressions
       });
+      ;
+    }
   }
 
   // 提交事件
@@ -95,93 +123,79 @@ function body(props) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        submitDate({ status: '1' });
+        submitDate({ status: '1' })
         // submitDate({ ...values })
       }
     });
   }
 
+
   return (
     <Card>
       <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ maxWidth: '1000px' }}>
         {/* <Form.Item label="客户ID" style={{ display: 'none' }}>
-          {getFieldDecorator('channelCustomerId')(<Input placeholder="客户ID" />)}
-        </Form.Item>
+          {getFieldDecorator('channelCustomerId')(
+            <Input
+              placeholder="客户ID"
+            />,
+          )}
+        </Form.Item>*/}
         <Form.Item label="项目ID" style={{ display: 'none' }}>
-          {getFieldDecorator('buildingId')(<Input placeholder="项目ID" />)}
+          {getFieldDecorator('buildingId')(
+            <Input
+              placeholder="项目ID"
+            />,
+          )}
         </Form.Item>
         <Form.Item label="意向项目：">
           {getFieldDecorator('buildingId')(
-            <BuildingSelect placeholder="意向项目" style={{ width: '100%' }} />,
+            <BuildingSelect
+            disabled
+              placeholder="意向项目"
+              style={{width:'100%'}}
+            />,
           )}
-        </Form.Item> */}
+        </Form.Item> 
         <Form.Item label="客户姓名">
-          {getFieldDecorator('name')(<Input placeholder="客户姓名" />)}
-        </Form.Item>
-        <Form.Item label="客户电话">
-          {getFieldDecorator('phone')(<Input placeholder="客户电话" />)}
-        </Form.Item>
-        <Form.Item label="客户性别">
-          {getFieldDecorator('sex')(
-            <Radio.Group>
-              <Radio value={1}>男</Radio>
-              <Radio value={2}>女</Radio>
-            </Radio.Group>,
+          {getFieldDecorator('name')(
+            <Input placeholder="客户姓名" />,
           )}
         </Form.Item>
-        <Form.Item label="客户描述">
-          {getFieldDecorator('remark')(<TextArea placeholder="客户描述" rows={10} />)}
-        </Form.Item>
+        {/* <Form.Item label="归属渠道">
+          {getFieldDecorator('channelId')(
+            <ChannelSelect placeholder="归属渠道" disabled/>,
+          )}
+        </Form.Item> */}
         <Form.Item label="归属置业顾问">
           {getFieldDecorator('realtyConsultant')(
-            <ConsultantSelect
-              placeholder="归属置业顾问"
-              buildingId={props.form.getFieldValue('buildingId')}
-            />,
+            <ConsultantSelect placeholder="归属置业顾问" buildingId={props.form.getFieldValue('buildingId')} />,
+          )}
+        </Form.Item>
+        <Form.Item label="到访照片">
+          {getFieldDecorator('imageUrl')(
+            <ImageUpload />,
+          )}
+        </Form.Item>
+        <Form.Item label="备注">
+          {getFieldDecorator('remark')(
+            <TextArea placeholder="客户描述" rows={10} />,
           )}
         </Form.Item>
-
-        {/* <Form.Item label="归属置业顾问"
-      >
-          <Row gutter={8}>
-            <Col span={12}>
-              {getFieldDecorator('consultantName', {
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择置业顾问',
-                  },
-                ],
-              })(<Input placeholder="请选择置业顾问" />)}
-            </Col>
-            <Col span={12}>
-              <Button onClick={() => showConsultant()}>选择</Button>
-            </Col>
-          </Row>
-        </Form.Item> */}
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" htmlType="submit">
-            审核通过
+          {data.status==='1'&&<><Button type="primary" htmlType="submit" >
+            确定
           </Button>
-          <Button
-            type="danger"
-            ghost
-            style={{ marginLeft: '4em' }}
-            onClick={() => submitDate({ status: '2' })}
-          >
-            驳回
-          </Button>
-          <Button style={{ marginLeft: '4em' }} onClick={() => router.goBack(-1)}>
+          <Button type="danger" ghost style={{marginLeft: '4em'}} onClick={() => submitDate({ status: '2' })}>
+            无效
+          </Button></>}
+          <Button style={{marginLeft: '4em'}} onClick={() => router.goBack(-1)}>
             取消
           </Button>
         </Form.Item>
       </Form>
-
-      {/* 选择置业顾问 */}
-      {/* <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)} /> */}
     </Card>
   );
 }
 const WrappedBody = Form.create({ name: 'body' })(body);
 
-export default WrappedBody;
+export default WrappedBody

src/pages/recommend/customer/index.jsx

@@ -21,7 +21,7 @@ function Recommend(props) {
 
   function toAudit(cuurentId) {
     router.push({
-      pathname: '/recommend/customer/audit',
+      pathname: '/customer/recommend/customer/audit',
       query: {
         id: cuurentId,
       },
@@ -105,7 +105,7 @@ function Recommend(props) {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
-      render: (_, record) => <><span>{record.status === '1' ? '待审核' : record.status === '2' ? '已通过' : record.status === '3' ? '已驳回' : ''}</span></>,
+      render: (_, record) => <><span>{record.status === '1' ? '未到访' : record.status === '2' ? '已到访' : record.status === '3' ? '无效' : ''}</span></>,
     },
     {
       title: '操作',
@@ -162,9 +162,9 @@ function Recommend(props) {
     placeholder: '请选择状态',
     type: 'select',
     options: [
-      {label: '未通过', value: '1'},
-      {label: '已通过', value: '2'},
-      {label: '已驳回', value: '3'}
+      {label: '未到访', value: '1'},
+      {label: '已到访', value: '2'},
+      {label: '无效', value: '3'}
     ]
   },
  ]

src/services/apis.js

@@ -378,6 +378,37 @@ export default {
       url: `${prefix}/channelCustomer/:id`,
       action: 'admin.customer.recommend.recommender.get',
     },
+
+    getStatusChange: {
+      method: 'GET',
+      url: `${prefix}/customer/detail/:id`,
+      action: 'admin.customer.detail.recommender.get',
+    },
+    //认筹
+    preparatory: {
+      method: 'PUT',
+      url: `${prefix}/marking/preparatory`,
+      action: 'admin.marking.preparatory.put',
+    },
+    // 签约
+    signatory: {
+      method: 'PUT',
+      url: `${prefix}/marking/signatory`,
+      action: 'admin.marking.signatory.put',
+    },
+     // 结佣
+     commission: {
+      method: 'PUT',
+      url: `${prefix}/marking/commission`,
+      action: 'admin.marking.commission.put',
+    },
+    // 无效
+    invalidCustomer: {
+      method: 'PUT',
+      url: `${prefix}/marking/invalidCustomer`,
+      action: 'admin.marking.invalidCustomer.put',
+    },
+    
     recommendGetById: {
       method: 'GET',
       url: `${prefix}/customer/recommend/getById/:id`,