fix

config/routes.js

@@ -138,8 +138,77 @@ export default [
               },
             ],
           },
+          {
+            path: '/staff',
+            name: '员工管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/staff/Staff/List',
+                name: '员工列表',
+                component: './staff/Staff/List',
+              },
+              {
+                path: '/staff/Staff/Edit',
+                name: '编辑员工',
+                hideInMenu: true,
+                component: './staff/Staff/Edit',
+              },
+              {
+                path: '/staff/Role/List',
+                name: '角色管理',
+                component: './staff/Role/List',
+              },
+              {
+                path: '/staff/Role/Edit',
+                name: '编辑角色',
+                hideInMenu: true,
+                component: './staff/Role/Edit',
+              },
+              {
+                path: '/staff/Organization/List',
+                name: '组织架构',
+                component: './staff/Organization',
+              },
+         
 
-
+              // {
+              //   path: '/staff/list/distribution',
+              //   name: '分配归属',
+              //   hideInMenu: true,
+              //   component: './staff/list/distribution',
+              // },
+            ],
+          },
+          {
+            path: '/news',
+            name: '资讯管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/news/type/NewsType',
+                name: '资讯类型',
+                component: './news/type/NewsType',
+              },
+              {
+                path: '/news/type/editNews',
+                name: '编辑资讯类型',
+                hideInMenu: true,
+                component: './news/type/editNews',
+              },
+              {
+                path: '/news/list/NewsList',
+                name: '资讯列表',
+                component: './news/list/NewsList',
+              },
+              {
+                path: '/news/list/editNewsList',
+                name: '编辑资讯',
+                hideInMenu: true,
+                component: './news/list/editNewsList',
+              },
+            ],
+          },
           {
             path: '/carouselFigure',
             name: '资源位管理',

src/components/ModalButton/ModalButton.jsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import { Modal, Button, message } from 'antd';
+
+export default function ModalButton(props) {
+  const {
+    method = 'confirm',
+    title = '',
+    content = '',
+    modalConfigs = {},
+    onClick,
+    onCancel,
+    // 未选数据弹出提示
+    beforeCheck = '',
+    okText = '确认',
+    cancelText = '取消',
+    ...btnProps
+  } = props || {}
+
+  const handleClick = e => {
+    if (!!beforeCheck) { message.info(beforeCheck); return }
+    Modal[method]({
+      title,
+      content,
+      okText,
+      cancelText,
+      ...modalConfigs,
+      onOk() {
+        // eslint-disable-next-line no-unused-expressions
+        onClick && onClick(e);
+      },
+      onCancel() {
+        // eslint-disable-next-line no-unused-expressions
+        onCancel && onCancel();
+      },
+    })
+  }
+
+  return <Button {...btnProps} onClick={handleClick}>{props.children}</Button>
+}

src/components/ModalButton/index.jsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import ModalButton from './ModalButton';
+
+const ConfirmButton = props => <ModalButton {...props} method="confirm" />
+
+export {
+  ModalButton,
+  ConfirmButton,
+}

src/pages/carouselFigure/advertisingList.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
+import { Form, Button, Select, message, Table, Pagination, Modal, Card } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import AuthButton from '@/components/AuthButton';
@@ -13,7 +13,6 @@ import request from '../../utils/request';
 import styles from '../style/GoodsList.less';
 
 const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = (props) => {
   const [data, setData] = useState({})
@@ -217,7 +216,7 @@ const header = (props) => {
   const { getFieldDecorator } = props.form
   return (
 
-    <>
+    <Card>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('cityId')(
@@ -272,13 +271,13 @@ const header = (props) => {
         </Form.Item>
       </Form>
       <AuthButton name="admin.advert.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+        <Button type='primary' onClick={toEdit()} style={{margin:'20px 0'}}>新增</Button>
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e, props)} current={data.current} />
       </div>
-    </>
+    </Card>
   )
 }
 const WrappedHeader = Form.create({ name: 'header' })(header);

src/pages/carouselFigure/carouselFigureList.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker } from 'antd';
+import { Form, Button, Select, message, Table, Pagination, Modal, DatePicker, Card } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import AuthButton from '@/components/AuthButton';
@@ -13,11 +13,9 @@ import request from '../../utils/request';
 import styles from '../style/GoodsList.less';
 
 const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = (props) => {
   const [data, setData] = useState({})
-  //   const [page, changePage] = useState({})
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
@@ -216,7 +214,7 @@ const header = (props) => {
   const { getFieldDecorator } = props.form
   return (
 
-    <>
+    <Card>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('cityId')(
@@ -270,13 +268,13 @@ const header = (props) => {
         </Form.Item>
       </Form>
       <AuthButton name="admin.extendContent.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
+        <Button type='primary' onClick={toEditCarouse()} style={{margin:'20px 0'}}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList" />
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="contentId" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>
-    </>
+    </Card>
   )
 }
 const WrappedHeader = Form.create({ name: 'header' })(header);

src/pages/carouselFigure/customImg/edit.jsx

@@ -1,30 +1,23 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-// import channels from '../../channel/channelList.less';
+import { Card, message, Form } from 'antd';
 import { connect } from 'dva';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import { createForm, FieldTypes } from '../../../components/XForm';
-import Wangedit from '../../../components/Wangedit/Wangedit'
 import router from 'umi/router';
 import apis from '../../../services/apis';
-import request from '../../../utils/request'
+import request from '../../../utils/request';
 
-const { TextArea } = Input;
-const { Option } = Select;
+let activityVisible = true;
+let helpTips = '';
 
-let activityVisible = true
-let helpTips = ''
-
-const setExtraData = (data) => {
-    activityVisible = data.imgType === 'index';
-  }
+const setExtraData = data => {
+  activityVisible = data.imgType === 'index';
+};
 
 const handleFormValueChange = (props, changedValues, allValues) => {
-    setExtraData(allValues)
-}
+  setExtraData(allValues);
+};
 
-const XForm = createForm({ onValuesChange: handleFormValueChange })
+const XForm = createForm({ onValuesChange: handleFormValueChange });
 
 const header = props => {
   const {
@@ -35,41 +28,43 @@ const header = props => {
     menu,
   } = props;
 
-  const imgId = props.location.query.imgId
-  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',
-  }
-  )
+  const imgId = props.location.query.imgId;
+  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){
+  if (imgId) {
     useEffect(() => {
       getData(imgId);
-    },[])
-
-  // 查询列表
-  const getData = (imgId) => {
-    request({ ...apis.carsuseFigure.getCustomImg, urlData: { id: imgId} }).then((data) => {
-        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'
+    }, []);
+
+    // 查询列表
+    const getData = imgId => {
+      request({ ...apis.carsuseFigure.getCustomImg, urlData: { id: imgId } }).then(data => {
+        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)
-    })
-  }
+        setData(data);
+      });
+    };
   }
 
   const fields = [
@@ -79,16 +74,15 @@ const header = props => {
       type: FieldTypes.ImageUploader,
       value: data.imgUrl,
       help: helpTips,
-      rules: [
-        {required: true, message: '请选择图片'},
-      ]
+      rules: [{ required: true, message: '请选择图片' }],
     },
     {
       label: '类型',
       name: 'imgType',
       type: FieldTypes.Select,
       value: data.imgType,
-      dict: [{
+      dict: [
+        {
           label: '首页分享',
           value: 'index',
         },
@@ -97,52 +91,53 @@ const header = props => {
           value: 'indexNews',
         },
       ],
-      rules: [
-        { required: true, message: '请选择类型' },
-      ],
+      rules: [{ required: true, message: '请选择类型' }],
     },
     data.imgType === 'index' && {
       label: '分享文案',
       name: 'imgDocument',
       type: FieldTypes.Text,
       value: data.imgDocument,
-      rules: [
-        { required: true, message: '请输入分享文案' },
-      ],
+      rules: [{ required: true, message: '请输入分享文案' }],
     },
-  ]
+  ];
 
   const handleSubmit = values => {
-    
     if (imgId) {
-      values.imgId = imgId
-      request({ ...apis.carsuseFigure.updateCustomImg, data: values,}).then((data) => {
-        cancelPage()
-      }).catch((err) => {
-        message.info(err.msg || err.message)
-      })
-      }else{
-      request({ ...apis.carsuseFigure.addCustomImg, data: values,}).then((data) => {
-        cancelPage()
-      }).catch((err) => {
-        message.info(err.msg || err.message)
-      })
-      }
-  }
+      values.imgId = imgId;
+      request({ ...apis.carsuseFigure.updateCustomImg, data: values })
+        .then(data => {
+          cancelPage();
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    } else {
+      request({ ...apis.carsuseFigure.addCustomImg, data: values })
+        .then(data => {
+          cancelPage();
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
+  };
 
   const cancelPage = () => {
     router.push({
-        pathname: '/carouselFigure/customImg/list',
+      pathname: '/carouselFigure/customImg/list',
     });
-  }
+  };
 
   return (
-    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-  )
-}
+    <Card>
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    </Card>
+  );
+};
 
 const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
 
 export default connect(({ user }) => ({
   currentUser: user.currentUser,
-}))(WrappedNormalLoginForm);
+}))(WrappedNormalLoginForm);

src/pages/carouselFigure/customImg/list.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Table } from 'antd';
+import { Form, Table, Card } from 'antd';
 import router from 'umi/router';
 import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
@@ -49,7 +49,7 @@ function header(props) {
   // const { getFieldDecorator } = props.form
   return (
 
-    <>
+    <Card>
       <Table dataSource={data}>
         <Column title="图片" dataIndex="imgUrl" key="imgUrl"
           render={(text, record) => (
@@ -73,7 +73,7 @@ function header(props) {
           ])}
         />
       </Table>,
-    </>
+    </Card>
   )
 }
 const WrappedHeader = Form.create({ name: 'header' })(header);

src/pages/carouselFigure/editAdvertising.jsx

@@ -1,17 +1,14 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { Modal, message } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../style/GoodsList.less';
-import moment from 'moment';
+import { Card, message } from 'antd';
 import router from 'umi/router';
-import BuildSelect from '../../components/SelectButton/BuildSelect2'
-import CitySelect from '../../components/SelectButton/CitySelect2'
+import BuildSelect from '../../components/SelectButton/BuildSelect2';
+import CitySelect from '../../components/SelectButton/CitySelect2';
 import { FieldTypes, createForm } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit';
 import SelectActivity from './SelectActivity';
 import SelectNews from './SelectNews';
 import apis from '../../services/apis';
-import request from '../../utils/request'
+import request from '../../utils/request';
 import SelectHelp from './SelectHelp';
 import SelectGroup from './SelectGroup';
 import SelectH5 from './SelectH5';
