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

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -42,10 +42,12 @@ class AvatarDropdown extends React.Component {
   }
 
   render() {
+    console.log(this.props, 'props')
     const {
       currentUser = {
         avatar: '',
         userName: '',
+        miniAppName: '',
       },
       menu,
     } = this.props;
@@ -80,7 +82,8 @@ class AvatarDropdown extends React.Component {
         <HeaderDropdown overlay={menuHeaderDropdown}>
             <span className={`${styles.action} ${styles.account}`}>
               <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
-              <span className={styles.name}>{currentUser.userName}</span>
+              <span className={styles.name}>{currentUser.loginName}</span>
+              <span className={styles.name}>欢迎登录{currentUser.miniAppName}</span>
             </span>
         </HeaderDropdown>
 

src/pages/building/list/add/components/base.jsx

@@ -434,6 +434,7 @@ function AddBuilding(props) {
                 <Option value="待售">待售</Option>
                 <Option value="在售">在售</Option>
                 <Option value="售罄">售罄</Option>
+                <Option value="在租">在租</Option>
               </Select>,
             )}
           </Form.Item>

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -98,12 +98,13 @@ class TypeForm extends React.Component {
                   <Radio.Group onChange={e => this.onChange(e, 'priceType')} >
                     <Radio value="average">均价</Radio>
                     <Radio value="total">总价</Radio>
+                    <Radio value="lease">租赁价</Radio>
                   </Radio.Group>
                 )}
               </Form.Item>
             <Form.Item label="价格区间" help='最高价与最低价一致时，只展示一个'>
               {getFieldDecorator('startPrice')(<Input type="number" placeholder="最低价" style={{width: '120px'}} maxLength="9" onChange={e => this.onChange(e, 'startPrice')} />)} --
