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

src/pages/carouselFigure/customImg/edit.jsx

 const { Option } = Select;
 
 let activityVisible = true
+let helpTips = ''
 
 const setExtraData = (data) => {
-    console.log(data, 'data');
     activityVisible = data.imgType === 'index';
   }
 
   } = props;
 
   const imgId = props.location.query.imgId
-  const [ data, setData ] = useState({'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图','imgDocument': currentUser.orgName+' 精准获客平台'})
+  const imgType = props.location.query.imgType
+
+  const [ data, setData ] = useState(imgType === 'index' ? 
+  {
+    'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
+    'imgType':'index',
+    'imgDesc':'小程序首页分享配图',
+    'imgDocument': currentUser.orgName+' 精准获客平台'
+  } : 
+  {
+    'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png',
+    'imgType':'indexNews',
+  }
+  )
+
   if(imgId){
     useEffect(() => {
       getData(imgId);
         console.log(data)
         if (data.imgType === 'index'){
             activityVisible = true;
+            helpTips = '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享';
         }else{
             activityVisible = false;
+            helpTips = '建议尺寸：80*80px，比例1:1，格式：jpg，用于：首页资讯logo'
         }
         setData(data)
     })
       name: 'imgUrl',
       type: FieldTypes.ImageUploader,
       value: data.imgUrl,
-      help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享',
+      help: helpTips,
       rules: [
         {required: true, message: '请选择图片'},
       ]
       label: '类型',
       name: 'imgType',
       type: FieldTypes.Select,
-      value: 'index',
+      value: data.imgType,
       dict: [{
           label: '首页分享',
           value: 'index',
         },
+        {
+          label: '首页资讯',
+          value: 'indexNews',
+        },
       ],
       rules: [
         { required: true, message: '请选择类型' },
       ],
     },
-    {
+    data.imgType === 'index' && {
       label: '分享文案',
       name: 'imgDocument',
       type: FieldTypes.Text,

src/pages/carouselFigure/customImg/list.jsx

         if(data.records.length > 0){
           setData(data.records)
         }else{
-          setData([{'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图'}])
+          setData([
+            {'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图'},
+            {'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png','imgType':'indexNews','imgDesc':'首页资讯logo'}
+          ])
         }
         
     })
   }
   
     // 跳转到编辑商品
-  const toEditCustom = (imgId) => () => {
+  const toEditCustom = (imgId, imgType) => () => {
     router.push({
       pathname: '/carouselFigure/customImg/edit',
       query: {
-        imgId
+        imgId,
+        imgType:imgType
       },
     });
   }
         <Column title="类型" dataIndex="imgType" key="imgType" 
         render={(text, record) => (
           <span>
-            {record.imgType === 'index' ?'首页分享':'请编辑'}
+            {record.imgType === 'index' ?'首页分享': record.imgType === 'indexNews' ? '首页资讯' : '请编辑'}
           </span>
           )}
         />
         key="handle" 
         render={(text, record) => (
           <AuthButton name="admin.custom.put" noRight={null}>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId)}>
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId, record.imgType)}>
               编辑<Icon type="form" className={styles.edit} />
             </span>
           </AuthButton>

src/pages/staff/components/BatchAssistConsultant.jsx

   }
 
   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.getUserList({ 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()
     })
   }
 
-  getList(params) {
-    // 网路请求
-    console.log('params: ', params)
-    request({ ...apis.customer.buildingConsultant }).then(res => {
-      this.setState({ dataSource: res })
-    }).catch(err => {
-      
-    })
-  }
-
   openNotificationWithIcon = (type, message) => {
     notification[type]({
       message,
 
   // 提交
   submitGm(record) {
-    console.log(record,"111111")
+    this.props.onCancel(record)
   }
 
   render() {
         dataIndex: 'personId',
         key: 'personId',
         // eslint-disable-next-line no-nested-ternary
-        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
+        render: (_, record) => <>{record.userId !== this.props.userId ? <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button> : ''}</>, },
     ]
     return (
       <>
             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) }} />