@@ -24,30 +21,30 @@ import LiveGroup from './LiveGroup';
  * @returns
  */
 const createEditor = () => {
-  let contentVisible = false
-  let activityVisible = false
-  let newsVisible = false
-  let helpVisible = false
-  let groupVisible = false
-  let salesBatchVisible = false
-  let liveVisible = false
-  let h5Visible = false
-  let buildingId = ''
-  let cityId = ''
-  let isHaveActive = false
-  let isCanChoose = true
-  let isHavePosition = false
-  let islet = true
+  let contentVisible = false;
+  let activityVisible = false;
+  let newsVisible = false;
+  let helpVisible = false;
+  let groupVisible = false;
+  let salesBatchVisible = false;
+  let liveVisible = false;
+  let h5Visible = false;
+  let buildingId = '';
+  let cityId = '';
+  let isHaveActive = false;
+  let isCanChoose = true;
+  let isHavePosition = false;
+  let islet = true;
 
-  const setExtraData = (data) => {
+  const setExtraData = data => {
     if (data.isHaveActive !== undefined) {
-      isHaveActive = data.isHaveActive
+      isHaveActive = data.isHaveActive;
       if (!isHaveActive) {
         // data.contentType=null
-        data.buildingId = null
+        data.buildingId = null;
       }
     }
-    islet = isHaveActive
+    islet = isHaveActive;
     if (data.showPosition == 'index') {
       isHavePosition = true;
     } else {
@@ -69,19 +66,24 @@ const createEditor = () => {
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
 
-    cityId = data.cityId
+    cityId = data.cityId;
     // console.log(data.buildingId, ' data.buildingId')
-    buildingId = data.buildingId
-  }
+    buildingId = data.buildingId;
+  };
 
   const setExtraData1 = data => {
-    console.log(data, "data.buildingIddata.buildingId2")
-    islet = data.isHaveActive
+    console.log(data, 'data.buildingIddata.buildingId2');
+    islet = data.isHaveActive;
 
-    if ((data.contentType === 'h5' && data.buildingId == null) || data.contentType === '' || data.contentType === 'nothing' || (data.contentType === 'live' && data.buildingId == null)) {
-      isHaveActive = false
+    if (
+      (data.contentType === 'h5' && data.buildingId == null) ||
+      data.contentType === '' ||
+      data.contentType === 'nothing' ||
+      (data.contentType === 'live' && data.buildingId == null)
+    ) {
+      isHaveActive = false;
     } else {
-      isHaveActive = true
+      isHaveActive = true;
     }
     // if (!isHaveActivea && data.contentType === 'h5') {
     //   // data.contentType=null
@@ -110,44 +112,44 @@ const createEditor = () => {
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
 
-    console.log(data.buildingId, ' data.buildingId')
-    buildingId = data.buildingId
-  }
+    console.log(data.buildingId, ' data.buildingId');
+    buildingId = data.buildingId;
+  };
 
   const handleFormValueChange = (props, changedValues, allValues) => {
-    setExtraData(allValues)
-  }
+    setExtraData(allValues);
+  };
 
-  const XForm = createForm({ onValuesChange: handleFormValueChange })
+  const XForm = createForm({ onValuesChange: handleFormValueChange });
 
-  return (props) => {
+  return props => {
     // const [tab, changeTab] = useState('basic')
-    const contentId = props.location.query.contentId
-    const [data, setData] = useState({})
+    const contentId = props.location.query.contentId;
+    const [data, setData] = useState({});
     const formRef = useRef(null);
 
     // 查询列表
     const getDetail = contentId => {
-      request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then((data) => {
-        setExtraData1(data)
-        setData(data)
-      })
-    }
+      request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
+        setExtraData1(data);
+        setData(data);
+      });
+    };
     useEffect(() => {
       if (contentId) {
-        isCanChoose = false
+        isCanChoose = false;
         getDetail(contentId);
       } else {
-        isCanChoose = true
+        isCanChoose = true;
       }
-    }, [])
+    }, []);
 
     const cancelPage = () => {
-      isCanChoose = true
+      isCanChoose = true;
       router.push({
         pathname: '/carouselFigure/advertisingList',
       });
-    }
+    };
 
     const fields = [
       {
@@ -158,34 +160,32 @@ const createEditor = () => {
         hidden: () => !isCanChoose,
         props: {
           onChange: () => {
-            const type = formRef.current.props.form.getFieldValue('contentType')
-            if (formRef.current && (type !== 'live' && type !== 'h5')) {
-              console.log(formRef.current.props.form.getFieldValue('contentType'), '2222')
+            const type = formRef.current.props.form.getFieldValue('contentType');
+            if (formRef.current && type !== 'live' && type !== 'h5') {
+              console.log(formRef.current.props.form.getFieldValue('contentType'), '2222');
               formRef.current.props.form.resetFields(['contentType', []]);
             }
           },
         },
-        rules: [
-          { required: true, message: '是否城市活动' },
-        ],
+        rules: [{ required: true, message: '是否城市活动' }],
       },
       {
         label: '发布位置',
         name: 'showPosition',
         type: FieldTypes.Select,
         value: isHaveActive,
-        dict: [{
-          label: '首页',
-          value: 'index',
-        },
-        {
-          label: '项目',
-          value: 'building',
-        }],
-        value: data.showPosition,
-        rules: [
-          { required: true, message: '请选择发布位置' },
+        dict: [
+          {
+            label: '首页',
+            value: 'index',
+          },
+          {
+            label: '项目',
+            value: 'building',
+          },
         ],
+        value: data.showPosition,
+        rules: [{ required: true, message: '请选择发布位置' }],
       },
       {
         label: '所属项目',
@@ -193,9 +193,7 @@ const createEditor = () => {
         render: <BuildSelect />,
         value: data.buildingId,
         hidden: () => !isHaveActive && isHavePosition,
-        rules: [
-          { required: true, message: '请选择所属项目' },
-        ],
+        rules: [{ required: true, message: '请选择所属项目' }],
       },
       {
         label: '展示城市',
@@ -203,9 +201,7 @@ const createEditor = () => {
         render: <CitySelect />,
         hidden: () => !isHavePosition || isHaveActive,
         value: data.cityId,
-        rules: [
-          { required: true, message: '请选择展示城市' },
-        ],
+        rules: [{ required: true, message: '请选择展示城市' }],
       },
       {
         label: '开屏广告',
@@ -213,31 +209,29 @@ const createEditor = () => {
         type: FieldTypes.ImageUploader,
         value: data.image,
         help: '建议图片尺寸：640*960px，比例2:3,格式：jpg，用于开屏广告',
-        rules: [
-          { required: true, message: '请上传图片' },
-        ],
+        rules: [{ required: true, message: '请上传图片' }],
       },
       {
         label: '类型',
         name: 'contentType',
         type: FieldTypes.Select,
         hidden: () => isHaveActive,
-        dict: [{
-          label: 'H5活动详情',
-          value: 'h5',
-        },
-        {
-          label: '直播活动详情',
-          value: 'live',
-        },
-        {
-          label: '其它',
-          value: 'others',
-        }],
-        value: data.contentType,
-        rules: [
-          { required: true, message: '请选择类型' },
+        dict: [
+          {
+            label: 'H5活动详情',
+            value: 'h5',
+          },
+          {
+            label: '直播活动详情',
+            value: 'live',
+          },
+          {
+            label: '其它',
+            value: 'others',
+          },
         ],
+        value: data.contentType,
+        rules: [{ required: true, message: '请选择类型' }],
       },
       {
         label: '标题',
@@ -245,65 +239,61 @@ const createEditor = () => {
         type: FieldTypes.Text,
         hidden: true,
         value: data.title,
-        rules: [
-          { required: true, message: '请输入标题' },
-        ],
+        rules: [{ required: true, message: '请输入标题' }],
       },
       {
         label: '类型',
         name: 'contentType',
         hidden: () => !isHaveActive,
         type: FieldTypes.Select,
-        dict: [{
-          label: '报名活动详情',
-          value: 'activity'
-        },
-        {
-          label: '项目详情',
-          value: 'project'
-        },
-        {
-          label: '资讯详情',
-          value: 'news'
-        },
-        {
-          label: '拼团活动详情',
-          value: 'group'
-        },
-        {
-          label: '助力活动详情',
-          value: 'help'
-        },
-        {
-          label: 'H5活动详情',
-          value: 'h5',
-        },
-        {
-          label: '在线选房详情',
-          value: 'salesBatch',
-        },
-        {
-          label: '直播活动详情',
-          value: 'live',
-        },
-        {
-          label: '其它',
-          value: 'others',
-        }],
-        value: data.contentType,
-        rules: [
-          { required: true, message: '请选择类型' },
+        dict: [
+          {
+            label: '报名活动详情',
+            value: 'activity',
+          },
+          {
+            label: '项目详情',
+            value: 'project',
+          },
+          {
+            label: '资讯详情',
+            value: 'news',
+          },
+          {
+            label: '拼团活动详情',
+            value: 'group',
+          },
+          {
+            label: '助力活动详情',
+            value: 'help',
+          },
+          {
+            label: 'H5活动详情',
+            value: 'h5',
+          },
+          {
+            label: '在线选房详情',
+            value: 'salesBatch',
+          },
+          {
+            label: '直播活动详情',
+            value: 'live',
+          },
+          {
+            label: '其它',
+            value: 'others',
+          },
         ],
+        value: data.contentType,
+        rules: [{ required: true, message: '请选择类型' }],
       },
       {
         label: '发布H5活动',
         name: 'targetId',
-        render: <SelectH5 buildingId={() => islet ? buildingId : ''} />,
+        render: <SelectH5 buildingId={() => (islet ? buildingId : '')} />,
         hidden: () => !h5Visible,
         value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布H5' },
-        ],
+        rules: [{ required: true, message: '请选择发布H5' }],
       },
       {
         label: '发布活动',
@@ -311,9 +301,7 @@ const createEditor = () => {
         render: <SelectActivity buildingId={() => buildingId} />,
         hidden: () => !activityVisible,
         value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布活动' },
-        ],
+        rules: [{ required: true, message: '请选择发布活动' }],
       },
       {
         label: '发布资讯',
@@ -321,9 +309,7 @@ const createEditor = () => {
         render: <SelectNews buildingId={() => buildingId} />,
         hidden: () => !newsVisible,
         value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布资讯' },
-        ],
+        rules: [{ required: true, message: '请选择发布资讯' }],
       },
       {
         label: '发布内容',
@@ -331,9 +317,7 @@ const createEditor = () => {
         render: <Wangedit />,
         value: data.content,
         hidden: () => !contentVisible,
-        rules: [
-          { required: true, message: '请选择发布内容' },
-        ],
+        rules: [{ required: true, message: '请选择发布内容' }],
       },
       {
         label: '发布助力',
@@ -341,9 +325,7 @@ const createEditor = () => {
         render: <SelectHelp buildingId={() => buildingId} />,
         hidden: () => !helpVisible,
         value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布助力' },
-        ],
+        rules: [{ required: true, message: '请选择发布助力' }],
       },
       {
         label: '发布拼团',
@@ -351,9 +333,7 @@ const createEditor = () => {
         render: <SelectGroup buildingId={() => buildingId} />,
         hidden: () => !groupVisible,
         value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布拼团' },
-        ],
+        rules: [{ required: true, message: '请选择发布拼团' }],
       },
       {
         label: '发布销售批次',
@@ -361,66 +341,79 @@ const createEditor = () => {
         render: <SalesBatchGroup buildingId={() => buildingId} />,
         hidden: () => !salesBatchVisible,
         value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布销售批次' },
-        ],
+        rules: [{ required: true, message: '请选择发布销售批次' }],
       },
       {
         label: '发布直播活动',
         name: 'targetId',
-        render: <LiveGroup buildingId={() => islet ? buildingId : ''} />,
+        render: <LiveGroup buildingId={() => (islet ? buildingId : '')} />,
         hidden: () => !liveVisible,
         value: data.targetId,
-        rules: [
-          { required: true, message: '请选择发布直播活动' },
-        ],
+        rules: [{ required: true, message: '请选择发布直播活动' }],
       },
       {
         label: '状态',
         name: 'status',
         type: FieldTypes.Select,
-        dict: [{
-          label: "上架",
-          value: 1
-        },
-        {
-          label: "下架",
-          value: 0
-        },],
+        dict: [
+          {
+            label: '上架',
+            value: 1,
+          },
+          {
+            label: '下架',
+            value: 0,
+          },
+        ],
         value: data.status != null ? data.status : 1,
       },
-    ]
+    ];
 
     const handleSubmit = val => {
-      val.showType = 'screen'
+      val.showType = 'screen';
       if (!isHaveActive && val.targetId) {
         if (!val.contentType) {
-          val.contentType = 'h5'
+          val.contentType = 'h5';
         }
       }
       if (!isHaveActive && !val.targetId) {
-        val.contentType = ''
+        val.contentType = '';
       }
       if (contentId) {
-        request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val, }).then((data) => {
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
+        request({
+          ...apis.carsuseFigure.updataExtendContent,
+          urlData: { id: contentId },
+          data: val,
         })
+          .then(data => {
+            cancelPage();
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
       } else {
-        request({ ...apis.carsuseFigure.addExtendContent, data: val, }).then((data) => {
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
+        request({ ...apis.carsuseFigure.addExtendContent, data: val })
+          .then(data => {
+            cancelPage();
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
       }
-    }
-
+    };
 
     return (
-      <XForm wrappedComponentRef={formRef} onSubmit={handleSubmit} onCancel={cancelPage} onValuesChange={handleFormValueChange} fields={fields}></XForm>
+      <Card>
+        <XForm
+          wrappedComponentRef={formRef}
+          onSubmit={handleSubmit}
+          onCancel={cancelPage}
+          onValuesChange={handleFormValueChange}
+          fields={fields}
+        ></XForm>
+      </Card>
     );
-  }
-}
+  };
+};
 
-export default createEditor()
+export default createEditor();

src/pages/carouselFigure/editCarousel.jsx

@@ -1,15 +1,13 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
+import { Card, DatePicker, message } from 'antd';
+
 import router from 'umi/router';
-import styles from '../style/GoodsList.less';
-import BuildSelect from '../../components/SelectButton/BuildSelect2'
-import CitySelect from '../../components/SelectButton/CitySelect2'
+import BuildSelect from '../../components/SelectButton/BuildSelect2';
+import CitySelect from '../../components/SelectButton/CitySelect2';
 import { createForm, FieldTypes } from '../../components/XForm';
-import Wangedit from '../../components/Wangedit/Wangedit'
+import Wangedit from '../../components/Wangedit/Wangedit';
 import apis from '../../services/apis';
-import request from '../../utils/request'
+import request from '../../utils/request';
 import SelectHelp from './SelectHelp';
 import SelectGroup from './SelectGroup';
 import SalesBatchGroup from './SalesBatchGroup';
@@ -18,35 +16,34 @@ import SelectNews from './SelectNews';
 import SelectActivity from './SelectActivity';
 import SelectH5 from './SelectH5';
 
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 /**
  *
  *
  * @param {*} props
  * @returns
  */
- const Edit = props => {
-  let contentVisible = false
-  let activityVisible = false
-  let newsVisible = false
-  let helpVisible = false
-  let groupVisible = false
-  let salesBatchVisible = false
-  let liveVisible = false
-  let h5Visible = false
-  let buildingId = ''
-  let cityId=''
-  let locationType = false
-  let isHaveActive=false
-  let isCanChoose=true
+const Edit = props => {
+  let contentVisible = false;
+  let activityVisible = false;
+  let newsVisible = false;
+  let helpVisible = false;
+  let groupVisible = false;
+  let salesBatchVisible = false;
+  let liveVisible = false;
+  let h5Visible = false;
+  let buildingId = '';
+  let cityId = '';
+  let locationType = false;
+  let isHaveActive = false;
+  let isCanChoose = true;
 
-  const setExtraData = (data) => {
+  const setExtraData = data => {
     console.log(data, 'data');
-    if(data.isHaveActive!=undefined){
-      isHaveActive=data.isHaveActive
-      if(!isHaveActive) {
+    if (data.isHaveActive != undefined) {
+      isHaveActive = data.isHaveActive;
+      if (!isHaveActive) {
         // data.contentType=null
-        data.buildingId=null
+        data.buildingId = null;
       }
     }
 
@@ -59,18 +56,23 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     liveVisible = data.contentType === 'live';
     h5Visible = data.contentType === 'h5';
 
-    cityId=data.cityId
-    buildingId = data.buildingId
+    cityId = data.cityId;
+    buildingId = data.buildingId;
     locationType = data.showPosition === 'mall';
     console.log(locationType, 'locationType');
-  }
+  };
 
-  const setExtraData1 = (data) => {
-     if((data.contentType=='h5'  && data.buildingId == null) || data.contentType==''||data.contentType=='nothing' || (data.contentType=='live' && data.buildingId == null)){
-        isHaveActive=false
-     }else{
-        isHaveActive=true
-     }
+  const setExtraData1 = data => {
+    if (
+      (data.contentType == 'h5' && data.buildingId == null) ||
+      data.contentType == '' ||
+      data.contentType == 'nothing' ||
+      (data.contentType == 'live' && data.buildingId == null)
+    ) {
+      isHaveActive = false;
+    } else {
+      isHaveActive = true;
+    }
 
     contentVisible = data.contentType === 'other';
     activityVisible = data.contentType === 'activity';
@@ -79,141 +81,136 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     groupVisible = data.contentType === 'group';
     salesBatchVisible = data.contentType === 'salesBatch';
     liveVisible = data.contentType === 'live';
-    buildingId = data.buildingId
+    buildingId = data.buildingId;
     locationType = data.showPosition === 'mall';
     h5Visible = data.contentType === 'h5';
     console.log(locationType, 'locationType');
-  }
-
+  };
 
   const handleFormValueChange = (props, changedValues, allValues) => {
-      setExtraData(allValues)
-  }
+    setExtraData(allValues);
+  };
 
-  const XForm = createForm({ onValuesChange: handleFormValueChange })
+  const XForm = createForm({ onValuesChange: handleFormValueChange });
 
   return props => {
-    const [tab, changeTab] = useState('basic')
-    const { contentId } = props.location.query
-    const [data, setData] = useState({})
+    const [tab, changeTab] = useState('basic');
+    const { contentId } = props.location.query;
+    const [data, setData] = useState({});
 
     if (contentId) {
-      isCanChoose=false
+      isCanChoose = false;
       // eslint-disable-next-line react-hooks/rules-of-hooks
       useEffect(() => {
         getDetail(contentId);
-      }, [])
+      }, []);
 
       // 查询列表
       const getDetail = contentId => {
-        request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(data => {
-            console.log(data)
-            setExtraData1(data)
-            setData(data)
-        })
-      }
-    }else{
-      isCanChoose=true
+        request({ ...apis.carsuseFigure.getExtendContent, urlData: { id: contentId } }).then(
+          data => {
+            console.log(data);
+            setExtraData1(data);
+            setData(data);
+          },
+        );
+      };
+    } else {
+      isCanChoose = true;
     }
 
     const cancelPage = () => {
       router.push({
         pathname: '/carouselFigure/carouselFigureList',
       });
-    }
+    };
 
-      const fields = [
-        {
-          label: '是否关联项目',
-          name: 'isHaveActive',
-          type: FieldTypes.Switch,
-          value:isHaveActive,
-          hidden: () => !isCanChoose,
-          rules: [
-            { required: true,message: '是否城市活动' },
-          ],
-        },
-        {
-          label: '所属项目',
-          name: 'buildingId',
-          render: <BuildSelect />,
-          hidden: () => !isHaveActive,
-          value: data.buildingId,
-          rules: [
-            { required: true, message: '请选择所属项目' },
-          ],
-        },
-        {
-          label: '展示城市',
-          name: 'cityId',
-          render: <CitySelect />,
-          hidden: () => isHaveActive,
-          value: data.cityId,
-          rules: [
-            { required: true, message: '请选择展示城市' },
-          ],
-        },
-        {
-          label: '发布位置',
-          name: 'showPosition',
-          type: FieldTypes.Select,
-          dict: [{
+    const fields = [
+      {
+        label: '是否关联项目',
+        name: 'isHaveActive',
+        type: FieldTypes.Switch,
+        value: isHaveActive,
+        hidden: () => !isCanChoose,
+        rules: [{ required: true, message: '是否城市活动' }],
+      },
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        hidden: () => !isHaveActive,
+        value: data.buildingId,
+        rules: [{ required: true, message: '请选择所属项目' }],
+      },
+      {
+        label: '展示城市',
+        name: 'cityId',
+        render: <CitySelect />,
+        hidden: () => isHaveActive,
+        value: data.cityId,
+        rules: [{ required: true, message: '请选择展示城市' }],
+      },
+      {
+        label: '发布位置',
+        name: 'showPosition',
+        type: FieldTypes.Select,
+        dict: [
+          {
             label: '首页',
             value: 'index',
           },
           {
             label: '积分商城',
             value: 'mall',
-          }],
-          value: data.showPosition,
-          rules: [
-            { required: true, message: '请选择发布位置' },
-          ],
-        },
-        {
-          label: () => (locationType ? '积分商城轮播图' : '首页轮播图'),
-          name: 'image',
-          type: FieldTypes.ImageUploader,
-          value: data.image,
-          help: () => (locationType ? '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于积分商城banner轮播' : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播'),
-          rules: [
-            { required: true, message: '请上传轮播图' },
-          ],
-        },
-        {
-          label: '类型',
-          name: 'contentType',
-          type: FieldTypes.Select,
-          hidden: () => isHaveActive,
-          dict: [{
+          },
+        ],
+        value: data.showPosition,
+        rules: [{ required: true, message: '请选择发布位置' }],
+      },
+      {
+        label: () => (locationType ? '积分商城轮播图' : '首页轮播图'),
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+        help: () =>
+          locationType
+            ? '建议图片尺寸：750*250px，比例3:1,格式：jpg，用于积分商城banner轮播'
+            : '建议图片尺寸：750*464px，比例1.:0.618,格式：jpg，用于：首页顶部banner轮播',
+        rules: [{ required: true, message: '请上传轮播图' }],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        hidden: () => isHaveActive,
+        dict: [
+          {
             label: 'h5',
             value: 'h5',
           },
           {
             label: '直播活动详情',
             value: 'live',
-          }],
-          value: data.contentType,
-          rules: [
-            { required: true, message: '请选择类型' },
-          ],
-        },
-        {
-          label: '标题',
-          name: 'title',
-          type: FieldTypes.Text,
-          value: data.title,
-          hidden: true,
-          rules: [
-            { required: true, message: '请输入标题' },
-          ],
-        },
-        {
-          label: '类型',
-          name: 'contentType',
-          type: FieldTypes.Select,
-          hidden: () => !isHaveActive,
-          dict: [{
+          },
+        ],
+        value: data.contentType,
+        rules: [{ required: true, message: '请选择类型' }],
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: data.title,
+        hidden: true,
+        rules: [{ required: true, message: '请输入标题' }],
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        hidden: () => !isHaveActive,
+        dict: [
+          {
             label: '常规活动',
             value: 'activity',
           },
@@ -248,146 +245,140 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
           {
             label: '直播活动详情',
             value: 'live',
-          }],
-          value: data.contentType,
-          rules: [
-            { required: true, message: '请选择类型' },
-          ],
-        },
-        {
-          label: '发布活动',
-          name: 'targetId',
-          render: <SelectActivity buildingId={() => buildingId} />,
-          hidden: () => !activityVisible,
-          value: data.targetId,
-          rules: [
-            { required: true, message: '请选择发布活动' },
-          ],
-        },
-        {
-          label: '是否发布H5',
-          name: 'targetId',
-          render: <SelectH5 buildingId={() => buildingId}/>,
-          hidden: () => !h5Visible,
-          value: data.targetId,
-          rules: [
-            { required: false, message: '请选择发布H5' },
-          ],
-        },
-        {
-          label: '发布资讯',
-          name: 'targetId',
-          render: <SelectNews buildingId={() => buildingId} />,
-          hidden: () => !newsVisible,
-          value: data.targetId,
-          rules: [
-            { required: true, message: '请选择发布资讯' },
-          ],
-        },
-        {
-          label: '发布内容',
-          name: 'content',
-          render: <Wangedit />,
-          value: data.content,
-          hidden: () => !contentVisible,
-          rules: [
-            { required: true, message: '请输入发布内容' },
-          ],
-        },
-        {
-          label: '发布助力',
-          name: 'targetId',
-          render: <SelectHelp buildingId={() => buildingId} />,
-          hidden: () => !helpVisible,
-          value: data.targetId,
-          rules: [
-            { required: true, message: '请选择发布助力' },
-          ],
-        },
-        {
-          label: '发布拼团',
-          name: 'targetId',
-          render: <SelectGroup buildingId={() => buildingId} />,
-          hidden: () => !groupVisible,
-          value: data.targetId,
-          rules: [
-            { required: true, message: '请选择发布拼团' },
-          ],
-        },
-        {
-          label: '发布销售批次',
-          name: 'targetId',
-          render: <SalesBatchGroup buildingId={() => buildingId} />,
-          hidden: () => !salesBatchVisible,
-          value: data.targetId,
-          rules: [
-            { required: true, message: '请选择发布销售批次' },
-          ],
-        },
-        {
-          label: '发布直播活动',
-          name: 'targetId',
-          render: <LiveGroup buildingId={() => buildingId} />,
-          hidden: () => !liveVisible,
-          value: data.targetId, 
-          rules: [
-            { required: true, message: '请选择发布直播活动' },
-          ],
-        },
-        {
-          label: '状态',
-          name: 'status',
-          type: FieldTypes.Select,
-          dict: [{
+          },
+        ],
+        value: data.contentType,
+        rules: [{ required: true, message: '请选择类型' }],
+      },
+      {
+        label: '发布活动',
+        name: 'targetId',
+        render: <SelectActivity buildingId={() => buildingId} />,
+        hidden: () => !activityVisible,
+        value: data.targetId,
+        rules: [{ required: true, message: '请选择发布活动' }],
+      },
+      {
+        label: '是否发布H5',
+        name: 'targetId',
+        render: <SelectH5 buildingId={() => buildingId} />,
+        hidden: () => !h5Visible,
+        value: data.targetId,
+        rules: [{ required: false, message: '请选择发布H5' }],
+      },
+      {
+        label: '发布资讯',
+        name: 'targetId',
+        render: <SelectNews buildingId={() => buildingId} />,
+        hidden: () => !newsVisible,
+        value: data.targetId,
+        rules: [{ required: true, message: '请选择发布资讯' }],
+      },
+      {
+        label: '发布内容',
+        name: 'content',
+        render: <Wangedit />,
+        value: data.content,
+        hidden: () => !contentVisible,
+        rules: [{ required: true, message: '请输入发布内容' }],
+      },
+      {
+        label: '发布助力',
+        name: 'targetId',
+        render: <SelectHelp buildingId={() => buildingId} />,
+        hidden: () => !helpVisible,
+        value: data.targetId,
+        rules: [{ required: true, message: '请选择发布助力' }],
+      },
+      {
+        label: '发布拼团',
+        name: 'targetId',
+        render: <SelectGroup buildingId={() => buildingId} />,
+        hidden: () => !groupVisible,
+        value: data.targetId,
+        rules: [{ required: true, message: '请选择发布拼团' }],
+      },
+      {
+        label: '发布销售批次',
+        name: 'targetId',
+        render: <SalesBatchGroup buildingId={() => buildingId} />,
+        hidden: () => !salesBatchVisible,
+        value: data.targetId,
+        rules: [{ required: true, message: '请选择发布销售批次' }],
+      },
+      {
+        label: '发布直播活动',
+        name: 'targetId',
+        render: <LiveGroup buildingId={() => buildingId} />,
+        hidden: () => !liveVisible,
+        value: data.targetId,
+        rules: [{ required: true, message: '请选择发布直播活动' }],
+      },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [
+          {
             label: '上架',
             value: 1,
           },
           {
             label: '下架',
             value: 0,
-          }],
-          value: data.status != null ? data.status : 1,
-        },
-        {
-          label: '权重',
-          name: 'orderNo',
-          type: FieldTypes.Number,
-          value: data.orderNo,
-          help: "数值越大越靠前",
-        },
-      ]
+          },
+        ],
+        value: data.status != null ? data.status : 1,
+      },
+      {
+        label: '权重',
+        name: 'orderNo',
+        type: FieldTypes.Number,
+        value: data.orderNo,
+        help: '数值越大越靠前',
+      },
+    ];
 
-      const handleSubmit = val => {
-        console.log(val,"232323")
-        val.showType = 'banner'
-        if(!isHaveActive&&val.targetId) {
-          if(!val.contentType){
-            val.contentType='h5'
-          }
-        }
-        if(!isHaveActive&&!val.targetId){
-          val.contentType=''
+    const handleSubmit = val => {
+      console.log(val, '232323');
+      val.showType = 'banner';
+      if (!isHaveActive && val.targetId) {
+        if (!val.contentType) {
+          val.contentType = 'h5';
         }
-        if (contentId) {
-          request({ ...apis.carsuseFigure.updataExtendContent, urlData: { id: contentId }, data: val }).then(data => {
-            cancelPage()
-          }).catch(err => {
-            message.info(err.msg || err.message)
+      }
+      if (!isHaveActive && !val.targetId) {
+        val.contentType = '';
+      }
+      if (contentId) {
+        request({
+          ...apis.carsuseFigure.updataExtendContent,
+          urlData: { id: contentId },
+          data: val,
+        })
+          .then(data => {
+            cancelPage();
           })
-        } else {
-          request({ ...apis.carsuseFigure.addExtendContent, data: val }).then(data => {
-            cancelPage()
-          }).catch(err => {
-            message.info(err.msg || err.message)
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
+      } else {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val })
+          .then(data => {
+            cancelPage();
           })
-        }
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
       }
+    };
 
     return (
-      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+      <Card>
+        <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+      </Card>
     );
-  }
- }
-
+  };
+};
 
-export default Edit()
+export default Edit();

src/pages/customer/Customer/PublicCustomer/AssistConsultant/AssistConsultant.jsx

@@ -0,0 +1,323 @@
+import React, { useState, useEffect } from 'react';
+import { Table, Modal, notification } from 'antd';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect';
+
+/**
+ * 分配置业顾问
+ *
+ * @param {*} props
+ * @returns
+ */
+
+const AssistConsultant = props => {
+  const { visible, data } = props.modelProps || {};
+
+  const [tableData, setTableData] = useState({});
+  const [loading, setLoading] = useState(false);
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+  function getList(params) {
+    // 网路请求
+    setLoading(true);
+    request({
+      ...apis.customer.buildingConsultant,
+      params: { ...params },
+    })
+      .then(res => {
+        console.log(res, 'res');
+        setTableData(res);
+        setLoading(false);
+      })
+      .catch(err => {
+        openNotificationWithIcon('error', err);
+        setLoading(false);
+      });
+  }
+
+  useEffect(() => {
+    if (visible) {
+      getList({ pageNumber: 1, pageSize: 5 });
+    } else {
+      setTableData({});
+    }
+  }, [visible]);
+
+  // 分页
+  function onChange(pageNum) {
+    getList({ pageNumber: pageNum, pageSize: 5 });
+  }
+
+  function changBuilding(buildingId) {
+    if (buildingId) {
+      getList({ pageNumber: 1, pageSize: 5, buildingId: buildingId });
+    }
+  }
+
+  //   // 提交
+  function submitGm(record) {
+    // 网路请求
+    request({
+      ...apis.customer.consultantAssist,
+      urlData: { id: data.customerId },
+      data: { userId: record.userId, buildingId: data.buildingName || data.buildingId },
+    })
+      .then(res => {
+        // eslint-disable-next-line no-unused-expressions
+
+        openNotificationWithIcon('success', '操作成功');
+        props.handleCancel();
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+      });
+  }
+
+  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={() => submitGm(record)}>
+              确定
+            </Button>
+          }
+        </>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <Modal
+        title={'分配置业顾问'}
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        onCancel={() => props.onCancel()}
+      >
+        {/* <span>你正在为{this.props.visibleData.customerId.length}位公客分配置业顾问</span><br/><br/>
+            {this.props.visibleData.buildingId == null && <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />} */}
+
+        {data && (
+          <>
+            {data.customerId?.length > 0 && (
+              <>
+                <span>你正在为{data.customerId.length}位公客分配置业顾问</span>
+                <br />
+                <br />
+              </>
+            )}
+            {data?.buildingId == null && (
+              <BuildSelect onChange={e => changBuilding(e)} value={data?.buildingName} />
+            )}
+            <Table
+              dataSource={tableData.records}
+              columns={columns}
+              loading={loading}
+              pagination={{
+                pageSize: tableData.pageSize,
+                total: tableData.total,
+                onChange: e => onChange(e),
+              }}
+            />
+          </>
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default AssistConsultant;
+
+// 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);
+//     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,buildingId:this.props.visibleData.buildingId })
+//       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, customerId: this.props.visibleData.customerId, buildingId: this.state.visibleData.buildingName ||this.props.visibleData.buildingId})
+//   }
+
+//   // 提交
+//   submitGm(record) {
+//     debugger
+//     // 网路请求
+//     request({ ...apis.customer.consultantAssist, urlData: { id: this.state.visibleData.customerId },
+//       data: { userId: record.userId,buildingId:this.state.visibleData.buildingName  || this.props.visibleData.buildingId } }).then(res => {
+//       // eslint-disable-next-line no-unused-expressions
+
+//       this.openNotificationWithIcon('success', '操作成功')
+//       this.handleCancel()
+//     }).catch(err => {
+//       // eslint-disable-next-line no-unused-expressions
+//     })
+//   }
+
+//   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)}
+//           >
+//             {this.props.visibleData.buildingId == null && <BuildSelect  onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />}
+//             <Table rowKey="assistConsultant" 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/Customer/PublicCustomer/AssistConsultant/Attribution.jsx

@@ -0,0 +1,98 @@
+import React from 'react';
+import { Button, Modal, notification } from 'antd';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import TableList from '@/components/TableList';
+
+const Attribution = props => {
+  console.log(props, 'props');
+
+  const { visible, data } = props.modelProps || {};
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+  // 提交
+  function submitGm(record) {
+    // 网路请求
+    request({
+      ...apis.customer.recommendEdit,
+      urlData: { id: data.customerId },
+      data: { customerId: data.customerId, realtyConsultant: record.userId },
+    })
+      .then(res => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        props.handleCancel();
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('error', err);
+      });
+  }
+
+  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',
+      render: (_, record) => (
+        <>
+          {data.realtyConsultant != record.userId && (
+            <Button type="primary" onClick={() => submitGm(record)}>
+              确定
+            </Button>
+          )}
+        </>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <Modal
+        title="变更状态"
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        onCancel={() => props.onCancel()}
+      >
+        {data && (
+          <TableList
+            rowKey="userId"
+            api={apis.customer.buildingConsultant}
+            params={{ buildingId: data.buildingId }}
+            columns={columns}
+          />
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default Attribution;

src/pages/customer/Customer/PublicCustomer/AssistConsultant/BatchAssistConsultant.jsx

@@ -0,0 +1,170 @@
+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,buildingId: this.props.visibleData.buildingId})
+      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 => {
+      message.err(err)
+    })
+  }
+
+  getList(params) {
+    // 网路请求
+    console.log('params: ', 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 ||this.props.visibleData.buildingId})
+
+    // this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
+  }
+
+  // 提交
+  submitGm(record) {
+    // 网路请求
+    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId
+      ,buildingId:this.state.visibleData.buildingName  || this.props.visibleData.buildingId
+      , customerIds: this.state.visibleData.customerId } }).then(res => {
+      // eslint-disable-next-line no-unused-expressions
+      debugger
+      if(res!= null && res.failNum > 0 ){
+        this.openNotificationWithIcon('success', '共'+res.totalNum+'条数据,失败操作'+res.failNum+'条')
+      }else{
+        this.openNotificationWithIcon('success', '操作成功')
+      }
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+  
+    })
+  }
+
+  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)}
+          >
+            <span>你正在为{this.props.visibleData.customerId.length}位公客分配置业顾问</span><br/><br/>
+            {this.props.visibleData.buildingId == null && <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/Customer/PublicCustomer/AssistConsultant/ChangeStatus.jsx

@@ -0,0 +1,77 @@
+import React, { useState, useEffect } from 'react';
+import {
+  Button,
+  Radio,
+  Modal,
+  notification,
+} from 'antd';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+
+const ChangeStatus = props => {
+  console.log(props, 'props');
+
+  const [value, setValue] = useState();
+
+  const { visible, data } = props.modelProps || {};
+
+  useEffect(() => {
+    console.log(data, 'data');
+    setValue(data?.status);
+  }, [data]);
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+const  submitButton = () => {
+    // 网路请求
+    request({
+      ...apis.customer.recommendEdit,
+      urlData: { id: data.customerId },
+      data: { customerId: data.customerId, status: value },
+    })
+      .then(() => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('success', '操作成功');
+        props.handleCancel()
+      })
+      .catch(err => {
+        // eslint-disable-next-line no-unused-expressions
+        openNotificationWithIcon('error', err);
+      });
+  };
+
+  return (
+    <>
+      <Modal
+        title="变更状态"
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        // onOk={() => this.handleOk()}
+        onCancel={() => props.onCancel()}
+      >
+        {data && (
+          <>
+            <Radio.Group value={value} onChange={e => setValue(e.target.value)}>
+              <Radio value={1}>客户报备</Radio>
+              <Radio value={2}>客户到访</Radio>
+              <Radio value={3}>客户认购</Radio>
+              <Radio value={4}>客户签约</Radio>
+            </Radio.Group>
+            <Button type="primary" onClick={submitButton}>
+              确定
+            </Button>
+          </>
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default ChangeStatus;

src/pages/customer/Customer/PublicCustomer/AssistConsultant/IntegralRecord.jsx

@@ -0,0 +1,140 @@
+import React, { useState, useEffect } from 'react';
+import { Select, Card, Modal, notification, Table } from 'antd';
+import moment from 'moment';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import Styles from '../../style.less';
+
+/**
+ * 积分记录
+ *
+ * @param {*} props
+ * @returns
+ */
+const IntegralRecord = props => {
+  const { visible, data } = props.modelProps || {};
+
+  const [tableData, setTableData] = useState({});
+  const [totalPoints, setTotalPoints] = useState();
+const [loading,setLoading] = useState(false)
+  function getList(params) {
+    const { personId } = data || {};
+    if (personId === '' || personId === undefined) {
+      return;
+    }
+
+    console.log(personId, 'customerId');
+    // 网路请求
+    setLoading(true);
+    request({
+      ...apis.customer.taPointsRecords,
+      urlData: { id: personId },
+      params: { ...params },
+    })
+      .then(res => {
+        console.log(res, 'res');
+        setTableData(res.result);
+        setTotalPoints(res.totalPoints);
+        setLoading(false);
+      })
+      .catch(err => {
+        this.openNotificationWithIcon('error', err);
+        setLoading(false);
+      });
+  }
+
+  useEffect(() => {
+    if (visible) {
+      getList({ pageNumber: 1, pageSize: 5 });
+    }else{
+      setTableData({})
+    }
+  }, [visible]);
+
+  // 分页
+  function onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 });
+  }
+
+  // 积分类型
+  function showChangeType(str) {
+    switch (str) {
+      case 'goods':
+        return '兑换商品';
+      case 'checkin':
+        return '签到';
+      case 'share-poster':
+        return '分享';
+      case 'signup-agent':
+        return '授权手机号';
+      case 'activity_checkin':
+        return '活动签到';
+      case 'document_verify':
+        return '资料审核';
+      case 'recommend-customer':
+        return '推荐客户';
+      case 'group':
+        return '拼团';
+      case 'recommend-customer':
+        return '推荐客户';
+      default:
+        return '未知类型';
+    }
+  }
+
+
+
+  const columns = [
+    {
+      title: '序号',
+      dataIndex: 'index',
+      key: 'index',
+      render: (_text, _record, index) => <span>{index + 1}</span>,
+    },
+    {
+      title: '积分类型',
+      dataIndex: 'changeType',
+      key: 'changeType',
+      render: (_, record) => <span>{showChangeType(record.changeType)}</span>,
+    },
+    {
+      title: '积分变化',
+      dataIndex: 'pointsAmount',
+      key: 'pointsAmount',
+    },
+    {
+      title: '发生时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (createDate) => <span> {moment(createDate).format('YYYY-MM-DD')}</span>,
+    },
+  ];
+  return (
+    <>
+      <Modal
+        title={'当前可用积分：' + (totalPoints || 0)}
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        // onOk={() => this.handleOk()}
+        onCancel={() => props.onCancel()}
+      >
+        {data && (
+          <Table
+            dataSource={tableData.records}
+            columns={columns}
+            loading={loading}
+            pagination={{
+              pageSize: tableData.pageSize,
+              total: tableData.total,
+              onChange: e => onChange(e),
+            }}
+          />
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default IntegralRecord;

src/pages/customer/Customer/PublicCustomer/AssistConsultant/Recommend.jsx

@@ -0,0 +1,285 @@
+import React, { useState, useEffect } from 'react';
+import { Table, Modal, notification } from 'antd';
+import moment from 'moment';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+
+/**
+ * 推荐客户
+ *
+ * @param {*} props
+ * @returns
+ */
+
+const Recommend = props => {
+  const { visible, data } = props.modelProps || {};
+
+  const [tableData, setTableData] = useState({});
+  const [loading, setLoading] = useState(false);
+
+  const openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    });
+  };
+
+  function getList(params) {
+    const { personId } = data || {};
+    if (personId === '' || personId === undefined) {
+      return;
+    }
+    // 网路请求
+    setLoading(true);
+    request({
+      ...apis.customer.recommendClient,
+      urlData: { id: personId },
+      params: { ...params },
+    })
+      .then(res => {
+        console.log(res, 'res');
+        setTableData(res);
+        setLoading(false);
+      })
+      .catch(err => {
+        this.openNotificationWithIcon('error', err);
+        setLoading(false);
+      });
+  }
+
+  useEffect(() => {
+    if (visible) {
+      getList({ pageNumber: 1, pageSize: 5 });
+    } else {
+      setTableData({});
+    }
+  }, [visible]);
+
+  // 分页
+  function onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5 });
+  }
+
+  const columns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      // eslint-disable-next-line jsx-a11y/alt-text
+      render: text => <img src={text} width={50} height={50} />,
+    },
+    {
+      title: '用户名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      render: text => <span>{text === 1 ? '男' : '女'}</span>,
+    },
+    {
+      title: '意向项目',
+      dataIndex: 'intention',
+      key: 'intention',
+    },
+    {
+      title: '推荐时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (_, record) => (
+        <>
+          <span>
+            {record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}
+          </span>
+        </>
+      ),
+    },
+    {
+      title: '状态',
+      dataIndex: 'state',
+      key: 'state',
+      // eslint-disable-next-line consistent-return
+      render: (_, records) => {
+        if (records.verifyStatus === 0) {
+          return '未审核';
+        }
+        if (records.verifyStatus === 1) {
+          if (records.reportRecommendStatus === 1) {
+            return '报备';
+          }
+          if (records.reportRecommendStatus === 2) {
+            return '推荐';
+          }
+        }
+        if (records.verifyStatus === 2) {
+          return '审核不通过';
+        }
+      },
+    },
+  ];
+
+  return (
+    <>
+      <Modal
+        title={'推荐客户'}
+        width={800}
+        destroyOnClose="true"
+        footer={null}
+        visible={visible}
+        // onOk={() => this.handleOk()}
+        onCancel={() => props.onCancel()}
+      >
+        {data && (
+          <Table
+            dataSource={tableData.records}
+            columns={columns}
+            loading={loading}
+            pagination={{
+              pageSize: tableData.pageSize,
+              total: tableData.total,
+              onChange: e => onChange(e),
+            }}
+          />
+        )}
+      </Modal>
+    </>
+  );
+};
+
+export default Recommend;
+
+// class ModalRecommendRecord extends React.Component {
+//   constructor(props) {
+//     super(props);
+//     this.state = {
+//        dataSource: [],
+//        visibleData: { visible: false, customerId: '' },
+//     }
+//   }
+
+//   // 挂载之后
+//   componentDidMount() {
+//     this.getList({ pageNumber: 1, pageSize: 5 })
+//   }
+
+//   componentDidUpdate(preProps, preState) {
+//     // console.log('this.props.visibleData', this.props.visibleData)
+//     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.props.onCancel()
+//   }
+
+//   // 弹框取消按钮
+//   handleCancel() {
+//     this.props.onCancel()
+//   }
+
+//   openNotificationWithIcon = (type, message) => {
+//     notification[type]({
+//       message,
+//       description:
+//         '',
+//     });
+//   }
+
+//   getList(params) {
+//     const { customerId } = this.state.visibleData
+//     if (customerId === '' || customerId === undefined) {
+//       return
+//     }
+//     console.log('customerId', customerId)
+//     // 网路请求
+//     // 网路请求
+//     request({ ...apis.customer.recommendClient, urlData: { id: customerId }, params: { ...params } }).then(res => {
+//       this.setState({ dataSource: res })
+//     }).catch(err => {
+//       this.openNotificationWithIcon('error', err)
+//     })
+//   }
+
+//    // 分页
+//   onChange(pageNum) {
+//     this.getList({ pageNumber: pageNum, pageSize: 5 })
+//   }
+
+//   render() {
+//     const columns = [
+//       {
+//         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',
+//       },
+//       {
+//         title: '电话',
+//         dataIndex: 'phone',
+//         key: 'phone',
+//       },
+//       {
+//         title: '性别',
+//         dataIndex: 'sex',
+//         key: 'sex',
+//         render: (text, records) => <span>{records.sex === 1 ? '男' : '女'}</span>,
+//       },
+//       {
+//         title: '意向项目',
+//         dataIndex: 'intention',
+//         key: 'intention',
+//       },
+//       {
+//         title: '推荐时间',
+//         dataIndex: 'createDate',
+//         key: 'createDate',
+//         render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span></>,
+//       },
+//       {
+//         title: '状态',
+//         // eslint-disable-next-line consistent-return
+//         render: (text, records) => {
+//           if (records.verifyStatus === 0) { return '未审核' }
+//           if (records.verifyStatus === 1) {
+//             if (records.reportRecommendStatus === 1) { return '报备' }
+//             if (records.reportRecommendStatus === 2) { return '推荐' }
+//            }
+//           if (records.verifyStatus === 2) { return '审核不通过' }
+//         },
+//       },
+//     ]
+//     return (
+//       <>
+//         <Modal
+//             title="推荐客户"
+//             width={800}
+//             destroyOnClose="true"
+//             footer={null}
+//             visible={this.state.visibleData.visible}
+//             // onOk={() => this.handleOk()}
+//             onCancel={(e) => this.handleCancel(e)}
+//           >
+//             {console.log('this.state.dataSource11111111111', this.state.dataSource.total)}
+//             <Table dataSource={this.state.dataSource.records} rowKey="integralrecord" columns={columns} pagination={{ total: this.state.dataSource.total, pageSize: this.state.dataSource.size, onChange: e => this.onChange(e) }} />
+//           </Modal>
+//       </>
+//     );
+//   }
+// }
+
+// export default ModalRecommendRecord

