.

config/routes.js

@@ -30,6 +30,18 @@ export default [
     redirect: '/person',
     hideInMenu: true,
   },
+  {
+    path: '/applicationList',
+    name: '申请列表',
+    icon: 'apartment',
+    component: '@/pages/applicationList',
+  },
+  {
+    path: '/applicationList/detail.jsx',
+    name: '申请详情',
+    icon: 'apartment',
+    component: '@/pages/applicationList/detail.jsx',
+  },
   {
     path: '/examine',
     name: '审核列表',
@@ -42,6 +54,12 @@ export default [
     icon: 'apartment',
     component: '@/pages/examine/detail.jsx',
   },
+  {
+    path: '/certificateIssuance',
+    name: '证件发放',
+    icon: 'apartment',
+    component: '@/pages/certificateIssuance',
+  },
   {
     path: '/banner',
     name: '轮播图列表',
@@ -54,7 +72,6 @@ export default [
     hideInMenu: true,
     component: '@/pages/banner/edit.jsx',
   },
-
   {
     path: '/notice',
     name: '通知列表',
@@ -67,6 +84,12 @@ export default [
     hideInMenu: true,
     component: '@/pages/notice/edit.jsx',
   },
+  {
+    path: '/userList',
+    name: '注册列表',
+    icon: 'apartment',
+    component: '@/pages/userList',
+  },
   {
     path: '/person',
     name: '人员列表',

src/pages/applicationList/detail.jsx

@@ -0,0 +1,58 @@
+import React, { useState, useEffect } from 'react';
+import { Card, Form, Button } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { getWithdrawalDetail } from '@/services/withdrawal'
+import { history } from 'umi';
+
+const FormItem = Form.Item;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+const goBack = () => {
+  history.goBack();
+};
+export default (props) => {
+  const { location } = props;
+  const { id } = location.query;
+  const [withdrawal, setWithdrawal] = useState();
+
+  useEffect(() => {
+    getWithdrawalDetail(id).then((res) => {
+      setWithdrawal(res)
+    }).catch((err) => {
+      console.log(err.message)
+    });
+  }, [id])
+  return (
+    <PageHeaderWrapper    >
+      <Card>
+        <Form {...formItemLayout}>
+          <FormItem label="申请人">
+            {withdrawal?.userName}
+          </FormItem>
+          <FormItem label="犬主">
+            {withdrawal?.phone}
+          </FormItem>
+          <FormItem label="犬名">
+            {withdrawal?.orgName}
+          </FormItem>
+          <FormItem label="犬种">
+            {withdrawal?.amountLeft / 100}
+          </FormItem>
+          <FormItem label="毛色">
+            {withdrawal?.bankCard.ownerBank}
+          </FormItem>
+          <FormItem label="照片">
+            {withdrawal?.bankCard.cardNo}
+          </FormItem>
+          <FormItem label="养狗地址">
+            {withdrawal?.money / 100}
+          </FormItem>
+          <FormItem label=" " colon={false}>
+            <Button type="default" onClick={() => goBack()}>
+              返回
+            </Button>
+          </FormItem>
+        </Form>
+      </Card>
+    </PageHeaderWrapper>
+  );
+};

src/pages/applicationList/index.jsx

@@ -0,0 +1,95 @@
+import React, { useRef } from 'react'
+import { useModel } from 'umi';
+import moment from 'moment';
+import { DatePicker, Button } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import PageTable from '@/components/PageTable'
+import { getList } from '@/services/work'
+
+const { RangePicker } = DatePicker;
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
+};
+
+export default (props) => {
+  const initDate = useRef(moment())
+  const actionRef = useRef();
+  const { initialState } = useModel('@@initialState');
+
+  const handleBeforSearch = (params) => {
+    const { createDate, ...others } = params;
+
+    let start, end, orgId;
+    if (!createDate || createDate.length < 1) {
+      // 默认时间是今天
+      start = moment().format('YYYY-MM-DD')
+      end = start
+    } else {
+      start = moment(createDate[0]).format('YYYY-MM-DD')
+      end = moment(createDate[1]).format('YYYY-MM-DD')
+    }
+    if (initialState.currentUser.orgId) {
+      orgId = initialState.currentUser.orgId
+      return { ...others, start, end, orgId };
+    }
+    return { ...others, start, end };
+  }
+  const columns = [
+    {
+      title: '申请人',
+      dataIndex: 'userName',
+      key: 'userName',
+      search: true,
+    },
+    {
+      title: '申请时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (t) => formatterTime(t),
+      renderFormItem: (_, record) => <RangePicker defaultValue={[initDate.current, initDate.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+    },
+    {
+      title: '订单状态',
+      dataIndex: 'userName',
+      key: 'userName',
+      search: true,//已支付 待支付
+    },
+    {
+      title: '审核状态',
+      dataIndex: 'userName',
+      key: 'userName',
+      search: true,
+    },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 160,
+      render: (_, record) => [
+        <Button key={1} style={{ padding: 0 }} type="link">
+          详情
+        </Button>
+      ],
+    },
+  ]
+
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        actionRef={actionRef}
+        columns={columns}
+        request={getList}
+        options={false}
+        search={{
+          defaultCollapsed: false
+        }}
+        form={{ ignoreRules: false }}
+        manualRequest={true}
+        revalidateOnFocus={false}
+        beforeSearchSubmit={handleBeforSearch}
+        rowKey="formId"
+      />
+    </PageHeaderWrapper>
+  )
+}

src/pages/certificateIssuance/index.jsx

@@ -36,12 +36,31 @@ export default (props) => {
     return { ...others, start, end };
   }
   const columns = [
+    
     {
-      title: '申请人',
+      title: '证件号',
       dataIndex: 'userName',
       key: 'userName',
       search: true,
     },
+    {
+      title: '犬主',
+      dataIndex: 'userName',
+      key: 'userName',
+      search: true,
+    },
+    {
+      title: '犬名',
+      dataIndex: 'userName',
+      key: 'userName',
+      search: true,
+    },
+    {
+      title: '申领方式',
+      dataIndex: 'userName',//快递到家，上门自取
+      key: 'userName',
+      search: true,
+    },
     {
       title: '申请时间',
       dataIndex: 'createDate',
@@ -50,19 +69,19 @@ export default (props) => {
       renderFormItem: (_, record) => <RangePicker defaultValue={[initDate.current, initDate.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
     },
     {
-      title: '审核状态',
+      title: '状态',
       dataIndex: 'userName',
       key: 'userName',
-      search: true,
+      search: true,//待发放 已发放
     },
     {
-      title: '审核人',
+      title: '发放人',
       dataIndex: 'userName',
       key: 'userName',
-      search: true,
+      search: true,//待发放 已发放
     },
     {
-      title: '审核时间',
+      title: '发放时间',
       dataIndex: 'createDate',
       key: 'createDate',
       render: (t) => formatterTime(t),
@@ -74,7 +93,7 @@ export default (props) => {
       width: 160,
       render: (_, record) => [
         <Button key={1} style={{ padding: 0 }} type="link">
-          详情
+          发放
         </Button>
       ],
     },

src/pages/certificateIssuance/issuance.jsx

@@ -0,0 +1,103 @@
+import React, { useState, useEffect } from 'react';
+import { Card, Form, Button, message, Input } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import { getWithdrawalDetail, updateWithdrawal } from '@/services/withdrawal'
+import { history } from 'umi';
+
+const { TextArea } = Input;
+const FormItem = Form.Item;
+const formItemLayout = { labelCol: { span: 6 }, wrapperCol: { span: 14 } };
+const goBack = () => {
+  history.goBack();
+};
+export default (props) => {
+  const { location } = props;
+  const { id } = location.query;
+  const [withdrawal, setWithdrawal] = useState();
+  const [remarks, setRemarks] = useState()
+  const [loading, setLoading] = useState(false)
+
+  const handleAudit = (val) => {
+    if (remarks) {
+      setLoading(true)
+      updateWithdrawal(withdrawal.withdrawalId, { ...withdrawal, auditStatus: val, auditRemark: remarks }).then(() => {
+        message.success('操作成功');
+        goBack()
+        setLoading(false)
+      }).catch(err => {
+        console.log(err.message)
+        setLoading(false)
+      })
+    }
+    else {
+      message.success('请输入处理结果');
+    }
+  }
+  useEffect(() => {
+    getWithdrawalDetail(id).then((res) => {
+      setWithdrawal(res)
+      setRemarks(res.auditRemark)
+    }).catch((err) => {
+      console.log(err.message)
+    });
+  }, [id])
+  return (
+    <PageHeaderWrapper    >
+      <Card>
+        <Form {...formItemLayout}>
+          <FormItem label="申请人">
+            {withdrawal?.userName}
+          </FormItem>
+          <FormItem label="犬主">
+            {withdrawal?.phone}
+          </FormItem>
+          <FormItem label="犬名">
+            {withdrawal?.orgName}
+          </FormItem>
+          <FormItem label="犬种">
+            {withdrawal?.amountLeft / 100}
+          </FormItem>
+          <FormItem label="毛色">
+            {withdrawal?.bankCard.ownerBank}
+          </FormItem>
+          <FormItem label="照片">
+            {withdrawal?.bankCard.cardNo}
+          </FormItem>
+          <FormItem label="养狗地址">
+            {withdrawal?.money / 100}
+          </FormItem>
+          <FormItem label="领取方式">
+            {withdrawal?.money / 100}
+          </FormItem>
+          <FormItem label="快递公司">
+            {
+              withdrawal?.auditStatus == 0 ?
+                <TextArea placeholder='请输入处理结果（必填）' rows='3' style={{ width: '350px' }} value={remarks} onChange={(e) => setRemarks(e.target.value)} /> :
+                remarks
+            }
+          </FormItem>
+          <FormItem label="快递单号">
+            {
+              withdrawal?.auditStatus == 0 ?
+                <TextArea placeholder='请输入处理结果（必填）' rows='3' style={{ width: '350px' }} value={remarks} onChange={(e) => setRemarks(e.target.value)} /> :
+                remarks
+            }
+          </FormItem>
+          <FormItem label=" " colon={false}>
+            {
+              withdrawal?.auditStatus == 0 &&
+              <>
+                <Button type="primary" loading={loading} style={{ marginRight: '16px' }} onClick={() => handleAudit(1)}>
+                  发放
+                </Button>
+              </>
+            }
+            <Button type="default" onClick={() => goBack()}>
+              返回
+            </Button>
+          </FormItem>
+        </Form>
+      </Card>
+    </PageHeaderWrapper>
+  );
+};

src/pages/dashboard/components/OrgDashboard/components/BannerStatis.jsx

@@ -1,111 +0,0 @@
-import { useEffect, useState } from 'react';
-import { history } from 'umi';
-import { Card, Row, Col } from 'antd'
-import { AppstoreOutlined, MacCommandOutlined, TeamOutlined, UsergroupDeleteOutlined, UsergroupAddOutlined } from '@ant-design/icons'
-import { getOrgComm } from '@/services/statis';
-import StatisCard from './StatisCard';
-import StatisGroup from './StatisGroup';
-
-const colorList = [
-  { backColor: '#126BAE', frontColor: '#fff' },
-  { backColor: '#66A9C9', frontColor: '#fff' },
-  { backColor: '#08507b', frontColor: '#fff' },
-]
-
-export default (props) => {
-  const [cardData, setCardData] = useState({})
-
-  const toAbnormal = () => {
-    history.push('../resume-work/abnormal');
-  }
-
-  useEffect(() => {
-    getOrgComm().then((res) => {
-      setCardData(res || {});
-    })
-  }, [])
-
-  const abnormalNum = (cardData.todayReportNum || 0) - (cardData.todayNormalNum || 0)
-
-  return (
-    <Row justify='space-around' gutter={24} >
-      <Col span={8}>
-        <StatisGroup
-          title="企业"
-          data1={{ title: '历史提交总数', value: cardData.orgTotalNum || 0 }}
-          data2={{ title: ' ', value: -1 }}
-          {...colorList[0]}
-          icon={<AppstoreOutlined />}
-        />
-      </Col>
-      <Col span={8}>
-        <StatisGroup
-          title="上报人次"
-          data1={{ title: '今日提交', value: cardData.todayReportNum || 0 }}
-          data2={{ title: '昨日提交', value: cardData.yestodayReportNum || 0 }}
-          {...colorList[1]}
-          icon={<TeamOutlined />}
-        />
-      </Col>
-      <Col span={8}>
-        <StatisGroup
-          title="今日概况"
-          data1={{ title: '正常人次', value: cardData.todayNormalNum || 0 }}
-          data2={{ title: '异常人次', value: abnormalNum }}
-          {...colorList[2]}
-          icon={<UsergroupDeleteOutlined />}
-          onClick2={toAbnormal}
-        />
-      </Col>
-      {/* <Col span={4}>
-        <StatisCard
-          title="企业总数"
-          value={cardData?.orgTotalNum || 0}
-          icon={<AppstoreOutlined />}
-          {...colorList[0]}
-        />
-      </Col>
-      <Col span={4}>
-        <StatisCard
-          title="无数据企业"
-          value={`${cardData?.noDataOrgNum || 0} / ${cardData?.orgTotalNum || 0}`}
-          icon={<MacCommandOutlined />}
-          {...colorList[1]}
-        />
-      </Col>
-      <Col span={4}>
-        <StatisCard
-          title="今日提交总人数"
-          value={cardData?.todayReportNum || 0}
-          icon={<TeamOutlined />}
-          {...colorList[2]}
-        />
-      </Col>
-      <Col span={4}>
-        <StatisCard
-          title="昨日提交总人数"
-          value={cardData?.yestodayReportNum || 0}
-          icon={<TeamOutlined />}
-          {...colorList[3]}
-        />
-      </Col>
-      <Col span={4}>
-        <StatisCard
-          title="今日正常人数"
-          value={cardData?.todayNormalNum || 0}
-          icon={<UsergroupDeleteOutlined />}
-          {...colorList[4]}
-        />
-      </Col>
-      <Col span={4}>
-        <StatisCard
-          title="今日异常人数"
-          value={(cardData?.todayReportNum || 0) - (cardData?.todayNormalNum || 0)}
-          icon={<UsergroupAddOutlined />}
-          {...colorList[5]}
-          onClick={toAbnormal}
-        />
-      </Col> */}
-    </Row>
-  )
-}

src/pages/dashboard/components/OrgDashboard/components/OrgSummary.jsx

@@ -1,130 +0,0 @@
-import { useEffect, useState, useCallback } from 'react';
-import Echart from '@/components/echart/echart'
-import { Card } from 'antd'
-import { getAllOrgLine } from '@/services/statis'
-import { useModel } from 'umi'
-import moment from 'moment';
-
-const lineOption = {
-  tooltip: {
-    trigger: 'axis',
-    axisPointer: {
-      type: 'shadow'
-    },
-    // formatter: (params) => `截止：${params[0].data.name} <br />正常： ${params[0].data.value}`
-    // formatter: (params) => `人次: ${params[0].data.value || 0}`
-  },
-
-  grid: {
-    containLabel: true,
-    left: 0,
-    top: 8,
-    right: 60,
-    bottom: 0,
-  },
-  yAxis: {
-    type: 'value',
-  },
-
-  xAxis: {
-    type: 'category',
-
-  },
-
-
-  dataset: [
-    {
-      dimensions: ['name', 'value'],
-      source: [],
-    },
-    {
-      dimensions: ['name', 'value'],
-      source: [],
-    }
-  ],
-  series: [
-    {
-      name: '正常',
-      type: 'line',
-      datasetIndex: 0,
-      itemStyle: {
-        normal: {
-          color: "#08507b",
-          lineStyle: {
-            color: "#08507b"
-          }
-        }
-      }
-
-
-
-    },
-    {
-      name: '异常',
-      type: 'line',
-      datasetIndex: 1,
-      itemStyle: {
-        normal: {
-          color: "red",
-          lineStyle: {
-            color: "red"
-          }
-        }
-      }
-
-      // lineStyle: {
-      //   color: 'red',
-      // },
-    }
-  ]
-}
-
-
-export default (props) => {
-  const [loading, setLoading] = useState(false)
-  const [list, setList] = useState({})
-  const { initialState } = useModel('@@initialState');
-
-  const dataset = [
-    {
-      dimensions: ['name', 'value'],
-      source: list.normal || [],
-    },
-    {
-      dimensions: ['name', 'value'],
-      source: list.abnormal || [],
-    }
-  ]
-
-  const option = {
-    ...lineOption,
-    dataset,
-  }
-  console.log('dataset', dataset);
-
-
-  useEffect(() => {
-    // queryList()
-    setLoading(true)
-
-    getAllOrgLine({
-      days: 7,
-      startDate: moment().subtract(7, 'day').format('YYYY-MM-DD'),
-      orgId: initialState.currentUser.orgId,
-    }).then((res) => {
-      setLoading(false)
-      setList(res)
-
-    }).catch(err => {
-      setLoading(false)
-
-    })
-
-  }, [])
-
-  return (
-    <Card title='企业数据总览' loading={loading} bodyStyle={{ height: 600 }}>
-      <Echart option={option} />
-    </Card>
-  )
-}

src/pages/dashboard/components/OrgDashboard/components/ReportList.jsx

@@ -1,124 +0,0 @@
-import moment from 'moment'
-import { Card, List, Badge, Space, Carousel } from 'antd'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { getList } from '@/services/work'
-import { random } from '@/utils/number'
-import { useModel } from 'umi'
-
-const colorList = [
-  '#a8071a',
-  '#ad2102',
-  '#ad4e00',
-  '#ad6800',
-  '#ad8b00',
-  '#5b8c00',
-  '#237804',
-  '#006d75',
-  '#0050b3',
-  '#10239e',
-  '#391085',
-  '#9e1068',
-]
-
-const Avatar = (props) => {
-  const style = useMemo(() => {
-    let r = random(0, colorList.length)
-    if (r >= 12) r = 0;
-    const color = colorList[r];
-
-    return {
-      background: color,
-      color: '#fff',
-      width: '48px',
-      height: '48px',
-      fontSize: '1.8em',
-      lineHeight: '48px',
-      textAlign: 'center',
-    }
-  }, [])
-
-  return <div style={style}>{props.children}</div>
-}
-
-
-const Content = (props) => {
-  const { item } = props;
-
-  const abnormal = item.antigenIsNormal === 0 || item.nucleicIsNormal === 0
-  const status = abnormal ? 'error' : 'success'
-
-  return (
-    <Space size="large">
-      <span><Badge status={status} /> {abnormal ? '异常' : '正常'}</span>
-      <span>{moment(item.createDate).format('HH:mm')}</span>
-    </Space>
-  )
-}
-
-const showNum = 8;
-
-export default (props) => {
-  const [loading, setLoading] = useState(false)
-  const [list, setList] = useState([])
-  const [disabled, setDisabled] = useState(false)
-  const { initialState } = useModel('@@initialState');
-
-
-  const queryList = useCallback(() => {
-    setLoading(true)
-    getList(
-      {
-        pageSize: 50, // 过多会很卡
-        start: moment().format('YYYY-MM-DD'),
-        end: moment().format('YYYY-MM-DD'),
-        isAll: true,
-        orgId: initialState.currentUser.orgId,
-      }).then(res => {
-        setLoading(false)
-        setList((res.records || []).reverse())
-      }).catch(er => {
-        setLoading(false)
-      })
-  }, [])
-
-  useEffect(() => {
-    queryList()
-  }, [])
-
-  useEffect(() => {
-    setDisabled(!list || list.length <= showNum)
-  }, [list])
-
-  return (
-    <Card title="今日提交记录" loading={loading} bodyStyle={{ height: '600px' }}>
-      <List style={{ height: '100%', overflow: 'hidden' }} itemLayout="horizontal">
-        <Carousel
-          autoplay={!disabled}
-          infinite={!disabled}
-          rtl
-          slidesToShow={showNum}
-          slidesToScroll={1}
-          dot={false}
-          dotPosition="right"
-          style={{ height: '100%' }}
-        >
-          {
-            list.map(item => (
-              <div key={item.formId} style={{ display: 'flex' }}>
-                <List.Item>
-                  <List.Item.Meta
-                    avatar={<Avatar>{item.orgName.substring(0, 1)}</Avatar>}
-                    title={item.userName}
-                    con
-                    description={item.orgName}
-                  />
-                  <Content item={item} />
-                </List.Item>
-              </div>
-            ))
-          }
-        </Carousel>
-      </List>
-    </Card>
-  )
-}

src/pages/dashboard/components/OrgDashboard/components/StatisCard.jsx

@@ -1,41 +0,0 @@
-import React from 'react'
-import { Statistic, Card } from 'antd';
-
-const iconDivStyle = {
-  position: 'absolute',
-  top: 20,
-  right: 20,
-}
-
-const iconStyle = {
-  fontSize: '5em',
-  color: '#fff',
-  opacity: 0.3,
-}
-
-export default (props) => {
-  const { title, value, icon, backColor = '#fff', frontColor='#000', onClick } = props
-
-  const bodyStyle = {
-    background: backColor,
-    overflow: 'hidden',
-    position: 'relative',
-  }
-
-  return (
-    <Card bodyStyle={bodyStyle} onClick={onClick}>
-      <Statistic
-        title={title}
-        value={value}
-        valueStyle={{ color: frontColor }}
-      />
-      {
-        icon && (
-          <div style={iconDivStyle}>
-            {React.cloneElement(icon, { style: iconStyle })}
-          </div>
-        )
-      }
-    </Card>
-  )
-}

src/pages/dashboard/components/OrgDashboard/components/StatisGroup.jsx

@@ -1,78 +0,0 @@
-import React, { useState } from 'react';
-import { StatisticCard } from '@ant-design/pro-card';
-
-const { Divider } = StatisticCard;
-const iconDivStyle = {
-  position: 'absolute',
-  top: '4px',
-  right: '-30px',
-}
-
-const iconStyle = {
-  fontSize: '10em',
-  color: '#fff',
-  opacity: 0.45,
-}
-
-export default (props) => {
-  const { title, data1, data2, icon, onClick1, onClick2, backColor = '#fff', frontColor = '#000' } = props
-
-  const headStyle = {
-    background: backColor,
-    color: frontColor,
-  }
-
-  const bodyStyle = {
-    background: backColor,
-    color: frontColor,
-    position: 'relative',
-    overflow: 'hidden',
-  }
-
-  const groupBodyStyle = {
-    ...bodyStyle,
-    padding: 0,
-  }
-
-  const valueStyle = {
-    color: frontColor
-  }
-
-  const headTitleStyle = {
-    color: frontColor,
-    fontSize: '19px',
-    fontWeight: 700,
-    letterSpacing: '2px',
-  }
-
-  const titleStyle = {
-    color: frontColor,
-  }
-
-  return (
-    <StatisticCard.Group title={<div style={headTitleStyle}>{title}</div>} headStyle={headStyle} bodyStyle={groupBodyStyle}>
-      <StatisticCard
-        bodyStyle={bodyStyle}
-        statistic={{ ...data1, title: (<div style={titleStyle}>{data1.title}</div>), valueStyle }}
-        onClick={onClick1}
-      />
-      <Divider type="vertical" />
-      <StatisticCard
-        bodyStyle={bodyStyle}
-        statistic={
-          data2.value == -1 ?
-            { ...data2, value: ' ', title: (<div style={titleStyle}>{data2.title}</div>), valueStyle }
-            :
-            { ...data2, title: (<div style={titleStyle}>{data2.title}</div>), valueStyle }}
-        onClick={onClick2}
-      />
-      {
-        icon && (
-          <div style={iconDivStyle}>
-            {React.cloneElement(icon, { style: iconStyle })}
-          </div>
-        )
-      }
-    </StatisticCard.Group>
-  )
-}

src/pages/dashboard/components/OrgDashboard/index.jsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { Space, Row, Col } from 'antd'
-import ReportList from './components/ReportList';
-import OrgSummary from './components/OrgSummary';
-import BannerStatis from './components/BannerStatis';
-
-export default (props) => {  
-  return (
-    <Space direction="vertical" size="large" style={{ width: '100%' }}>
-      <BannerStatis />
-
-      <Row gutter={24}>
-        <Col span={12}><OrgSummary /></Col>
-        <Col span={12}>
-          <ReportList />
-        </Col>
-      </Row>
-    </Space>
-  )
-}

src/pages/userList/index.jsx

@@ -0,0 +1,79 @@
+import React, { useRef } from 'react'
+import { useModel } from 'umi';
+import moment from 'moment';
+import { DatePicker, Button } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import PageTable from '@/components/PageTable'
+import { getList } from '@/services/work'
+
+const { RangePicker } = DatePicker;
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
+};
+
+export default (props) => {
+  const initDate = useRef(moment())
+  const actionRef = useRef();
+  const { initialState } = useModel('@@initialState');
+
+  const handleBeforSearch = (params) => {
+    const { createDate, ...others } = params;
+
+    let start, end, orgId;
+    if (!createDate || createDate.length < 1) {
+      // 默认时间是今天
+      start = moment().format('YYYY-MM-DD')
+      end = start
+    } else {
+      start = moment(createDate[0]).format('YYYY-MM-DD')
+      end = moment(createDate[1]).format('YYYY-MM-DD')
+    }
+    if (initialState.currentUser.orgId) {
+      orgId = initialState.currentUser.orgId
+      return { ...others, start, end, orgId };
+    }
+    return { ...others, start, end };
+  }
+  const columns = [
+    
+    {
+      title: '姓名',
+      dataIndex: 'userName',
+      key: 'userName',
+      search: true,
+    },
+    {
+      title: '手机号',
+      dataIndex: 'userName',
+      key: 'userName',
+      search: true,
+    },
+    {
+      title: '注册时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (t) => formatterTime(t),
+      renderFormItem: (_, record) => <RangePicker defaultValue={[initDate.current, initDate.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+    },
+  ]
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        actionRef={actionRef}
+        columns={columns}
+        request={getList}
+        options={false}
+        search={{
+          defaultCollapsed: false
+        }}
+        form={{ ignoreRules: false }}
+        manualRequest={true}
+        revalidateOnFocus={false}
+        beforeSearchSubmit={handleBeforSearch}
+        rowKey="formId"
+      />
+    </PageHeaderWrapper>
+  )
+}