-              {getFieldDecorator('endPrice')(<Input type="number" placeholder="最高价" style={{width: '120px'}} maxLength="9" onChange={e => this.onChange(e, 'endPrice')} />)}{this.props.type.priceType === "average" ? "元/㎡" : "万元/套"}
+              {getFieldDecorator('endPrice')(<Input type="number" placeholder="最高价" style={{width: '120px'}} maxLength="9" onChange={e => this.onChange(e, 'endPrice')} />)}{this.props.type.priceType === "average" ? "元/㎡" : this.props.type.priceType === "lease" ? "元/㎡/天" : "万元/套"}
             </Form.Item>
             <Form.Item label="销售状态" >
             {getFieldDecorator('marketStatus')(
@@ -111,6 +112,7 @@ class TypeForm extends React.Component {
                 <Option value="待售">待售</Option>
                 <Option value="在售">在售</Option>
                 <Option value="售罄">售罄</Option>
+                <Option value="在租">在租</Option>
               </Select>,
             )}
           </Form.Item>

src/pages/building/list/add/components/imageSet.jsx

@@ -23,6 +23,10 @@ const saleType = [
     id: 3,
     name: '在售',
   },
+  {
+    id: 4,
+    name: '在租',
+  },
 ]
 
 const houseType = [

src/pages/building/list/add/components/modalImage.jsx

@@ -40,6 +40,10 @@ const saleType = [
     id: 3,
     name: '在售',
   },
+  {
+    id: 4,
+    name: '在租',
+  },
 ]
 
 const houseType = [

src/pages/customer/customerlist/index.jsx

@@ -374,7 +374,8 @@ function body(props) {
       key: 'picture',
       align: 'center',
       width: '15%',
-      render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+      // render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
+      render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={record.picture } size={64} icon="user" />,
     },
     {
       title: '姓名',
@@ -383,7 +384,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} >{customerType === 'private' ? record.name : record.nickname}</span></>,
+      // render: (_, record) => <><span style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} >{customerType === 'private' ? record.name : record.nickname}</span></>,
     },
     {
       title: '电话',
@@ -392,6 +393,21 @@ function body(props) {
       align: 'center',
       width: '15%',
     },
+    {
+      title: '是否归属项目',
+      dataIndex: '',
+      key: '',
+      align: 'center',
+      width: '15%',
+      render: (_, record) => <><span>{record.buildingId != null ? '是' : '否'}</span></>,
+    },
+    {
+      title: '归属项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      width: '15%',
+    },
     {
       title: '推广人员',
       dataIndex: 'sharePersonName',
@@ -401,12 +417,12 @@ function body(props) {
     },
     {
       title: '性别',
-      dataIndex: 'gender',
-      key: 'gender',
+      dataIndex: 'sex',
+      key: 'sex',
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+      render: (_, record) => <><span>{record.sex === '1' ? '男' : record.sex === '2' ? '女' : '未知'}</span></>,
     },
     {
       title: '操作',
@@ -484,6 +500,13 @@ function body(props) {
         </>
       ),
     },
+    {
+      title: '归属项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+      width: '15%',
+    },
     {
       title: '推广人员',
       dataIndex: 'sharePersonName',
@@ -542,6 +565,14 @@ function body(props) {
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      {customerType === 'public' && <Form.Item>
+          {getFieldDecorator('belongStatus')(
+            <Select style={{ width: '180px' }} placeholder="是否归属项目" onChange={handleSelectChange}>
+              <Option value={1}>是</Option>
+              <Option value={0}>否</Option>
+            </Select>,
+          )}
+        </Form.Item>}
         <Form.Item>
           {getFieldDecorator('buildingId')(
             <BuildSelect />,
@@ -654,7 +685,7 @@ function body(props) {
           //     onClick: () => publicCustomerDetail(record),
           //   };
           // }}
-          dataSource={dataSource.records} columns={publicColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r => r.personId} />
+          dataSource={dataSource.records} columns={publicColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r => r.customerId} />
       }
 
       {/* 调整归属 */}

src/pages/staff/components/BatchAssistConsultant.jsx

@@ -0,0 +1,140 @@
+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';
+
+
+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, buildingId: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    console.log(this.props.preState,"111111111111111")
+    if (this.props.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.buildingId })
+      this.setState({ visibleData: { visible: this.props.visible, buildingId: this.props.buildingId } });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  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) {
+    // 网路请求
+    console.log('params: ', params)
+    request({ ...apis.customer.buildingConsultant }).then(res => {
+      this.setState({ dataSource: res })
+    }).catch(err => {
+      
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+
+    this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingId })
+  }
+
+  // 提交
+  submitGm(record) {
+    console.log(record,"111111")
+  }
+
+  render() {
+    const columns = [
+      {
+        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={500}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <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/staff/components/CustomerChange.jsx

@@ -0,0 +1,63 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+import BatchAssistConsultant from './BatchAssistConsultant'
+
+const CustomerChange = (props) => {
+  const [data, setData] = useState([])
+  const [consultantVisible, setConsultantVisible] = useState(false)
+
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+    },
+  };
+
+  const columns = [
+    {
+      title: '用户名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+    },
+    {
+      title: '调整后归属',
+      dataIndex: 'buildingId',
+      key: 'buildingId',
+      align: 'center',
+    }
+  ];
+
+  useEffect(() => {
+    request({ ...apis.staff.check, params: { userId: props.userId, personId: props.consultantPersonId, buildingId: props.buildingId } }).then(data => {
+       setData(data)
+   })
+  }, [props.userId])
+
+  return (
+    <div>
+        <Button type="primary" onClick={() => setConsultantVisible(true)} style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }}>分配置业顾问</Button>
+        <Table rowSelection={rowSelection} dataSource={data} columns={columns} rowKey="customerId" pagination={false} scroll={{ y: 500 }}/>
+        <BatchAssistConsultant visible={consultantVisible} buildingId={props.buildingId} />
+    </div>
+  )
+}
+
+export default CustomerChange;

src/pages/staff/list/StaffList.jsx

@@ -9,6 +9,7 @@ import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import Styles from './style.less';
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import CustomerChange from '../components/CustomerChange'
 
 const { Meta } = Card;
 const { Option } = Select;
@@ -32,22 +33,39 @@ const toEditStaff = userId => () => {
  */
 const CartBody = props => {
   const { data } = props
+  const [visible, setVisible] = useState(false)
   // console.log("data11:", data)
 
   const confirm = data => () => {
     // console.log(data, "11111")
     if (data.status === 1) {
-      Modal.confirm({
-        title: '停用后无法登录后台系统',
-        okText: '确认',
-        cancelText: '取消',
-        onOk () {
-          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(data => {
-            message.info('操作成功')
-            props.onFresh()
-          })
-        },
-      });
+      if(data.isConsultant){
+        request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(data => {
+          if(data){
+            Modal.confirm({
+              title: '此置业顾问下有私客，是否转移私客？',
+              okText: '确认',
+              cancelText: '取消',
+              onOk () {
+                setVisible(true)
+              },
+            });
+          }
+       })
+      }else{
+        const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为置业顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
+        Modal.confirm({
+          title: titleMessahe,
+          okText: '确认',
+          cancelText: '取消',
+          onOk () {
+            request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(data => {
+              message.info('操作成功')
+              props.onFresh()
+            })
+          },
+        });
+      }
     } else {
       Modal.confirm({
         title: '确认启用该角色？',
@@ -95,45 +113,55 @@ const CartBody = props => {
   }
 
   return (
+    <div>
+      <Card className={Styles.card}>
+        <div>
+          <Avatar src={data.photo} style={{ width: '0.48rem', height: '0.48rem' }} />
+          <AuthButton name="admin.user.put" noRight={null}>
+          <Button type="link" style={{ color: '#FF925C', fontSize: '0.106rem', position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
+            编辑
+                  <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
+          </Button>
+          </AuthButton>
+          {/* <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={() => departure(data)}>
+            离职
+                  <Icon type="exclamation-circle" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
+          </Button> */}
+          <AuthButton name="admin.user.publish" noRight={null}>
+          <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
+            {data.status === 1 ? '停用' : '启用'}
+            <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
+          </Button>
+          </AuthButton>
+        </div>
+        <div>
 
-    <Card className={Styles.card}>
-      <div>
-        <Avatar src={data.photo} style={{ width: '0.48rem', height: '0.48rem' }} />
-        <AuthButton name="admin.user.put" noRight={null}>
-        <Button type="link" style={{ color: '#FF925C', fontSize: '0.106rem', position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
-          编辑
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
-        </Button>
-        </AuthButton>
-        {/* <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={() => departure(data)}>
-          离职
-                <Icon type="exclamation-circle" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
-        </Button> */}
-        <AuthButton name="admin.user.publish" noRight={null}>
-        <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
-          {data.status === 1 ? '停用' : '启用'}
-          <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
-        </Button>
-        </AuthButton>
-      </div>
-      <div>
+          <span>
+            {
+              data.taTagsList.map((item, index) => <Tag className={Styles.cardTag} color={item.tagColor}>{item.tagName}</Tag>)
+            }
+          </span>
 
-        <span>
-          {
-            data.taTagsList.map((item, index) => <Tag className={Styles.cardTag} color={item.tagColor}>{item.tagName}</Tag>)
-          }
-        </span>
-
-        <p className={Styles.cardText} >姓名 : {data.userName}
-        </p>
-        {/* <p className={Styles.statusText} > 状态 : {data.status === 1 ? '启用' : '停用'} </p> */}
-        <p className={Styles.statusText} > 绑定状态 : {data.miniStatus === 1 ? '已绑定' : '未绑定'} </p>
-        <p className={Styles.phoneText} >
-          电话 : {data.phone}
-        </p>
-      </div>
+          <p className={Styles.cardText} >姓名 : {data.userName}
+          </p>
+          {/* <p className={Styles.statusText} > 状态 : {data.status === 1 ? '启用' : '停用'} </p> */}
+          <p className={Styles.statusText} > 绑定状态 : {data.miniStatus === 1 ? '已绑定' : '未绑定'} </p>
+          <p className={Styles.phoneText} >
+            电话 : {data.phone}
+          </p>
+        </div>
 
-    </Card>
+      </Card>
+      <Modal
+        visible={visible}
+        title="分配归属"
+        onCancel={() => setVisible(false)}
+        footer={null}
+        width={900}
+      >
+          <CustomerChange userId={data.userId} consultantPersonId={data.consultantPersonId} buildingId={data.buildingId} />
+      </Modal>
+    </div>
   )
 }
 
@@ -219,6 +247,16 @@ const header = props => {
           )}
         </Form.Item>
 
+        <Form.Item>
+
+          {getFieldDecorator('miniStatus')(
+            <Select style={{ width: '180px' }} placeholder="是否绑定" >
+              <Option value="0">未绑定</Option>
+              <Option value="1">已绑定</Option>
+            </Select>,
+          )}
+        </Form.Item>
+
         <Form.Item>
         <AuthButton name="admin.user.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>

src/services/apis.js

@@ -831,6 +831,11 @@ export default {
       method: 'PUT',
       action: 'admin.turn.taUser.put',
     },
+    check: {
+      url: `${prefix}/consultant/customer/list`,
+      method: 'GET',
+      action: 'admin.consultant.customer.list.put',
+    },
     departure: {
       url: `${prefix}/user/departure/:id`,
       method: 'PUT',