src/pages/news/list/NewsList.jsx

@@ -0,0 +1,354 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Modal, message, Card, Row, Col, Pagination, Alert } from 'antd';
+import moment from 'moment';
+import router from 'umi/router';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+import styles from '../../style/GoodsList.less';
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import Prompt from 'umi/prompt';
+
+import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const tempDate = [{ code: 's101' }]
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+  const [page, setPage] = useState(props.location.query.page || 1)
+
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    if (localStorage.getItem("newsPageParams")) {
+      props.form.setFieldsValue(JSON.parse(localStorage.getItem("newsPageParams")));
+      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
+
+      getList(JSON.parse(localStorage.getItem("newsPageParams")))
+    } else {
+      localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: 1, pageSize: 6 }));
+      getList({ pageNum: 1, pageSize: 6 })
+    }
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.news.getList, params: { ...params } }).then(res => {
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        localStorage.setItem("newsPageParams", (JSON.stringify({ pageNum: 1, pageSize: 6, ...values })));
+        getList({ pageNum: 1, pageSize: 6, ...values })
+      }
+    });
+  }
+
+  // 跳转到编辑资讯列表
+  const toEditList = (id) => () => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        id
+      },
+    });
+  }
+
+
+
+  /**
+   *卡片
+   *
+   * @returns
+   */
+  function CartBody(props) {
+    const { data } = props
+    console.log(data);
+    const cancelPage = () => {
+      router.push({
+        pathname: '/news/list/NewsList',
+      });
+    }
+
+    //删除资讯
+    const changeNewsListStatus = (row, newsId) => () => {
+      Modal.confirm({
+        title: '资讯会被删除，小程序端和后台都无法再看到',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.news.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
+            message.info('操作成功！')
+            getList(JSON.parse(localStorage.getItem("newsPageParams")));
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        }
+      });
+    }
+
+    // 跳转到编辑资讯列表
+    const toEditList = (newsId) => () => {
+      router.push({
+        pathname: '/news/list/editNewsList',
+        query: {
+          newsId,
+        },
+      });
+    }
+
+    //   置顶
+    const topNews = (weightParam, newsId) => () => {
+      const weight = Math.abs(weightParam - 1)
+      request({ ...apis.news.weight, params: { newsId: newsId, weight } }).then((data) => {
+        console.log(data)
+        message.info('操作成功！')
+        getList(JSON.parse(localStorage.getItem("newsPageParams")))
+      }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
+      })
+    }
+
+    function cancelRelease(newsId, newsStatus, buildingId, newsTypeId) {
+      console.log("newsId" + newsId + "status" + newsStatus);
+      if (newsStatus === 1) {
+        Modal.confirm({
+          title: '资讯会在小程序端隐藏，后台可继续编辑重新发布',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({ ...apis.news.cancel, data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId }, urlData: { id: newsId }, }).then((data) => {
+              message.info('操作成功！')
+              getList(JSON.parse(localStorage.getItem("newsPageParams")));
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      } else if (newsStatus === 0) {
+        Modal.confirm({
+          title: '确认发布该资讯？',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({ ...apis.news.cancel, data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId }, urlData: { id: newsId }, }).then((data) => {
+              message.info('操作成功！')
+              getList(JSON.parse(localStorage.getItem("newsPageParams")));
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      }
+    }
+
+    return (
+      <Card
+        // hoverable
+        style={{ height: '230px', minWidth: '570px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)', position: 'relative' }}
+        cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '230px', height: '228px' }}></img>}
+        bodyStyle={{ padding: '10px 20px' }}
+      >
+        <AuthButton name="admin.taNews.top" noRight={null}>
+          <span style={{ position: 'absolute', right: '83px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{data.weight === 1 ? '取消置顶' : '置顶'}</span>
+        </AuthButton>
+
+        <AuthButton name="admin.taNews.id.put" noRight={null}>
+          <span style={{ position: 'absolute', right: '10px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
+            <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
+          </span>
+        </AuthButton>
+        <AuthButton name="admin.taNews.publish" noRight={null}>
+          {data.newsStatus === 0 ?
+            <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+              <EditIcon text="取消发布" color='#FF4A4A' type="cancel"></EditIcon>
+            </span> :
+            <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+              <EditIcon text="发布" color='#ff925c' type="publish"></EditIcon>
+            </span>
+          }
+        </AuthButton>
+        <AuthButton name="admin.taNews.id.delete" noRight={null}>
+          <span style={{ position: 'absolute', right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', zIndex: 1 }} onClick={changeNewsListStatus(data, data.newsId)}>
+            <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon>
+          </span>
+        </AuthButton>
+        <div style={{ position: 'absolute', left: '240px', top: '0px', padding: '16px 10px', width: '64%' }}>
+          <p style={{
+            fontSize: ' 0.106rem', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+            width: '75%',
+          }}><Navigate to={`/news/list/editNewsList?newsId=${data.newsId}`}>{data.newsName}</Navigate></p>
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex' }}>
+            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>资讯类型：{data.newsType.newsTypeName}</span>
+            <span>状态：{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
+          </p>
+
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
+            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>阅读数量：{data.pvNum}</span>
+            <span>转发数量：{data.shareNum}</span>
+          </p>
+
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
+            {/* <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span> */}
+            <span>收藏数量：{data.saveNum}</span>
+          </p>
+
+          <p style={{ fontSize: ' 0.106rem', color: '#999', marginBottom: '8px' }}>发布时间：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</p>
+        </div>
+      </Card>
+    )
+  }
+
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 6, ...values }));
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        getList({ pageNum: pageNumber, pageSize: 6, ...values })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: 1, pageSize: 6 }));
+    getList({ pageNum: 1, pageSize: 6 })
+  }
+
+  function getDate(value, dateString) {
+    // moment(value).format('YYYY-MM-DD HH:mm:ss')
+    console.log(value, dateString)
+  }
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('title')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('newsTypeId')(
+            <NewsTypeSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('newsStatus')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="0">已发布</Option>
+              <Option value="1">未发布</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.news.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.taNews.post" noRight={null}>
+        <Button type="danger" style={{ padding: '0 40px', margin: '20px 0' }} onClick={toEditList()}>
+          新增
+        </Button>
+      </AuthButton>
+
+      {/* 卡片内容，显示楼盘项目  */}
+      <Row>
+        {
+          dataSource.records.map((item, index) => (
+            <Col span={12}>
+              <CartBody data={item} key={item.buildingId} />
+            </Col>
+          ))
+        }
+      </Row>
+      {/* 分页 */}
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} pageSize={6} onChange={onChange} current={dataSource.current} />
+      </div>
+      <Prompt message={location =>
+        location.pathname.startsWith("/news/list")
+          ? true
+          : localStorage.removeItem("newsPageParams")} />
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/news/list/editNewsList.jsx

@@ -0,0 +1,398 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Button, Radio, message } from 'antd';
+import apis from '../../../services/apis';
+import router from 'umi/router';
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+import  { FieldTypes, createForm } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import request from '../../../utils/request'
+import ImageUploader from '../../../components/XForm/ImageUpload';
+import logo from '../../../assets/logo.png';
+import yinhao from '../../../assets/yinhao.png'
+import touxiang from '../../../assets/touxiang.jpg';
+import poster1 from '../../../assets/poster1.png';
+import poster2 from '../../../assets/poster2.png';
+import xiaochengxu from '../../../assets/xiaochengxu.png'
+import Prompt from 'umi/prompt';
+
+const { TextArea } = Input;
+
+let detailVisible = false;
+let urlVisible = false;
+
+const setExtraData = (data) => {
+  detailVisible = data.newsDetailType == '1'
+  urlVisible = data.newsDetailType == '0'
+}
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+const cancelPage = () =>{
+  router.push({
+    pathname: '/news/list/NewsList',
+  });
+}
+
+const Basic = (props) => {
+  const { data: dynamicData } = props
+  const [ changeBuildingId, setChangeBuildingIdData ] = useState('')
+
+  const handleBuildingChange = (e) => {
+    console.log(e)
+    setChangeBuildingIdData(e)
+  }
+
+  const fields = [
+    {
+      label: '意向项目',
+      name: 'buildingId',
+      render: <BuildSelect onChange={(e => handleBuildingChange(e))}/>,
+      value: dynamicData.buildingId,
+      rules: [
+        {required: true, message: '请选择所属项目'},
+      ]
+    },
+    {
+      label: '资讯列表图',
+      name: 'newsImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.newsImg,
+      help: '建议图片尺寸：320*240px，比例5:4,格式：jpg，用于资讯列表',
+      rules: [
+        {required: true, message: '请选择资讯列表'},
+      ]
+    },
+    {
+      label: '资讯标题',
+      name: 'newsName',
+      type: FieldTypes.Text,
+      value: dynamicData.newsName,
+      rules: [
+        {required: true, message: '请输入资讯标题'},
+      ]
+    },
+    {
+      label: '资讯类型',
+      name: 'newsTypeId',
+      render: <NewsTypeSelect buildingId={changeBuildingId || dynamicData.buildingId}/>,
+      value: dynamicData.newsTypeId,
+      rules: [
+        {required: true, message: '请选择资讯类型'},
+      ]
+    },
+    {
+      label: '资讯详情',
+      name: 'newsDetailType',
+      render: <Radio.Group> 
+              <Radio value={1}>自定义</Radio>
+              <Radio value={0}>公众号链接</Radio>
+              </Radio.Group>,
+      value: dynamicData.newsDetailType - 0,
+      rules: [
+        {required: true, message: '请选择资讯类型'},
+      ]
+    },
+    {
+      label: '详情内容',
+      name: 'newsDetail',
+      render: <Wangedit />,
+      hidden: () => !detailVisible,
+      value: dynamicData.newsDetail,
+      rules: [
+        {required: true, message: '请输入详情内容'},
+      ]
+    },
+    {
+      label: '公众号链接',
+      name: 'newsDetail',
+      type: FieldTypes.Text,
+      hidden: () => !urlVisible,
+      value: dynamicData.newsDetail,
+      help: "只能填写同一主体公众号的文章链接",
+      rules: [
+        {required: true, message: '请输入公众号链接'},
+      ]
+    },
+  ]
+
+  const handleSubmit = val => { 
+    console.log(dynamicData,'12312345')
+    let {...submitValue} = val
+    
+    if(dynamicData.newsId){
+      submitValue.newsId = dynamicData.newsId
+      request({ ...apis.news.put, urlData: {id: dynamicData.newsId}, data: { ...submitValue },}).then((data) => {
+        // cancelPage();
+        message.info("保存成功")
+        console.log(data,'data1')
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    }else{
+      request({ ...apis.news.post, data: { ...submitValue },}).then((data) => {
+        // cancelPage();
+        message.info("保存成功")
+        router.push({
+          pathname: '/news/list/editNewsList',
+          query: {
+            newsId:data.newsId
+          },
+        });
+        console.log(data,'data2')
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+  
+  return <XForm onSubmit={handleSubmit} onCancel={cancelPage}  fields={fields}></XForm>
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const [ tab, changeTab ] = useState('basic')
+  const newsId = props.location.query.newsId
+  const [ dynamicData, setDynamicData ] = useState({})
+
+    useEffect(() => {
+      if(newsId){
+        getDynamicData(newsId);
+      }
+    },[newsId])
+
+  // 查询列表
+  const getDynamicData = (newsId) => {
+    request({ ...apis.news.get, urlData: { id: newsId },}).then((data) => {
+      setDynamicData(data)
+      setExtraData(data)
+      // detailVisible = data.newsDetailType == '1'
+      // urlVisible = data.newsDetailType == '0'
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+    }
+
+  const Poster = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if(newsId){
+      useEffect(() => {
+        request({ ...apis.activity.poster, params: {targetId: newsId,targetType: 'news'} }).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setPosterId(data[0].posterId)
+            changeImg(data[0].posterImg)
+            changeTextArea(data[0].posterDescription)
+            changeInput(data[0].posterTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+        getMiniappName()
+      }, [])
+    }else{
+      getMiniappName()
+    }
+
+    // 获取小程序名称
+  const [miniappName, setMiniappName] = useState('')
+  function getMiniappName() {
+
+    request({ ...apis.building.getMiniappName }).then(res => {
+    
+      setMiniappName(res)
+     
+    })
+  }
+    const submitPoster  = () => {
+       if(newsId){
+        if(posterId){
+          request({ ...apis.activity.updatePoster, urlData: {id: posterId}, data: {targetId: newsId,targetType: 'news',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }else{
+          request({ ...apis.activity.addPoster, data: {targetId: newsId,targetType: 'news',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
+            setPosterId(data.posterId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }
+       }else{
+        message.warn("请先保存基本信息数据")
+       }
+    }
+
+    return <div>
+      <div style={{ display: 'flex' }}>
+        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+          <div style={{ width: '375px', height: '700px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+            <img style={{ width: '100%', height: '300px' }} src={imgValue ? imgValue : poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
+              <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+              <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
+            </div>
+            <p style={{
+              margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+              display: '-webkit-box', lineClamp: '3', height: '60px',
+              WebkitLineClamp: '2',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{inputValue ? inputValue : '海报标题'}</p>
+
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
+            <p style={{
+              margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+              display: '-webkit-box', lineClamp: '3', height: '72px',
+              WebkitLineClamp: '3',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
+               <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc',position:'relative' }}>
+            <p style={{margin:'0',fontSize:'18px',color:'#888'}}>长按识别小程序码</p>
+            <p style={{margin:'0',fontSize:'18px',color:'#888'}}>进入资讯查看详情</p>
+            <img style={{ width: '80px',position: 'absolute',right:'30px',top:'10px' }} src={xiaochengxu} alt="" />
+          </div>
+      
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+        </div>
+
+        <div >
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯海报图</p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于资讯海报</p>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+            <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+          </div>
+          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+            <TextArea rows={5} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          </div>
+
+        </div>
+      </div>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+      <Button onClick={cancelPage}>取消</Button>
+    </div>
+
+  }
+ 
+  const Share = (props) => {
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [shareContentId, setShareContentId] = useState('')
+    
+    if(newsId){
+      useEffect(() => {
+        request({ ...apis.activity.shareContent, params: {targetId: newsId,targetType: 'news'},}).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setShareContentId(data[0].shareContentId)
+            changeImg(data[0].shareContentImg)
+            changeInput(data[0].shareContentTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
+
+    const submitShare = () => {
+      if(newsId){
+        if(shareContentId){
+          request({ ...apis.activity.updateShareContent, urlData: {id: shareContentId},data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }else{
+          request({ ...apis.activity.addShareContent, data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
+            setShareContentId(data.shareContentId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }
+       }else{
+        message.warn("请先保存基本信息数据")
+       }
+    }
+
+    return <div style={{ padding: '20px' }}>
+      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+        <div>
+          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />橙蕉互动</p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
+          <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享标题</p>
+        <Input placeholder="请输入分享标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>资讯分享好友图</p>
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+      </div>
+      <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议图片尺寸：750*600px，比例5:4,格式：jpg，用于资讯分享好友</p>
+      <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={cancelPage}>取消</Button>
+    </div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        { tab === 'basic' && <Basic data={dynamicData} /> }
+        { tab === 'poster' && <Poster /> }
+        { tab === 'share' && <Share /> }
+      </div>
+      <Prompt message={location =>
+                          location.pathname.startsWith("/news/list")
+                            ? true
+                            : localStorage.removeItem("newsPageParams")} />
+    </div>
+  );
+ }
+
+
+
+export default Edit

src/pages/news/list/style.less

@@ -0,0 +1,119 @@
+.SubmitButton {
+    background: #3a91d5;
+    border-radius: 7px;
+    border: 0px;
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    color: #333;
+    display: flex;
+    align-items: center;
+    position: relative;
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  
+  }
+  .cardItem{
+    color: #666;
+    display: flex;
+    align-items: center;  
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  }
+  .ediText {
+    font-size: 0.106rem;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width:  0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+
+  .SubmitButton {
+    background: rgba(239,39,58,1);
+    border-radius: 7px;
+    border: 0px;
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    color: #333;
+    display: flex;
+    align-items: center;
+    position: relative;
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  
+  }
+  .cardItem{
+    font-size: 0.106rem;
+    font-weight: 400;
+    color: #666;
+    line-height: 24px;
+    display: flex;
+    align-items: center;  
+  }
+  .ediText {
+    font-size:  0.106rem;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width:  0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  
+  
+  
+  

src/pages/news/type/NewsType.jsx

@@ -0,0 +1,148 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Button, message, Table, Pagination, Card } from 'antd';
+import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import { ConfirmButton } from '@/components/ModalButton';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+import BuildSelect from '../../../components/SelectButton/BuildSelect';
+import styles from '../../style/GoodsList.less';
+import Navigate from '@/components/Navigate';
+
+function NewsType(props) {
+  // 获取初始化数据
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.newsType.list, params: { ...params } }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const changePageNum = (pageNumber) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: pageNumber, pageSize: 10, ...values })
+      }
+    });
+  }
+
+
+  // 跳转到编辑资讯
+  const toEditNews = (id) => () => {
+    router.push({
+      pathname: '/news/type/editNews',
+      query: {
+        id
+      },
+    });
+  }
+
+
+  const changeNewsStatus = (row, newsId) => () => {
+    request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 });
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
+    {
+      title: '类型图',
+      dataIndex: 'newsTypeImg',
+      key: 'newsTypeImg',
+      align: 'center',
+      render: (text, record) => <img src={record.newsTypeImg} style={{ width: '165px', height: '104px' }} />,
+    },
+    {
+      title: '名称',
+      dataIndex: 'newsTypeName',
+      key: 'newsTypeName',
+      align: 'center',
+      render: (text, record) => <Navigate to={`/news/type/editNews?id=${record.newsTypeId}`}>{text}</Navigate>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: withActions((x, row) => [
+        <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
+          <ConfirmButton type="link" title="确认删除？" onClick={changeNewsStatus(row, row.newsTypeId)}>
+            <EditIcon text="删除" type="delete" />
+          </ConfirmButton>
+        </AuthButton>,
+        <AuthButton name="admin.taNewsType.id.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={toEditNews(row.newsTypeId)} />
+        </AuthButton>,
+      ]),
+    },
+  ];
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <Card>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.taNewsType.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+              </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.taNewsType.post" noRight={null}>
+        <Button type='primary' style={{margin:'20px 0'}} onClick={toEditNews()}>新增</Button>
+      </AuthButton>
+      <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+      </div>
+    </Card>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(NewsType);
+
+export default WrappedHeader

src/pages/news/type/editNews.jsx

@@ -0,0 +1,93 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../components/XForm';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+  const newsId = props.location.query.id
+  console.log("newsId" + newsId);
+  const [ newsData, setNewsData ] = useState({})
+  if(newsId){
+    useEffect(() => {
+      getNewsData(newsId);
+    },[])
+
+  // 查询列表
+  const getNewsData = (newsId) => {
+    request({
+        ...apis.newsType.get,
+        urlData: { id: newsId }
+    }).then((data) => {
+        setNewsData(data)
+    }).catch((err) => {
+      message.error(err.msg || err.message)
+    })
+  }
+  }
+
+  const fields = [
+    {
+      label: '所属项目',
+      name: 'buildingId',
+      render: <BuildSelect />,
+      value: newsData.buildingId,
+      rules: [
+        {required: true, message: '请选择所属项目'},
+      ]
+    },
+    {
+      label: '类型图',
+      name: 'newsTypeImg',
+      type: FieldTypes.ImageUploader,
+      value: newsData.newsTypeImg,
+      help: '建议图片尺寸：660px*416px',
+    },
+    {
+      label: '名称',
+      name: 'newsTypeName',
+      type: FieldTypes.Text,
+      value: newsData.newsTypeName,
+      rules: [
+        {required: true, message: '请输入资讯名称'},
+      ]
+    },
+  ]
+
+   
+  const handleSubmit = (values) => {
+    if(newsId){
+        values.newsTypeId = newsId
+        request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...values }}).then((data) => {
+          cancelPage();
+        }).catch((err) => {
+          message.error(err.msg || err.message)
+        })
+      }else{
+        request({ ...apis.newsType.post, data: { ...values } }).then((data) => {
+          cancelPage();
+        }).catch((err) => {
+          message.error(err.msg || err.message)
+        })
+      }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/news/type/NewsType',
+    });
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

src/pages/news/type/style.less

@@ -0,0 +1,56 @@
+.searchBox {
+    font-size: 30px;
+    color: red;
+    display: flex;
+    display: flex;
+    justify-items: center;
+    align-items: center;
+    justify-content: space-between;
+    .searchItem {
+      min-width: 200px;
+      margin-right: 20px;
+      text-align: left;
+      .anticon-down {
+        float: right !important;
+      }
+    }
+  }
+  .addBtn {
+    padding: 0 30px;
+    height: 36px;
+    background-color: #50be00;
+    color: #fff;
+    margin: 30px 0;
+    border-color: #50be00;
+  }
+  .addBtn:focus {
+    color: #fff;
+    background-color: #50be00;
+    border-color: #50be00;
+  }
+  .searchBtn{
+   background-color: #3A91D5;
+   border-color: #3A91D5;
+  }
+  .searchBtn:focus {
+    color: #fff;
+    background-color: #3A91D5;
+    border-color: #3A91D5;
+  }
+  .touxiang {
+    width: 93px;
+    height: 93px;
+  }
+  .ant-table-column-title {
+    font-weight: 600;
+  }
+  .shoppingCart{
+    color: #dcdcdc;
+    margin-left: 6px;
+    font-size: 16px;
+  }
+  .edit{
+    color: #dcdcdc;
+    margin-left: 6px;
+    font-size: 15px;
+  }

src/pages/staff/Organization/index.jsx

@@ -0,0 +1,15 @@
+import React from 'react';
+
+function Organization(props) {
+  
+
+
+  return (
+    <>
+     组织架构
+    </>
+  );
+}
+
+
+export default Organization

src/pages/staff/Role/Edit/index.jsx

@@ -0,0 +1,278 @@
+import React, { useState, useEffect } from 'react';
+import { Checkbox, Input, Card, Form, Button, Row, Col, Spin, message } from 'antd';
+import { connect } from 'dva';
+import XForm, { FieldTypes } from '@/components/XForm';
+import request from '@/utils/request';
+import router from 'umi/router';
+import apis from '@/services/apis';
+
+const { TextArea } = Input;
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Poster = props => {
+  const userMenus = props.user.currentUser.menus;
+  const userBtns = props.user.currentUser.buttons;
+  console.log(userMenus)
+  // 获取当前所有菜单
+  const [data, setData] = useState({ data: [] })
+  const [buttonData, setButtonData] = useState([])
+
+  // 展示要显示的菜单和按钮----（编辑）
+  const [dataMenuId, setDataMenuId] = useState([])
+  const [dataButtonId, setDataButtonId] = useState([])
+
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    // 新增和编辑用一个页面
+    if (props.location.query) {
+      const { id } = props.location.query
+      if (id) {
+        buttonAndMenuList('', id)
+      }
+    }
+    // menuList({ pageNum: 1, pageSize: 100 })
+    buttonList({ pageNum: 1, pageSize: 100 })
+  }, [])
+  // 当前所有的菜单
+  function menuList(params) {
+    request({ ...apis.role.menuList, params: { ...params } }).then((data) => {
+      setData(data)
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
+  }
+
+  // 所有按钮
+  function buttonList(params) {
+    request({ ...apis.role.buttonList, params: { ...params } }).then((data) => {
+      setButtonData(data)
+  }).catch((err) => {
+      console.log(err)
+  })
+  }
+
+
+  // 根据角色id查询当前的菜单及其按钮
+  function buttonAndMenuList(params, ids) {
+    setLoading(true)
+    request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } }).then(data => {
+      setLoading(false)
+      props.form.setFieldsValue({ roleName: data.roleName })
+      console.log(data)
+      setData(data)
+
+      // 获取所有的权限Id
+      if (data.sysMenuList) {
+        setDataMenuId(data.sysMenuList.map(item => item && item.menuId))
+        // setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a) ) )
+        setDataButtonId(data.sysButtonInMenu.map(item => item && item.btnId))
+      }
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
+  }
+
+  // const [menus, setMenus] = useState([]);
+  // 判断menus是否有值
+  const [menus, setMenus] = useState([]);
+  const [but, setBut] = useState([]);
+
+  const addMenus = m => setMenus([...menus, m])
+  const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
+
+  const handleMenuChange = m => e => {
+    // 如果是根菜单, 把子菜单挑出来
+    const isMenuRoot = m.parentCode === '-1'
+    const subMenus = isMenuRoot ? userMenus.filter(x => x.parentCode == m.menuId) : []
+    // 把子菜单与当前对象, 同时作为当前操作对象
+    const currentMenus = [ m, ...subMenus ]
+    // 先把选中列表中, 当前操作对象去掉
+    const leftCheckedMenusIds = dataMenuId.filter(x => !currentMenus.some(it => it.menuId == x))
+
+    // 当前选中菜单
+    const currentCheckedMenus = e.target.checked ? currentMenus : []
+
+    // 计算所有选中菜单
+    let checkedMenus = [
+      ...currentCheckedMenus,
+      ...userMenus.filter(x => leftCheckedMenusIds.some(it => it == x.menuId)),
+    ]
+
+    // 如果子菜单全部取消选择, 那么根菜单也取消选择
+    // 如果子菜单有一个选中, 那么根菜单也选中
+    if (!isMenuRoot) {
+      const children = checkedMenus.filter(x => x.menuRoot === m.menuRoot && x.menuId !== m.menuRoot)
+      if (!children || children.length < 1) {
+        checkedMenus = checkedMenus.filter(x => x.menuId !== m.menuRoot)
+      } else {
+        const hasRootMenu = checkedMenus.some(x => x.menuId === m.menuRoot)
+  
+        if (!hasRootMenu) {
+          const rootMenu = userMenus.filter(x => x.menuId === m.menuRoot)[0]
+          if (rootMenu) {
+            checkedMenus.push(rootMenu)
+          }
+        }
+      }
+    }
+
+    // 只要菜单选中, 所属按钮全部选中
+    // 菜单取消选择, 所有按钮全部取消选择
+    const currentMenuBtns = currentMenus.reduce((acc, it) => [...acc, ...userBtns.filter(x => x.menuId === it.menuId)], [])
+    const currentCheckedMenuBtns = currentCheckedMenus.reduce((acc, it) => [...acc, ...userBtns.filter(x => x.menuId === it.menuId)], [])
+    const checkedBtns = dataButtonId.filter(x => !currentMenuBtns.some(it => it.btnId === x)).map(x => userBtns.filter(it => x == it.btnId)[0]).concat(...currentCheckedMenuBtns)
+
+    setMenus(checkedMenus)
+    setDataMenuId(checkedMenus.map(x => x.menuId))
+    setDataButtonId(checkedBtns.map(x => x.btnId))
+    setBut(checkedBtns)
+  }
+
+  // 判断menus是否有值
+  const addBut = m => setBut([...but, m])
+  const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
+  const handleButChange = m => e => {
+
+    // 如果有一个按钮选中, 那么对应的菜单也需要选中
+    // 如果没有一个兄弟节点选中, 不做任何处理
+    if (e.target.checked) {
+      const parentMenuId = dataMenuId.filter(x => x === m.menuId)[0]
+
+      if (!parentMenuId) {
+        const parentMenu = userMenus.filter(x => x.menuId === m.menuId)[0]
+        const parentMenuRoot = userMenus.filter(x => x.menuId === parentMenu.menuRoot)[0]
+
+        const checkedMenus = menus.concat(parentMenu).concat(parentMenuRoot)
+        setMenus(checkedMenus)
+        setDataMenuId(checkedMenus.map(x => x.menuId))
+      }
+    }
+
+    if (e.target.checked) {
+      setDataButtonId(dataButtonId.concat(m.btnId))
+      addBut(m)
+    } else {
+      setDataButtonId(dataButtonId.filter(item => item !== m.btnId));
+      delBut(m)
+    }
+  }
+  const gridStyle1 = {
+    width: '16%',
+    textAlign: 'left',
+    height: '72px',
+    padding:'24px'
+  };
+  const gridStyle2 = {
+    width: '84%',
+    textAlign: 'left',
+    height: '72px',
+  };
+
+  function toRoleList() {
+    router.push({
+      pathname: '/staff/RoleList',
+    });
+  }
+
+  function updateAuthMenu(data) {
+    setLoading(true)
+    request({ ...apis.role.updateAuthMenu, data: { ...data } }).then((data) => {
+      setLoading(false)
+      toRoleList()
+  }).catch((err) => {
+      console.log(err)
+  })
+  }
+
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (values.roleName === undefined || values.roleName === '') {
+        message.error('请输入角色名称')
+        return
+      }
+
+      if (props.location.query.id !== undefined) {
+        console.log('menus', menus)
+      
+        const sumitMenu = userMenus.filter(item => dataMenuId.includes(item.menuId))
+        const sumitBtn = buttonData.filter(item => dataButtonId.includes(item.btnId))
+        updateAuthMenu({ sysMenu: sumitMenu, name: values.roleName, id: props.location.query.id, sysButton: sumitBtn })
+      } else {
+        updateAuthMenu({ sysMenu: menus, name: values.roleName, id: props.location.query.id, sysButton: but })
+        }
+    });
+  }
+  const { getFieldDecorator } = props.form;
+  
+  return (
+    <Card>
+      <div>
+      <Spin spinning={ loading } size="large">
+        <Form labelCol={{ span: 6 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item label="角色名称">
+            {getFieldDecorator('roleName', {
+              rules: [{ required: true, message: '请输入角色名称' }],
+            })(<Input  />)}
+
+          </Form.Item>
+          {userMenus.map(item => (
+            (item.parentCode === '-1') &&
+            <Row >
+              <Col span={6}>
+              </Col>
+              <Col span={18}>
+
+                <Card title={<Checkbox checked={dataMenuId.includes(item.menuId)} onChange={handleMenuChange(item)}>{item.name}</Checkbox>} bordered style={{ width: '100%', alignItems: 'center',margin:'10px 0', boxShadow:'3px 3px 10px  rgba(0,0,0,0.15)',borderRadius:'8px'}} >
+                  {
+                    userMenus.map(menu => (
+
+                      (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
+                      <>
+                        <Card.Grid style={gridStyle1} >
+                          <Checkbox checked={dataMenuId.includes(menu.menuId)} onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
+                        </Card.Grid>
+                        <Card.Grid style={gridStyle2}>
+                          {buttonData.length > 0 && buttonData.map(btn => (
+                            <>
+                              {
+                                btn.menuId === menu.menuId &&
+                                <Checkbox checked={dataButtonId.includes(btn.btnId)} onChange={handleButChange(btn)}>{btn.name}</Checkbox>
+                              }
+                            </>
+                          ))}
+                        </Card.Grid>
+                      </>
+                    ))
+                  }
+                </Card>
+              </Col>
+
+            </Row>
+          ))}
+          <Form.Item wrapperCol={{ span: 15, offset: 7 }} style={{ marginTop: '10px' }}>
+            <Button type="primary" htmlType="submit">
+              保存
+          </Button>
+            <Button onClick = {toRoleList}>
+              取消
+          </Button>
+          </Form.Item>
+        </Form>
+        </Spin>
+      </div>
+    </Card>
+  )
+}
+const WrappedNormalLoginForm = Form.create({ name: 'Poster' })(Poster);
+export default connect(({ user }) => ({ user }))(WrappedNormalLoginForm);

src/pages/staff/Role/List/index.jsx

@@ -0,0 +1,148 @@
+
+import React, { useState, useEffect } from 'react';
+import { Button, message, Table, Modal, Card } from 'antd';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import router from 'umi/router';
+import request from '@/utils/request'
+import apis from '@/services/apis';
+import AuthButton from '@/components/AuthButton';
+
+
+const header = props => {
+  // function confirm(id) {
+  //   Modal.confirm({
+  //     title: '确认停用该角色？',
+  //     okText: '确认',
+  //     cancelText: '取消',
+  //     onOk() {
+  //     },
+  //     onCancel() {
+  //       console.log('Cancel');
+  //     },
+  //   });
+  // }
+
+  function addRole(roleId) {
+    router.push({
+      pathname: '/staff/Role/Edit',
+    });
+  }
+
+  function toEditRole(roleId) {
+    router.push({
+      pathname: '/staff/Role/Edit',
+      query: {
+        id: roleId,
+      },
+    });
+  }
+  const [data, setData] = useState({ data: [] })
+  // 初始化角色
+  useEffect(() => {
+    localStorage.removeItem('value');
+    getRoleList({ pageNum: 1, pageSize: 100 })
+  }, [])
+
+  //  function getRoleList(params) {
+  //    request({
+  //      url: '/api/admin/taRole',
+  //      method: 'GET',
+  //      params: { ...params },
+  //  // eslint-disable-next-line no-shadow
+  //  }).then(data => {
+  //      console.log(data)
+  //      setData(data)
+  //  })
+  //  }
+
+  function getRoleList(params) {
+    request({ ...apis.role.getRoleList, params: { ...params } }).then((data) => {
+      setData(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+
+  function stop(ids, status) {
+    Modal.confirm({
+      title: "删除后角色对应账号权限也会被自动停用，请谨慎操作",
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
+          getRoleList({ pageNum: 1, pageSize: 100 })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const dataSource = [
+    {
+      name: '置业顾问',
+      status: '1',
+    },
+    {
+      name: '置业经理',
+      status: '1',
+    },
+  ];
+
+  const columns = [
+    // {
+    //   title: '商品图片',
+    //   dataIndex: 'img',
+    //   key: 'img',
+    //   align: 'center',
+
+    //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+    // },
+    {
+      title: '角色名称',
+      dataIndex: 'roleName',
+      key: 'roleName',
+      align: 'center',
+    },
+
+    {
+      title: '操作  ',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+
+      render: withActions((text, record) => {
+        return record.isAdmin ? [] :
+          [
+            record.status === 1 ?
+            <AuthButton name="admin.role.publish" noRight={null}>
+              <EditIcon type="delete" text="删除" onClick={() => stop(record.roleId, record.status)} />
+            </AuthButton> : null,
+
+            <AuthButton name="admin.role.put" noRight={null}>
+              <EditIcon text="编辑" type="edit" onClick={() => toEditRole(record.roleId)} />
+            </AuthButton>,
+          ]
+      }),
+    },
+  ];
+
+
+  return (
+    <Card>
+      <AuthButton name="admin.role.add" noRight={null}>
+        <Button type="primary"  onClick={addRole}>新增</Button>
+      </AuthButton>
+      <div style={{marginTop:'20px'}}>
+
+        <Table rowKey="roleList" dataSource={data.records} columns={columns} />
+      </div>
+    </Card>
+
+  )
+}
+export default header

src/pages/staff/components/BatchAssistConsultant.jsx

@@ -0,0 +1,129 @@
+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) {
+    if (this.props.visible !== preState.visibleData.visible) {
+      this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: this.props.buildingId })
+      this.setState({ visibleData: { visible: this.props.visible, buildingId: this.props.buildingId } });
+    }
+  }
+
+  // 弹框取消按钮
+  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 => {
+
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+  // 分页
+  onChange(pageNum) {
+
+    this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingId })
+  }
+
+  // 提交
+  submitGm(record) {
+    this.props.onCancel(record)
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+        width: 120,
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+        width: 150,
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+        width: 130,
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+        width: 120,
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        width: 80,
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{record.userId !== this.props.userId ? <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button> : ''}</>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+          title="分配置业顾问"
+          width={600}
+          destroyOnClose="true"
+          footer={null}
+          visible={this.state.visibleData.visible}
+          onCancel={(e) => this.handleCancel(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>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/staff/components/BuildingSelection.jsx

@@ -0,0 +1,58 @@
+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

@@ -0,0 +1,115 @@
+import React, { Component, useState, useEffect } from 'react';
+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 [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: '用户名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '客户状态',
+      dataIndex: 'reportRecommendStatus',
+      key: 'reportRecommendStatus',
+      align: 'center',
+      render: (text, records) => {
+        if (records.status === 1) { return '报备' }
+        if (records.status === 2) { return '到访' }
+        if (records.status === 3) { return '认购' }
+        if (records.status === 4) { return '签约' }
+      },
+    },
+    {
+      title: '调整后归属',
+      dataIndex: 'moveUserName',
+      key: 'moveUserName',
+      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={() => 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} userId={props.userId} buildingId={props.buildingId} onCancel={consulatanChange} />
+      <div style={{ textAlign: 'center', marginTop: '16px' }}><Button type="primary" onClick={() => batchSaveConsultant()}>保存</Button>
+        <Button style={{ marginLeft: '10px' }} onClick={() => cancelConsultant()}>取消</Button></div>
+    </div>
+  )
+}
+
+export default CustomerChange;

src/pages/staff/components/Tagss.jsx

@@ -0,0 +1,83 @@
+import React from 'react';
+import { Tag, Input, Tooltip, Icon } from 'antd';
+import Styles from './style.less';
+
+ class Tagss extends React.Component {
+  state = {
+    tags: [ 'Tag 2', 'Tag 3'],
+    inputVisible: false,
+    inputValue: '',
+  };
+
+  handleClose = removedTag => {
+    const tags = this.state.tags.filter(tag => tag !== removedTag);
+    console.log(tags);
+    this.setState({ tags });
+  };
+
+  showInput = () => {
+    this.setState({ inputVisible: true }, () => this.input.focus());
+  };
+
+  handleInputChange = e => {
+    this.setState({ inputValue: e.target.value });
+  };
+
+  handleInputConfirm = () => {
+    const { inputValue } = this.state;
+    let { tags } = this.state;
+    if (inputValue && tags.indexOf(inputValue) === -1) {
+      tags = [...tags, inputValue];
+    }
+    console.log(tags);
+    this.setState({
+      tags,
+      inputVisible: false,
+      inputValue: '',
+    });
+  };
+
+  saveInputRef = input => (this.input = input);
+
+  render() {
+    const { tags, inputVisible, inputValue } = this.state;
+    return (
+      <div>
+        {tags.map((tag, index) => {
+          const isLongTag = tag.length > 20;
+          const tagElem = (
+            <Tag className = {Styles.tagss} key={tag} closable = {true} onClose={() => this.handleClose(tag)}>
+              {isLongTag ? `${tag.slice(0, 20)}...` : tag}
+            </Tag>
+          );
+          return isLongTag ? (
+            <Tooltip title={tag} key={tag}>
+              {tagElem}
+            </Tooltip>
+          ) : (
+            tagElem
+          );
+        })}
+        {inputVisible && (
+          <Input className = {Styles.tagss}
+            ref={this.saveInputRef}
+            // type="text"
+            // size="small"
+            // style={{ width: 78 }}
+            value={inputValue}
+            onChange={this.handleInputChange}
+            onBlur={this.handleInputConfirm}
+            onPressEnter={this.handleInputConfirm}
+          />
+        )}
+        {!inputVisible && (
+          <Tag className = {Styles.tagss} onClick={this.showInput} >
+            <Icon type="plus" /> 新建
+          </Tag>
+        )}
+      </div>
+    );
+  }
+}
+
+export default Tagss;

src/pages/staff/components/attribution.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);
+    this.state = {
+       dataSource: { records: [] },
+       visibleData: { visible: false, realtyConsultant: '', buildingId: '', userId: '' },
+    }
+  }
+
+  // 挂载之后
+  componentDidMount() {
+    // this.getList({ pageNumber: 1, pageSize: 5 })
+  }
+
+  componentDidUpdate(preProps, preState) {
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.visibleData.buildingId })
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.props.onCancel()
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.props.onCancel()
+  }
+
+  getList(params) {
+    if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
+      return
+    }
+
+    // 网路请求
+    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+      const records = res.records.filter(f => f.userId !== this.state.visibleData.userId)
+      this.setState({ dataSource: { ...res, records, total: res.total - 1 } })
+    }).catch(() => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+   // 分页
+  onChange(pageNum) {
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.props.visibleData.buildingId })
+  }
+
+  // 提交
+  submitGm(record) {
+
+    console.log('传递之前：', record)
+    this.handleCancel()
+    this.props.onSuccess({ realtyConsultant: record.userId, name: record.userName })
+  }
+
+  render() {
+    const columns = [
+      // {
+      //   title: '编号',
+      //   dataIndex: 'personId',
+      //   key: 'personId',
+      // },
+      {
+        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) => <>{ this.props.visibleData.realtyConsultant !== record.userId && <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/staff/components/style.less

@@ -0,0 +1,24 @@
+.tagss{
+  width: 150px;
+  height: 32px;
+  
+font-size:14px;
+
+font-weight:400;
+color:rgba(153,153,153,1);
+
+
+padding: 4px 11px;
+
+color: rgba(0, 0, 0, 0.65);
+
+
+
+line-height: 1.5;
+
+background-color: #fff;
+
+
+
+border: 1px solid #d9d9d9;
+}

src/pages/staff/list/RoleList.jsx

@@ -0,0 +1,149 @@
+
+import React, { useState, useEffect } from 'react';
+import { Button, message, Table, Modal } from 'antd';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import router from 'umi/router';
+import request from '../../../utils/request'
+import Styles from './style.less';
+import apis from '../../../services/apis';
+import AuthButton from '../../../components/AuthButton';
+import styles from '../../style/GoodsList.less';
+
+const header = props => {
+  // function confirm(id) {
+  //   Modal.confirm({
+  //     title: '确认停用该角色？',
+  //     okText: '确认',
+  //     cancelText: '取消',
+  //     onOk() {
+  //     },
+  //     onCancel() {
+  //       console.log('Cancel');
+  //     },
+  //   });
+  // }
+
+  function addRole(roleId) {
+    router.push({
+      pathname: '/staff/list/addRole',
+    });
+  }
+
+  function toEditRole(roleId) {
+    router.push({
+      pathname: '/staff/list/addRole',
+      query: {
+        id: roleId,
+      },
+    });
+  }
+  const [data, setData] = useState({ data: [] })
+  // 初始化角色
+  useEffect(() => {
+    localStorage.removeItem('value');
+    getRoleList({ pageNum: 1, pageSize: 100 })
+  }, [])
+
+  //  function getRoleList(params) {
+  //    request({
+  //      url: '/api/admin/taRole',
+  //      method: 'GET',
+  //      params: { ...params },
+  //  // eslint-disable-next-line no-shadow
+  //  }).then(data => {
+  //      console.log(data)
+  //      setData(data)
+  //  })
+  //  }
+
+  function getRoleList(params) {
+    request({ ...apis.role.getRoleList, params: { ...params } }).then((data) => {
+      setData(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+
+  function stop(ids, status) {
+    Modal.confirm({
+      title: "删除后角色对应账号权限也会被自动停用，请谨慎操作",
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
+          getRoleList({ pageNum: 1, pageSize: 100 })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const dataSource = [
+    {
+      name: '置业顾问',
+      status: '1',
+    },
+    {
+      name: '置业经理',
+      status: '1',
+    },
+  ];
+
+  const columns = [
+    // {
+    //   title: '商品图片',
+    //   dataIndex: 'img',
+    //   key: 'img',
+    //   align: 'center',
+
+    //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+    // },
+    {
+      title: '角色名称',
+      dataIndex: 'roleName',
+      key: 'roleName',
+      align: 'center',
+    },
+
+    {
+      title: '操作  ',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+
+      render: withActions((text, record) => {
+        return record.isAdmin ? [] :
+          [
+            record.status === 1 ?
+            <AuthButton name="admin.role.publish" noRight={null}>
+              <EditIcon type="delete" text="删除" onClick={() => stop(record.roleId, record.status)} />
+            </AuthButton> : null,
+
+            <AuthButton name="admin.role.put" noRight={null}>
+              <EditIcon text="编辑" type="edit" onClick={() => toEditRole(record.roleId)} />
+            </AuthButton>,
+          ]
+      }),
+    },
+  ];
+
+
+  return (
+    <>
+      <AuthButton name="admin.role.add" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={addRole}>新增</Button>
+      </AuthButton>
+      <div className={Styles.roletext}>
+
+        <Table rowKey="roleList" dataSource={data.records} columns={columns} />
+      </div>
+    </>
+
+  )
+}
+export default header

src/pages/staff/list/StaffList.jsx

@@ -0,0 +1,284 @@
+
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker, Card, Avatar } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import router from 'umi/router';
+import AuthButton from '../../../components/AuthButton';
+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'
+import EditIcon from '@/components/EditIcon';
+
+const { Meta } = Card;
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+// 跳转到编辑商品
+const toEditStaff = userId => () => {
+  router.push({
+    pathname: '/staff/editStaff',
+    query: {
+      userId,
+    },
+  });
+}
+
+
+/**
+ *卡片
+ *
+ * @returns
+ */
+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) {
+      if (data.isConsultant) {
+        request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(res => {
+          if (res.length > 0) {
+            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(res => {
+                  message.info('操作成功')
+                  props.onFresh()
+                })
+              },
+            });
+          }
+        })
+      } 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 {
+      Modal.confirm({
+        title: '确认启用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then(res => {
+            message.info('操作成功')
+            props.onFresh()
+          })
+        },
+      });
+    }
+  }
+
+  //迁移私客成功回调
+  const moveSuccess = (e) => {
+    setVisible(false)
+    if (e === 'success') {
+      confirm(data)()
+    }
+  }
+
+ 
+  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)}>
+              <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
+            </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 ? <EditIcon text="停用" color='#FF4A4A' type="stop"></EditIcon> : <EditIcon text="启用" color='#ff925c' type="start"></EditIcon>}
+
+            </Button>
+          </AuthButton>
+        </div>
+        <div>
+
+          <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>
+
+      </Card>
+      <Modal
+        visible={visible}
+        title="分配归属"
+        onCancel={() => setVisible(false)}
+        footer={null}
+        width={900}
+      >
+        <CustomerChange userId={data.userId} consultantPersonId={data.consultantPersonId} buildingId={data.buildingId} onSuccess={moveSuccess} />
+      </Modal>
+    </div>
+  )
+}
+
+const header = props => {
+  const [tempData, setTempData] = useState({ records: [] })
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 8 });
+  }, [])
+
+  const getList = params => {
+    request({ ...apis.staff.taUser, params: { ...params } }).then(data => {
+      console.log(data, 'listData')
+      setTempData(data)
+    })
+  }
+
+  // 分页
+  const onChange = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 8, ...props.form.getFieldsValue() });
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 8, ...values })
+      }
+    });
+  }
+
+  // 重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 8 });
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildingSelect />
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('userName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="姓名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="电话"
+            />,
+          )}
+        </Form.Item>
+
+        <Form.Item>
+
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态" >
+              <Option value="1">启用</Option>
+              <Option value="9">停用</Option>
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item>
+
+          {getFieldDecorator('isConsultant')(
+            <Select style={{ width: '180px' }} placeholder="是否置业顾问" >
+              <Option value="0">非置业顾问</Option>
+              <Option value="1">置业顾问</Option>
+            </Select>,
+          )}
+        </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}>
+              搜索
+          </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.user.add" noRight={null}>
+        <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
+      </AuthButton>
+      <Row style={{ padding: ' 0 10px' }}>
+        {
+          tempData.records.filter(f => f.isAdmin != 1).map((item, index) => (
+            <Col span={6}>
+              <CartBody data={item} onFresh={() => getList({ pageNum: 1, pageSize: 8 })} key={item.userId} />
+            </Col>
+          ))
+        }
+      </Row>
+
+      {/* 分页  */}
+      <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
+        <Pagination showQuickJumper defaultCurrent={1} pageSize={8} total={tempData.total} onChange={onChange} current={tempData.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/staff/list/addRole.jsx

@@ -0,0 +1,280 @@
+import React, { useState, useEffect } from 'react';
+import { Checkbox, Input, Card, Form, Button, Row, Col, Spin, message } from 'antd';
+import { connect } from 'dva';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import request from '../../../utils/request';
+import channels from './channelList.less';
+import { resolve, join } from 'path';
+import router from 'umi/router';
+import apis from '../../../services/apis';
+
+const { TextArea } = Input;
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Poster = props => {
+  const userMenus = props.user.currentUser.menus;
+  const userBtns = props.user.currentUser.buttons;
+  console.log(userMenus)
+  // 获取当前所有菜单
+  const [data, setData] = useState({ data: [] })
+  const [buttonData, setButtonData] = useState([])
+
+  // 展示要显示的菜单和按钮----（编辑）
+  const [dataMenuId, setDataMenuId] = useState([])
+  const [dataButtonId, setDataButtonId] = useState([])
+
+  const [loading, setLoading] = useState(false);
+
+  useEffect(() => {
+    // 新增和编辑用一个页面
+    if (props.location.query) {
+      const { id } = props.location.query
+      if (id) {
+        buttonAndMenuList('', id)
+      }
+    }
+    // menuList({ pageNum: 1, pageSize: 100 })
+    buttonList({ pageNum: 1, pageSize: 100 })
+  }, [])
+  // 当前所有的菜单
+  function menuList(params) {
+    request({ ...apis.role.menuList, params: { ...params } }).then((data) => {
+      setData(data)
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
+  }
+
+  // 所有按钮
+  function buttonList(params) {
+    request({ ...apis.role.buttonList, params: { ...params } }).then((data) => {
+      setButtonData(data)
+  }).catch((err) => {
+      console.log(err)
+  })
+  }
+
+
+  // 根据角色id查询当前的菜单及其按钮
+  function buttonAndMenuList(params, ids) {
+    setLoading(true)
+    request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } }).then(data => {
+      setLoading(false)
+      props.form.setFieldsValue({ roleName: data.roleName })
+      console.log(data)
+      setData(data)
+
+      // 获取所有的权限Id
+      if (data.sysMenuList) {
+        setDataMenuId(data.sysMenuList.map(item => item && item.menuId))
+        // setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a) ) )
+        setDataButtonId(data.sysButtonInMenu.map(item => item && item.btnId))
+      }
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
+  }
+
+  // const [menus, setMenus] = useState([]);
+  // 判断menus是否有值
+  const [menus, setMenus] = useState([]);
+  const [but, setBut] = useState([]);
+
+  const addMenus = m => setMenus([...menus, m])
+  const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
+
+  const handleMenuChange = m => e => {
+    // 如果是根菜单, 把子菜单挑出来
+    const isMenuRoot = m.parentCode === '-1'
+    const subMenus = isMenuRoot ? userMenus.filter(x => x.parentCode == m.menuId) : []
+    // 把子菜单与当前对象, 同时作为当前操作对象
+    const currentMenus = [ m, ...subMenus ]
+    // 先把选中列表中, 当前操作对象去掉
+    const leftCheckedMenusIds = dataMenuId.filter(x => !currentMenus.some(it => it.menuId == x))
+
+    // 当前选中菜单
+    const currentCheckedMenus = e.target.checked ? currentMenus : []
+
+    // 计算所有选中菜单
+    let checkedMenus = [
+      ...currentCheckedMenus,
+      ...userMenus.filter(x => leftCheckedMenusIds.some(it => it == x.menuId)),
+    ]
+
+    // 如果子菜单全部取消选择, 那么根菜单也取消选择
+    // 如果子菜单有一个选中, 那么根菜单也选中
+    if (!isMenuRoot) {
+      const children = checkedMenus.filter(x => x.menuRoot === m.menuRoot && x.menuId !== m.menuRoot)
+      if (!children || children.length < 1) {
+        checkedMenus = checkedMenus.filter(x => x.menuId !== m.menuRoot)
+      } else {
+        const hasRootMenu = checkedMenus.some(x => x.menuId === m.menuRoot)
+  
+        if (!hasRootMenu) {
+          const rootMenu = userMenus.filter(x => x.menuId === m.menuRoot)[0]
+          if (rootMenu) {
+            checkedMenus.push(rootMenu)
+          }
+        }
+      }
+    }
+
+    // 只要菜单选中, 所属按钮全部选中
+    // 菜单取消选择, 所有按钮全部取消选择
+    const currentMenuBtns = currentMenus.reduce((acc, it) => [...acc, ...userBtns.filter(x => x.menuId === it.menuId)], [])
+    const currentCheckedMenuBtns = currentCheckedMenus.reduce((acc, it) => [...acc, ...userBtns.filter(x => x.menuId === it.menuId)], [])
+    const checkedBtns = dataButtonId.filter(x => !currentMenuBtns.some(it => it.btnId === x)).map(x => userBtns.filter(it => x == it.btnId)[0]).concat(...currentCheckedMenuBtns)
+
+    setMenus(checkedMenus)
+    setDataMenuId(checkedMenus.map(x => x.menuId))
+    setDataButtonId(checkedBtns.map(x => x.btnId))
+    setBut(checkedBtns)
+  }
+
+  // 判断menus是否有值
+  const addBut = m => setBut([...but, m])
+  const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
+  const handleButChange = m => e => {
+
+    // 如果有一个按钮选中, 那么对应的菜单也需要选中
+    // 如果没有一个兄弟节点选中, 不做任何处理
+    if (e.target.checked) {
+      const parentMenuId = dataMenuId.filter(x => x === m.menuId)[0]
+
+      if (!parentMenuId) {
+        const parentMenu = userMenus.filter(x => x.menuId === m.menuId)[0]
+        const parentMenuRoot = userMenus.filter(x => x.menuId === parentMenu.menuRoot)[0]
+
+        const checkedMenus = menus.concat(parentMenu).concat(parentMenuRoot)
+        setMenus(checkedMenus)
+        setDataMenuId(checkedMenus.map(x => x.menuId))
+      }
+    }
+
+    if (e.target.checked) {
+      setDataButtonId(dataButtonId.concat(m.btnId))
+      addBut(m)
+    } else {
+      setDataButtonId(dataButtonId.filter(item => item !== m.btnId));
+      delBut(m)
+    }
+  }
+  const gridStyle1 = {
+    width: '16%',
+    textAlign: 'left',
+    height: '72px',
+    padding:'24px'
+  };
+  const gridStyle2 = {
+    width: '84%',
+    textAlign: 'left',
+    height: '72px',
+  };
+
+  function toRoleList() {
+    router.push({
+      pathname: '/staff/RoleList',
+    });
+  }
+
+  function updateAuthMenu(data) {
+    setLoading(true)
+    request({ ...apis.role.updateAuthMenu, data: { ...data } }).then((data) => {
+      setLoading(false)
+      toRoleList()
+  }).catch((err) => {
+      console.log(err)
+  })
+  }
+
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (values.roleName === undefined || values.roleName === '') {
+        message.error('请输入角色名称')
+        return
+      }
+
+      if (props.location.query.id !== undefined) {
+        console.log('menus', menus)
+      
+        const sumitMenu = userMenus.filter(item => dataMenuId.includes(item.menuId))
+        const sumitBtn = buttonData.filter(item => dataButtonId.includes(item.btnId))
+        updateAuthMenu({ sysMenu: sumitMenu, name: values.roleName, id: props.location.query.id, sysButton: sumitBtn })
+      } else {
+        updateAuthMenu({ sysMenu: menus, name: values.roleName, id: props.location.query.id, sysButton: but })
+        }
+    });
+  }
+  const { getFieldDecorator } = props.form;
+  
+  return (
+    <>
+      <div>
+      <Spin spinning={ loading } size="large">
+        <Form labelCol={{ span: 6 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item label="角色名称">
+            {getFieldDecorator('roleName', {
+              rules: [{ required: true, message: '请输入角色名称' }],
+            })(<Input className={channels.inpuit} />)}
+
+          </Form.Item>
+          {userMenus.map(item => (
+            (item.parentCode === '-1') &&
+            <Row >
+              <Col span={6}>
+              </Col>
+              <Col span={18}>
+
+                <Card title={<Checkbox checked={dataMenuId.includes(item.menuId)} onChange={handleMenuChange(item)}>{item.name}</Checkbox>} bordered style={{ width: '100%', alignItems: 'center',margin:'10px 0', boxShadow:'3px 3px 10px  rgba(0,0,0,0.15)',borderRadius:'8px'}} >
+                  {
+                    userMenus.map(menu => (
+
+                      (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
+                      <>
+                        <Card.Grid style={gridStyle1} >
+                          <Checkbox checked={dataMenuId.includes(menu.menuId)} onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
+                        </Card.Grid>
+                        <Card.Grid style={gridStyle2}>
+                          {buttonData.length > 0 && buttonData.map(btn => (
+                            <>
+                              {
+                                btn.menuId === menu.menuId &&
+                                <Checkbox checked={dataButtonId.includes(btn.btnId)} onChange={handleButChange(btn)}>{btn.name}</Checkbox>
+                              }
+                            </>
+                          ))}
+                        </Card.Grid>
+                      </>
+                    ))
+                  }
+                </Card>
+              </Col>
+
+            </Row>
+          ))}
+          <Form.Item wrapperCol={{ span: 15, offset: 7 }} style={{ marginTop: '10px' }}>
+            <Button type="primary" htmlType="submit">
+              保存
+          </Button>
+            <Button className={channels.formButton} onClick = {toRoleList}>
+              取消
+          </Button>
+          </Form.Item>
+        </Form>
+        </Spin>
+      </div>
+    </>
+  )
+}
+const WrappedNormalLoginForm = Form.create({ name: 'Poster' })(Poster);
+export default connect(({ user }) => ({ user }))(WrappedNormalLoginForm);

src/pages/staff/list/channelList.less

@@ -0,0 +1,64 @@
+.searchBox {
+  font-size: 20px;
+  color: red;
+  display: flex;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .searchItem {
+    min-width: 20px;
+    margin-right: 20px;
+    text-align: left;
+    .anticon-down {
+      float: right !important;
+    }
+  }
+}
+.addBtn {
+  padding: 0 30px;
+  height: 36px;
+  background-color: #50be00;
+  color: #fff;
+  margin: 30px 0;
+}
+.touxiang {
+  width: 93px;
+  height: 93px;
+}
+.ant-table-column-title {
+  font-weight: 600;
+}
+
+.about {
+  padding: 0 30px;
+  height: 36px;
+  background-color: #00bfff;
+  color: #fff;
+  margin: 30px 0;
+}
+
+.selectName {
+  font-size: 17px;
+  padding: 0 10px;
+  height: 36px;
+  color: rgb(10, 10, 10);
+  margin: 30px 0;
+}
+
+.inpuit {
+  width:50%;
+}
+
+.inpuitTxt {
+  width:70%;
+}
+
+
+.formButton{
+  margin-left: 12% 
+}
+
+.divInput{
+  float: 'left'; 
+  width: 500
+}

src/pages/staff/list/distribution.jsx

@@ -0,0 +1,159 @@
+import React, { useState, useEffect } from 'react';
+import { Button, Table, message, Modal } from 'antd';
+
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import ModalAttribution from '../components/attribution';
+import { router } from 'umi';
+
+function body(props) {
+    console.log('props.localtion.query: ', props.location.query)
+
+    const { id } = props.location.query
+    
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [dataSource, setDataSource] = useState({ records: [], current: 1, size: 10, total: 0 })
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [consultant, setConsultant] = useState({ consultantUserId: '', consultantName: '' })
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [selectedRowIndex, setSelectedRowIndex] = useState([])
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [customerIdList, setCustomerIdList] = useState([])
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [visibleData, setVisibleData] = useState({ visible: false, realtyConsultant: '', buildingId: '', userId: '' })
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    const [userData, setUserData] = useState({})
+
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+        if (id) {
+            getList({ pageNumber: 1, pageSize: 99999, userId: id })
+            getUserData(id)
+        }
+    }, [])
+
+    function getList(params) {
+        // 网路请求
+        request({ ...apis.customer.byUserIdSelectCustomer, urlData: { id: params.userId }, params: { ...params } }).then(res => {
+          setDataSource(res)
+        }).catch(() => {
+
+        })
+    }
+
+     // 查询列表
+    function getUserData(userId) {
+        request({ ...apis.staff.getTaUser, urlData: { id: userId } }).then((data) => {
+            setUserData(data)
+        })
+    }
+
+    function onShow() {
+        setVisibleData({ visible: true, realtyConsultant: '', buildingId: userData.buildingId, userId: userData.userId })
+    }
+
+    function onCancel() {
+        setVisibleData({ visible: false, realtyConsultant: '', buildingId: '', userId: '' })
+    }
+
+    function onSuccess({ realtyConsultant, name }) {
+        setConsultant({ consultantUserId: realtyConsultant, consultantName: name })
+    }
+
+    function onSubmit() {
+        if (customerIdList.length !== dataSource.total) {
+            message.error('存在未分配归属客户')
+            return
+        }
+
+        if (consultant.consultantId === '') {
+            message.error('请选择分配归属的置业顾问')
+            return
+        }
+
+        Modal.confirm({
+            title: '确认保存后，当前员工下的客户数据将转移',
+            content: '同时删除此员工所有数据，确认进行保存操作？',
+            okText: '确认',
+            cancelText: '取消',
+            onOk () {
+                request({ ...apis.staff.departure, urlData: { id: userData.userId }, params: { customerIdList, consultantUserId: consultant.consultantUserId } }).then(() => {
+                    message.info('操作成功')
+                    props.onFresh()
+                    router.go(-1)
+                }).catch(() => {
+          
+                })
+            },
+          });
+    }
+
+    const rowSelection = {
+        selectedRowKeys: selectedRowIndex,
+        hideDefaultSelections: true,
+        onChange: (selectedRowKeys, selectedRows) => {
+          console.log('selectedRowKeys: ', selectedRowKeys, 'selectedRows: ', selectedRows, selectedRowKeys);
+          setSelectedRowIndex(selectedRowKeys)
+          setCustomerIdList(selectedRows.map(p => p.customerId))
+        },
+    };
+
+    const columns = [
+        {
+          title: '用户名',
+          dataIndex: 'name',
+          key: 'name',
+          align: 'center',
+        },
+        {
+          title: '手机号',
+          dataIndex: 'phone',
+          align: 'center',
+          key: 'phone',
+        },
+        {
+            title: '状态',
+            dataIndex: 'reportRecommendStatus',
+            key: 'reportRecommendStatus',
+            align: 'center',
+            // eslint-disable-next-line no-nested-ternary
+            render: (text, records) => {
+              if (records.status === 1) { return '报备' }
+              if (records.status === 2) { return '到访' }
+              if (records.status === 3) { return '认筹' }
+              if (records.status === 4) { return '签约' }
+            },
+          },
+        {
+            title: '调整后归属',
+            dataIndex: 'consultantName',
+            key: 'consultantName',
+            align: 'center',
+            render: (text, records, index) => {
+                return selectedRowIndex.includes(index) ? consultant.consultantName : ''
+            },
+        },
+      ];
+
+    return (
+        <>
+            <Button type="primary" onClick={() => onShow()}>分配归属</Button>
+            <Table rowSelection={rowSelection} dataSource={dataSource.records} columns={columns} pagination={{ pageSize: dataSource.size, current: dataSource.current, total: dataSource.total }} />
+            <div style={{ display: 'flex', justifyContent: 'center', marginTop: '20px' }}>
+                <Button type="primary" onClick={() => onSubmit()}>保存</Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => router.go(-1)}>取消</Button>
+            </div>
+
+            {/* 选择只顾问弹框 */}
+            <ModalAttribution visibleData={visibleData} onCancel={() => onCancel()} onSuccess={e => onSuccess(e)}/>
+        </>
+    )
+}
+
+export default body

