fix

src/pages/customer/Customer/statusChange.jsx

@@ -35,7 +35,7 @@ const header = props => {
 
   const { id, buildingId } = props.location.query;
 
-const [loading,setLoading] = useState(false)
+  const [loading, setLoading] = useState(false);
   const [data, setData] = useState({});
   const [apartmentTypeList, setApartmentTypeList] = useState([]);
 
@@ -79,11 +79,10 @@ const [loading,setLoading] = useState(false)
   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)
+        setLoading(true);
         if (status == 3) {
           //认筹
           const params = {
@@ -91,7 +90,9 @@ setLoading(true)
             customerPreparatory: {
               ...values,
               customerId: id,
+              channeCustomerId: data.channelCustomer?.channelCustomerId,
             },
+            
           };
           request({
             ...apis.customer.preparatory,
@@ -99,8 +100,8 @@ setLoading(true)
           })
             .then(data => {
               message.info('认筹成功');
-              setLoading(false)
-                cancelPage();
+              setLoading(false);
+              cancelPage();
             })
             .catch(err => {
               message.info(err.msg || err.message);
@@ -111,41 +112,45 @@ setLoading(true)
             customerSignatory: {
               ...values,
               customerId: id,
+              channeCustomerId: data.channelCustomer?.channelCustomerId,
             },
+           
           };
           request({
             ...apis.customer.signatory,
             data: params,
           })
             .then(data => {
-              message.info('认筹成功');
-              setLoading(false)
-                cancelPage();
+              message.info('签约成功');
+              setLoading(false);
+              cancelPage();
             })
             .catch(err => {
               message.info(err.msg || err.message);
             });
-        }else if (status == 5) {
-            const params = {
+        } else if (status == 5) {
+          const params = {
+            customerId: id,
+            customerSignatory: {
+              ...values,
               customerId: id,
-              customerSignatory: {
-                ...values,
-                customerId: id,
-              },
-            };
-            request({
-              ...apis.customer.commission,
-              data: params,
+              channeCustomerId: data.channelCustomer?.channelCustomerId,
+            },
+
+          };
+          request({
+            ...apis.customer.commission,
+            data: params,
+          })
+            .then(data => {
+              message.info('结佣成功');
+              setLoading(false);
+              cancelPage();
             })
-              .then(data => {
-                message.info('结佣成功');
-                setLoading(false)
-                  cancelPage();
-              })
-              .catch(err => {
-                message.info(err.msg || err.message);
-              });
-          }
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        }
       }
     });
   }
@@ -157,10 +162,16 @@ setLoading(true)
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="变更状态为">
           {getFieldDecorator('status', {
-            // initialValue: data.status,
+            initialValue: data.status,
             rules: [{ required: true, message: ' 请选择变更状态' }],
           })(
             <Select>
+              <Option value={1} disabled>
+                报备
+              </Option>
+              <Option value={2} disabled>
+                到访
+              </Option>
               <Option value={3}>认筹</Option>
               <Option value={4}>签约</Option>
               <Option value={5}>结佣</Option>
@@ -210,7 +221,11 @@ setLoading(true)
               })(
                 <Select>
                   {apartmentTypeList?.map(x => {
-                    return <Option key={x.apartmentId} value={x.apartmentId}>{x.apartmentName}</Option>;
+                    return (
+                      <Option key={x.apartmentId} value={x.apartmentId}>
+                        {x.apartmentName}
+                      </Option>
+                    );
                   })}
                 </Select>,
               )}
@@ -230,7 +245,7 @@ setLoading(true)
           </>
         )}
 
-{props.form.getFieldValue('status') == 5 && (
+        {props.form.getFieldValue('status') == 5 && (
           <>
             <Form.Item label="业绩分成人">
               {getFieldDecorator('dividendsName', {})(<Input placeholder="业绩分成人" />)}
@@ -244,7 +259,11 @@ setLoading(true)
               })(
                 <Select>
                   {apartmentTypeList?.map(x => {
-                    return <Option key={x.apartmentId} value={x.apartmentId}>{x.apartmentName}</Option>;
+                    return (
+                      <Option key={x.apartmentId} value={x.apartmentId}>
+                        {x.apartmentName}
+                      </Option>
+                    );
                   })}
                 </Select>,
               )}
@@ -265,7 +284,12 @@ setLoading(true)
         )}
 
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit" loading={loading} style={{ marginRight: '20px' }}>
+          <Button
+            type="primary"
+            htmlType="submit"
+            loading={loading}
+            style={{ marginRight: '20px' }}
+          >
             确定
           </Button>
           <Button onClick={() => router.go(-1)}>取消</Button>

src/pages/recommend/customer/audit.jsx

@@ -1,5 +1,23 @@
 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 AuthButton from '@/components/AuthButton';
 import moment from 'moment';
@@ -7,12 +25,11 @@ 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 = {
@@ -29,51 +46,52 @@ 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){
+      if (res) {
+        let channelCustomer = {};
+        if (res.channelCustomer) {
           // channelCustomer.channelId=res.channelCustomer.channelId
-          channelCustomer.remark=res.channelCustomer.remark
-          
+          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
-          
         }
-        channelCustomer.name=res.name||res.channelCustomer?.name
-        setData(res)
-        props.form.setFieldsValue({...res,...channelCustomer})
+        channelCustomer.name = res.name || res.channelCustomer?.name;
+        setData(res);
+        props.form.setFieldsValue({ ...res, ...channelCustomer });
       }
-    
-    })
+    });
   }
 
   function submitDate(data) {
@@ -87,6 +105,7 @@ function body(props) {
         name: props.form.getFieldValue('name'),
         customerVisit: {
           imageUrl: props.form.getFieldValue('imageUrl'),
+          name: props.form.getFieldValue('name'),
         },
         remark: props.form.getFieldValue('remark'),
       };
@@ -102,20 +121,19 @@ function body(props) {
         });
     } else {
       const params = {
-        id:id,
-        type:'report'
+        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
-      });
-      ;
+      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
+        });
     }
   }
 
@@ -124,13 +142,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' }}>
@@ -142,25 +159,15 @@ 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')(
@@ -169,33 +176,37 @@ function body(props) {
         </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 style={{ display: 'flex', justifyContent: 'center' }}>
-          {data.status==='1'&& <>
-            <AuthButton name="customer.common.verify">
-              <Button type="primary" htmlType="submit" >
-                确定
-              </Button>
-            </AuthButton>
-            <AuthButton name="customer.common.verify">
-              <Button type="danger" ghost style={{marginLeft: '4em'}} onClick={() => submitDate({ status: '2' })}>
-                无效
-              </Button>
-            </AuthButton>
-          </>}
-          <Button style={{marginLeft: '4em'}} onClick={() => router.goBack(-1)}>
+          {data.status === '1' && (
+            <>
+              <AuthButton name="customer.common.verify">
+                <Button type="primary" htmlType="submit">
+                  确定
+                </Button>
+              </AuthButton>
+              <AuthButton name="customer.common.verify">
+                <Button
+                  type="danger"
+                  ghost
+                  style={{ marginLeft: '4em' }}
+                  onClick={() => submitDate({ status: '2' })}
+                >
+                  无效
+                </Button>
+              </AuthButton>
+            </>
+          )}
+          <Button style={{ marginLeft: '4em' }} onClick={() => router.goBack(-1)}>
             取消
           </Button>
         </Form.Item>
@@ -205,4 +216,4 @@ function body(props) {
 }
 const WrappedBody = Form.create({ name: 'body' })(body);
 
-export default WrappedBody
+export default WrappedBody;