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

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

@@ -72,7 +72,7 @@ class ModalAttribution extends React.Component {
   getList(params) {
     // 网路请求
     console.log('params: ', params)
-    request({ ...apis.customer.buildingConsultant,params: { ...params } }).then(res => {
+    request({ ...apis.customer.buildingConsultant }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
       
@@ -90,7 +90,7 @@ class ModalAttribution extends React.Component {
    // 分页
   onChange(pageNum) {
 
-    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
+    this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
   }
 
   // 提交

src/pages/customer/customerlist/index.jsx

@@ -67,6 +67,8 @@ function body(props) {
 
   const [batchAssistVisibleData, setBatchAssistVisibleData] = useState({ visible: false, customerId: [] })
 
+  const [currentSelectedRows, setSelectedRows] = useState([])
+
   // const [page, setPage] = useState(1)
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -178,9 +180,9 @@ function body(props) {
         props.form.setFieldsValue(JSON.parse(localStorage.getItem("priPageParams")));
 
         getList(JSON.parse(localStorage.getItem("priPageParams")))
-      }else{
+      } else {
         localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: value }))
-      getList({ pageNumber: 1, pageSize: 10, customerType: value })
+        getList({ pageNumber: 1, pageSize: 10, customerType: value })
       }
 
     } else {
@@ -259,6 +261,7 @@ function body(props) {
   }
 
   function batchAssistConsultant() {
+    console.log(personInfo, 'personInfo')
     if (personInfo.length <= 0) {
       return message.info("请至少选择一条数据");
     }
@@ -347,7 +350,14 @@ function body(props) {
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-      setPersonInfo(selectedRows)
+      // const array = selectedRows + personInfo
+
+      const newSelectedRows = personInfo.filter(x => !selectedRows.some(y => x.personId === y.personId))     // 去重
+                                .concat(selectedRows)                                                                 // 新增选择
+                                .filter(x => selectedRowKeys.some(y => y === x.personId))                             // 去掉未选的数据
+
+      // setSelectedRows(newSelectedRows)
+      setPersonInfo(newSelectedRows)
     },
   };
 
@@ -569,11 +579,11 @@ function body(props) {
         </Form.Item>}
         <Form.Item >
           {getFieldDecorator('startCreateDate')(
-            <DatePicker placeholder="注册开始时间" format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+            <DatePicker placeholder="注册开始时间" format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} />)}
         </Form.Item>
         <Form.Item >
           {getFieldDecorator('endCreateDate')(
-            <DatePicker placeholder="注册结束时间" format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+            <DatePicker placeholder="注册结束时间" format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }} />)}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('sceneType')(
@@ -581,7 +591,7 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-        {getFieldDecorator('sharePersonName')(
+          {getFieldDecorator('sharePersonName')(
             <Input placeholder="推广人" />,
           )}
         </Form.Item>
@@ -631,14 +641,14 @@ function body(props) {
           //     onClick: () => toCustomerDateil(record),
           //   };
           // }}
-          dataSource={dataSource.records} columns={privateColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r=>r.customerId} /> :
+          dataSource={dataSource.records} columns={privateColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r => r.customerId} /> :
         <Table rowSelection={rowSelection}
           // onRow={record => {
           //   return {
           //     onClick: () => publicCustomerDetail(record),
           //   };
           // }}
-          dataSource={dataSource.records} columns={publicColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r=>r.customerId} />
+          dataSource={dataSource.records} columns={publicColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r => r.personId} />
       }
 
       {/* 调整归属 */}