src/pages/staff/list/editRole.jsx

@@ -0,0 +1,203 @@
+import React, { useState, useEffect } from 'react';
+import { Checkbox, Input, Card } from 'antd';
+import { connect } from 'dva';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import request from '../../../utils/request';
+import channels from './channelList.less';
+import { resolve } from 'path';
+
+const { TextArea } = Input;
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  console.log('props,props', props.user.currentUser)
+  const userMenus = props.user.currentUser.menus;
+  const userBtns = props.user.currentUser.buttons;
+
+  const [data, setData] = useState({ data: [] })
+ // 获取当前所有菜单
+  useEffect(() => {
+    localStorage.removeItem('value');
+    menuList({ pageNum: 1, pageSize: 100 })
+  }, [])
+
+  function menuList(params) {
+    request({
+      url: '/api/admin/menuList',
+      method: 'GET',
+      params: { ...params },
+  // eslint-disable-next-line no-shadow
+  }).then(data => {
+      console.log(data)
+      setData(data)
+  })
+  }
+
+  // function SuBmenu(params) {
+  //  return Array.from(userMenus).map(Item =>
+  //  <Checkbox value={ Item.menuId }> { Item.name }</Checkbox>)
+  // }
+  // const [tab, changeTab] = useState('basic')
+
+  const Permission = [
+    '项目管理',
+    '员工管理',
+    '客户管理',
+    '系统管理',
+    '渠道管理',
+    '轮播图管理',
+    '资讯管理',
+    '活动管理',
+    '积分商城',
+    '首页数据',
+  ]
+
+  const Poster = props => {
+    const [menus, setMenus] = useState([]);
+// 判断menus是否有值
+    const addMenus = m => setMenus([...menus, m]);
+    const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
+    const handleMenuChange = m => e => {
+      console.log('e', m)
+      if (e.target.checked) {
+        addMenus(m)
+      } else {
+        delMenus(m)
+      }
+      console.log('menus', menus)
+    }
+
+    const [but, setBut] = useState([]);
+    // 判断menus是否有值
+        const addBut = m => setBut([...but, m]);
+        const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
+        const handleButChange = m => e => {
+          console.log('e', m)
+          if (e.target.checked) {
+            addBut(m)
+          } else {
+            delBut(m)
+          }
+          // console.log('menus', menus)
+
+          console.log('menus', menus)
+          console.log('but', but)
+        }
+
+
+    const dataSource = [
+      {
+        name: '员工管理',
+        per: [
+          '111111',
+          '22222',
+          '33333',
+        ],
+      },
+      {
+        name: '角色管理',
+        per: [
+          '444',
+          '555',
+          '666',
+        ],
+      },
+    ];
+
+
+    const gridStyle1 = {
+      width: '20%',
+      textAlign: 'left',
+    };
+    const gridStyle2 = {
+      width: '80%',
+      textAlign: 'left',
+      height: '69px',
+    };
+
+    return (
+    <>
+      <div style={{}}>
+        {/* { console.log('userMenus', userMenus) }
+        { console.log('userBtns', userBtns) } */}
+        {userMenus.map(item => (
+          (item.parentCode === '-1') &&
+          <Card title={<Checkbox onChange={handleMenuChange(item)}>{item.name}</Checkbox>} bordered style={{ width: '100%' }}>
+              {
+                   userMenus.map(menu => (
+
+                    (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
+                    <>
+                      <Card.Grid style={gridStyle1} >
+                          <Checkbox onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
+                      </Card.Grid>
+                      <Card.Grid style={gridStyle2}>
+                        {userBtns.map(btn => (
+                          <>
+                            {
+                              btn.menuId === menu.menuId &&
+                              <Checkbox onChange={handleButChange(btn)}>{btn.name}</Checkbox>
+                            }
+                          </>
+                        ))}
+                      </Card.Grid>
+                   </>
+                   ))
+              }
+          </Card>
+        ))}
+      </div>
+    </>
+    )
+  }
+
+  const fields = [
+    {
+      label: '角色名称',
+      name: 'roleName',
+      type: FieldTypes.Text,
+      // placeholder: '名称',
+      value: ''
+    },
+    {
+      label: '简介',
+      name: 'roleIntroduction',
+      render: <TextArea className={channels.inpuitTxt} ></TextArea>,
+      value: ''
+
+    },
+
+    {
+      label: '菜单权限',
+      name: 'rolePermission',
+      render:
+        <>
+          <div>
+            <Poster/>
+          </div>
+        </>,
+    },
+
+  ]
+
+  const handleSubmit = val => {
+    window.console.log('submit data --->', val)
+    request({
+      url: '/api/admin/menuList',
+      method: 'POST',
+      params: { ...params },
+  // eslint-disable-next-line no-shadow
+  }).then(data => {
+      console.log(data)
+      setData(data)
+  })
+  }
+  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
+}
+export default connect(({ user }) => ({ user }))(Edit);

