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

src/pages/channel/recommendClients.jsx

@@ -72,7 +72,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
-    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : '女' }</a>,
+    render: (text, record) => <span>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</span>
   },
   {
     title: '意向项目',

src/pages/customer/customerlist/index.jsx

@@ -422,7 +422,7 @@ function body(props) {
       align: 'center',
       width: '10%',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.sex === '1' ? '男' : record.sex === '2' ? '女' : '未知'}</span></>,
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
     },
     {
       title: '操作',

src/pages/staff/components/CustomerChange.jsx

@@ -22,7 +22,7 @@ const CustomerChange = (props) => {
   };
 
   const batchAssistConsultant = () => {
-    if(selectIds.length < 1){
+    if (selectIds.length < 1) {
       message.info("请至少选择一条数据");
       return
     }
@@ -30,10 +30,10 @@ const CustomerChange = (props) => {
   }
 
   const consulatanChange = (e) => {
-    if(e){
-      data.map(x =>{ 
+    if (e) {
+      data.map(x => {
         selectIds.map(y => {
-          if(x.customerId === y){
+          if (x.customerId === y) {
             x.realtyConsultant = e.userId
             x.moveUserId = e.userId
             x.moveUserName = e.userName
@@ -46,9 +46,9 @@ const CustomerChange = (props) => {
   }
 
   //批量保存
-  const batchSaveConsultant = () =>{
+  const batchSaveConsultant = () => {
     const unMoveData = data.filter(x => !x.moveUserId)
-    if(unMoveData.length > 0){
+    if (unMoveData.length > 0) {
       message.info("存在未分配归属客户");
       return
     }
@@ -78,10 +78,16 @@ const CustomerChange = (props) => {
       align: 'center',
     },
     {
-      title: '状态',
-      dataIndex: 'status',
-      key: 'status',
+      title: '客户状态',
+      dataIndex: 'reportRecommendStatus',
+      key: 'reportRecommendStatus',
       align: 'center',
+      render: (text, records) => {
+        if (records.status === 1) { return '报备' }
+        if (records.status === 2) { return '到访' }
+        if (records.status === 3) { return '认购' }
+        if (records.status === 4) { return '签约' }
+      },
     },
     {
       title: '调整后归属',
@@ -93,17 +99,17 @@ const CustomerChange = (props) => {
 
   useEffect(() => {
     request({ ...apis.staff.check, params: { userId: props.userId, personId: props.consultantPersonId, buildingId: props.buildingId } }).then(data => {
-       setData(data)
-   })
+      setData(data)
+    })
   }, [props.userId])
 
   return (
     <div>
-        <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} userId={props.userId} buildingId={props.buildingId} onCancel={consulatanChange} />
-        <Button type="primary" onClick={() => batchSaveConsultant()} style={{}}>保存</Button>
-        <Button onClick={() => cancelConsultant()} style={{}}>取消</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} userId={props.userId} buildingId={props.buildingId} onCancel={consulatanChange} />
+      <div style={{ textAlign: 'center', marginTop: '16px' }}><Button type="primary" onClick={() => batchSaveConsultant()}>保存</Button>
+        <Button style={{ marginLeft: '10px' }} onClick={() => cancelConsultant()}>取消</Button></div>
     </div>
   )
 }

src/pages/staff/list/StaffList.jsx

@@ -97,6 +97,9 @@ const CartBody = props => {
   //迁移私客成功回调
   const moveSuccess = (e) => {
     setVisible(false)
+    if(e === 'success'){
+      confirm(data)()
+    }
   }
 
   // 员工离职