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

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

@@ -35,7 +35,7 @@ class ModalAttribution extends React.Component {
   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.getList({ pageNumber: 1, pageSize: 5,buildingId: this.props.visibleData.buildingId})
       this.setState({ visibleData: this.props.visibleData });
     }
   }

src/pages/customer/customerlist/index.jsx

@@ -367,9 +367,10 @@ function body(props) {
   }
 
   const rowSelection = {
+    selectedRowKeys,
     onChange: (selectedRowKeys, selectedRows) => {
       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))                             // 去掉未选的数据