src/pages/staff/list/editStaff.jsx

@@ -0,0 +1,324 @@
+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 { FormattedMessage } from 'umi-plugin-react/locale';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import router from 'umi/router';
+import styles from '../../style/GoodsList.less';
+import { FieldTypes, createForm } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import channels from './channelList.less';
+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;
+let consultantChecked = false;
+
+const setExtraData = (data) => {
+  consultantChecked = data.isConsultant
+}
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = (props) => {
+  const userId = props.location.query.userId
+  const [userData, setUserData] = useState({})
+  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) => {
+      setTagData(data.records)
+    })
+  }
+
+  const getRoleList = () => {
+    request({ ...apis.role.getRoleList, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
+      console.log(data)
+      setRoleData(data.records)
+    })
+  }
+
+  //获取项目列表
+  const getBuildList = e => {
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setBuildData(data)
+    })
+  }
+
+  // 查询列表
+  const getUserData = (userId) => {
+    request({ ...apis.staff.getTaUser, urlData: { id: userId } }).then((data) => {
+      consultantChecked = data.isConsultant
+      setUserData(data)
+    })
+  }
+
+  if(userData.buildingIds && buildData.length > 0 && !consultantChecked){
+      const newBuildings = userData.buildingIds.filter(x => buildData.filter(it => it.buildingId === x)[0])
+      userData.buildingIds = newBuildings
+  }
+
+  if(userData.roleIds && roleData.length > 0){
+    const newRoleIds = userData.roleIds.filter(x => roleData.filter(it => it.roleId === x)[0])
+      userData.roleIds = newRoleIds
+  }
+
+  useEffect(() => {
+    getTagList();
+    getRoleList();
+    getBuildList();
+    if (userId) {
+      getUserData(userId);
+    }
+  }, [])
+
+  const tagsChange = (value) => {
+    console.log(`selected ${value}`);
+  }
+
+  const handleSubmit = val => {
+    if (userId) {
+      request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    } else {
+      request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    }
+  }
+
+  const photoBeforeUpload = (file) => {
+    // const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+    // if (!isJpgOrPng) {
+    //   message.error('请上传 JPG/PNG 格式的图片!');
+    // }
+    console.log(file.size, file.size / 1024)
+    const isLt100k = (file.size / 1024) < 100;
+    if (!isLt100k) {
+      message.error('请上传小于100k的图片!');
+    }
+    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: '姓名',
+      name: 'userName',
+      type: FieldTypes.Text,
+      value: userData.userName,
+      rules: [
+        { required: true, message: '请输入姓名' },
+      ]
+    },
+    {
+      label: '公司',
+      name: 'orgName',
+      type: FieldTypes.Text,
+      placeholder: '请输入公司名称',
+      value: userData.orgName,
+      rules: [
+        { required: true, message: '请输入公司名称' },
+      ]
+    },
+    {
+      label: '部门',
+      name: 'department',
+      type: FieldTypes.Text,
+      placeholder: '请输入部门',
+      value: userData.department,
+      rules: [
+        { required: true, message: '请输入部门' },
+      ]
+    },
+    {
+      label: '职位',
+      name: 'position',
+      type: FieldTypes.Text,
+      placeholder: '请输入职位',
+      value: userData.position,
+      rules: [
+        { required: true, message: '请输入职位' },
+      ]
+    },
+    {
+      label: '是否置业顾问',
+      name: 'isConsultant',
+      type: FieldTypes.Switch,
+      value: userData.isConsultant,
+      props: {disabled: userData.isConsultant},
+    },
+    {
+      label: '电话',
+      name: 'phone',
+      type: FieldTypes.Text,
+      placeholder: '请输入电话号码',
+      value: userData.phone,
+      rules: [
+        {
+            required: true,
+            pattern: new RegExp('^1[0-9]{10}$'),
+            message: '请输入正确的电话号码',
+        },
+      ]
+    },
+    {
+      label: '登录名',
+      name: 'loginName',
+      type: FieldTypes.Text,
+      placeholder: '请输入登录名',
+      value: userData.loginName,
+      // hidden: () => consultantChecked,
+      help: '默认密码：123456',
+    },
+    {
+      label: '角色',
+      name: 'roleIds',
+      render: <Select
+        mode="multiple"
+        style={{ width: '100%' }}
+        placeholder="请选择标签"
+        onChange={tagsChange} >
+        {roleData.map(item => (
+          <Select.Option key={item.roleId} value={item.roleId}>
+            {item.roleName}
+          </Select.Option>
+        ))}
+      </Select>,
+      value: userData.roleIds,
+    },
+    {
+      label: '授权项目',
+      name: 'buildingId',
+      render: <BuildingSelection userData={userData} />,
+      value: userData.buildingId,
+      hidden: () => !consultantChecked,
+      rules: [
+        { required: true, message: '请选择授权项目' },
+      ]
+    },
+    {
+      label: '授权项目',
+      name: 'buildingIds',
+      render: <Select
+        mode="multiple"
+        showSearch
+        style={{ width: '100%' }}
+        placeholder="请选择授权项目"
+        filterOption={(input, option) =>
+          option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        }
+        >
+        {buildData.map(item => (
+          <Select.Option key={item.buildingId} value={item.buildingId}>
+            {item.buildingName}
+          </Select.Option>
+        ))}
+      </Select>,
+      value: userData.buildingIds,
+      hidden: () => consultantChecked,
+      rules: [
+        { required: true, message: '请选择授权项目' },
+      ]
+    },
+    {
+      label: '置业顾问头像',
+      name: 'photo',
+      type: FieldTypes.ImageUploader,
+      extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
+      value: userData.photo,
+      beforeUpload: (e) => photoBeforeUpload(e),
+      rules: [
+        { required: true, message: '请选择头像' },
+      ]
+    },
+    {
+      label: '简介',
+      name: 'description',
+      render: <TextArea className={channels.inpuitTxt} ></TextArea>,
+      value: userData.description
+
+    },
+    {
+      label: '状态',
+      name: 'status',
+      render: <Radio.Group initialValue="1" buttonStyle="solid">
+        <Radio.Button value="9">禁用</Radio.Button>
+        <Radio.Button value="1">启用</Radio.Button>
+      </Radio.Group>,
+      value: userData.status != null ? userData.status.toString() : "1"
+    },
+    {
+      label: '权重',
+      name: 'weight',
+      type: FieldTypes.Number,
+      render: <Input type="number" style={{ width: 150}} />,
+      value: userData.weight,
+      help: '数字越大越靠前',
+    },
+  ]
+
+  console.log('--------->', fields)
+
+  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/pages/staff/list/index.jsx

