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

src/components/SelectButton/BuildSelect.jsx

       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>
-          {/* <Option key="" value="">全部项目</Option> */}
+          <Option key="" value="">全部项目</Option>
           {data.map(building => (
             <Option key={building.buildingId} value={building.buildingId}>{building.buildingName}</Option>
           ))}

src/pages/activity/drainage/DrainageList.jsx

 import moment from 'moment';
 import AuthButton from '../../../components/AuthButton';
 import ImageUploader from '../../../components/XForm/ImageUpload';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 import Prompt from 'umi/prompt';
 
 const toEditList = (row) => () => {

src/pages/activity/editActivity.jsx

 import styles from '../style/GoodsList.less';
 import apis from '../../services/apis';
 import moment from 'moment';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import request from '../../utils/request'

src/pages/activity/groupActivity/editGroupActivity.jsx

 import apis from '../../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import request from '../../../utils/request'

src/pages/activity/helpActivity/edithelpActivity.jsx

 import apis from '../../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import request from '../../../utils/request'

src/pages/carouselFigure/editAdvertising.jsx

 import styles from '../style/GoodsList.less';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import CitySelect from '../../components/SelectButton/CitySelect2'
 import { FieldTypes, createForm } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit';

src/pages/carouselFigure/editCarousel.jsx

 import moment from 'moment';
 import router from 'umi/router';
 import styles from '../style/GoodsList.less';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import CitySelect from '../../components/SelectButton/CitySelect2'
 import { createForm, FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'

src/pages/carouselFigure/propaganda.jsx

 import styles from '../style/GoodsList.less';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import CitySelect from '../../components/SelectButton/CitySelect2'
 import { FieldTypes, createForm } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit';

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

     request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
-
+      message.err(err)
     })
   }
 
     // 网路请求
     request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, customerIds: this.state.visibleData.customerId } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
-      this.openNotificationWithIcon('success', '操作成功')
+      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
-      this.openNotificationWithIcon('error', err)
+  
     })
   }
 

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

     request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
-
+      message.err(err)
     })
   }
 
     request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
-
+      message.err(err)
     })
   }
 
       this.handleCancel()
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-      this.openNotificationWithIcon('error', err)
+
     })
   }
 

src/pages/customer/customerlist/index.jsx

   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ records: [] })
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataPub, setDataPub] = useState({ records: [] })
+  // const [columns, setColumns] = useState(privateColumns)
+
   // 默认私客
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [customerType, setCustomerType] = useState('private')
   // 推荐客户
   const [recommendVisibleData, setRecommendVisibleData] = useState({ visible: false, customerId: '' })
 
-  const [assistVisibleData, setAssistVisibleData] = useState({ visible: false, customerId: '', buildingId: '' })
+  const [assistVisibleData, setAssistVisibleData] = useState({ visible: false, customerId: '',buildingId:'' })
 
   const [loadingStatus, setLoadingStatus] = useState(false)
 
   // 选中的公客信息
   const [personInfo, setPersonInfo] = useState([])
 
-  const [batchAssistVisibleData, setBatchAssistVisibleData] = useState({ visible: false, customerId: [], buildingId: '' })
+  const [batchAssistVisibleData, setBatchAssistVisibleData] = useState({ visible: false, customerId: [] ,buildingId:''})
 
   const [currentSelectedRows, setSelectedRows] = useState([])
 
-  const [selectedRowKeys, setSelectedRowKeys] = useState([])
+  const [selectedRowKeys,setSelectedRowKeys] = useState([])
+
+//  const [ radio, setRadio] = useState(true)
+
+  // const [page, setPage] = useState(1)
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
       localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType }))
       getList({ pageNumber: 1, pageSize: 10, customerType })
     }
-  }, [])
+  }, []) 
 
   function getList(params) {
     // 网路请求
+    // setDataSource([])
+    // setRadio(true)
     request({ ...apis.customer.customerRecommend, params: { ...params } }).then(res => {
-      if (params.customerType === 'private') {
-        setDataSource(res)
-      } else {
-        setDataPub(res)
-      }
+      setDataSource(res)
+      setRadio(false)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
 
   // 私客/公客切换
   function radioButtonHandleSizeChange(e) {
-
+    
     displayNone()
-
+    
     props.form.resetFields();
     const { value } = e.target
     setCustomerType(value)
         // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
         getList({ customerType, ...JSON.parse(localStorage.getItem("pubPageParams")) })
       } else {
-        localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'public' }))
-        getList({ pageNumber: 1, pageSize: 10, customerType: 'public' })
+        localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: value }))
+        getList({ pageNumber: 1, pageSize: 10, customerType: value })
       }
     }
 
   function handleReset() {
     props.form.resetFields();
     if (customerType === 'private') {
-      localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'private' }));
+      localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'private', }));
       getList(JSON.parse(localStorage.getItem("priPageParams")))
     } else {
       localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'public' }))
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
   }
 
   function showRecord(record) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
   }
 
   function showStatus(record) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
