Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

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

+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';
+import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+
+
+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);
+    console.log(props, 'props')
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: [], buildingName: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    console.log(this.props.visibleData)
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId })
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  changBuilding(buildingId){
+    this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
+    this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
+  }
+
+  getUserList(params){
+    console.log('params: ', params)
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  getList(params) {
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
+  }
+
+  // 提交
+  submitGm(record) {
+    // 网路请求
+    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, personIds: this.state.visibleData.customerId } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'userId',
+      //   key: 'userId',
+      // },
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
+    ]
+    return (
+      <>
+        <Modal
+            title="分配置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />
+            <Table rowKey="BatchAssistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/customer/customerlist/index.jsx

 
 import Attribution from './components/attribution'
 import AssistConsultant from './components/assistConsultant'
+import BatchAssistConsultant from './components/BatchAssistConsultant'
 import IntegralRecord from './components/integralRecord'
 import ModalRecommendRecord from './components/recommend'
 import ChangeStatus from './components/changeStatus'
 
   const [loadingStatus, setLoadingStatus] = useState(false)
 
+  // 选中的公客信息
+  const [personInfo, setPersonInfo] = useState([])
+
+  const [batchAssistVisibleData, setBatchAssistVisibleData] = useState({visible: false, customerId: []})
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList({ pageNumber: 1, pageSize: 10, customerType })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
   }
 
   function showRecord(record) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
   }
 
   function showStatus(record) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
   }
 
   // 推荐客户
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: true, customerId: personId })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
   }
 
   //分配置业顾问
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
     setAssistVisibleData({ visible: true, customerId: personId })
+    setBatchAssistVisibleData({ visible: false, customerId: '' })
+  }
+
+  function batchAssistConsultant(){
+    if (personInfo.length <= 0){
+      return message.info("请至少选择一条数据");
+    }
+    setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
+    setRecordVisibleData({ visible: false, customerId: '' })
+    setStatusVisibleData({ visible: false, customerId: '' })
+    setRecommendVisibleData({ visible: false, customerId: '' })
+    setAssistVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: true, customerId: personInfo })
   }
 
   function toCustomerDateil(record) {
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
     setAssistVisibleData({ visible: false, customerId: ''})
+    setBatchAssistVisibleData({visible: false, customerId: ''})
     getList({ pageNum: 1, pageSize: 10, customerType, ...props.form.getFieldsValue() })
   }
 
+    const rowSelection = {
+      onChange: (selectedRowKeys, selectedRows) => {
+        console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+        setPersonInfo(selectedRows)
+      },
+    };
+
   const publicColumns = [
     {
       title: '头像',
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <AuthButton name="admin.customer.public.detail" noRight={null}>
+          {/* <AuthButton name="admin.customer.public.detail" noRight={null}>
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => publicCustomerDetail(record)}>查看详情</Button>
           </AuthButton>
-          &nbsp;&nbsp;
+          &nbsp;&nbsp; */}
           <AuthButton name="admin.customer.recommend" noRight={null}>
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
           </AuthButton>
           <AuthButton name="admin.customer.assign" noRight={null}>
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => assistConsultant(record.personId)}>分配置业顾问</Button>
           </AuthButton>
+          <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
+            <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+          </AuthButton>
         </>
       ),
     },
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
           </AuthButton>
             &nbsp;&nbsp;
-          <AuthButton name="admin.customer.recommend.get" noRight={null}>
+          {/* <AuthButton name="admin.customer.recommend.get" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
           </AuthButton>
-            &nbsp;&nbsp;
+            &nbsp;&nbsp; */}
           <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
           </AuthButton>
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.customer.import" noRight={null}>
-        <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-          导出
-        </Button>
-      </AuthButton>
+      {
+        customerType === 'private' ? 
+        <AuthButton name="admin.customer.import" noRight={null}>
+          <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+            导出
+          </Button>
+        </AuthButton> :
+        <>
+        <AuthButton name="admin.customer.import" noRight={null}>
+          <Button type="primary" onClick={() => batchAssistConsultant()} style={{ float: 'right', margin: '20px 0', marginLeft:'20px', zIndex: 1 }}>
+            批量分配置业顾问
+          </Button>
+        </AuthButton>
+        <AuthButton name="admin.customer.import" noRight={null}>
+          <Button type="primary" loading={loadingStatus} onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+            导出
+          </Button>
+        </AuthButton>
+        </>
+      }
+      
 
       <div style={{ margin: '20px 0'}}>
           <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
         //   };
         // }}
         dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
-        <Table 
+        <Table rowSelection={rowSelection}
         // onRow={record => {
         //   return {
         //     onClick: () => publicCustomerDetail(record),
 
       {/* 分配置业顾问 */}
       <AssistConsultant visibleData={assistVisibleData} onCancel={() => closeAll()}/>
+
+      {/* 批量分配置业顾问 */}
+      <BatchAssistConsultant visibleData={batchAssistVisibleData} onCancel={() => closeAll()}/>
     </>
   );
 }

src/services/apis.js

       url: `${prefix}/customer/consultant/assist/:id`,
       action: 'admin.customer.consultant.assist.id.put',
     },
+    batchConsultantAssist: {
+      method: 'POST',
+      url: `${prefix}/customer/consultant/batchAssist`,
+      action: 'admin.customer.consultant.assist.id.put',
+    },
     taPointsRecords: {
       method: 'GET',
       url: `${prefix}/mine/taPointsRecords/:id`,