@@ -0,0 +1,56 @@
+import React, { useMemo, useRef, useCallback, useState } from 'react'
+import {Button} from 'antd'
+import apis from '@/services/apis'
+import AuthButton from '@/components/AuthButton';
+// import QueryTable from '@/components/QueryTable'
+import TableList from '@/components/TableList'
+import getTableColumns from './tableColumns'
+import { router } from 'umi';
+
+export default (props) => {
+  const ref = useRef()
+  const [page, setPage] = useState({current: 1, pageSize: 10})
+  const toEdit = useCallback((row) => {
+    //
+    router.push({
+      pathname: '/building/Developers/Edit',
+      query: {
+        id: row?.id || undefined,
+      },
+    });
+  }, [])
+
+  const onDelete = useCallback((row) => {
+
+  }, [])
+
+
+  const tableColumns = useMemo(() => {
+    return getTableColumns({
+      page,
+      onEdit:(e)=>toEdit(e),
+      onDelete,
+    })
+  }, [page])
+
+  const actionRender = () => {
+    return (
+      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toEdit()} >
+          新增
+        </Button>
+      </AuthButton>
+    );
+  };
+
+  return (
+    <>
+      <TableList
+        rowKey="buildingId"
+        api={apis.building.getList}
+        columns={tableColumns}
+        actionRender={actionRender}
+      />
+    </>
+  )
+}