-    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '' ,buildingId:''})
   }
 
   // 推荐客户
   }
 
   //分配置业顾问
-  function assistConsultant(personId, buildingId) {
+  function assistConsultant(personId,buildingId) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setAssistVisibleData({ visible: true, customerId: personId, buildingId: buildingId })
-    setBatchAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+    setAssistVisibleData({ visible: true, customerId: personId ,buildingId:buildingId})
+    setBatchAssistVisibleData({ visible: false, customerId: '' ,buildingId:''})
   }
 
   function batchAssistConsultant() {
     const compareSet = new Set();
     personInfo.filter(record => {
       compareSet.add(record.buildingName)
-    })
+    } )
 
-    if (compareSet.size != 1) {
-      return message.info("请选择项目");
+    if(compareSet.size != 1){
+      return message.info("选中的公客存在于不同项目中，请分开进行分配置业顾问操作");
     }
 
     // const newSelectedRows = personInfo.filter()  
-
+    
     // console.log(newSelectedRows,'newSelectedRows')
 
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
-    setBatchAssistVisibleData({ visible: true, customerId: personInfo, buildingId: personInfo[0].buildingId })
+    setAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
+    setBatchAssistVisibleData({ visible: true, customerId: personInfo, buildingId: personInfo[0].buildingId})
   }
 
   function toCustomerDateil(record) {
         download(response)
         setLoadingStatus(false)
       }).catch(error => {
-        message.err('连接超时');
+        message.err("连接超时");
         setLoadingStatus(false)
       })
   }
   function closeAttribution() {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     if (customerType === 'private') {
-      getList(JSON.parse(localStorage.getItem('priPageParams')))
+
+      getList(JSON.parse(localStorage.getItem("priPageParams")))
     } else {
-      getList(JSON.parse(localStorage.getItem('pubPageParams')))
+
+      getList(JSON.parse(localStorage.getItem("pubPageParams")))
     }
+
   }
   // 回调关闭所有弹框
   function closeAll() {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setAssistVisibleData({ visible: false, customerId: '', buildingId: '' })
+    setAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
     setBatchAssistVisibleData({ visible: false, customerId: '' })
     if (customerType === 'private') {
 
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
       setSelectedRowKeys(selectedRowKeys)
       const newSelectedRows = personInfo.filter(x => !selectedRows.some(y => x.customerId === y.customerId))     // 去重
-        .concat(selectedRows)                                                                 // 新增选择
-        .filter(x => selectedRowKeys.some(y => y === x.customerId))                             // 去掉未选的数据
+                                .concat(selectedRows)                                                                 // 新增选择
+                                .filter(x => selectedRowKeys.some(y => y === x.customerId))                             // 去掉未选的数据
 
       // setSelectedRows(newSelectedRows)
-      console.log(newSelectedRows, "33333333333333333333")
       setPersonInfo(newSelectedRows)
     },
   };
       align: 'center',
       width: '15%',
       // render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
-      render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={record.picture} size={64} icon="user" />,
+      render: (_, record) => <Avatar shape="square" style={{ color: 'blue', cursor: 'pointer' }} onClick={() => publicCustomerDetail(record)} src={record.picture } size={64} icon="user" />,
     },
     {
       title: '姓名',
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
           </AuthButton>
           <AuthButton name="admin.customer.assign" noRight={null}>
-            <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId, record.buildingId)}>分配置业顾问</Button>
+            <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId,record.buildingId)}>分配置业顾问</Button>
           </AuthButton>
           <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
             <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        {customerType === 'public' && <Form.Item>
+      {customerType === 'public' && <Form.Item>
           {getFieldDecorator('belongStatus')(
             <Select style={{ width: '180px' }} placeholder="是否归属项目" onChange={handleSelectChange}>
               <Option value={1}>是</Option>

src/pages/integralMall/editGoods.jsx

 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 BuildSelect from '../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect2'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import router from 'umi/router';

src/pages/news/list/editNewsList.jsx

 import apis from '../../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect2'
 import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
 import  { FieldTypes, createForm } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'