+            <Table rowKey="userId" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
           </Modal>
       </>
     );

src/pages/staff/components/BuildingSelection.jsx

+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert, Modal } from 'antd';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import CustomerChange from './CustomerChange'
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+
+let building = null
+const BuildingSelection = (props) => {
+    const [visible, setVisible] = useState(false) 
+    const { userData } = props;
+
+     //授权项目改变
+  const consultantBuildingChange =(e) => {
+    building = e
+    if(userData.isConsultant && props.value !== e){
+      request({ ...apis.staff.check, params: { userId: userData.userId, personId: userData.consultantPersonId, buildingId: userData.buildingId } }).then(res => {
+        if(res.length > 0){
+          Modal.confirm({
+            title: '此项目下有私客，是否转移私客？',
+            okText: '确认',
+            cancelText: '取消',
+            onOk () {
+              setVisible(true)
+            },
+          });
+        }else{
+            props.onChange(e)
+        }
+     })
+    }else{
+        props.onChange(e)
+    }
+  }
+
+   //迁移私客成功回调
+   const moveSuccess = (e) => {
+       if(e === 'success'){
+        props.onChange(building)
+       }
+       setVisible(false)
+  }
+
+     return (<>
+        <BuildSelect value={props.value} onChange={consultantBuildingChange} />
+        <Modal
+              visible={visible}
+              title="分配归属"
+              onCancel={() => setVisible(false)}
+              footer={null}
+              width={900}
+            >
+                <CustomerChange userId={userData.userId} consultantPersonId={userData.consultantPersonId} buildingId={userData.buildingId} onSuccess={moveSuccess} />
+            </Modal>
+     </>)
+  }
+  
+  export default BuildingSelection;

src/pages/staff/components/CustomerChange.jsx

 const CustomerChange = (props) => {
   const [data, setData] = useState([])
   const [consultantVisible, setConsultantVisible] = useState(false)
+  const [selectIds, setSelectIds] = useState([])
 
   const rowSelection = {
+    selectedRowKeys: selectIds,
     onChange: (selectedRowKeys, selectedRows) => {
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setSelectIds(selectedRowKeys)
     },
   };
 
+  const batchAssistConsultant = () => {
+    if(selectIds.length < 1){
+      message.info("请至少选择一条数据");
+      return
+    }
+    setConsultantVisible(true)
+  }
+
+  const consulatanChange = (e) => {
+    if(e){
+      data.map(x =>{ 
+        selectIds.map(y => {
+          if(x.customerId === y){
+            x.realtyConsultant = e.userId
+            x.moveUserId = e.userId
+            x.moveUserName = e.userName
+          }
+        })
+      })
+    }
+    setConsultantVisible(false)
+    setSelectIds([])
+  }
+
+  //批量保存
+  const batchSaveConsultant = () =>{
+    const unMoveData = data.filter(x => !x.moveUserId)
+    if(unMoveData.length > 0){
+      message.info("存在未分配归属客户");
+      return
+    }
+    request({ ...apis.staff.move, data }).then(data => {
+      message.info('操作成功')
+      props.onSuccess('success')
+    })
+  }
+
+  //取消按钮
+  const cancelConsultant = () => {
+    props.onSuccess('cancel')
+  }
+
+
   const columns = [
     {
       title: '用户名',
     },
     {
       title: '调整后归属',
-      dataIndex: 'buildingId',
-      key: 'buildingId',
+      dataIndex: 'moveUserName',
+      key: 'moveUserName',
       align: 'center',
     }
   ];
 
   return (
     <div>
-        <Button type="primary" onClick={() => setConsultantVisible(true)} style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }}>分配置业顾问</Button>
+        <Button type="primary" onClick={() => batchAssistConsultant()} 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} />
+        <BatchAssistConsultant visible={consultantVisible} userId={props.userId} buildingId={props.buildingId} onCancel={consulatanChange} />
+        <Button type="primary" onClick={() => batchSaveConsultant()} style={{}}>保存</Button>
+        <Button onClick={() => cancelConsultant()} style={{}}>取消</Button>
     </div>
   )
 }

