bug

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

@@ -55,7 +55,7 @@ class ModalAttribution extends React.Component {
   }
 
   changBuilding(buildingId) {
-    this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: this.buildingId })
+    this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
     this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
   }
 
@@ -101,16 +101,16 @@ class ModalAttribution extends React.Component {
     // 网路请求
     request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, 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{
+
+      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
-  
+
     })
   }
 

src/pages/customer/customerlist/index.jsx

@@ -34,8 +34,7 @@ function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ records: [] })
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  // const [columns, setColumns] = useState(privateColumns)
-
+  const [dataPub, setDataPub] = useState({ records: [] })
   // 默认私客
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [customerType, setCustomerType] = useState('private')
@@ -58,22 +57,18 @@ function body(props) {
   // 推荐客户
   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 [ radio, setRadio] = useState(true)
-
-  // const [page, setPage] = useState(1)
+  const [selectedRowKeys, setSelectedRowKeys] = useState([])
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
@@ -93,15 +88,16 @@ function body(props) {
       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 => {
-      setDataSource(res)
-      setRadio(false)
+      if (params.customerType === 'private') {
+        setDataSource(res)
+      } else {
+        setDataPub(res)
+      }
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
@@ -179,9 +175,9 @@ function body(props) {
 
   // 私客/公客切换
   function radioButtonHandleSizeChange(e) {
-    
+
     displayNone()
-    
+
     props.form.resetFields();
     const { value } = e.target
     setCustomerType(value)
@@ -203,8 +199,8 @@ function body(props) {
         // 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: value }))
-        getList({ pageNumber: 1, pageSize: 10, customerType: value })
+        localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: 'public' }))
+        getList({ pageNumber: 1, pageSize: 10, customerType: 'public' })
       }
     }
 
@@ -215,7 +211,7 @@ function body(props) {
   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' }))
@@ -233,7 +229,7 @@ function body(props) {
     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) {
@@ -241,7 +237,7 @@ function body(props) {
     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) {
@@ -249,7 +245,7 @@ function body(props) {
     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: '' })
   }
 
   // 推荐客户
@@ -262,13 +258,13 @@ function body(props) {
   }
 
   //分配置业顾问
-  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() {
@@ -281,22 +277,22 @@ function body(props) {
     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) {
@@ -325,7 +321,7 @@ function body(props) {
         download(response)
         setLoadingStatus(false)
       }).catch(error => {
-        message.err("连接超时");
+        message.err('连接超时');
         setLoadingStatus(false)
       })
   }
@@ -347,13 +343,10 @@ function body(props) {
   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() {
@@ -361,7 +354,7 @@ function body(props) {
     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') {
 
@@ -379,10 +372,11 @@ function body(props) {
       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)
     },
   };
@@ -395,7 +389,7 @@ function body(props) {
       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: '姓名',
@@ -461,7 +455,7 @@ function body(props) {
             <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>
@@ -585,7 +579,7 @@ function body(props) {
   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>