合并

config/routes.js

@@ -123,6 +123,11 @@ export default [
                 name: '经纪人',
                 component: './customer/independentList/index',
               },
+              {
+                path: '/customer/visiting',
+                name: '到访记录',
+                component: './customer/visiting/index',
+              },
             ],
           },
           {
@@ -419,6 +424,12 @@ export default [
                 hideInMenu: true,
                 component: './system/document/audit',
               },
+              {
+                path: '/system/document/see',
+                name: '客户资料查看',
+                hideInMenu: true,
+                component: './system/document/see',
+              },
             ],
           },
           {

src/pages/customer/visiting/index.jsx

@@ -0,0 +1,169 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
+
+const columns = [
+  {
+    title: '头像',
+    dataIndex: 'picture',
+    key: 'picture',
+    align: 'center',
+    width: '15%',
+    render: (_, record) => <Avatar shape="square"  size={64} icon="user" />,
+  },
+  {
+    title: '姓名',
+    dataIndex: 'name',
+    key: 'name',
+    align: 'center',
+    width: '10%',
+    // eslint-disable-next-line no-nested-ternary
+    // render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
+  },
+  {
+    title: '电话',
+    dataIndex: 'phone',
+    key: 'phone',
+    align: 'center',
+    width: '15%',
+  },
+  {
+    title: '性别',
+    dataIndex: 'sex',
+    key: 'sex',
+    align: 'center',
+    width: '15%',
+  },
+  {
+    title: '置业顾问',
+    dataIndex: 'asdf',
+    key: 'asdf',
+    align: 'center',
+    width: '15%',
+  },
+  {
+    title: '置业顾问电话',
+    dataIndex: 'tel',
+    key: 'tel',
+    align: 'center',
+    width: '15%',
+  },
+  {
+    title: '到访时间',
+    dataIndex: 'time',
+    key: 'time',
+    align: 'center',
+    width: '15%',
+  },
+]
+
+const data = [
+
+]
+
+function onChangetime(dates, dateStrings) {
+ 
+  // setEndDate(dateStrings[1])
+  // setStartDate(dateStrings[0])
+  
+}
+
+function exportReport() {
+  // request({ ...apis.customer.customerRecommendReportExport, responseType: 'blob' })
+  //   .then(response => {
+  //     download(response)
+  //   })
+}
+
+
+
+
+
+
+
+function body (props) {
+  const { getFieldDecorator, getFieldsValue } = props.form
+  const { RangePicker } = DatePicker;
+
+  function handleReset() {
+    props.form.resetFields();
+    // getList({ pageNumber: 1, pageSize: 10, customerType })
+  }
+
+  function handleSubmit(e) {
+ 
+  }
+
+  // 分页
+  function onChange(pageNum) {
+   
+    // getList({ pageNumber: pageNum, pageSize: 9 })
+  }
+
+  return (
+    <>
+    <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+       <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+       
+        <Form.Item>
+          {getFieldDecorator('name')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="姓名"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('tel')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="电话"
+            />,
+          )}
+        </Form.Item>
+        
+         <Form.Item label="到访时间">
+          { getFieldDecorator('time')(
+            <RangePicker
+            style={{ width: '400px' }}
+            // placeholder="到访时间"
+            // ranges={{
+            //   Today: [moment(), moment()],
+            //   'This Month': [moment().startOf('month'), moment().endOf('month')],
+            // }}
+            // defaultValue={[moment(new Date(new Date().setDate((new Date().getDate() - 6))), 'YYYY-MM-DD HH:MM:SS'), moment(new Date(), 'YYYY-MM-DD HH:MM:SS')]}
+            showTime
+            onChange={onChangetime}
+          />
+          )}
+        </Form.Item>
+        <Form.Item>
+            <Button type="primary" htmlType="submit" >
+              查询
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+        导出
+      </Button>
+
+      <Table dataSource={data} columns={columns} pagination={{ total: 1, onChange }} />
+      {/* pagination={{ total: dataSource.total, onChange }} */}
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/customer/visiting/style.less

@@ -0,0 +1,151 @@
+.SubmitButton {
+  background: rgba(239,39,58,1);
+  border-radius: 7px;
+  border: 0px;
+}
+.text {
+  color: rgba(239,39,58,1);
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+
+}
+.cardItem{
+  color: #666;
+  display: flex;
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem; 
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title{
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last:justify
+}
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.pitchButton { 
+  border-color: rgba(255,126,72,1);
+  background-color: rgba(255,126,72,1);
+  color: rgba(255,255,255,1); 
+}
+.noButton {
+  border-color: rgba(255,126,72,1);
+  color: rgba(255,126,72,1);
+}
+.displayS {
+  display: none;
+}
+
+
+// 客户详情样式
+.cardBox{
+  display: flex;
+  .leftBox{
+    width:342px;
+    min-width:342px;
+    height:511px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:-webkit-fill-available;
+    height:511px;
+    min-width: 800px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .tit{
+    font-size:24px;
+    font-weight:600;
+    color:#222;
+    margin: 10px 0 0 0;
+  }
+  .touxiang{
+    width: 120px;
+    width: 120px;
+    border-radius: 6px;
+    margin: 30px 0 20px 0;
+  }
+  .infoItem{
+    color:#666;
+    font-size: 19px;
+    margin: 0 0 10px 0;
+    
+  }
+  .rightItem{
+    color:#666;
+    font-size: 19px;
+    margin: 0 0 15px 0;
+  }
+  .right{
+    position: absolute;
+    top:108px;
+    left:170px;
+  }
+  .rightInfo{
+    position: absolute;
+    top:50px;
+    left:50%;
+  }
+  
+}
+.recordBox{
+  width:100%;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  margin-top: 30px;
+  padding: 30px;
+  .tableName{
+    font-size:24px;
+    font-weight:600;
+    color:#222;
+  }
+}
+

src/pages/system/document/audit.jsx

@@ -1,22 +1,88 @@
-import React from 'react'
-import { Col, Row, Button } from 'antd'
+import React, { useState, useEffect } from 'react';
+import { Col, Row, Button, Modal} from 'antd'
 import ZmageImg from '../../../components/ZmageImg/ZmageImg'
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import { router } from 'umi';
+
+
+function body (props) {
+  const documentVerifyId = props.location.query.id
+  const [data, setData] = useState([])
+
+  useEffect(() => {
+    getList()
+
+  }, [])
+// , documentVerifyId: documentVerifyId
+  function getList (params) {
+    // 网路请求
+    console.log(props,'1111')
+    request({ ...apis.system.documentVerifyDetail, urlData:{ id:documentVerifyId }  }).then(data => {
+      console.log('data:', data.imgList)
+      setData(data.imgList)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+  
+  function onVerify (params) {
+
+    alert(params)
+    // 网路请求
+    request({ ...apis.system.updateTaPolicy, urlData:{ id:documentVerifyId }, data:  {  verifyStatus: params}  }).then(data => {
+    
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+
+
+
+  const handleOk =  () => {
+    Modal.confirm({
+      title: '审核通过后，将给当前用户发放积分 确认审核通过？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+       
+        onVerify(2)
+      }
+    });
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/system/document/list',
+    });
+  }
 
-function body(props) {
   return (
     <>
       <div style={{ background: '#ECECEC', padding: '30px' }}>
         <Row gutter={16}>
-          <Col span={6}>
-            <ZmageImg style={{ width: '300px', height: '400px' }} src="https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1571303731819-1.jpg" />
-          </Col>
+          {
+            // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
+            data.map((data, inx) => 
+              <Col span={6}>
+               <ZmageImg style={{ width: '300px', height: '400px' }} src={data.img} />
+              </Col>
+            )
+          }
         </Row>
       </div>
       <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
-        <Button type="primary">通过</Button>
+        <Button type="primary" onClick={()=>handleOk()}>通过</Button>
+        &nbsp;&nbsp;&nbsp;&nbsp;
+        <Button onClick={()=>onVerify(2)}>不通过</Button>
         &nbsp;&nbsp;&nbsp;&nbsp;
-        <Button>不通过</Button>
+        <Button onClick={cancelPage}>返回</Button>
+        
       </div>
+     
+      
     </>
   )
 }

src/pages/system/document/list.jsx

@@ -1,10 +1,28 @@
-import React, { useState } from 'react'
-import { Table, Form, Icon, Input, Button  } from 'antd'
+import React, { useState, useEffect } from 'react'
+import { Table, Form, Icon, Input, Button, message  } from 'antd'
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import { router } from 'umi';
 
 function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ records: [] })
 
+  useEffect(() => {
+    getList({ pageNumber: 1, pageSize: 10 })
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.system.documentVerifylist, params: { ...params } }).then(data => {
+      console.log('data:',data)
+      setDataSource(data)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+
   /**
    * 提交
    * @param e
@@ -12,9 +30,10 @@ function body(props) {
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('Received values of form: ', values);
-      }
+      getList({ pageNumber: 1, pageSize: 10, ...values})
+      // if (!err) {
+      //   console.log('Received values of form: ', values);
+      // }
     });
   }
 
@@ -34,6 +53,26 @@ function body(props) {
     props.form.resetFields();
   }
 
+  function audit(record){
+    if(record.verifyStatus === 0){
+      router.push({
+        pathname: '/system/document/audit',
+        query: {
+          id: record.documentVerifyId,
+        },
+      })
+    }
+  else{
+    router.push({
+      pathname: '/system/document/see',
+      query: {
+        id: record.documentVerifyId,
+      },
+    })
+      
+    }
+  }
+
   const columns = [
     {
       title: '姓名',
@@ -52,13 +91,27 @@ function body(props) {
     },
     {
       title: '状态',
-      dataIndex: 'status',
-      key: 'status',
+      dataIndex: 'verifyStatus',
+      key: 'verifyStatus',
+      render: (x,row) => (
+        <>
+         
+            <span style={{ cursor: 'pointer' }}>{ row.verifyStatus === 0 ? '未审核' : row.verifyStatus === 1 ? '审核通过' : '审核未通过' }</span>
+           
+        </>
+      )
     },
     {
       title: '操作',
       dataIndex: 'documentVerifyId',
       key: 'documentVerifyId',
+      render: (x,row) => (
+        <>
+          
+            <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={()=>audit(row)}>{ row.verifyStatus === 0 ? '审核' : '查看' }</span>
+           
+        </>
+      )
     },
   ]
 
@@ -67,14 +120,14 @@ function body(props) {
     <>
       <Form layout="inline" onSubmit={handleSubmit}>
         <Form.Item>
-          {getFieldDecorator('username')(
+          {getFieldDecorator('name')(
             <Input
               placeholder="用户名"
             />,
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('phone')(
+          {getFieldDecorator('tel')(
             <Input
               placeholder="手机号"
             />,
@@ -90,7 +143,7 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Table dataSource={dataSource.records} pagination={{ total: dataSource.total, pageSize: dataSource.pageSize, onChange: (page, pageSize) => onPageNum(page, pageSize), defaultCurrent: 1 }} columns={columns} />
+      <Table style={{marginTop: '30px'}} dataSource={dataSource.records} pagination={{ total: dataSource.total, pageSize: dataSource.pageSize, onChange: (page, pageSize) => onPageNum(page, pageSize), defaultCurrent: 1 }} columns={columns} />
     </>
   )
 }

src/pages/system/document/see.jsx

@@ -0,0 +1,64 @@
+import React, { useState, useEffect } from 'react';
+import { Col, Row, Button, Modal} from 'antd'
+import ZmageImg from '../../../components/ZmageImg/ZmageImg'
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import { router } from 'umi';
+
+
+function body (props) {
+  const documentVerifyId = props.location.query.id
+  const [data, setData] = useState([])
+
+  useEffect(() => {
+    getList()
+
+  }, [])
+// , documentVerifyId: documentVerifyId
+  function getList (params) {
+    // 网路请求
+    console.log(props,'1111')
+    request({ ...apis.system.documentVerifyDetail, urlData:{ id:documentVerifyId }  }).then(data => {
+      console.log('data:', data.imgList)
+      setData(data.imgList)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+  
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/system/document/list',
+    });
+  }
+
+
+
+  return (
+    <>
+      <div style={{ background: '#ECECEC', padding: '30px' }}>
+        <Row gutter={16}>
+          {
+            // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
+            data.map((data, inx) => 
+              <Col span={6}>
+               <ZmageImg style={{ width: '300px', height: '400px' }} src={data.img} />
+              </Col>
+            )
+          }
+        </Row>
+      </div>
+      <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
+       
+        <Button onClick={cancelPage}>返回</Button>
+        
+      </div>
+     
+      
+    </>
+  )
+}
+
+export default body

src/services/apis.js

@@ -607,6 +607,25 @@ export default {
       method: 'POST',
       action: 'admin.taBuildingReport.add.post',
     },
+
+    documentVerifylist:{
+      url: `${prefix}/documentVerify`,
+      method: 'GET',
+      action: 'admin.documentVerify.get',
+    },
+    documentVerifyDetail:{
+      url: `${prefix}/documentVerify/:id`,
+      method: 'GET',
+      action: 'admin.documentVerify.id.get',
+    },
+    updateTaPolicy: {
+      url: `${prefix}/documentVerify/:id`,
+      method: 'PUT',
+      action: 'admin.documentVerify.id.put',
+    },
+// /admin/documentVerify  查询审核列表，参数 pageNum, pageSize, name, tel
+// /documentVerify/{id}   根据id查询详情
+// /admin/documentVerify/{id} 根据Id修改
   },
   staff: {
     taUser: {