新需求

src/pages/staff/components/BatchAssistConsultant.jsx

@@ -31,19 +31,12 @@ class ModalAttribution extends React.Component {
   }
 
   componentDidUpdate(preProps, preState) {
-    console.log(this.props.preState,"111111111111111")
     if (this.props.visible !== preState.visibleData.visible) {
-      this.getList({ pageNumber: 1, pageSize: 5, buildingId: this.props.buildingId })
+      this.getUserList({ pageNumber: 1, pageSize: 5, buildingId: this.props.buildingId })
       this.setState({ visibleData: { visible: this.props.visible, buildingId: this.props.buildingId } });
     }
   }
 
-  // 弹框确定按钮
-  // eslint-disable-next-line react/sort-comp
-  handleOk() {
-    this.props.onCancel()
-  }
-
   // 弹框取消按钮
   handleCancel() {
     this.props.onCancel()
@@ -62,16 +55,6 @@ class ModalAttribution extends React.Component {
     })
   }
 
-  getList(params) {
-    // 网路请求
-    console.log('params: ', params)
-    request({ ...apis.customer.buildingConsultant }).then(res => {
-      this.setState({ dataSource: res })
-    }).catch(err => {
-      
-    })
-  }
-
   openNotificationWithIcon = (type, message) => {
     notification[type]({
       message,
@@ -88,7 +71,7 @@ class ModalAttribution extends React.Component {
 
   // 提交
   submitGm(record) {
-    console.log(record,"111111")
+    this.props.onCancel(record)
   }
 
   render() {
@@ -118,7 +101,7 @@ 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) => <>{record.userId !== this.props.userId ? <Button type="danger" onClick={() => this.submitGm(record)}>确定</Button> : ''}</>, },
     ]
     return (
       <>
@@ -130,7 +113,7 @@ class ModalAttribution extends React.Component {
             visible={this.state.visibleData.visible}
             onCancel={(e) => this.handleCancel(e)}
           >
-            <Table rowKey="BatchAssistConsultant" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+            <Table rowKey="userId" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
           </Modal>
       </>
     );

src/pages/staff/components/CustomerChange.jsx

@@ -11,13 +11,59 @@ import BatchAssistConsultant from './BatchAssistConsultant'
 const CustomerChange = (props) => {
   const [data, setData] = useState([])
   const [consultantVisible, setConsultantVisible] = useState(false)
+  const [selectIds, setSelectIds] = useState([])
 
   const rowSelection = {
+    selectedRowKeys: selectIds,
     onChange: (selectedRowKeys, selectedRows) => {
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setSelectIds(selectedRowKeys)
     },
   };
 
+  const batchAssistConsultant = () => {
+    if(selectIds.length < 1){
+      message.info("请至少选择一条数据");
+      return
+    }
+    setConsultantVisible(true)
+  }
+
+  const consulatanChange = (e) => {
+    if(e){
+      data.map(x =>{ 
+        selectIds.map(y => {
+          if(x.customerId === y){
+            x.realtyConsultant = e.userId
+            x.moveUserId = e.userId
+            x.moveUserName = e.userName
+          }
+        })
+      })
+    }
+    setConsultantVisible(false)
+    setSelectIds([])
+  }
+
+  //批量保存
+  const batchSaveConsultant = () =>{
+    const unMoveData = data.filter(x => !x.moveUserId)
+    if(unMoveData.length > 0){
+      message.info("存在未分配归属客户");
+      return
+    }
+    request({ ...apis.staff.move, data }).then(data => {
+      message.info('操作成功')
+      props.onSuccess('success')
+    })
+  }
+
+  //取消按钮
+  const cancelConsultant = () => {
+    props.onSuccess('cancel')
+  }
+
+
   const columns = [
     {
       title: '用户名',
@@ -39,8 +85,8 @@ const CustomerChange = (props) => {
     },
     {
       title: '调整后归属',
-      dataIndex: 'buildingId',
-      key: 'buildingId',
+      dataIndex: 'moveUserName',
+      key: 'moveUserName',
       align: 'center',
     }
   ];
@@ -53,9 +99,11 @@ const CustomerChange = (props) => {
 
   return (
     <div>
-        <Button type="primary" onClick={() => setConsultantVisible(true)} style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }}>分配置业顾问</Button>
+        <Button type="primary" onClick={() => batchAssistConsultant()} style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }}>分配置业顾问</Button>
         <Table rowSelection={rowSelection} dataSource={data} columns={columns} rowKey="customerId" pagination={false} scroll={{ y: 500 }}/>
-        <BatchAssistConsultant visible={consultantVisible} buildingId={props.buildingId} />
+        <BatchAssistConsultant visible={consultantVisible} userId={props.userId} buildingId={props.buildingId} onCancel={consulatanChange} />
+        <Button type="primary" onClick={() => batchSaveConsultant()} style={{}}>保存</Button>
+        <Button onClick={() => cancelConsultant()} style={{}}>取消</Button>
     </div>
   )
 }

src/pages/staff/list/StaffList.jsx

@@ -40,8 +40,8 @@ const CartBody = props => {
     // console.log(data, "11111")
     if (data.status === 1) {
       if(data.isConsultant){
-        request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(data => {
-          if(data){
+        request({ ...apis.staff.check, params: { userId: data.userId, personId: data.consultantPersonId, buildingId: data.buildingId } }).then(res => {
+          if(res.length > 0){
             Modal.confirm({
               title: '此置业顾问下有私客，是否转移私客？',
               okText: '确认',
@@ -50,6 +50,19 @@ const CartBody = props => {
                 setVisible(true)
               },
             });
+          }else{
+            const titleMessahe = data.isConsultant ? '停用后此员工无法继续登录后台（若为置业顾问停用后在小程序端将成为普通用户）确认进行停用操作？' : '停用后此员工无法继续登录后台,确认进行停用操作？';
+            Modal.confirm({
+              title: titleMessahe,
+              okText: '确认',
+              cancelText: '取消',
+              onOk () {
+                request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(res => {
+                  message.info('操作成功')
+                  props.onFresh()
+                })
+              },
+            });
           }
        })
       }else{
@@ -59,7 +72,7 @@ const CartBody = props => {
           okText: '确认',
           cancelText: '取消',
           onOk () {
-            request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(data => {
+            request({ ...apis.staff.change, urlData: { id: data.userId, type: 'off' } }).then(res => {
               message.info('操作成功')
               props.onFresh()
             })
@@ -72,7 +85,7 @@ const CartBody = props => {
         okText: '确认',
         cancelText: '取消',
         onOk () {
-          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then(data => {
+          request({ ...apis.staff.change, urlData: { id: data.userId, type: 'on' } }).then(res => {
             message.info('操作成功')
             props.onFresh()
           })
@@ -81,6 +94,11 @@ const CartBody = props => {
     }
   }
 
+  //迁移私客成功回调
+  const moveSuccess = (e) => {
+    setVisible(false)
+  }
+
   // 员工离职
   const departure = row => {
     // 是置业顾问
@@ -159,7 +177,7 @@ const CartBody = props => {
         footer={null}
         width={900}
       >
-          <CustomerChange userId={data.userId} consultantPersonId={data.consultantPersonId} buildingId={data.buildingId} />
+          <CustomerChange userId={data.userId} consultantPersonId={data.consultantPersonId} buildingId={data.buildingId} onSuccess={moveSuccess} />
       </Modal>
     </div>
   )

src/services/apis.js

@@ -836,6 +836,11 @@ export default {
       method: 'GET',
       action: 'admin.consultant.customer.list.put',
     },
+    move: {
+      url: `${prefix}/consultant/customer/move`,
+      method: 'PUT',
+      action: 'admin.user.departure.put',
+    },
     departure: {
       url: `${prefix}/user/departure/:id`,
       method: 'PUT',