src/pages/staff/list/style.less

@@ -0,0 +1,82 @@
+.SubmitButton {
+  background: #3a91d5;
+  border-radius: 7px;
+  border: 0px;
+}
+
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+
+
+.card {
+  min-width: 240px;
+  margin-right: 0.1rem;
+  height: 1.4rem;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px;
+  margin-bottom: 40px;
+  position: relative;
+  padding: 0.1rem;
+  
+}
+
+.cardText {
+  font-size: 0.12rem;
+  color: rgba(102, 102, 102, 1);
+  position: absolute;
+  bottom:0.28rem;
+}
+.statusText {
+  font-size: 0.12rem;
+  color: rgba(102, 102, 102, 1);
+  position: absolute;
+  bottom:0.28rem;
+  right: 20px;
+}
+.phoneText{
+  font-size: 0.12rem;
+  color: rgba(102, 102, 102, 1);
+  position: absolute;
+  bottom:0.05rem;
+}
+
+.cardItem {
+  color: #666;
+  display: flex;
+  align-items: center;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+}
+
+
+.cardTag {
+  font-size: 10px;
+  border-radius: 4px;
+  color: #ffffff;
+  line-height: 16px;
+  margin-top: 10px;
+  padding: 1px 3px;
+
+}
+
+.title {
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last: justify;
+}
+
+
+.roletext {
+  font-size: 20px;
+  font-weight: 400;
+  color: rgba(51, 51, 51, 1);
+  line-height: 28px;
+}

