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

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

@@ -22,8 +22,9 @@ class ModalAttribution extends React.Component {
     super(props);
     console.log(props, 'props')
     this.state = {
-       dataSource: { records: [] },
-       visibleData: { visible: false, customerId: [], buildingName: '' },
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: [], buildingName: '' },
+      buildingId: ''
     }
   }
 
@@ -33,9 +34,11 @@ class ModalAttribution extends React.Component {
   }
 
   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 });
     }
   }
@@ -51,12 +54,12 @@ class ModalAttribution extends React.Component {
     this.props.onCancel()
   }
 
-  changBuilding(buildingId){
-    this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: buildingId })
+  changBuilding(buildingId) {
+    this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: this.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
@@ -72,10 +75,10 @@ class ModalAttribution extends React.Component {
   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 => {
-      
+
     })
   }
 
@@ -87,10 +90,10 @@ class ModalAttribution extends React.Component {
     });
   };
 
-   // 分页
+  // 分页
   onChange(pageNum) {
 
-    this.getUserList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
+    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingId })
   }
 
   // 提交
@@ -98,7 +101,12 @@ 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
-      this.openNotificationWithIcon('success', '操作成功')
+      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
@@ -138,22 +146,23 @@ class ModalAttribution extends React.Component {
         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

@@ -21,8 +21,8 @@ class ModalAttribution extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-       dataSource: { records: [] },
-       visibleData: { visible: false, customerId: '', buildingName: '' },
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', buildingName: '' },
     }
   }
 
@@ -34,7 +34,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, customerId: this.props.visibleData.customerId, buildingId: this.props.visibleData.buildingId })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -50,12 +50,12 @@ class ModalAttribution extends React.Component {
     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
@@ -85,9 +85,9 @@ class ModalAttribution extends React.Component {
     });
   };
 
-   // 分页
+  // 分页
   onChange(pageNum) {
-    this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
+    this.getList({ pageNumber: pageNum, pageSize: 5, customerId: this.props.visibleData.customerId, buildingId: this.props.visibleData.buildingId })
   }
 
   // 提交
@@ -95,7 +95,6 @@ class ModalAttribution extends React.Component {
     // 网路请求
     request({ ...apis.customer.consultantAssist, urlData: { id: this.state.visibleData.customerId }, data: { userId: record.userId } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
-      debugger
       this.openNotificationWithIcon('success', '操作成功')
       this.handleCancel()
     }).catch(err => {
@@ -136,21 +135,22 @@ class ModalAttribution extends React.Component {
         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>
       </>
     );
   }

src/pages/customer/customerlist/index.jsx

@@ -705,7 +705,7 @@ function body(props) {
           //     onClick: () => publicCustomerDetail(record),
           //   };
           // }}
-          dataSource={dataSource.records} columns={publicColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r => r.customerId} />
+          dataSource={dataPub.records} columns={publicColumns} pagination={{ current: dataPub.current, total: dataPub.total, pageSize: dataPub.size, onChange }} rowKey={r => r.customerId} ></Table>
       }
 
       {/* 调整归属 */}