瀏覽代碼

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

zhoulisen 5 年之前
父節點
當前提交
bc2c9ab9f0

+ 1
- 1
src/pages/customer/customerlist/components/BatchAssistConsultant.jsx 查看文件

35
   componentDidUpdate(preProps, preState) {
35
   componentDidUpdate(preProps, preState) {
36
     console.log(this.props.visibleData)
36
     console.log(this.props.visibleData)
37
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
37
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
38
-      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId ,buildingId: this.props.visibleData.buildingId})
38
+      this.getList({ pageNumber: 1, pageSize: 5,buildingId: this.props.visibleData.buildingId})
39
       this.setState({ visibleData: this.props.visibleData });
39
       this.setState({ visibleData: this.props.visibleData });
40
     }
40
     }
41
   }
41
   }

+ 2
- 1
src/pages/customer/customerlist/index.jsx 查看文件

367
   }
367
   }
368
 
368
 
369
   const rowSelection = {
369
   const rowSelection = {
370
+    selectedRowKeys,
370
     onChange: (selectedRowKeys, selectedRows) => {
371
     onChange: (selectedRowKeys, selectedRows) => {
371
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
372
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
372
-
373
+      setSelectedRowKeys(selectedRowKeys)
373
       const newSelectedRows = personInfo.filter(x => !selectedRows.some(y => x.customerId === y.customerId))     // 去重
374
       const newSelectedRows = personInfo.filter(x => !selectedRows.some(y => x.customerId === y.customerId))     // 去重
374
         .concat(selectedRows)                                                                 // 新增选择
375
         .concat(selectedRows)                                                                 // 新增选择
375
         .filter(x => selectedRowKeys.some(y => y === x.customerId))                             // 去掉未选的数据
376
         .filter(x => selectedRowKeys.some(y => y === x.customerId))                             // 去掉未选的数据