src/pages/staff/staff/Edit/index.jsx

@@ -0,0 +1,314 @@
+import React, { useState, useEffect } from 'react';
+
+import { Input, Card, message, Radio, Select, Modal } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+import router from 'umi/router';
+import { FieldTypes, createForm } from '@/components/XForm';
+import Wangedit from '@/components/Wangedit/Wangedit'
+// import channels from './channelList.less';
+// 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;
+let consultantChecked = false;
+
+const setExtraData = (data) => {
+  consultantChecked = data.isConsultant
+}
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const StaffEdit = (props) => {
+  const userId = props.location.query.userId
+  const [userData, setUserData] = useState({})
+  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) => {
+      setTagData(data.records)
+    })
+  }
+
+  const getRoleList = () => {
+    request({ ...apis.role.getRoleList, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
+      console.log(data)
+      setRoleData(data.records)
+    })
+  }
+
+  //获取项目列表
+  const getBuildList = e => {
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setBuildData(data)
+    })
+  }
+
+  // 查询列表
+  const getUserData = (userId) => {
+    request({ ...apis.staff.getTaUser, urlData: { id: userId } }).then((data) => {
+      consultantChecked = data.isConsultant
+      setUserData(data)
+    })
+  }
+
+  if(userData.buildingIds && buildData.length > 0 && !consultantChecked){
+      const newBuildings = userData.buildingIds.filter(x => buildData.filter(it => it.buildingId === x)[0])
+      userData.buildingIds = newBuildings
+  }
+
+  if(userData.roleIds && roleData.length > 0){
+    const newRoleIds = userData.roleIds.filter(x => roleData.filter(it => it.roleId === x)[0])
+      userData.roleIds = newRoleIds
+  }
+
+  useEffect(() => {
+    getTagList();
+    getRoleList();
+    getBuildList();
+    if (userId) {
+      getUserData(userId);
+    }
+  }, [])
+
+  const tagsChange = (value) => {
+    console.log(`selected ${value}`);
+  }
+
+  const handleSubmit = val => {
+    if (userId) {
+      request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    } else {
+      request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    }
+  }
+
+  const photoBeforeUpload = (file) => {
+    // const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+    // if (!isJpgOrPng) {
+    //   message.error('请上传 JPG/PNG 格式的图片!');
+    // }
+    console.log(file.size, file.size / 1024)
+    const isLt100k = (file.size / 1024) < 100;
+    if (!isLt100k) {
+      message.error('请上传小于100k的图片!');
+    }
+    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: '姓名',
+      name: 'userName',
+      type: FieldTypes.Text,
+      value: userData.userName,
+      rules: [
+        { required: true, message: '请输入姓名' },
+      ]
+    },
+    {
+      label: '公司',
+      name: 'orgName',
+      type: FieldTypes.Text,
+      placeholder: '请输入公司名称',
+      value: userData.orgName,
+      rules: [
+        { required: true, message: '请输入公司名称' },
+      ]
+    },
+    {
+      label: '部门',
+      name: 'department',
+      type: FieldTypes.Text,
+      placeholder: '请输入部门',
+      value: userData.department,
+      rules: [
+        { required: true, message: '请输入部门' },
+      ]
+    },
+    {
+      label: '职位',
+      name: 'position',
+      type: FieldTypes.Text,
+      placeholder: '请输入职位',
+      value: userData.position,
+      rules: [
+        { required: true, message: '请输入职位' },
+      ]
+    },
+    {
+      label: '是否置业顾问',
+      name: 'isConsultant',
+      type: FieldTypes.Switch,
+      value: userData.isConsultant,
+      props: {disabled: userData.isConsultant},
+    },
+    {
+      label: '电话',
+      name: 'phone',
+      type: FieldTypes.Text,
+      placeholder: '请输入电话号码',
+      value: userData.phone,
+      rules: [
+        {
+            required: true,
+            pattern: new RegExp('^1[0-9]{10}$'),
+            message: '请输入正确的电话号码',
+        },
+      ]
+    },
+    {
+      label: '登录名',
+      name: 'loginName',
+      type: FieldTypes.Text,
+      placeholder: '请输入登录名',
+      value: userData.loginName,
+      // hidden: () => consultantChecked,
+      help: '默认密码：123456',
+    },
+    {
+      label: '角色',
+      name: 'roleIds',
+      render: <Select
+        mode="multiple"
+        style={{ width: '100%' }}
+        placeholder="请选择标签"
+        onChange={tagsChange} >
+        {roleData.map(item => (
+          <Select.Option key={item.roleId} value={item.roleId}>
+            {item.roleName}
+          </Select.Option>
+        ))}
+      </Select>,
+      value: userData.roleIds,
+    },
+    {
+      label: '授权项目',
+      name: 'buildingId',
+      render: <BuildingSelection userData={userData} />,
+      value: userData.buildingId,
+      hidden: () => !consultantChecked,
+      rules: [
+        { required: true, message: '请选择授权项目' },
+      ]
+    },
+    {
+      label: '授权项目',
+      name: 'buildingIds',
+      render: <Select
+        mode="multiple"
+        showSearch
+        style={{ width: '100%' }}
+        placeholder="请选择授权项目"
+        filterOption={(input, option) =>
+          option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        }
+        >
+        {buildData.map(item => (
+          <Select.Option key={item.buildingId} value={item.buildingId}>
+            {item.buildingName}
+          </Select.Option>
+        ))}
+      </Select>,
+      value: userData.buildingIds,
+      hidden: () => consultantChecked,
+      rules: [
+        { required: true, message: '请选择授权项目' },
+      ]
+    },
+    {
+      label: '置业顾问头像',
+      name: 'photo',
+      type: FieldTypes.ImageUploader,
+      extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
+      value: userData.photo,
+      beforeUpload: (e) => photoBeforeUpload(e),
+      rules: [
+        { required: true, message: '请选择头像' },
+      ]
+    },
+    {
+      label: '简介',
+      name: 'description',
+      render: <TextArea  ></TextArea>,
+      value: userData.description
+      // className={channels.inpuitTxt}
+    },
+    {
+      label: '状态',
+      name: 'status',
+      render: <Radio.Group initialValue="1" buttonStyle="solid">
+        <Radio.Button value="9">禁用</Radio.Button>
+        <Radio.Button value="1">启用</Radio.Button>
+      </Radio.Group>,
+      value: userData.status != null ? userData.status.toString() : "1"
+    },
+    {
+      label: '权重',
+      name: 'weight',
+      type: FieldTypes.Number,
+      render: <Input type="number" style={{ width: 150}} />,
+      value: userData.weight,
+      help: '数字越大越靠前',
+    },
+  ]
+
+
+  return <Card>
+            <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
+
+        </Card>
+}
+
+export default StaffEdit

src/pages/staff/staff/components/BatchAssistConsultant.jsx

@@ -0,0 +1,125 @@
+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 apis from '@/services/apis';
+import request from '@/utils/request';
+
+
+/**
+ * 分配置业顾问
+ *
+ * @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) {
+    if (this.props.visible !== preState.visibleData.visible) {
+      this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: this.props.buildingId })
+      this.setState({ visibleData: { visible: this.props.visible, buildingId: this.props.buildingId } });
+    }
+  }
+
+  // 弹框取消按钮
+  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 => {
+
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+  // 分页
+  onChange(pageNum) {
+
+    this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingId })
+  }
+
+  // 提交
+  submitGm(record) {
+    this.props.onCancel(record)
+  }
+
+  render() {
+    const columns = [
+      {
+        title: '姓名',
+        dataIndex: 'userName',
+        key: 'userName',
+        width: 120,
+      },
+      {
+        title: '电话',
+        dataIndex: 'phone',
+        key: 'phone',
+        width: 150,
+      },
+      {
+        title: '部门',
+        dataIndex: 'department',
+        key: 'department',
+        width: 130,
+      },
+      {
+        title: '岗位',
+        dataIndex: 'position',
+        key: 'position',
+        width: 120,
+      },
+      {
+        title: '操作',
+        dataIndex: 'personId',
+        key: 'personId',
+        width: 80,
+        // eslint-disable-next-line no-nested-ternary
+        render: (_, record) => <>{record.userId !== this.props.userId ? <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button> : ''}</>,
+      },
+    ]
+    return (
+      <>
+        <Modal
+          title="分配置业顾问"
+          width={600}
+          destroyOnClose="true"
+          footer={null}
+          visible={this.state.visibleData.visible}
+          onCancel={(e) => this.handleCancel(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>
+      </>
+    );
+  }
+}
+
+export default ModalAttribution

src/pages/staff/staff/components/BuildingSelection.jsx

@@ -0,0 +1,58 @@
+import React, { useState } from 'react';
+import {  Modal } from 'antd';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+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/staff/components/CustomerChange.jsx

@@ -0,0 +1,113 @@
+import React, {  useState, useEffect } from 'react';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import { Table, Button,  message } from 'antd';
+import BatchAssistConsultant from './BatchAssistConsultant'
+
+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: '用户名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '客户状态',
+      dataIndex: 'reportRecommendStatus',
+      key: 'reportRecommendStatus',
+      align: 'center',
+      render: (text, records) => {
+        if (records.status === 1) { return '报备' }
+        if (records.status === 2) { return '到访' }
+        if (records.status === 3) { return '认购' }
+        if (records.status === 4) { return '签约' }
+      },
+    },
+    {
+      title: '调整后归属',
+      dataIndex: 'moveUserName',
+      key: 'moveUserName',
+      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={() => 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} userId={props.userId} buildingId={props.buildingId} onCancel={consulatanChange} />
+      <div style={{ textAlign: 'center', marginTop: '16px' }}><Button type="primary" onClick={() => batchSaveConsultant()}>保存</Button>
+        <Button style={{ marginLeft: '10px' }} onClick={() => cancelConsultant()}>取消</Button></div>
+    </div>
+  )
+}
+
+export default CustomerChange;

src/pages/staff/staff/list/index.jsx

@@ -0,0 +1,259 @@
+import React, { useMemo, useRef, useCallback, useState } from 'react';
+import { Button, Modal, message } from 'antd';
+import moment from 'moment';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import AuthButton from '@/components/AuthButton';
+import QueryTable from '@/components/QueryTable';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import OperButton from '@/components/OperButton';
+import withActions from '@/components/ActionList';
+import { router } from 'umi';
+
+export default props => {
+  const ref = useRef();
+  const [visible, setVisible] = useState(false);
+  const [data, setData] = useState(false);
+
+
+  const toEdit = useCallback(row => {
+    //跳转到编辑商品
+    router.push({
+      pathname: '/staff/Staff/Edit',
+      query: {
+        userId: row?.userId || undefined,
+      },
+    });
+  }, []);
+
+
+  //迁移私客成功回调
+  const moveSuccess = e => {
+    setVisible(false);
+    if (e === 'success') {
+      confirm(data)();
+      setData()
+    }
+  };
+
+  const confirm = data => () => {
+    // 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(res => {
+          if (res.length > 0) {
+            Modal.confirm({
+              title: '此置业顾问下有私客，是否转移私客？',
+              okText: '确认',
+              cancelText: '取消',
+              onOk() {
+                setVisible(true);
+                setData(data);
+              },
+            });
+          } 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('操作成功');
+                    ref.current.reload();
+                  },
+                );
+              },
+            });
+          }
+        });
+      } 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('操作成功');
+                ref.current.reload();
+              },
+            );
+          },
+        });
+      }
+    } else {
+      Modal.confirm({
+        title: '确认启用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then(res => {
+            message.info('操作成功');
+            ref.current.reload();
+          });
+        },
+      });
+    }
+  };
+
+  const searchFields = [
+    {
+      name: 'buildingId',
+      label: '所属项目',
+      placeholder: '请选择项目',
+      render: () => <BuildingSelect style={{ width: 160 }} />,
+    },
+    {
+      name: 'code',
+      label: '工号',
+      placeholder: '请输入工号',
+    },
+    {
+      name: 'userName',
+      label: '姓名',
+      placeholder: '请输入姓名',
+    },
+    {
+      name: 'isConsultant',
+      label: '类型',
+      placeholder: '请选择类型',
+      type: 'select',
+      options: [
+        { label: '全部', value: '' },
+        { label: '非置业顾问', value: 0 },
+        { label: '置业顾问', value: 1 },
+      ],
+    },
+    {
+      name: 'status',
+      label: '状态',
+      placeholder: '请选择状态',
+      type: 'select',
+      options: [
+        { label: '全部', value: '' },
+        { label: '启用', value: 1 },
+        { label: '禁用', value: 9 },
+      ],
+    },
+  ];
+
+  const tableColumns = [
+    {
+      title: '工号',
+      key: 'code',
+      dataIndex: 'code',
+      align: 'center',
+    },
+    {
+      title: '姓名',
+      dataIndex: 'userName',
+      key: 'userName',
+      align: 'center',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '类型',
+      dataIndex: 'isConsultant',
+      key: 'isConsultant',
+      align: 'center',
+      render: text => (text === 1 ? '置业顾问' : '非置业顾问'),
+    },
+    {
+      title: '绑定状态',
+      dataIndex: 'miniStatus',
+      key: 'miniStatus',
+      align: 'center',
+      render: text => (text === 1 ? '已绑定' : '未绑定'),
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: t => moment(t).format('YYYY-MM-DD HH:mm'),
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: text => (text === 1 ? '启用' : '停用'),
+    },
+
+    {
+      title: '操作',
+      key: 'options',
+      align: 'center',
+      render: withActions(
+        (_, row) => [
+          <AuthButton name="admin.building.public" noRight={null}>
+            <OperButton onClick={confirm(row)}>{row.status === 1 ? '停用' : '启用'}</OperButton>
+          </AuthButton>,
+          <AuthButton name="admin.building.delete" noRight={null}>
+               <OperButton onClick={() => toEdit(row)}>编辑</OperButton>
+          </AuthButton>,
+        ],
+        { noMargin: true },
+      ),
+    },
+  ];
+
+  const actionRender = () => {
+    return (
+      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toEdit()}>
+          新增
+        </Button>
+      </AuthButton>
+    );
+  };
+
+  return (
+    <>
+      <QueryTable
+        ref={ref}
+        rowKey="buildingId"
+        api={apis.staff.taUser}
+        columns={tableColumns}
+        searchFields={searchFields}
+        actionRender={actionRender}
+      />
+
+      <Modal
+        visible={visible}
+        title="分配归属"
+        onCancel={() => setVisible(false)}
+        footer={null}
+        width={900}
+      >
+        {data && (
+          <CustomerChange
+            userId={data.userId}
+            consultantPersonId={data.consultantPersonId}
+            buildingId={data.buildingId}
+            onSuccess={moveSuccess}
+          />
+        )}
+      </Modal>
+    </>
+  );
+};