提交

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

@@ -31,8 +31,7 @@ class ModalAttribution extends React.Component {
   }
 
   componentDidUpdate(preProps, preState) {
-    console.log(this.props.visibleData.realtyConsultant)
-    if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
       this.getList({ pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
     }
@@ -41,12 +40,12 @@ class ModalAttribution extends React.Component {
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
   handleOk() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   // 弹框取消按钮
   handleCancel() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
+    this.props.onCancel()
   }
 
   getList(params) {
@@ -55,14 +54,7 @@ class ModalAttribution extends React.Component {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+      
     })
   }
 

src/pages/customer/customerlist/index.jsx

@@ -171,6 +171,12 @@ function body(props) {
     link.click()
   }
 
+  // 关闭调整归属的窗口
+  function closeAttribution() {
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
+  }
+
   const publicColumns = [
     {
       title: '头像',
@@ -374,7 +380,7 @@ function body(props) {
       }
       
       {/* 调整归属 */}
-      <Attribution visibleData={gVisibleData} />
+      <Attribution visibleData={gVisibleData} onCancel={() => closeAttribution()}/>
 
       {/* 积分记录 */}
       <IntegralRecord visibleData={recordVisibleData} />

src/pages/customer/recommendCustomer/audit.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Upload, message } 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';
@@ -7,6 +7,8 @@ import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
 
+import Attribution from './components/attribution'
+
 const { Option } = Select;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const { Meta } = Card;
@@ -24,9 +26,20 @@ const tailFormItemLayout = {
   },
 };
 
+const openNotificationWithIcon = (type, message) => {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
 function body(props) {
   const { getFieldDecorator } = props.form
 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ picture: '' })
 
@@ -49,27 +62,13 @@ function body(props) {
 
   function submitDate(params) {
     // props.form.setFieldsValue(res)
-    request({ ...apis.customer.auto, urlData: { id: params.customerId }, params: { verifyStatus: params.verifyStatus } }).then(() => {
+    request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus } }).then(() => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message="操作成功"
-        type="success"
-        showIcon
-      />
+      openNotificationWithIcon('success', '操作成功')
       router.go(-1)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+
     })
   }
 
@@ -89,6 +88,21 @@ function body(props) {
     console.log(e)
   }
 
+  // 显示选择置业顾问的窗口
+  function showConsultant() {
+    setVisibleData({ visible: true, customerId: props.form.getFieldValue('customerId'), realtyConsultant: props.form.getFieldValue('realtyConsultant') })
+  }
+
+  // 关闭选择置业顾问的窗口
+  function closeConsultant() {
+    setVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+  }
+
+  // 选择置业顾问弹窗
+  function consultantSuccess(e) {
+    props.form.setFieldsValue({ realtyConsultant: e.realtyConsultant, consultantName: e.name })
+  }
+
   return (
     <>
       <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ width: '800px', margin: 'auto' }}>
@@ -99,6 +113,13 @@ function body(props) {
             />,
           )}
         </Form.Item>
+        <Form.Item label="归属人" style={{ display: 'none' }}>
+          {getFieldDecorator('realtyConsultant')(
+            <Input
+              placeholder="归属人"
+            />,
+          )}
+        </Form.Item>
         <Form.Item label="意向项目：">
           {getFieldDecorator('intention')(
             <Input
@@ -159,7 +180,7 @@ function body(props) {
             <DatePicker showTime placeholder="报备日期" />,
           )}
         </Form.Item>
-        <Form.Item label="状态">
+        {/* <Form.Item label="状态">
           {getFieldDecorator('verifyStatus')(
             <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
               <Option value={0}>未通过</Option>
@@ -167,27 +188,30 @@ function body(props) {
               <Option value={2}>已驳回</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="归属置业顾问">
             <Row gutter={8}>
               <Col span={12}>
-                {getFieldDecorator('consultantName')(<Input placeholder="归属置业顾问" />)}
+                {getFieldDecorator('consultantName')(<Input placeholder="请选择置业顾问" />)}
               </Col>
               <Col span={12}>
-                <Button>选择</Button>
+                <Button onClick={() => showConsultant()}>选择</Button>
               </Col>
             </Row>
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-            确定
+          <Button type="primary" className={Styles.SubmitButton} onClick={() => submitDate({ verifyStatus: '1' })}>
+            审核通过
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => router.go(-1)}>
-            取消
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>
+            驳回
           </Button>
         </Form.Item>
       </Form>
+
+      {/* 选择置业顾问 */}
+      <Attribution visibleData={visibleData} onCancel={() => closeConsultant()} onSuccess={e => consultantSuccess(e)}/>
     </>
   );
 }

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

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

src/pages/customer/recommendCustomer/index.jsx

@@ -160,7 +160,7 @@ function body(props) {
       title: '状态',
       dataIndex: 'verifyStatus',
       key: 'verifyStatus',
-      render: (_, record) => <><span>{ record.verifyStatus === 0 ? '未通过': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</span></>,
+      render: (_, record) => <><span>{ record.verifyStatus === 0 ? '待审核': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</span></>,
     },
     {
       title: '操作',
@@ -170,7 +170,7 @@ function body(props) {
         <>
           {
             <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
-              {record.verifyStatus === null ? <span style={{ color: 'rgba(239,39,58,1)',cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
+              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)',cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
             </AuthButton>
           }
         </>