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

# Conflicts:
#	src/pages/channel/independentList/index.jsx

src/pages/activity/editActivity.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
+import Prompt from 'umi/prompt';
+import router from 'umi/router';
 import styles from '../style/GoodsList.less';
 import apis from '../../services/apis';
 import moment from 'moment';
-import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
@@ -16,7 +17,6 @@ import touxiang from '../../assets/touxiang.jpg';
 import poster1 from '../../assets/poster1.png';
 import poster2 from '../../assets/poster2.png';
 import xiaochengxu from '../../assets/xiaochengxu.png'
-import Prompt from 'umi/prompt';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
@@ -72,16 +72,15 @@ const BasicForm = props => {
     function compareDate(dateTime1, dateTime2) {
       return new Date(dateTime1) > new Date(dateTime2)
     }
-    
     // 1）修改后的开始时间不得大于当前时间（会存在已经成功报名的用户）
 
     // （2）修改后开始时间<当前时间<修改后结束时间：活动进行中
 
     // （3）修改后结束时间<当前时间：活动已结束
     if (showSignupTime[0]) {
-      const date = data.signupTime
+      // const date = data.signupTime
       const nowDate = new Date()
-      console.log(compareDate(nowDate, showSignupTime[0]))
+      // console.log(compareDate(nowDate, showSignupTime[0]))
       if (compareDate(nowDate, showSignupTime[0])) {
         return true
       } else {

src/pages/channel/independentList/index.jsx

@@ -47,6 +47,7 @@ class ModalTable extends React.Component {
   }
 
   getList(params) {
+    // eslint-disable-next-line no-console
     console.log('this.state.visibleData', this.state.visibleData)
     const { customerId } = this.state.visibleData
     if (customerId === '' || customerId === undefined) {
@@ -156,13 +157,13 @@ class ModalTable extends React.Component {
           // onOk={() => this.handleOk()}
           onCancel={(e) => this.handleCancel(e)}
         >
-          <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+          <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ current: this.state.dataSource.current, pageSize: this.state.dataSource.size, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
         </Modal>
       </>
     );
   }
 }
-
+// defaultCurrent={1} total={dataSource.total} pageSize={6} onChange={onChange} current={dataSource.current}
 
 /**
  * 邀请客户

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

@@ -35,7 +35,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 })
+      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId ,buildingId: this.props.visibleData.buildingId})
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -72,7 +72,7 @@ class ModalAttribution extends React.Component {
   getList(params) {
     // 网路请求
     console.log('params: ', params)
-    request({ ...apis.customer.buildingConsultant }).then(res => {
+    request({ ...apis.customer.buildingConsultant , params: { ...params }}).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
       
@@ -151,7 +151,7 @@ class ModalAttribution extends React.Component {
             onCancel={(e) => this.handleCancel(e)}
           >
             <span>你正在为{this.props.visibleData.customerId.length}位公客分配置业顾问</span><br/><br/>
-            <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />
+            {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

@@ -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 })
+      this.getList({ pageNumber: 1, pageSize: 5, customerId: this.props.visibleData.customerId,buildingId:this.props.visibleData.buildingId })
       this.setState({ visibleData: this.props.visibleData });
     }
   }
@@ -147,7 +147,7 @@ class ModalAttribution extends React.Component {
             visible={this.state.visibleData.visible}
             onCancel={(e) => this.handleCancel(e)}
           >
-            <BuildSelect onChange={this.changBuilding.bind(this)} value={this.state.visibleData.buildingName} />
+            {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

@@ -58,17 +58,19 @@ function body(props) {
   // 推荐客户
   const [recommendVisibleData, setRecommendVisibleData] = useState({ visible: false, customerId: '' })
 
-  const [assistVisibleData, setAssistVisibleData] = useState({ visible: false, customerId: '' })
+  const [assistVisibleData, setAssistVisibleData] = useState({ visible: false, customerId: '',buildingId:'' })
 
   const [loadingStatus, setLoadingStatus] = useState(false)
 
   // 选中的公客信息
   const [personInfo, setPersonInfo] = useState([])
 
-  const [batchAssistVisibleData, setBatchAssistVisibleData] = useState({ visible: false, customerId: [] })
+  const [batchAssistVisibleData, setBatchAssistVisibleData] = useState({ visible: false, customerId: [] ,buildingId:''})
 
   const [currentSelectedRows, setSelectedRows] = useState([])
 
+  const [selectedRowKeys,setSelectedRowKeys] = useState([])
+
 //  const [ radio, setRadio] = useState(true)
 
   // const [page, setPage] = useState(1)
@@ -91,7 +93,7 @@ function body(props) {
       localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType }))
       getList({ pageNumber: 1, pageSize: 10, customerType })
     }
-  }, [])
+  }, []) 
 
   function getList(params) {
     // 网路请求
@@ -124,6 +126,8 @@ function body(props) {
   function handleSubmit(e) {
     displayNone()
 
+    setPersonInfo([])
+    setSelectedRowKeys([])
 
     e.preventDefault();
     props.form.validateFields((err, values) => {
@@ -229,7 +233,7 @@ function body(props) {
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setBatchAssistVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
   }
 
   function showRecord(record) {
@@ -237,7 +241,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setBatchAssistVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
   }
 
   function showStatus(record) {
@@ -245,7 +249,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
-    setBatchAssistVisibleData({ visible: false, customerId: '' })
+    setBatchAssistVisibleData({ visible: false, customerId: '' ,buildingId:''})
   }
 
   // 推荐客户
@@ -258,26 +262,41 @@ function body(props) {
   }
 
   //分配置业顾问
-  function assistConsultant(personId) {
+  function assistConsultant(personId,buildingId) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setAssistVisibleData({ visible: true, customerId: personId })
-    setBatchAssistVisibleData({ visible: false, customerId: '' })
+    setAssistVisibleData({ visible: true, customerId: personId ,buildingId:buildingId})
+    setBatchAssistVisibleData({ visible: false, customerId: '' ,buildingId:''})
   }
 
   function batchAssistConsultant() {
     console.log(personInfo, 'personInfo')
+    console.log(personInfo.length)
     if (personInfo.length <= 0) {
       return message.info("请至少选择一条数据");
     }
+
+    const compareSet = new Set();
+    personInfo.filter(record => {
+      compareSet.add(record.buildingName)
+    } )
+
+    if(compareSet.size != 1){
+      return message.info("请选择项目");
+    }
+
+    // const newSelectedRows = personInfo.filter()  
+    
+    // console.log(newSelectedRows,'newSelectedRows')
+
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setRecordVisibleData({ visible: false, customerId: '' })
     setStatusVisibleData({ visible: false, customerId: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setAssistVisibleData({ visible: false, customerId: '' })
-    setBatchAssistVisibleData({ visible: true, customerId: personInfo })
+    setAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
+    setBatchAssistVisibleData({ visible: true, customerId: personInfo, buildingId: personInfo[0].buildingId})
   }
 
   function toCustomerDateil(record) {
@@ -342,7 +361,7 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '', buildingId: '' })
     setStatusVisibleData({ visible: false, customerId: '', status: '' })
     setRecommendVisibleData({ visible: false, customerId: '' })
-    setAssistVisibleData({ visible: false, customerId: '' })
+    setAssistVisibleData({ visible: false, customerId: '',buildingId:'' })
     setBatchAssistVisibleData({ visible: false, customerId: '' })
     if (customerType === 'private') {
 
@@ -363,6 +382,7 @@ function body(props) {
                                 .filter(x => selectedRowKeys.some(y => y === x.customerId))                             // 去掉未选的数据
 
       // setSelectedRows(newSelectedRows)
+      console.log(newSelectedRows,"33333333333333333333")
       setPersonInfo(newSelectedRows)
     },
   };
@@ -441,7 +461,7 @@ function body(props) {
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
           </AuthButton>
           <AuthButton name="admin.customer.assign" noRight={null}>
-            <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId)}>分配置业顾问</Button>
+            <Button className={customerType === 'private' ? Styles.displayS : Styles.text} type="link" onClick={() => assistConsultant(record.customerId,record.buildingId)}>分配置业顾问</Button>
           </AuthButton>
           <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
             <Button className={Styles.text} type="link" onClick={() => showRecord(record)}>积分记录</Button>