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

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

@@ -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 => {
       
@@ -89,6 +89,7 @@ class ModalAttribution extends React.Component {
 
    // 分页
   onChange(pageNum) {
+
     this.getList({ pageNumber: pageNum, pageSize: 5, buildingId: this.state.visibleData.buildingName })
   }
 

src/pages/customer/customerlist/index.jsx

@@ -631,14 +631,14 @@ function body(props) {
           //     onClick: () => toCustomerDateil(record),
           //   };
           // }}
-          dataSource={dataSource.records} columns={privateColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey="customerList" /> :
+          dataSource={dataSource.records} columns={privateColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r=>r.customerId} /> :
         <Table rowSelection={rowSelection}
           // onRow={record => {
           //   return {
           //     onClick: () => publicCustomerDetail(record),
           //   };
           // }}
-          dataSource={dataSource.records} columns={publicColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey="customerList" />
+          dataSource={dataSource.records} columns={publicColumns} pagination={{ current: dataSource.current, total: dataSource.total, pageSize: dataSource.size, onChange }} rowKey={r=>r.customerId} />
       }
 
       {/* 调整归属 */}

src/pages/statistical/activity/compenents/Content.jsx

@@ -401,7 +401,7 @@ class OverView extends React.Component {
             {getFieldDecorator('startDate', {initialValue: moment(startDate)
               
             })(
-                <DatePicker placeholder="开始日期"/>,
+                <DatePicker allowClear={false} placeholder="开始日期"/>,
             )}
             </Form.Item>
             <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
@@ -409,7 +409,7 @@ class OverView extends React.Component {
                 initialValue: moment(endDate)
 
               })(
-                <DatePicker placeholder="结束日期" />,
+                <DatePicker allowClear={false} placeholder="结束日期" />,
               )}
             </Form.Item>
             <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>

src/pages/statistical/activity/compenents/OverView.jsx

@@ -206,6 +206,7 @@ class OverView extends React.Component {
 
   getList () {
     const { formData } = this.state
+    console.log(formData,'formData')
     request({ ...apis.activityDataStatis.total, params: formData }).then(res => {
       this.setState({ personData: res })
     }).catch(err => {
@@ -269,6 +270,7 @@ class OverView extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    console.log('handleReset',this.state.formData)
     this.setState( {
       radioVal: 6,
       formData: {
@@ -291,8 +293,8 @@ class OverView extends React.Component {
       buildingId: [],
       targetType: [],
       helpVisible: false,
-    })
-    this.getAllList()
+    },this.getAllList)
+    
   }
 
   exportActivityStats = () => {

src/pages/statistical/consultant/homePagePersons.jsx

@@ -93,7 +93,7 @@ function record(props) {
             dataIndex: 'gender',
             key: 'gender',
             align: 'center',
-            render: (_, record) => <span>{record.gender == 1 ? '男' : record.gender == 2 ? '女' : '未知'}</span>,
+            render: (_, record) => <span>{(record.gender || record.sex) == 1 ? '男' : (record.gender || record.sex) == 2 ? '女' : '未知'}</span>,
         },
         {
             title: '访问次数',

src/pages/statistical/consultant/table.jsx

@@ -109,7 +109,7 @@ function record(props) {
             dataIndex: 'gender',
             key: 'gender',
             align: 'center',
-            render: (_, record) => <span>{record.gender == 1 ? '男' : record.gender == 2 ? '女' : '未知'}</span>,
+            render: (_, record) => <span>{(record.gender || record.sex) == 1 ? '男' : (record.gender || record.sex) == 2 ? '女' : '未知'}</span>,
         },
     ]
 
@@ -162,9 +162,9 @@ function record(props) {
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
             </div>
             <Prompt message={location =>
-        location.pathname.startsWith("/statistical/consultant")
-          ? true
-          : localStorage.removeItem("consultantPageParams")} />
+                location.pathname.startsWith("/statistical/consultant")
+                    ? true
+                    : localStorage.removeItem("consultantPageParams")} />
         </>
     )
 }

src/pages/statistical/consultant/visitNum.jsx

@@ -139,7 +139,7 @@ function record(props) {
             dataIndex: 'gender',
             key: 'gender',
             align: 'center',
-            render: (_, record) => <span>{record.gender == 1 ? '男' : record.gender == 2 ? '女' : '未知'}</span>,
+            render: (_, record) => <span>{(record.gender || record.sex) == 1 ? '男' : (record.gender || record.sex) == 2 ? '女' : '未知'}</span>,
         },
         {
             title: '访问时间',

src/pages/statistical/consultant/visitPersons.jsx

@@ -87,7 +87,7 @@ function record(props) {
             dataIndex: 'gender',
             key: 'gender',
             align: 'center',
-            render: (_, record) => <span>{record.gender == 1 ? '男' : record.gender == 2 ? '女' : '未知'}</span>,
+            render: (_, record) => <span>{(record.gender || record.sex) == 1 ? '男' : (record.gender || record.sex) == 2 ? '女' : '未知'}</span>,
         },
         {
             title: '访问次数',