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

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

     super(props);
     console.log(props, 'props')
     this.state = {
-      dataSource: { records: [] },
-      visibleData: { visible: false, customerId: [], buildingName: '' },
-      buildingId: ''
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: [], buildingName: '' },
     }
   }
 
   }
 
   componentDidUpdate(preProps, preState) {
-    // this.setState({ buildingId: this.props.visibleData.buildingId })
     console.log(this.props.visibleData)
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
-
-      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.visibleData.buildingId })
+      this.getList({ pageNumber: 1, pageSize: 5,buildingId: this.props.visibleData.buildingId})
       this.setState({ visibleData: this.props.visibleData });
     }
   }
     this.props.onCancel()
   }
 
-  changBuilding(buildingId) {
+  changBuilding(buildingId){
     this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
     this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
   }
 
-  getUserList(params) {
+  getUserList(params){
     console.log('params: ', params)
     if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
       return
   getList(params) {
     // 网路请求
     console.log('params: ', params)
-    request({ ...apis.customer.buildingConsultant, params: { ...params } }).then(res => {
+    request({ ...apis.customer.buildingConsultant , params: { ...params }}).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
-
+      
     })
   }
 
     });
   };
 
-  // 分页
+   // 分页
   onChange(pageNum) {
-    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName ||this.props.visibleData.buildingId})
+    console.log(this.state.visibleData.buildingName,"222222222222222222222222")
+
+    this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
   }
 
   // 提交
   submitGm(record) {
+    console.log(this.state.visibleData.buildingName,"3333333333333333333")
     // 网路请求
-    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId, customerIds: this.state.visibleData.customerId } }).then(res => {
+    request({ ...apis.customer.batchConsultantAssist, data: { userId: record.userId
+      ,buildingId:this.state.visibleData.buildingName  || this.props.visibleData.buildingId
+      , customerIds: this.state.visibleData.customerId } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
-
-      if (res != null && res.failNum > 0) {
-        this.openNotificationWithIcon('success', '共' + res.totalNum + '条数据,失败操作' + res.failNum + '条')
-      } else {
+      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
-
+  
     })
   }
 
         dataIndex: 'personId',
         key: 'personId',
         // eslint-disable-next-line no-nested-ternary
-        render: (_, record) => <>{<Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
-      },
+        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
     ]
     return (
       <>
         <Modal
-          title="分配置业顾问"
-          width={800}
-          destroyOnClose="true"
-          footer={null}
-          visible={this.state.visibleData.visible}
-          onCancel={(e) => this.handleCancel(e)}
-        >
-          <span>你正在为{this.props.visibleData.customerId.length}位公客分配置业顾问</span><br /><br />
-          {this.props.visibleData.buildingId == null && <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />}
-          <Table rowKey="BatchAssistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-        </Modal>
+            title="分配置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            <span>你正在为{this.props.visibleData.customerId.length}位公客分配置业顾问</span><br/><br/>
+            {this.props.visibleData.buildingId == null && <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />}
+            <Table rowKey="BatchAssistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
       </>
     );
   }

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

   constructor(props) {
     super(props);
     this.state = {
-      dataSource: { records: [] },
-      visibleData: { visible: false, customerId: '', buildingName: '' },
+       dataSource: { records: [] },
+       visibleData: { visible: false, customerId: '', buildingName: '' },
     }
   }
 
   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, customerId: this.props.visibleData.customerId,buildingId:this.props.visibleData.buildingId })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
     this.props.onCancel()
   }
 
-  changBuilding(buildingId) {
-    console.log(buildingId,'buildingId')
+  changBuilding(buildingId){
     this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
     this.setState({ visibleData: { visible: this.props.visibleData.visible, customerId: this.props.visibleData.customerId, buildingName: buildingId } });
   }
 
-  getUserList(params) {
+  getUserList(params){
     console.log('params: ', params)
     if (params.buildingId === '' || params.buildingId === null || params.buildingId === undefined) {
       return
     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)
+      
     })
   }
 
     });
   };
 
-  // 分页
+   // 分页
   onChange(pageNum) {
-    console.log(this.state.visibleData.buildingName,this.props.visibleData.buildingId)
-    this.getList({ pageNumber: pageNum, pageSize: 5, customerId: this.props.visibleData.customerId, buildingId: this.state.visibleData.buildingName ||this.props.visibleData.buildingId})
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
   }
 
   // 提交
   submitGm(record) {
+    debugger
     // 网路请求
-    request({ ...apis.customer.consultantAssist, urlData: { id: this.state.visibleData.customerId }, data: { userId: record.userId } }).then(res => {
+    request({ ...apis.customer.consultantAssist, urlData: { id: this.state.visibleData.customerId }, 
+      data: { userId: record.userId,buildingId:this.state.visibleData.buildingName  || this.props.visibleData.buildingId } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
+      
       this.openNotificationWithIcon('success', '操作成功')
       this.handleCancel()
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
-
     })
   }
 
         dataIndex: 'personId',
         key: 'personId',
         // eslint-disable-next-line no-nested-ternary
-        render: (_, record) => <>{<Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>,
-      },
+        render: (_, record) => <>{ <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button>}</>, },
     ]
     return (
       <>
         <Modal
-          title="分配置业顾问"
-          width={800}
-          destroyOnClose="true"
-          footer={null}
-          visible={this.state.visibleData.visible}
-          onCancel={(e) => this.handleCancel(e)}
-        >
-          {this.props.visibleData.buildingId == null && <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />}
-          <Table rowKey="assistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-        </Modal>
+            title="分配置业顾问"
+            width={800}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onCancel={(e) => this.handleCancel(e)}
+          >
+            {this.props.visibleData.buildingId == null && <BuildSelect  onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />}
+            <Table rowKey="assistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          </Modal>
       </>
     );
   }