src/pages/staff/list/StaffList.jsx

     // console.log(data, "11111")
     if (data.status === 1) {
       if(data.isConsultant){
-        request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(data => {
-          if(data){
+        request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(res => {
+          if(res.length > 0){
             Modal.confirm({
               title: '此置业顾问下有私客，是否转移私客？',
               okText: '确认',
                 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(res => {
+                  message.info('操作成功')
+                  props.onFresh()
+                })
+              },
+            });
           }
        })
       }else{
           okText: '确认',
           cancelText: '取消',
           onOk () {
-            request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(data => {
+            request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(res => {
               message.info('操作成功')
               props.onFresh()
             })
         okText: '确认',
         cancelText: '取消',
         onOk () {
-          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then(data => {
+          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then(res => {
             message.info('操作成功')
             props.onFresh()
           })
     }
   }
 
+  //迁移私客成功回调
+  const moveSuccess = (e) => {
+    setVisible(false)
+  }
+
   // 员工离职
   const departure = row => {
     // 是置业顾问
         footer={null}
         width={900}
       >
-          <CustomerChange userId={data.userId} consultantPersonId={data.consultantPersonId} buildingId={data.buildingId} />
+          <CustomerChange userId={data.userId} consultantPersonId={data.consultantPersonId} buildingId={data.buildingId} onSuccess={moveSuccess} />
       </Modal>
     </div>
   )

src/pages/staff/list/editStaff.jsx

 import React, { useState, useEffect } from 'react';
 
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert, Modal } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import router from 'umi/router';
 import Tagss from '../components/Tagss.jsx';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
+import BuildingSelection from '../components/BuildingSelection'
 
 const { TextArea } = Input;
 const { Option } = Select;
   const [tagData, setTagData] = useState([])
   const [roleData, setRoleData] = useState([])
   const [buildData, setBuildData] = useState([])
+  const [visible, setVisible] = useState(false)
 
   const getTagList = () => {
     request({ ...apis.staff.taTags, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
     return isLt100k;
   }
 
+  //授权项目改变
+  const consultantBuildingChange =(e) => {
+    if(userData.isConsultant){
+      request({ ...apis.staff.check, params: { userId: userData.userId, personId: userData.consultantPersonId, buildingId: userData.buildingId } }).then(res => {
+        if(res.length > 0){
+          Modal.confirm({
+            title: '此项目下有私客，是否转移私客？',
+            okText: '确认',
+            cancelText: '取消',
+            onOk () {
+              setVisible(true)
+            },
+          });
+        }
+     })
+    }
+  }
+
+   //迁移私客成功回调
+   const moveSuccess = (e) => {
+    setVisible(false)
+  }
+
   const fields = [
     {
       label: '姓名',
       type: FieldTypes.Text,
       placeholder: '请输入登录名',
       value: userData.loginName,
-      hidden: () => consultantChecked,
+      // hidden: () => consultantChecked,
       help: '默认密码：123456',
     },
     {
     {
       label: '授权项目',
       name: 'buildingId',
-      render: <BuildSelect />,
+      render: <BuildingSelection userData={userData} />,
       value: userData.buildingId,
       hidden: () => !consultantChecked,
       rules: [
 
   console.log('--------->', fields)
 
-  return <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
+  return <div>
+            <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
+            {/* <Modal
+              visible={visible}
+              title="分配归属"
+              onCancel={() => setVisible(false)}
+              footer={null}
+              width={900}
+            >
+                <CustomerChange userId={userData.userId} consultantPersonId={userData.consultantPersonId} buildingId={userData.buildingId} onSuccess={moveSuccess} />
+            </Modal> */}
+        </div>
 }
 
 export default Edit

src/services/apis.js

       method: 'GET',
       action: 'admin.consultant.customer.list.put',
     },
+    move: {
+      url: `${prefix}/consultant/customer/move`,
+      method: 'PUT',
+      action: 'admin.user.departure.put',
+    },
     departure: {
       url: `${prefix}/user/departure/:id`,
       method: 'PUT',