合并

src/pages/customer/customerlist/index.jsx

@@ -5,140 +5,15 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 
+import Attribution from './components/attribution'
+import IntegralRecord from './components/integralRecord'
+import ChangeStatus from './components/changeStatus'
+
 
 const { Option } = Select;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const { Meta } = Card;
 
-/**
- * 调整归属
- *  (废弃， 后面研究)
- *
- * @param {*} props
- * @returns
- */
-class ModalTable 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.customerId !== preState.visibleData.customerId) {
-      this.getList({ pageNumber: 1, pageSize: 5 })
-      this.setState({ visibleData: this.props.visibleData });
-    }
-  }
-
-  // 弹框确定按钮
-  // eslint-disable-next-line react/sort-comp
-  handleOk() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
-  }
-
-  // 弹框取消按钮
-  handleCancel() {
-    this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
-  }
-
-  getList(params) {
-    // 网路请求
-    request({ ...apis.customer.consultant, params: { ...params } }).then(res => {
-      this.setState({ dataSource: res })
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-   // 分页
-  onChange(pageNum) {
-    this.getList({ pageNumber: pageNum, pageSize: 5 })
-  }
-
-  // 提交
-  submitGm() {
-    const { url, method } = apis.customer.recommendEdit
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(this.state.visibleData.customerId)
-
-    // 网路请求
-    request({ url: tempUrl, method, data: { ...this.state.visibleData } }).then(res => {
-      this.handleCancel()
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
-  render() {
-    const columns = [
-      {
-        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) => <><Button className={Styles.SubmitButton} onClick={() => this.submitGm()}>确定</Button></>,
-      },
-    ]
-    return (
-      <>
-        <Modal
-            title="选择置业顾问"
-            destroyOnClose="true"
-            footer={null}
-            visible={this.state.visibleData.visible}
-            // onOk={() => this.handleOk()}
-            onCancel={(e) => this.handleCancel(e)}
-          >
-            <Table dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-          </Modal>
-      </>
-    );
-  }
-}
-
 /**
  *
  *
@@ -158,9 +33,18 @@ function body(props) {
   // 调整归属 ============  start
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [gVisibleData, setGVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
-
   // 调整归属 ============= end
 
+  // 积分记录 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [recordVisibleData, setRecordVisibleData] = useState({ visible: false, customerId: '' })
+  // 积分记录 ============= end
+
+  // 变更状态 ============  start
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [statusVisibleData, setStatusVisibleData] = useState({ visible: false, customerId: '', status: '' })
+  // 变更状态 ============= end
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNumber: 1, pageSize: 10, customerType })
@@ -183,8 +67,17 @@ function body(props) {
     })
   }
 
+  function displayNone() {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: false, customerId: '', status: '' })
+  }
+
   // 提交事件
   function handleSubmit(e) {
+    displayNone()
+
+
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -207,17 +100,33 @@ function body(props) {
 
   // 私客/公客切换
   function radioButtonHandleSizeChange(e) {
+    displayNone()
+
     const { value } = e.target
     setCustomerType(value)
     getList({ pageNumber: 1, pageSize: 10, customerType: value })
   }
 
-  // 调整归属 ============ start
-  // 调整归属 显示
-  function gM(row) {
-    setGVisibleData({ visible: true, customerId: row.customerId, realtyConsultant: row.realtyConsultant })
+  // 这里有个 Bug， 就是 Modal 弹框，会联动出现， 比如 我点击 调整归属的Model弹框， 那么 积分记录的Model弹框莫名其妙的也显示了
+  // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
+
+  function showGM(record) {
+    setGVisibleData({ visible: true, customerId: record.customerId, realtyConsultant: record.realtyConsultant })
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+  }
+
+  function showRecord(record) {
+    setRecordVisibleData({ visible: true, customerId: record.customerId })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+  }
+
+  function showStatus(record) {
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
+    setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
   }
-  // 调整归属 ============ end
 
   const columns = [
     {
@@ -272,13 +181,13 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <sapn className={ customerType === 'private' ? Styles.text : Styles.displayS }>变更状态</sapn>
+          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={() => showStatus(record)}>变更状态</Button>
           &nbsp;&nbsp;
-          <sapn className={ customerType === 'private' ? Styles.text : Styles.displayS } onClick={() => gM(record)}>调整归属</sapn>
+          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={() => showGM(record)}>调整归属</Button>
           <br/>
-          <sapn className={ Styles.text }>查看详情</sapn>
+          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link">查看详情</Button>
           &nbsp;&nbsp;
-          <sapn className={ Styles.text }>积分记录</sapn>
+          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={ () => showRecord(record) }>积分记录</Button>
         </>
       ),
     },
@@ -330,7 +239,7 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+          <Button type="danger" htmlType="submit" >
             搜索
           </Button>
         </Form.Item>
@@ -345,8 +254,13 @@ function body(props) {
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
 
         {/* 调整归属 */}
-        <ModalTable visibleData={gVisibleData} />
+        <Attribution visibleData={gVisibleData} />
+
+        {/* 积分记录 */}
+        <IntegralRecord visibleData={recordVisibleData} />
 
+        {/* 变更状态 */}
+        <ChangeStatus visibleData={statusVisibleData} />
     </>
   );
 }

src/pages/customer/independentList/index.jsx

@@ -44,8 +44,16 @@ class ModalTable extends React.Component {
   }
 
   getList(params) {
+    console.log('this.state.visibleData', this.state.visibleData)
+    const { customerId } = this.state.visibleData
+    if (customerId === '' || customerId === undefined) {
+      return
+    }
+    // 网路请求
+    const { url, method } = apis.customer.recommend
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(customerId)
     // 网路请求
-    request({ ...apis.customer.consultant, params: { ...params } }).then(res => {
+    request({ url: tempUrl, method, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
@@ -65,31 +73,15 @@ class ModalTable extends React.Component {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
-  // 提交
-  submitGm() {
-    const { url, method } = apis.customer.recommendEdit
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(this.state.visibleData.customerId)
-
-    // 网路请求
-    request({ url: tempUrl, method, data: { ...this.state.visibleData } }).then(res => {
-      this.handleCancel()
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
   render() {
     const columns = [
       {
-        title: '姓名',
+        title: '头像',
+        // eslint-disable-next-line jsx-a11y/alt-text
+        render: (text, records) => <img src={records.picture } width={50} height={50} />,
+      },
+      {
+        title: '用户名',
         dataIndex: 'name',
         key: 'name',
       },
@@ -99,28 +91,41 @@ class ModalTable extends React.Component {
         key: 'phone',
       },
       {
-        title: '部门',
-        dataIndex: 'department',
-        key: 'department',
+        title: '性别',
+        dataIndex: 'sex',
+        key: 'sex',
+        render: (text, records) => <span>{ records.sex === 1 ? '男' : '女' }</span>,
+      },
+      {
+        title: '意向项目',
+        dataIndex: 'intention',
+        key: 'intention',
       },
       {
-        title: '岗位',
-        dataIndex: 'post',
-        key: 'post',
+        title: '推荐时间',
+        dataIndex: 'createDate',
+        key: 'createDate',
       },
       {
-        title: '操作',
-        dataIndex: 'personId',
-        key: 'personId',
-        // eslint-disable-next-line no-nested-ternary
-     render: (_, record) => <><Button className={Styles.SubmitButton} onClick={() => this.submitGm()}>确定</Button></>,
+        title: '状态',
+        // eslint-disable-next-line consistent-return
+        render: (text, records) => {
+                                    if (records.status === 1) { return '报备' }
+                                    if (records.status === 2) { return '到访' }
+                                    if (records.status === 3) { return '认购' }
+                                    if (records.status === 4) { return '签约' }
+                                    if (records.verifyStatus === 1) { return '待审核' }
+                                    if (records.verifyStatus === 2) { return '审核同意' }
+                                    if (records.verifyStatus === 3) { return '签约' }
+                                  },
       },
     ]
     return (
       <>
         <Modal
-            title="选择置业顾问"
+            title="推荐客户"
             destroyOnClose="true"
+            width={900}
             footer={null}
             visible={this.state.visibleData.visible}
             // onOk={() => this.handleOk()}
@@ -183,7 +188,7 @@ function body(props) {
     console.log(e)
   }
   function gM(row) {
-    setGVisibleData({ visible: true, customerId: row.customerId, realtyConsultant: row.realtyConsultant })
+    setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
   }
 
   // 分页

src/services/apis.js

@@ -88,5 +88,13 @@ export default {
       method: 'PUT',
       url: `${prefix}/customer/recommend/edit/id`,
     },
+    taPointsRecords: {
+      method: 'GET',
+      url: `${prefix}/mine/taPointsRecords/id`,
+    },
+    recommend: {
+      method: 'GET',
+      url: `${prefix}/customer/recommend/id`,
+    },
   },
 }