Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-manage

config/defaultSettings.js

   },
   title: '远道荟',
   pwa: false,
-  iconfontUrl: '',
+  iconfontUrl: ''
 };

config/routes.js

           {
             path: '/index',
             name: '首页',
-            component: './Index',
+            component: './dashboard',
           },
           // {
           //   path: '/',
             name: '物业管理',
             component: '../layouts/BlankLayout',
             routes: [
+              {
+                path: 'community',
+                name: '社区管理',
+                component: './property/community'
+              },
               {
                 path: 'buildingInfo',
                 name: '楼栋管理',
-                component: './property/building'
+                component: './property/building/list'
               },
               {
                 path: 'buildingInfo/importExcel',
                 component: './property/news/Edit',
                 hideInMenu: true,
               },
+              {
+                path: 'public-service',
+                name: '公共服务',
+                component: './property/contact/PublicServ'
+              },
               {
                 path: 'bill/management',
-                name: '收费组管理',
+                name: '收费管理',
                 component: './property/bill/list',
               },
               {
                 path: 'bill/management/add',
-                name: '新增收费组',
+                name: '新增收费项目',
                 component: './property/bill/edit',
                 hideInMenu: true,
               },
               {
                 path: 'bill/management/info',
-                name: '收费组详情',
+                name: '收费详情',
                 component: './property/bill/info',
                 hideInMenu: true,
               },
               },
               {
                 path: 'contact',
-                name: '联系方式',
+                name: '联系物业',
                 component: './property/contact'
               },
               {

package.json

     "umi-plugin-pro-block": "^1.3.6",
     "umi-plugin-react": "^1.15.8",
     "umi-request": "^1.0.8",
-    "wangeditor": "^3.1.1"
+    "wangeditor": "^4.6.2"
   },
   "devDependencies": {
     "@ant-design/colors": "^3.1.0",

src/components/CommunitySelect/index.jsx

+import React, { useEffect, useState, useRef } from 'react'
+import { connect } from 'dva'
+import { Select } from 'antd'
+
+const CommunitySelect = props => {
+  const [value, setValue] = useState()
+  const inited = useRef(false)
+
+  const { communityList, user, dispatch, autoInited, ...selectProps } = props
+
+  const dataList = ((user || {}).isAdmin ? communityList : (user || {}).communityList) || []
+
+  const handleChange = val => {
+    if (props.onChange) {
+      props.onChange(val)
+    } else {
+      setValue(val)
+    }
+  }
+
+  useEffect(() => {
+    if (!user || !user.userId) {
+      return
+    }
+
+    // 初始化逻辑
+    if (!inited.current) {
+      // 如果有默认值, 则使用默认值
+      if (props.value) {
+        setValue(props.value)
+        inited.current = true
+      } else if (autoInited) {
+        // 如果没有默认值, 但是需要设置默认值
+        // 那么默认使用第一个
+        const first = (dataList[0] || {}).id
+        if (first) {
+          handleChange(props.mode === 'multiple' ? [first] : first)
+        }
+
+        inited.current = true
+      }
+    } else {
+      setValue(props.value)
+    }
+  }, [user, autoInited, dataList, props.value])
+
+  return (
+    <Select {...selectProps} value={value} onChange={handleChange}>
+      {
+        dataList.map(community => (<Select.Option key={community.id} value={community.id}>{community.name}</Select.Option>))
+      }
+    </Select>
+  )
+}
+
+export default connect(s => ({ communityList: (s.user || {}).communityList, user: (s.user || {}).currentUser }))(CommunitySelect)

src/components/Wangedit/Preview.jsx

+import React, { useEffect, useRef } from 'react'
+import { Modal } from 'antd'
+import PreviewMenu from './PreviewMenu'
+
+export default props => {
+  const ref = useRef()
+
+  useEffect(() => {
+    let t = null
+    if (props.visible) {
+      // 防止 postMessage 的时候 iframe 内容还没有加载完成
+      t = setInterval(() => {
+        console.log('----postMessage----->', ref.current)
+        // window.preViewFrame.window.postMessage(props.html, '*')
+        if (ref.current) {
+          ref.current.contentWindow.postMessage(props.html, '*')
+        }
+      }, 800)
+    }
+
+    return () => t && clearInterval(t)
+  }, [props.visible, props.html])
+
+  return (
+    <Modal
+      visible={props.visible}
+      wrapClassName="editor-preivew-modal-content"
+      width={props.width}
+      bodyStyle={props.style}
+      footer={null}
+      closable={false}
+      title={null}
+      onCancel={props.onCancel}
+      >
+      <iframe
+        ref={ref}
+        style={{width: '100%', height: '100%'}}
+        src={`${window.location.origin}/preview-html/index.html`}
+        frameBorder={0}
+        name="preViewFrame"
+      ></iframe>
+    </Modal>
+  )
+}

src/components/Wangedit/PreviewMenu.js

+import E from 'wangeditor'
+
+const { $, BtnMenu } = E
+
+class PreViewMenu extends BtnMenu {
+  constructor(editor) {
+    // data-title属性表示当鼠标悬停在该按钮上时提示该按钮的功能简述
+      const $elem = E.$(
+          `<div class="w-e-menu" data-title="预览">
+            <i>预览</i>
+          </div>`
+      )
+      super($elem, editor)
+      this.editor = editor
+      // <i class="w-e-icon-fullscreen"></i>
+  }
+
+  static preview() {}
+
+  clickHandler() {
+    PreViewMenu.preview(this.editor.txt.html())
+  }
+
+  tryChangeActive(){}
+}
+
+export default PreViewMenu

src/components/Wangedit/Wangedit.jsx

-import React from 'react';
+import React, { useState, useRef, useEffect, useCallback } from 'react';
 import E from 'wangeditor';
+import PreviewMenu from './PreviewMenu'
+import Preview from './Preview'
 import { fetch, apis } from '../../utils/request';
 
-/**
- * @param {*} props
- * @returns
- */
-class Wangedit extends React.Component {
-  constructor(props, context) {
-    super(props, context);
-    this.state = {
-      html: undefined,
-      contenteditable: props.contenteditable == false ? false : true
-    }
-    this.editor = undefined;
-  }
-
-  render() {
-    return (
-      <div ref="editorElem" style={{ textAlign: 'left' }}>
-      </div>
-    );
-  }
-
-  componentDidMount() {
-    const elem = this.refs.editorElem
-    this.editor = new E(elem)
-    // 使用 onchange 函数监听内容的变化
-    this.editor.customConfig.onchange = html => {
-      this.setState({ html })
-
-      if (typeof this.props.onChange === 'function') {
-        this.props.onChange(html)
+export default props => {
+  const ref = useRef()
+  const editorRef = useRef()
+  const [preview, setPreview] = useState(false)
+  const [content, setContent] = useState()
+
+  // wangeditor 有bug, 初始先触发 onchange
+  const firstChanged = useRef(false)
+
+  const initEditor = useCallback(() => {
+    const editor = new E(ref.current)
+    editorRef.current = editor
+    
+    // 取消自动 focus
+    editor.config.focus = false
+
+    // 触发 change
+    editor.config.onchange = html => {
+      // 规避 bug
+      if (!firstChanged.current) {
+        firstChanged.current = true
+        return
+      }
+
+      setContent(html)
+
+      if (typeof props.onChange === 'function') {
+        props.onChange(html)
       }
     }
-    this.editor.customConfig.zIndex = 100
-    this.editor.customConfig.uploadImgMaxLength = 1
-    this.editor.customConfig.customUploadImg = function (files, insert) {
+
+    editor.config.zIndex = 100
+
+    // 自定义图片上传
+    editor.config.uploadImgMaxLength = 1
+    editor.config.customUploadImg = function (files, insert) {
       if (!files.length) return
       
       const data = new FormData()
       data.append('file', files[0])
-
       fetch(apis.image.upload)({data}).then(insert)
     }
-    this.editor.customConfig.menus = [
+
+    // 扩展预览按钮
+    editor.menus.extend('previewMenu', PreviewMenu)
+    PreviewMenu.preview = (html) => setPreview(true)
+
+    // 配置菜单
+    editor.config.menus = [
       'head',  // 标题
       'bold',  // 粗体
       'fontSize',  // 字号
       'quote',  // 引用
       'image',  // 插入图片
       'undo',  // 撤销
-      'redo'  // 重复
+      'redo',  // 重复
+      'previewMenu'
     ]
-    
+
     // 过滤 word 字符
-    this.editor.customConfig.pasteFilterStyle = false
-    this.editor.customConfig.pasteTextHandle = function(content) {
+    editor.config.pasteFilterStyle = false
+    editor.config.pasteTextHandle = content => {
       const regs = [
         /<!--\[if [\s\S]*?endif\]-->/ig,
         /<[a-zA-Z0-9]+\:[^>]+>[^>]*<\/[a-zA-Z0-9]+\:[^>]+>/ig,
       }, content)
     }
 
-    this.editor.create()
-    this.editor.$textElem.attr('contenteditable',this.state.contenteditable);
-    this.editor.customConfig.uploadImgShowBase64 = true
-    this.editor.txt.html(this.props.value)
-  }
+    editor.create()
+    editor.$textElem.attr('contenteditable', props.contenteditable !== false)
 
-  componentDidUpdate(props, state) {
-    if (this.props.value && !state.html) {
-      if (this.editor) {
-        this.editor.txt.html(this.props.value)
-      }
-    }
-  }
-
-  /**
-   *增加这个 shouldComponentUpdate 生命函数
-    处理自动聚焦到富文本上
-   *
-   * @param {*} nextProps
-   * @returns
-   * @memberof Wangedit
-   */
-  shouldComponentUpdate(nextProps) {
-    return nextProps.value !== this.editor.txt.html()
-  }
-}
+    return () => editor.destroy()
+  }, [props.contenteditable])
 
-export default Wangedit
+  useEffect(() => {
+    initEditor()
+  }, [])
+  
+  useEffect(() => {
+    if (props.value !== content && editorRef.current) {
+      setContent(props.value)
+      editorRef.current.txt.html(props.value)
+    }
+  }, [props.value])
 
+  return (
+    <>
+      <div ref={ref} style={{ textAlign: 'left' }} />
+      <Preview
+        width={426}
+        style={{width: '426px', height: '863px', margin: 0, padding: 0}}
+        visible={preview}
+        html={props.value}
+        onCancel={() => setPreview(false)}
+      />
+    </>
+  )
+}

src/components/XForm/WrapperForm.jsx

 
   render () {
     const {fields, form, children, submitBtn, cancelBtn, ...formProps} = this.props;
-    console.log('fields:', fields)
     const FeildItems = (fields || []).filter(x => x).map((props, inx) => (<WrapperItem key={inx} {...props} form={form} />))
     
     return (

src/global.less

     border-top:none;
   }
 }
+
+.editor-preivew-modal-content {
+  .ant-modal-content {
+    background: transparent !important;
+    box-shadow: none;
+  }
+}
+
+
 :global {
   .ant-layout {
     min-height: 100vh;

src/models/user.js

   },
   reducers: {
     saveCurrentUser(state, { payload }) {
-      const { taUser = {} , menuList = [], buttonList = [] } = payload || {}
+      const { taUser = {} , menuList = [], buttonList = [], ...others } = payload || {}
       const currentUser = { ...taUser, roles: (taUser.roles || []).map(x => x.roleId) }
 
       setAllBtnAuth(buttonList)
       setUserBtnAuth(currentUser.buttons)
 
-      return { ...state, currentUser, menuList, buttonList };
+      return { ...state, currentUser, menuList, buttonList, ...others };
     },
     changeNotifyCount(
       state = {

src/pages/activity/SignList.jsx

 
 const header = props => {
   const [data, setData] = useState({ list: {} })
+  const [actInfo, setActInfo] = useState()
+
   //   const [page, changePage] = useState({})
   // 存入导入数据的值
   const { getFieldDecorator, getFieldsValue } = props.form
   useEffect(() => {
     // eslint-disable-next-line no-use-before-define
     getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId });
+    //
+    
+    request({ ...apis.activity.details, params: { dynamicId: props.location.query.dynamicId } }).then(res => {
+      setActInfo(res)
+    })
   }, [])
 
   // 查询列表
         if (!data) {
           return
         }
+
         const url = window.URL.createObjectURL(new Blob([data]))
         const link = document.createElement('a')
         link.style.display = 'none'
         link.href = url
-        link.setAttribute('download', '报名列表.xlsx')
+        link.setAttribute('download', `${actInfo.title || {}}-报名列表.xlsx`)
         document.body.append(link)
         link.click()
       }).catch(() => {

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

         title: '发生时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (createDate, records) => <span> {moment(createDate).format('YYYY-MM-DD')}</span>,
+        render: (createDate, records) => <span> {moment(createDate).format('YYYY-MM-DD HH:mm')}</span>,
       },
     ]
     return (

src/pages/customer/personlist/index.jsx

 import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetch, apis, fetchList } from '@/utils/request'
+import { exportExcel } from '@/utils/utils'
 import IntegralRecord from '../customerlist/components/integralRecord'
 
 const getPersonList = fetchList(apis.person.getPersonList)
+const exportPersonList = fetch(apis.person.export)
 
 const Condition = Form.create()(props => {
   const handleSubmit = e => {
               getFieldDecorator('phone')(<Input placeholder="手机号" />)
             }
             </Form.Item>
+            <Form.Item label="推荐人">
+            {
+              getFieldDecorator('recommended')(<Input placeholder="推荐人" />)
+            }
+            </Form.Item>
         </div>
         <div style={{ flex: 'none', width: '180px' }}>
           <Form.Item>
     })
   }
 
+  const handleExport = () => {
+    exportPersonList({params: queryParams}).then(res => {
+      exportExcel(res, '会员列表')
+    })
+  }
+
   useEffect(() => {
     setLoading(true)
     getPersonList(queryParams).then(res => {
   return (
     <div>
       <Condition onSearch={handleSearch} onReset={handleSearch} />
-      <div style={{margin: '24px 0'}}> </div>
+      <div style={{margin: '24px 0'}}><Button type="" onClick={handleExport}>导出</Button></div>
       <Table dataSource={listData} loading={loading} pagination={{...pagination, onChange: handlePageChange}} rowKey="personId">
         <Table.Column
           title="头像"
         />
         <Table.Column title="姓名" dataIndex="nickname" key="nickname" />
         <Table.Column title="电话" dataIndex="phone" key="phone" render={t => t ? t.replace(/(\d{3})\d*(\d{4})/,'$1****$2') : ''} />
+        <Table.Column title="推荐人" dataIndex="sharePersonName" key="sharePersonName" />
+        <Table.Column title="总积分" dataIndex="points" key="points" />
         <Table.Column title="创建时间" dataIndex="createDate" key="createDate" />
         <Table.Column
           title="操作"
           render={(_, row) => {
             return (
               <>
-                <Button type="link" onClick={() => setShowPoints({visible: true, customerId: row.personId})}>积分</Button>
+                <Button type="link" onClick={() => setShowPoints({visible: true, customerId: row.personId})}>积分明细</Button>
               </>
             )
           }}

src/pages/dashboard/components/ABPart.jsx

+import React, { useEffect, useState } from 'react'
+import { Row, Col } from 'antd'
+
+export default props => {
+
+  const left = props.left || 16
+  const right = 24 - left
+
+  return (
+    <Row type="flex" align={props.align || "top"} justify="space-around" gutter={props.gutter || 24}>
+      <Col span={left}>{props.a}</Col>
+      <Col span={right}>{props.b}</Col>
+    </Row>
+  )
+}

src/pages/dashboard/components/BuildingStatic.jsx

+import React, { useEffect, useState } from 'react'
+import { Row, Col, Statistic, Icon, Spin } from 'antd'
+import { apis, fetch } from '@/utils/request'
+
+const getHouseVerified = fetch(apis.dashboard.houseVerified)
+
+export default props => {
+  const [loading, setLoading] = useState({})
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    setLoading(true)
+    getHouseVerified().then(res => {
+      setData(res)
+      setLoading(false)
+    }).catch(e => console.error(e) || setLoading(false))
+  }, [])
+
+
+  return (
+    <Spin spinning={loading}>
+      <Row gutter={16}>
+        <Col span={4}>
+          {/* <Statistic title={<div><Icon type="bell" style={{fontSize: '1.2em'}} /> 工单 </div>} value={112893} /> */}
+        </Col>
+        <Col span={10}>
+          <Statistic title={<div><Icon type="home" style={{fontSize: '1.2em'}} /> 已认证(户) </div>} value={data.valid} />
+        </Col>
+        <Col span={10}>
+          <Statistic title={<div><Icon type="home" style={{fontSize: '1.2em'}} /> 未认证(户) </div>} value={data.total - data.valid} />
+        </Col>
+      </Row>
+    </Spin>
+  )
+}

src/pages/dashboard/components/CommAlert.jsx

+import React, { useEffect, useState } from 'react'
+import { Card, Alert, Icon } from 'antd'
+import { fetch, apis } from '@/utils/request'
+import Link from 'umi/link'
+
+const getTips = fetch(apis.dashboard.tips)
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    setLoading(true)
+    getTips().then(res => {
+      setData(res)
+      setLoading(false)
+    }).catch(e => console.error(e) || setLoading(false))
+  }, [])
+
+  const ticket = data.ticketNum ? `您有 ${data.ticketNum} 个待处理工单, 点击处理` : '暂无未处理工单'
+  const verify = data.verifyNum ? `您有 ${data.verifyNum} 条待审核记录, 点击处理` : '暂无业主申请'
+  const exchange = data.exchangeNum ? `累计有 ${data.exchangeNum} 条兑换记录, 点击查看` : '暂兑换记录'
+  const enlistNum = data.enlistNum && data.enlistNum.dynamicId ? `总计 ${data.enlistNum.num} 人报名参与 ${data.enlistNum.title} 活动, 点击查看` : '暂进行中活动'
+
+  return (
+    <Card title="日常工作" bordered={false} loading={loading}>
+      <Link to="/property/ticket">
+        <Alert
+          message="工单报修"
+          description={ticket}
+          type="success"
+          showIcon
+          icon={<Icon type="snippets" />}
+          style={{marginBottom: 16}}
+        />
+      </Link>
+      <Link to="/property/proprietor/audit">
+        <Alert
+          message="业主审核"
+          description={verify}
+          type="info"
+          showIcon
+          icon={<Icon type="user-add" />}
+          style={{marginBottom: 16}}
+        />
+      </Link>
+      <Link to="/integralMall/exchangeRecords">
+        <Alert
+          message="商品兑换"
+          description={exchange}
+          type="warning"
+          showIcon
+          icon={<Icon type="gift" />}
+          style={{marginBottom: 16}}
+        />
+      </Link>
+      <Link to={data.enlistNum && data.enlistNum.dynamicId ? `/activity/detailActivity?dynamicId=${data.enlistNum.dynamicId}` : '/activity/ActivityList'}>
+        <Alert
+          message="活动报名"
+          description={enlistNum}
+          type="error"
+          showIcon
+          icon={<Icon type="crown" />}
+          // style={{marginBottom: 16}}
+        />
+      </Link>
+    </Card>
+  )
+}

src/pages/dashboard/components/ScrollAlert.jsx

+import React, { useEffect, useState } from 'react'
+import { Card, Carousel, Row, Col } from 'antd'
+import moment from 'moment'
+import { orderBy } from 'lodash'
+import { fetch, apis } from '@/utils/request'
+
+const getDynamic = fetch(apis.dashboard.dynamic)
+
+const Item = props => (
+  <Row gutter={16} type="flex" align="middle" style={{ marginTop: 8, marginBottom: 8 }}>
+    <Col span={8}>{props.dataSource.createDate}</Col>
+    <Col span={16}>{`${props.dataSource.nickname} ${props.dataSource.desc}`}</Col>
+  </Row>
+)
+
+const showMax = 10
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [list, setList] = useState([])
+  const [showSlides, setShowSlides] = useState(0)
+
+  useEffect(() => {
+    const today = moment()
+    // 取最近 15 天的记录
+    const endDate = today.format('YYYY-MM-DD')
+    today.subtract(15, 'days')
+    const startDate = today.format('YYYY-MM-DD')
+
+    setLoading(true)
+    getDynamic({params: {startDate, endDate}}).then(res => {
+      const { ticketList, propList, billList } = res
+
+      // 组合list
+      const compList = [
+        ...(ticketList || []).map(x => ({...x, createDate: moment(x.createDate).format('MM-DD HH:mm'), desc: '提了一个工单'})),
+        ...(propList || []).map(x => ({...x, createDate: moment(x.createDate).format('MM-DD HH:mm'), desc: '申请了一个业主认证'})),
+        ...(billList || []).map(x => ({...x, createDate: moment(x.createDate).format('MM-DD HH:mm'), desc: '缴了一笔费用'})),
+      ]
+      
+      if (compList.length === 0) {
+        setShowSlides(0)
+      } else {
+        setShowSlides(compList.length > showMax ? showMax : compList.length - 1)
+      }
+
+      // 按照时间倒叙
+      const newList = orderBy(compList, ['createDate'], ['desc'])
+      setList(newList)
+
+      setLoading(false)
+    }).catch(e => console.error(e) || setLoading(false))
+
+  }, [])
+
+  return (
+    <Card title="最新动态" loading={loading}>
+      <Carousel
+        dots={false}
+        autoplay={true}
+        lazyLoad={true}
+        infinite={true}
+        speed={500}
+        slidesToShow={showSlides}
+        slidesToScroll={1}
+        dotPosition="right"
+      >
+        {
+          list.map(x => <Item key={x.createDate} dataSource={x} />)
+        }
+      </Carousel>
+    </Card>
+  )
+}

src/pages/dashboard/components/ShortCut.jsx

+import React, { useEffect, useState } from 'react'
+import { Card, Row, Col, Icon, Spin } from 'antd'
+import moment from 'moment'
+import Link from 'umi/link'
+import { fetch, apis } from '@/utils/request'
+import ABPart from './ABPart'
+
+const Title = props => <div> <Icon type={props.icon} style={{color: props.color, fontSize: '1.2em'}} /> <span style={{display: 'inline-block', marginLeft: 8}}>{props.children}</span></div>
+const StatNum = props => <Spin spinning={props.loading}><div style={{textAlign: 'center'}}><span style={{fontSize: '1.6em'}}>{props.value}</span> {props.unit}</div></Spin>
+
+const getStatis = fetch(apis.dashboard.statis)
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [data, setData] = useState({})
+
+  useEffect(() => {
+    const today = moment()
+    // 当月第一天
+    const startDate = today.format('YYYY-MM-01')
+
+    // 当月最后一天,
+    // 因为当前日期是业务数据最大值, 因此当天的数据跟月末是一致的
+    const endDate = today.format(`YYYY-MM-DD`)
+
+    setLoading(true)
+    getStatis({params: {startDate, endDate}}).then(res => {
+      setData(res)
+      setLoading(false)
+    }).catch(er => setLoading(false))
+  }, [])
+
+  return (
+    <Row gutter={24}>
+      <Col span={6}>
+        <Link to="/property/buildingInfo">
+          <Card title={false}>
+            <ABPart
+              align="middle"
+              gutter={8}
+              left={12}
+              a={<Title icon="home" color="#f50">楼栋管理</Title>}
+              b={<StatNum loading={loading} value={data.buildingNum} unit="栋" />}
+            />
+          </Card>
+        </Link>
+      </Col>
+      <Col span={6}>
+        <Link to="/property/proprietor">
+          <Card title={false}>
+            <ABPart
+              align="middle"
+              gutter={8}
+              left={12}
+              a={<Title icon="user" color="#2db7f5">业主管理</Title>}
+              b={<StatNum loading={loading} value={data.propNum} unit="人" />}
+            />
+          </Card>
+        </Link>
+      </Col>
+      <Col span={6}>
+        <Link to="/property/bill/management">
+          <Card title={false}>
+            <ABPart
+              align="middle"
+              gutter={8}
+              left={12}
+              a={<Title icon="bank" color="#87d068">缴费(本月)</Title>}
+              b={<StatNum loading={loading} value={data.houseNum} unit="单" />}
+            />
+          </Card>
+        </Link>
+      </Col>
+      <Col span={6}>
+        <Link to="/property/bill/ticket">
+          <Card title={false}>
+            <ABPart
+              align="middle"
+              gutter={8}
+              left={12}
+              a={<Title icon="bell" color="#108ee9">工单(本月)</Title>}
+              b={<StatNum loading={loading} value={data.ticketNum} unit="条" />}
+            />
+          </Card>
+        </Link>
+      </Col>
+    </Row>
+  )
+}

src/pages/dashboard/index.jsx

+import React, { useEffect, useState } from 'react'
+import { PageHeader, Row, Col, Card, Icon } from 'antd'
+import CommunitySelect from '@/components/CommunitySelect'
+import ABPart from './components/ABPart'
+import BuildingStatic from './components/BuildingStatic'
+import ShortCut from './components/ShortCut'
+import CommAlert from './components/CommAlert'
+import ScrollAlert from './components/ScrollAlert'
+
+export default props => {
+  // const [] = useState()
+
+
+  // useEffect(() => {
+
+  // }, [])
+
+  const randText = `精铸致远，盛道自来。
+  今天的远道集团，以卓越的产品和服务创造高品质生活与理想工作为使命，建设家园，服务社会，创造美好生活。
+  我们相信，致远需要我们时刻创新奋进，而盛道的来临也正因为我们每一天为创造美好而不懈的努力！`
+
+  return (
+    <div>
+      <PageHeader
+        title="工作台"
+        backIcon={false}
+        ghost={false}
+        extra={[
+          <CommunitySelect key="1" style={{minWidth: 200}} autoInited />
+        ]}
+      >
+        <ABPart
+          align="middle"
+          a={<div style={{verticalAlign: 'center'}}><p>管理员您好, 祝您开心每一天! </p><p>{randText}</p></div>}
+          b={<BuildingStatic />}
+        />
+      </PageHeader>
+
+      <div style={{marginTop: 24}}><ShortCut /></div>
+      
+      <div style={{marginTop: 24}}>
+        <ABPart
+          a={<CommAlert />}
+          b={<ScrollAlert />}
+        />
+      </div>
+    </div>
+  )
+}

src/pages/integralMall/exchangeRecords.jsx

 import apis from '../../services/apis';
 import request from '../../utils/request'
 import AuthButton from '@/components/AuthButton';
+import { exportExcel } from '@/utils/utils'
 
 /**
   @param {*} props
 
   // 获取初始化数据
   const [data, setData] = useState({})
+  const [queryParam, setQueryParam] = useState()
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
           submitValue.endVerifyDate = null
         }
 
+        setQueryParam(submitValue)
+
         console.log(submitValue)
         getList({ pageNum: 1, pageSize: 10, ...submitValue })
       }
     });
   }
 
+  const handleExport = () => {
+    request({ ...apis.integralMall.taPointsExchangeExport, params: queryParam, }).then((data) => {
+      exportExcel(data, '积分兑换记录')
+    })
+  }
+
   const changePageNum = (pageNumber) => {
     props.form.validateFields((err, values) => {
       if (!err) {
       dataIndex: 'personType',
       key: 'personType',
       align: 'center',
-      render: (personType) => <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : personType === 'customer' ? '客户' : ''}</span></>
+      render: (personType) => <><span>{personType === 'prop' ? '物业相关' : personType === 'life-consultant' ? '生活管家' : ''}</span></>
     },
     {
       title: '手机号',
         </div>
 
       </Form>
+      <div style={{marginTop: 24}}>
+        <Button onClick={handleExport}>导出</Button>
+      </div>
       <Table rowKey="exchangeRecords" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />

src/pages/mpSetting/components/MainSeting.jsx

         <Form.Item label="小程序封面" help="仅支持JPG图片,建议大小为520*416">
           <div>
             {props.value.miniappMedia && <span style={{display: 'inline-block', marginRight: '24px'}}>{props.value.miniappMedia}</span>}
-            <MiniAppMedia onChange={handleMiniAppChange} />
+            {/* <MiniAppMedia onChange={handleMiniAppChange} /> */}
           </div>
         </Form.Item>
       </Form>

src/pages/mpSetting/components/TemplateItem.jsx

   const [typeDict, setTypeDict] = useState([
     {typeCode: 'birthday', typeName: '生日'},
     {typeCode: 'festival', typeName: '节日'},
+    {typeCode: 'ticket', typeName: '工单'},
   ])
 
   const handleChange = e => {
         onChange={handleChange}
         style={{width: '70%'}}
         placeholder="请填写消息模板ID"
+        readOnly={true}
         />
-      <Dropdown.Button
+      {/* <Dropdown.Button
          size="large"
         overlay={OverMenu}
         onClick={handleSubmit}
         style={{width: '15%'}}
       >
         提交
-      </Dropdown.Button>
+      </Dropdown.Button> */}
     </Input.Group>
   )
 }

src/pages/mpSetting/components/TemplateSetting.jsx

 
   return (
     <div>
-      <Button onClick={handleAdd}>新增</Button>
+      {/* <Button onClick={handleAdd}>新增</Button> */}
       <div style={{maxWidth: '800px', marginTop: '24px'}}>
         <List
           loading={loading}

src/pages/property/bill/edit/components/AddOn.jsx

 
 const Section = props => {
   return (
-    <p style={{ color: '#99a9bf', fontSize: '13px' }}>
+    <div style={{ color: '#99a9bf', fontSize: '13px' }}>
       {props.children}
-    </p>
+    </div>
   )
 }
 
   const [listData, setListData] = useState([])
   const [pagination, setPagination] = useState({})
 
+  const {communityId, phaseId, buildingId, dataSource} = props
+
   const handleDownloadExcel = () => {
-    billDownloadExcel().then(res => {
+    billDownloadExcel({params: {communityId, phaseId,buildingId}}).then(res => {
       const url = window.URL.createObjectURL(new Blob([res]))
       const link = document.createElement('a')
       link.href = url
   }
 
   useEffect(() => {
-    if (props.dataSource) {
-      setListData(props.dataSource.billInvoice)
-      setPagination({ total: props.dataSource.total })
+    if (dataSource) {
+      setListData(dataSource.billInvoice)
+      setPagination({ total: dataSource.total })
+      
     }
-  }, [props.dataSource])
+  }, [dataSource])
 
   return (
     <div>
       <Section>
-        <span>如果还未制作账单，请先下载账单模板，按规则填写费用后再上传</span>
+        <span> 如果还未制作账单，请先下载账单模板，按规则填写费用后再上传 </span>            
         <Button type="link" size="small" style={{ marginLeft: '6px' }} onClick={handleDownloadExcel}><Icon type="download" />下载模板</Button>
         <Button type="link" size="small" onClick={handleUploadExcel}><Icon type="upload" />选取账单文件并预览</Button>
       </Section>
       </Section>
       <List dataSource={listData} loading={loading} pagination={pagination} size="small" bordered>
         <Table.Column align="center" title="房屋信息" dataIndex="phase" key="phase" render={(_, row) => (row.phase + row.building + row.unit + row.level + row.roomNo)} />
-        <Table.Column align="center" title="收费说明" dataIndex="billExplain" key="billExplain" />
-        <Table.Column align="center" title="收费金额(元)" dataIndex="payPrice" key="payPrice" render={payPrice => (payPrice === null || payPrice === undefined ? '' : Number(payPrice/100).toFixed(2))} />
+        {/* <Table.Column align="center" title="收费说明" dataIndex="billExplain" key="billExplain" /> */}
+        <Table.Column align="center" title="收费金额(元)" dataIndex="payPrice" key="payPrice" width={160} render={payPrice => (payPrice === null || payPrice === undefined ? '' : Number(payPrice/100).toFixed(2))} />
       </List>
       <Section>
         <span>点击发送后账单会发送给对应家庭，家庭中的成员都可以查看到他们家的收费项，缴费成功无法线上退款，只能线下当面退款，请先保存为草稿，核对无误后再发送账单给住户</span>

src/pages/property/bill/edit/index.jsx

 import React, { useEffect, useState, useRef } from 'react'
 import router from 'umi/router'
 import { fetch, apis } from '@/utils/request'
-import { Button, Form, Input, DatePicker, notification, Modal } from 'antd'
+import { Button, Form, Input, Select, DatePicker, notification, Modal, Spin } from 'antd'
+import CommunitySelect from '@/components/CommunitySelect'
 import AddOn from './components/AddOn'
 
 const formItemLayout = {
 
 const billUploadExcelAdd = fetch(apis.bill.billUploadExcelAdd)
 const billInvoiceGetInvoiceInvalid = fetch(apis.bill.billInvoiceGetInvoiceInvalid)
+const fetchPhaseList = fetch(apis.buildingOwnerInfo.getPhaseList)
+const fetchBuildingList = fetch(apis.buildingOwnerInfo.getBuildingList)
 
 export default Form.create()(props => {
+  const [loading, setLoading] = useState(false)
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
   const [formData, setFormData] = useState()
   const [addOnData, setAddOnData] = useState()
+  const [communityId, setCommunityId] = useState()
+  const [phaseId, setPhaseId] = useState()
+  const [buildingId, setBuildingId] = useState()
+  const [phaseList, setPhaseList] = useState([])
+  const [buildingList, setBuildingList] = useState([])
+  const [rangeDate, setRangeDate] = useState([])
   const file = useRef()
   
   const { id } = props.location.query
           return
         }
 
+        if (!rangeDate || rangeDate.length !== 2) {
+          notification.warn({
+            message: '请设置缴费时间'
+          })
+          return
+        }
+
         const data = new FormData()
         data.append('file', file.current)
-        data.append('billExplain', values.billExplain)
+        data.append('communityId', communityId)
+        // data.append('billExplain', values.billExplain)
         data.append('billName', values.billName)
-        data.append('endDate', values.endDate)
+        data.append('startDate', rangeDate[0].format('YYYY-MM-DD'))
+        data.append('endDate', rangeDate[1].format('YYYY-MM-DD'))
         data.append('billStatus', billStatus)
 
         if (id) {
           data.append('billId', id)
         }
 
+        setLoading(true)
         billUploadExcelAdd({ data }).then(res => {
+          setLoading(false)
           Modal.success({
             content: '生成数据成功',
             onOk: () => router.go(-1)
           })
-        })
+        }).catch(e => console.error(e) || setLoading(false))
       }
     })
   }
 
   useEffect(() => {
     if (id) {
+      setLoading(true)
       billInvoiceGetInvoiceInvalid({
         data: {
           ...queryParams,
           billId: id,
+          communityId,
         }
       }).then(res => {
         setFormData(res.bill)
+        // setCommunityId(communityId)
         setAddOnData(res)
-      })
+        setLoading(false)
+      }).catch(e => console.error(e) || setLoading(false))
     }
   }, [id, queryParams])
 
     setFieldsValue(formData || {})
   }, [formData])
 
+  // 获取期
+  useEffect(() => {
+    if (communityId) {
+      fetchPhaseList({params: {communityId}}).then(res => setPhaseList(res))
+    }
+  }, [communityId])
+
+  // 楼栋
+  useEffect(() => {
+    if (phaseId) {
+      fetchBuildingList({params: {phaseId}}).then(res => setBuildingList(res))
+    }
+    setBuildingId()
+  }, [phaseId])
+
   return (
-    <div>
+    <Spin spinning={loading}>
       <Form {...formItemLayout} onSubmit={e => e.preventDefault()}>
-        <Form.Item label="收费组名称">
+        <Form.Item label="小区" required>
+          <CommunitySelect value={communityId} onChange={v => setCommunityId(v)} autoInited />
+        </Form.Item>
+        <Form.Item label="期/区">
+          <Select onChange={v => setPhaseId(v)} placeholder="期/区" allowClear>
+            {
+              phaseList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+            }
+          </Select>
+        </Form.Item>
+        <Form.Item label="楼栋">
+          <Select onChange={v => setBuildingId(v)} placeholder="栋" allowClear>
+            {
+              buildingList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+            }
+          </Select>
+        </Form.Item>
+        <Form.Item label="收费名称">
         {
           getFieldDecorator('billName', {
             rules: [
-              { required: true, message: '请填写收费组名称', },
+              { required: true, message: '请填写收费名称', },
             ],
           })(<Input />)
         }
         </Form.Item>
-        <Form.Item label="收费组说明">
+        {/* <Form.Item label="收费组说明">
         {
           getFieldDecorator('billExplain', {
             rules: [
             ],
           })(<Input />)
         }
-        </Form.Item>
-        <Form.Item label="截止时间">
-        {
-          getFieldDecorator('endDate', {
-            rules: [
-              { required: true, message: '请填写公告内容', },
-            ],
-          })(<DatePicker />)
-        }
+        </Form.Item> */}
+        <Form.Item label="缴费时间" required>
+          <DatePicker.RangePicker value={rangeDate} onChange={v => setRangeDate(v)} style={{width: '100%'}} />
         </Form.Item>
         <Form.Item label=" " colon={false}>
-          <AddOn dataSource={addOnData} onFileInput={f => file.current = f}/>
+          <AddOn dataSource={addOnData} onFileInput={f => file.current = f} communityId={communityId} phaseId={phaseId} buildingId={buildingId} />
         </Form.Item>
         <Form.Item {...tailFormItemLayout} >
-          <Button type="primary" onClick={() => handleSubmit(2)}>草稿</Button>
+          {/* <Button type="primary" onClick={() => handleSubmit(2)}>草稿</Button> */}
           <Button type="danger" style={{ marginLeft: '24px' }} onClick={() => handleSubmit(0)}>发布</Button>
           <Button style={{ marginLeft: '24px' }} onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>
       </Form>
-    </div>
+    </Spin>
   )
 })

src/pages/property/bill/info/Add.jsx

 import List from '../../components/List'
 import AddOne from './components/AddOne'
 
+const getBillInfoBydId = fetch(apis.bill.getBillInfoBydId)
 const getTempBillInvoice = fetch(apis.bill.getTempBillInvoice)
 const addTempBillInvoice = fetch(apis.bill.addTempBillInvoice)
 const deleteTempBillInvoice = fetch(apis.bill.deleteTempBillInvoice)
 export default props => {
   const [loading, setLoading] = useState(false)
   const [showAdd, setShowAdd] = useState(false)
+  const [billInfo, setBillInfo] = useState({})
   const [listData, setListData] = useState([])
+  const [communityId, setCommunityId] = useState()
   const [formData, setFormData] = useState({})
 
   const { id } = props.location.query
   const handleAdd = (vals, callback) => {
     addTempBillInvoice({data: {
       billId: id,
+      communityId: billInfo.communityId,
       ...vals,
     }}).then(res => {
       callback()
   useEffect(() => {
     if (id) {
       getListData()
+      getBillInfoBydId({urlData: {id}}).then(x => setBillInfo(x))
     }
     getListData()
   }, [])
         />
       </List>
       <Modal title="收费组信息" visible={showAdd} footer={null} maskClosable={false} destroyOnClose onCancel={() => setShowAdd(false)}>
-        <AddOne onSubmit={handleAdd} onCancel={() => setShowAdd(false)} />
+        <AddOne communityId={billInfo.communityId} onSubmit={handleAdd} onCancel={() => setShowAdd(false)} />
       </Modal>
     </div>
   )

src/pages/property/bill/info/components/AddOne.jsx

     unitList,
     levelList,
     roomNoList
-  } = useRoomSelect()
+  } = useRoomSelect(props.communityId)
+
   const [formData, setFormData] = useState({})
 
   const [phaseErr, setPhaseErr] = useState('')
           }
         </Select>
       </Form.Item>
-      <Form.Item label="收费单说明">
+      <Form.Item label="收费名称">
       {
         props.form.getFieldDecorator('billInvoiceExplain', {
           rules: [
-            {required: true, message: '请填写收费单说明'}
+            {required: true, message: '请填写收费名称'}
           ]
-        })(<Input placeholder="收费单说明" />)
+        })(<Input placeholder="收费名称" />)
       }
       </Form.Item>
       <Form.Item label="收费金额(元)">

src/pages/property/bill/info/components/Edit.jsx

-import React, { useEffect, useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import { Modal, Form, Input, DatePicker, Button } from 'antd'
 import moment from 'moment'
 
     e.preventDefault()
     props.form.validateFields((err, values) => {
       if (!err && props.onSubmit) {
-        const endDate = values.endDate ? moment(values.endDate).toDate() : undefined
-        props.onSubmit({...values, endDate})
+        const startDate = values.startDate ? moment(values.startDate).format('YYYY-MM-DDT00:00:00[Z]') : undefined
+        const endDate = values.endDate ? moment(values.endDate).format('YYYY-MM-DDT23:59:59[Z]') : undefined
+        props.onSubmit({...values, startDate, endDate})
       }
     })
   }
 
   useEffect(() => {
     const vals = props.initialData || {}
+    const startDate = vals.startDate ? moment(vals.startDate) : undefined
     const endDate = vals.endDate ? moment(vals.endDate) : undefined
-    props.form.setFieldsValue({...vals, endDate})
+    props.form.setFieldsValue({...vals, startDate, endDate})
   }, [props.initialData])
 
   return (
-    <Modal title="收费组信息" visible={props.visible} footer={null} maskClosable={false} destroyOnClose onCancel={props.onCancel}>
+    <Modal title="收费信息" visible={props.visible} footer={null} maskClosable={false} onCancel={props.onCancel}>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
-        <Form.Item label="收费组名称">
+        <Form.Item label="收费名称">
         {
           props.form.getFieldDecorator('billName', {
             rules: [
-              { required: true, message: '请填写收费组名称' },
+              { required: true, message: '请填写收费名称' },
             ],
           })(<Input placeholder="收费组名称" />)
         }
         </Form.Item>
-        <Form.Item label="收费组说明">
+        <Form.Item label="开始时间">
         {
-          props.form.getFieldDecorator('billExplain', {
+          props.form.getFieldDecorator('startDate', {
             rules: [
-              { required: true, message: '请填写收费组说明' },
+              { required: true, message: '请选择开始时间' },
             ],
-          })(<Input placeholder="收费组说明" />)
+          })(
+            <DatePicker placeholder="请选择开始时间" />
+          )
         }
         </Form.Item>
         <Form.Item label="截止时间">
               { required: true, message: '请选择截止时间' },
             ],
           })(
-            <DatePicker showTime placeholder="请选择截止时间" />
+            <DatePicker placeholder="请选择截止时间" />
           )
         }
         </Form.Item>

src/pages/property/bill/info/index.jsx

 
 const BillStatusDict = [
   { value: '0', label: '未缴费' },
-  { value: '1', label: '已线上缴费' },
-  { value: '2', label: '已线下缴费' },
+  { value: '1', label: '已缴费' },
+  // { value: '2', label: '已线下缴费' },
+  { value: '3', label: '支付中' },
 ]
 
 const PayTypeDict = [
     unitList,
     levelList,
     roomNoList
-  } = useRoomSelect()
+  } = useRoomSelect(props.communityId)
   
   const handleSearch = vals => {
     const data = {
         style={{ borderBottom: '1px solid rgb(235, 237, 240)' }}
       >
         <Descriptions column={3}>
-          <Descriptions.Item label="收费组名称">{billData.billName}</Descriptions.Item>
-          <Descriptions.Item label="截止时间">{billData.endDate}</Descriptions.Item>
-          <Descriptions.Item label="收费组说明">
-            <Typography.Text ellipsis>{billData.billExplain}</Typography.Text>
-          </Descriptions.Item>
+          <Descriptions.Item label="收费名称">{billData.billName}</Descriptions.Item>
+          <Descriptions.Item label="开始时间">{(billData.startDate || '').substring(0, 10)}</Descriptions.Item>
+          <Descriptions.Item label="截止时间">{(billData.endDate || '').substring(0, 10)}</Descriptions.Item>
         </Descriptions>
       </PageHeader>
 
       <div style={{margin: '36px 0'}}>
-        <Condition onSearch={handleSearch} onReset={handleSearch} />
+        <Condition onSearch={handleSearch} communityId={billData.communityId} onReset={handleSearch} />
       </div>
 
       <div style={{margin: '24px 0'}}>
           <Table.Column title="缴费途径" dataIndex="payType" key="payType" render={t => getDictLabel(PayTypeDict, t)} />
           <Table.Column title="缴费人" dataIndex="payName" key="payName" />
           <Table.Column title="缴费时间" dataIndex="payDate" key="payDate" />
-          <Table.Column title="新建时间" dataIndex="createDate" key="createDate" render={t => moment(t).format('YYYY-MM-DD HH:mm')} />
+          {/* <Table.Column title="新建时间" dataIndex="createDate" key="createDate" render={t => t ? moment(t).format('YYYY-MM-DD HH:mm') : ''} />
           <Table.Column title="新建人" dataIndex="createUserName" key="createUserName" />
-          <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" render={t => moment(t).format('YYYY-MM-DD HH:mm')}/>
-          <Table.Column title="修改人" dataIndex="updateUserName" key="updateUserName" />
+          <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" render={t => t ? moment(t).format('YYYY-MM-DD HH:mm'): ''}/>
+          <Table.Column title="修改人" dataIndex="updateUserName" key="updateUserName" /> */}
           <Table.Column
             title="操作"
             key="action"

src/pages/property/bill/list/index.jsx

 import React, { useRef, useState, useEffect } from 'react'
-import { Spin, Form, Input, Divider, Button, Row, Col, Popconfirm } from 'antd'
+import { Spin, Form, Input, Divider, Button, Row, Col, Popconfirm, DatePicker, Select } from 'antd'
 import router from 'umi/router'
 import NavLink from 'umi/navlink'
+import moment from 'moment'
 import { fetch, fetchList, apis } from '@/utils/request'
+import CommunitySelect from '@/components/CommunitySelect'
 import Search from '../../components/Search'
 import List from '../../components/List'
 
 
 const Condition = props => {
+  const [communityId, setCommunityId] = useState()
+  const [rangeDate, setRangeDate] = useState([])
+
+  const handleCommunityChange = v => {
+    setCommunityId(v)
+
+    props.onCommunityChange(v)
+  }
+
+  const handleSearch = v => {
+    props.onSearch({
+      ...v,
+      startDate: rangeDate[0] ? rangeDate[0].format('YYYY-MM-DD') : undefined,
+      endDate: rangeDate[1] ? rangeDate[1].format('YYYY-MM-DD') : undefined,
+    })
+  }
+
+  const handleReset = v => {
+    setRangeDate([])
+    props.onReset({
+      ...v,
+      startDate: undefined,
+      endDate: undefined,
+    })
+  }
+
   return (    
     <Search
-      onSearch={props.onSearch}
-      onReset={props.onReset}
+      onSearch={handleSearch}
+      onReset={handleReset}
       render={form => {
         const { getFieldDecorator } = form
 
         return (
           <>
-            <Form.Item label="收费组编号">
+            <Form.Item label="小区">
+              <CommunitySelect value={communityId} onChange={handleCommunityChange} autoInited />
+            </Form.Item>
+            <Form.Item label="收费ID">
             {
               getFieldDecorator('billId')(<Input />)
             }
             </Form.Item>
-            <Form.Item label="收费组名">
+            <Form.Item label="收费名称">
             {
               getFieldDecorator('billName')(<Input />)
             }
             </Form.Item>
-            <Form.Item label="收费组说明">
+            <Form.Item label="收费时间">
+              <DatePicker.RangePicker value={rangeDate} onChange={v => setRangeDate(v)} />
+            </Form.Item>
+            <Form.Item label="收费类型">
             {
-              getFieldDecorator('billExplain')(<Input />)
+              getFieldDecorator('isTicket')(
+                <Select style={{minWidth: 100}} allowClear>
+                  <Select.Option value={1}>物业</Select.Option>
+                  <Select.Option value={0}>工单</Select.Option>
+                </Select>
+              )
             }
             </Form.Item>
           </>
 const TableList = props => {
   const columns = [
     {
-      title: '收费组编号',
+      title: '收费编号',
       dataIndex: 'id',
       key: 'id',
       align: 'center',
     },
     {
-      title: '收费组名称',
+      title: '类型',
+      dataIndex: 'isTicket',
+      key: 'isTicket',
+      render: t => t === 1 || t === true ? '工单' : '物业'
+    },
+    {
+      title: '收费名称',
       dataIndex: 'billName',
       key: 'billName',
     },
     {
-      title: '收费组说明',
-      dataIndex: 'billExplain',
-      key: 'billExplain',
+      title: '收费时间',
+      dataIndex: 'startDate',
+      key: 'startDate',
+      render: (t, row) => `${row.startDate ? moment(row.startDate).format('YYYY-MM-DD') : '--'} ~ ${row.endDate ? moment(row.endDate).format('YYYY-MM-DD') : '--'}`
     },
     {
       title: '应缴户数',
       key: 'unpayedNum',
     },
     {
-      title: '收费组状态',
+      title: '收费状态',
       key: 'billStatus',
       render: (t, row) => {
         switch (row.billStatus) {
           case '0':
-            return '正在收费'
+            return '进行中'
           case '1':
-            return '收费完成'
+            return '完成'
           case '2':
             return '草稿'
           default:
         }
       }
     },
-    {
-      title: '发布时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      render: dt => (dt || '').substr(0, 16)
-    },
-    {
-      title: '截止时间',
-      dataIndex: 'endDate',
-      key: 'endDate',
-      render: dt => (dt || '').substr(0, 16)
-    },
     {
       title: '操作',
       key: 'action',
   const [listData, setListData] = useState([])
   const [pagination, setPagination] = useState({})
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  const [communityId, setCommunityId] = useState()
   
   const handleQuery = vals => {
     setQueryParams({
   }
 
   useEffect(() => {
-    setLoading(true)
-    FetchBillList(queryParams).then(res => {
-      const {list, ...pagi} = res[1]
-      setListData(list)
-      setPagination(pagi)
-      setLoading(false)
-    })
-  }, [queryParams])
+    if (communityId) {
+      setLoading(true)
+      FetchBillList({...queryParams, communityId}).then(res => {
+        const {list, ...pagi} = res[1]
+        setListData(list)
+        setPagination(pagi)
+        setLoading(false)
+      })
+    }
+  }, [queryParams, communityId])
 
   return (
     <div>
-      <Condition onReset={handleQuery} onSearch={handleQuery} />
+      <Condition onReset={handleQuery} onSearch={handleQuery} onCommunityChange={v => setCommunityId(v)} />
       <div style={{ margin: '24px 0' }}>
         <NavLink to={`/property/bill/management/add`}>
           <Button type="primary">添加</Button>

src/pages/property/bill/order/index.jsx

 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider, Icon } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Icon, DatePicker } from 'antd'
 import NavLink from 'umi/navlink'
+import moment from 'moment';
 import { fetchList, apis, fetch } from '@/utils/request'
 import Search from '../../components/Search'
 import List from '../../components/List'
 
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
 const exportStatementExcel = fetch(apis.bill.exportStatementExcel)
 const getBillStatementAll = fetch(apis.bill.getBillStatementAll)
 
   '3': '已关闭',
 }
 
+const PayStatusDict = [
+  {
+    label: '未支付',
+    value: '0',
+  },
+  {
+    label: '已支付',
+    value: '1',
+  },
+  {
+    label: '支付中',
+    value: '2',
+  },
+  {
+    label: '已关闭',
+    value: '3',
+  },
+]
+
 const PayTypeDict = {
   '0': '微信缴费',
   '1': '线下缴费',
-  '2': '支付宝缴费',
+  // '2': '支付宝缴费',
 }
 
+const PayTypesDict = [
+  {
+    label: '微信缴费',
+    value: '0',
+  },
+  {
+    label: '线下缴费',
+    value: '1',
+  },
+]
+
 const Condition = props => {
   return (
     <Search
               getFieldDecorator('payPhone')(<Input placeholder="缴费人手机号" />)
             }
             </Form.Item>
+            <Form.Item label="订单状态">
+            {
+              getFieldDecorator('orderStatus')(
+                <Select placeholder="选择订单状态" style={{ width: '120px' }}>
+                  {
+                    PayStatusDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
+                  }
+                </Select>
+              )
+            }
+            </Form.Item>
+            <Form.Item label="缴费方式">
+            {
+              getFieldDecorator('payType')(
+                <Select placeholder="选择缴费方式" style={{ width: '120px' }}>
+                  {
+                    PayTypesDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
+                  }
+                </Select>
+              )
+            }
+            </Form.Item>
+            <Form.Item label="缴费时间">
+            {getFieldDecorator('createTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
           </>
         )
       }}
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
 
   const handleSearch = vals => {
+    let { createTime, ...submitValue  } = vals
+    if (null != createTime && createTime.length > 0) {
+      const [startCreateDate, endCreateDate] = createTime
+      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+    } else {
+      submitValue.startCreateDate = null
+      submitValue.endCreateDate = null
+    }
     setQueryParams({
       ...queryParams,
-      ...vals,
+      ...submitValue,
       pageNum: 1,
     })
   }
           dataIndex="orderStatus"
           key="orderStatus"
           render={(_, row) => StatusDict[row.orderStatus]}
+          sorter={(a, b) => a.orderStatus - b.orderStatus}
         />
         <Table.Column title="缴费人手机号" dataIndex="payPhone" key="payPhone" />
         <Table.Column title="缴费备注" dataIndex="payRemark" key="payRemark" />
         <Table.Column title="缴费方式" dataIndex="payType" key="payType" render={payType => PayTypeDict[payType]}/>
-        <Table.Column title="订单生成时间" dataIndex="createTime" key="createTime" />
-        <Table.Column title="缴费完成时间" dataIndex="updateDate" key="updateDate" />
+        <Table.Column title="订单生成时间" dataIndex="createDate" key="createDate" 
+          sorter={(a, b) => new Date(a.createDate).getTime() - new Date(b.createDate).getTime()}/>
+        <Table.Column title="缴费完成时间" dataIndex="createTime" key="createTime" 
+          sorter={(a, b) => new Date(a.createTime).getTime() - new Date(b.createTime).getTime()}/>
       </List>
 
     </div>

src/pages/property/building/BatchImport.jsx

         excelRef.current = files[0]
         const formData = new FormData()
         formData.append('file', excelRef.current)
+        formData.append("communityId", props.community)
         
         setLoading(true)
         uploadBuildingTreeExcel({ data: formData }).then(res => {
 
     const formData = new FormData()
     formData.append('file', excelRef.current)
+    formData.append("communityId", props.community)
 
     setLoading(true)
     submitBuildingTreeExcel({ data: formData }).then(res => {

src/pages/property/building/components/Building.jsx

+import React, { useEffect, useState } from 'react'
+import { Tabs, Spin, Button, Icon, Modal, notification } from 'antd'
+import { fetch, fetchList, apis } from '@/utils/request'
+import Prompt from '@/components/Prompt'
+import BuildingUnit from './BuildingUnit'
+
+const fetchBuildingList = fetch(apis.buildingOwnerInfo.getBuildingList)
+const addNode = fetch(apis.buildingOwnerInfo.addNode)
+const deleteNode = fetch(apis.buildingOwnerInfo.deleteNode)
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [buildingVisible, setBuildingVisible] = useState(false)
+  const [buildingList, setBuildingList] = useState([])
+
+  const handleAddBuilding = v => {
+    addNode({ data: {
+      id: props.phase.id,
+      name: props.phase.name,
+      type: 'building',
+      nodeNumber: v,
+      communityId: props.community,
+    }}).then((res) => {
+      notification.success({message: '添加成功'})
+      setBuildingList(buildingList.concat(res))
+    })
+    setBuildingVisible(false)
+  }
+
+  const handleDeleteBuilding = building => {
+    Modal.confirm({
+      title: `确认删除 ${building.name} 数据?`,
+      content: '谨慎操作, 数据不可恢复',
+      onOk: () => {
+        deleteNode({ data: {
+          id: building.id,
+          name: building.name,
+          type: 'unit', // 删除的时候, type 是 unit 。这个接口比较诡异
+          nodeNumber: building.name,
+        }}).then(() => {
+          notification.success({message: '删除成功'})
+          setBuildingList(buildingList.filter(x => x.id !== building.id))
+        })
+
+      }
+    })
+  }
+
+  useEffect(() => {
+    if (props.phase && props.phase.id) {
+      setLoading(true)
+      fetchBuildingList({params: {phaseId: props.phase.id}}).then(res => {
+        setBuildingList(res)
+        setLoading(false)
+      }).catch(() => setLoading(false))
+    }
+  }, [props.phase])
+
+  return (
+    <div style={{marginTop: 8}}>
+      <Spin spinning={loading}>
+        <Tabs
+          defaultActiveKey="0"
+          type="line"
+          tabPosition="left"
+          tabBarExtraContent={<Button type="link" onClick={() => setBuildingVisible(true)}><Icon type="plus" />栋</Button>}
+        >
+        {
+          buildingList.map((building, index) => {
+            return (
+              <Tabs.TabPane
+                key={`${index}`}
+                tab={<span>{building.name} <Icon type="close" style={{fontSize: '0.8em', color: '#888', marginLeft: 8}} onClick={() => handleDeleteBuilding(building)} /></span>}
+              >
+                <BuildingUnit building={building} phase={props.phase} community={props.community} />
+              </Tabs.TabPane>
+            )
+          })
+        }
+        </Tabs>
+      </Spin>
+      <Prompt visible={buildingVisible} onOk={handleAddBuilding} onCancel={() => setBuildingVisible(false)} placeholder="请填写楼栋名称" />
+    </div>
+  )
+}

src/pages/property/building/components/BuildingLevelCell.jsx

+import React, { useEffect, useState } from 'react'
+import { Menu, Dropdown, Button, Popconfirm, Icon, notification } from 'antd'
+import Prompt from '@/components/Prompt'
+import { fetchList, fetch, apis } from '@/utils/request'
+
+const addNode = fetch(apis.buildingOwnerInfo.addNode)
+const updateNode = fetch(apis.buildingOwnerInfo.updateNode)
+const deleteNode = fetch(apis.buildingOwnerInfo.deleteNode)
+
+export default props => {
+  const [roomInfo, setRoomInfo] = useState({})
+  const [levelVisible, setLevelVisible] = useState(false)
+  const [houseVisible, setHouseVisible] = useState(false)
+
+  const handleEdit = val => {
+    updateNode({ data: {
+      id: roomInfo.levelId,
+      name: val,
+      type: 'level',
+    }}).then(() => {
+      const room = {
+        ...roomInfo,
+        levelName: val
+      }
+      if (props.onEdit) {
+        props.onEdit(room)
+      }
+      notification.success({message: '修改成功'})
+    })
+    setLevelVisible(false)
+  }
+
+  const handleDelete = () => {
+    deleteNode({ data: {
+      id: roomInfo.levelId,
+      name: roomInfo.levelName,
+      type: 'roomNo',   // 删除楼层传 roomNo
+      nodeNumber: undefined,
+    }}).then(() => {
+      if (props.onDelete) {
+        props.onDelete(roomInfo)
+      }
+      notification.success({message: '删除成功'})
+    })
+  }
+
+  const handleHouseAdd = val => {
+    addNode({ data: {
+      id: roomInfo.levelId,
+      name: roomInfo.levelName,
+      type: 'roomNo',
+      nodeNumber: val,
+      communityId: props.community,
+    }}).then((res) => {
+      if (props.onHouseAdd) {
+        props.onHouseAdd(res)
+      }
+      notification.success({message: '添加成功'})
+    })
+    setHouseVisible(false)
+  }
+
+  const menu = (
+    <Menu>
+      <Menu.Item>
+        <Button type="link" onClick={() => setHouseVisible(true)}><Icon type="plus" />房</Button>
+      </Menu.Item>
+      <Menu.Item>
+        <Button type="link" onClick={() => setLevelVisible(true)}>编辑</Button>
+      </Menu.Item>
+      <Menu.Item>
+        <Popconfirm
+         title={`确认删除 ${roomInfo.levelName}`}
+         onConfirm={handleDelete}
+         okText="是"
+         cancelText="否"
+        >
+          <Button type="danger" ghost style={{border: 'none', boxShadow: 'none'}}>删除</Button>
+        </Popconfirm>
+      </Menu.Item>
+    </Menu>
+  );
+  
+  useEffect(() => {
+    setRoomInfo(props.dataSource || {})
+  }, [props.dataSource])
+
+  return (
+    <span>
+      <Dropdown overlay={menu} trigger={['contextMenu']} placement="topCenter">
+        <div style={{cursor: 'pointer'}}>{roomInfo.levelName}</div>
+      </Dropdown>
+      <Prompt visible={levelVisible} onOk={handleEdit} onCancel={() => setLevelVisible(false)} placeholder="请填写楼层名称" />
+      <Prompt visible={houseVisible} onOk={handleHouseAdd} onCancel={() => setHouseVisible(false)} placeholder="请填写房室名称" />
+    </span>
+  )
+}

src/pages/property/building/components/BuildingLevelRow.jsx

+import React, { useEffect, useMemo, useRef, useState } from 'react'
+import { Table, Spin, Menu, Dropdown, Button, Popconfirm, Icon, notification } from 'antd'
+import { maxBy } from 'lodash'
+import Prompt from '@/components/Prompt'
+import { fetchList, fetch, apis } from '@/utils/request'
+import BuildingRoomCell from './BuildingRoomCell'
+import BuildingLevelCell from './BuildingLevelCell'
+import BuildingUnitCell from './BuildingUnitCell'
+
+const addNode = fetch(apis.buildingOwnerInfo.addNode)
+const updateNode = fetch(apis.buildingOwnerInfo.updateNode)
+const deleteNode = fetch(apis.buildingOwnerInfo.deleteNode)
+
+const nvlIdStart = 'tmp'
+
+export default props => {
+  const [dataList, setDataList] = useState([])
+  const [roomNum, setRoomNum] = useState(0)
+
+  // 表格列
+  const columns = useMemo(() => {
+    const rooms = new Array(roomNum).fill()
+
+    return [
+      // 楼层字段
+      {
+        title: '#',
+        dataIndex: 'levelName',
+        key: 'levelName',
+        width: 80,
+        align: 'center',
+        render: (t, row) => (
+          <BuildingLevelCell
+            dataSource={row}
+            community={props.community}
+            onHouseAdd={props.onHouseAdd}
+            onEdit={props.onLevelEdit}
+            onDelete={props.onLevelDelete}
+          />
+        )
+      },
+      ...rooms.map((_, index) => ({
+        title: `房间 ${index + 1}`,
+        dataIndex: `name-${index}`,
+        key: `name-${index}`,
+        align: 'center',      
+        render: (t, row) => (
+          <BuildingRoomCell
+            dataSource={{
+              ...row,
+              id: row[`id-${index}`],
+              name: row[`name-${index}`]
+            }}
+            community={props.community}
+            onEdit={props.onHouseEdit}
+            onDelete={props.onHouseDelete}
+          />
+        )
+      }))
+    ]
+  }, [roomNum, props])
+  
+  useEffect(() => {
+    const list = (props.dataSource || []).slice()
+    if (!list.length) {
+      return
+    }
+
+    // 找到 房间最多的那层, 然后所有的楼层都按照这个房间数造数据
+    const maxRooms = maxBy(list, x => x.length)
+    setRoomNum(maxRooms.length)
+
+    // 合并同楼层的房间
+    const zipedList = list.map(rooms => {
+      return maxRooms.reduce((acc, _, index) => {
+        const room = rooms[index] || {}
+
+        return {
+          ...acc,
+          ...room,
+          id: acc.id || room.id || `${nvlIdStart}-${Math.random().toString(36).substring(2)}`,
+          [`id-${index}`]: room.id,
+          [`name-${index}`]: room.name || '#'
+        }
+      }, {})
+    })
+
+    setDataList(zipedList)
+  }, [props.dataSource])
+
+  // 任意一个房间数据都可以
+  // 因为所有房间的单元信息都是一样的
+  const anyRoom = dataList[0]
+
+  return (
+    <div>
+      <BuildingUnitCell
+        dataSource={anyRoom}
+        community={props.community}
+        onLevelAdd={props.onLevelAdd}
+        onEdit={props.onUnitEdit}
+        onDelete={props.onUnitDelete}
+      />
+      <Table
+        columns={columns}
+        dataSource={dataList}
+        pagination={false}
+        rowKey="id"
+        size="middle"
+        bordered
+      />
+    </div>
+  )
+}

src/pages/property/building/components/BuildingRoomCell.jsx

+import React, { useEffect, useState } from 'react'
+import { Menu, Dropdown, Button, Popconfirm, Icon, notification } from 'antd'
+import Prompt from '@/components/Prompt'
+import { fetchList, fetch, apis } from '@/utils/request'
+
+const addNode = fetch(apis.buildingOwnerInfo.addNode)
+const updateNode = fetch(apis.buildingOwnerInfo.updateNode)
+const deleteNode = fetch(apis.buildingOwnerInfo.deleteNode)
+
+export default props => {
+  const [houseVisible, setHouseVisible] = useState(false)
+  const [roomInfo, setRoomInfo] = useState({})
+
+  const handleDelete = () => {
+    deleteNode({ data: {
+      id: roomInfo.id,
+      name: roomInfo.name,
+      type: 'end',   // 删除房间传 end
+      nodeNumber: undefined,
+    }}).then(() => {
+      if (props.onDelete) {
+        props.onDelete(roomInfo)
+      }
+      notification.success({message: '删除成功'})
+    })
+  }
+
+  const handleEdit = val => {
+    if (!roomInfo.id) {
+      addNode({ data: {
+        id: roomInfo.levelId,
+        name: roomInfo.levelName,
+        type: 'roomNo',
+        nodeNumber: val,
+        communityId: props.community,
+      }}).then((res) => {
+        if (props.onEdit) {
+          props.onEdit(res)
+        }
+        notification.success({message: '修改成功'})
+      })
+    } else {
+      updateNode({ data: {
+        id: roomInfo.id,
+        name: val,
+        type: 'roomNo',
+      }}).then(() => {
+        const room = {
+          ...roomInfo,
+          name: val
+        }
+
+        if (props.onEdit) {
+          props.onEdit(room)
+        }
+        notification.success({message: '修改成功'})
+      })
+    }
+    setHouseVisible(false)
+  }
+
+  const menu = (
+    <Menu>
+      <Menu.Item>
+        <Button type="link" onClick={() => setHouseVisible(true)}>编辑</Button>
+      </Menu.Item>
+      {
+        roomInfo.id && (
+          <Menu.Item>
+            <Popconfirm
+             title={`确认删除 ${roomInfo.name} ?`}
+             onConfirm={handleDelete}
+             okText="是"
+             cancelText="否"
+            >
+              <Button type="danger" ghost style={{border: 'none', boxShadow: 'none'}}>删除</Button>
+            </Popconfirm>
+          </Menu.Item>
+        )
+      }
+    </Menu>
+  );
+
+  useEffect(() => {
+    setRoomInfo(props.dataSource || {})
+  }, [props.dataSource])
+
+  return (
+    <span>
+      <Dropdown overlay={menu} trigger={['contextMenu']} placement="topCenter">
+        <div style={{cursor: 'pointer'}}>{roomInfo.name}</div>
+      </Dropdown>
+      <Prompt visible={houseVisible} onOk={handleEdit} onCancel={() => setHouseVisible(false)} placeholder="请填写房室名称" />
+    </span>
+  )
+}

src/pages/property/building/components/BuildingUnit.jsx

+import React, { useEffect, useMemo, useState, useCallback } from 'react'
+import { Table, Spin, Button, Icon, notification } from 'antd'
+import { fetchList, fetch, apis } from '@/utils/request'
+import { groupBy, orderBy } from 'lodash'
+import Prompt from '@/components/Prompt'
+import BuildingLevelRow from './BuildingLevelRow'
+
+const fetchBuildingList = fetchList(apis.buildingOwnerInfo.getAllRoomNoList)
+const addNode = fetch(apis.buildingOwnerInfo.addNode)
+const deleteNode = fetch(apis.buildingOwnerInfo.deleteNode)
+
+const getNumFromStr = str => {
+  return ((str || '').match(/\d+/g) || []).join('') - 0
+}
+
+/**
+ * 房间排序规则
+ * 1、维护内容必须有数字
+ * 2、单元 从小到大
+ * 3、楼层 从大到小
+ * 4、房号 从小到大
+ * @param {*} room 
+ */
+const sortRoomList = roomList => {
+  return orderBy(roomList,
+    [
+      room => getNumFromStr(room.unitName),
+      room => getNumFromStr(room.levelName),
+      room => getNumFromStr(room.name),
+    ],
+    [
+      'asc',
+      'desc',
+      'asc'
+    ]
+  )
+}
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [unitVisible, setUnitVisible] = useState(false)
+  const [roomList, setRoomList] = useState([])
+  const [roomGroup, setRoomGroup] = useState({})
+  
+  const handleAddUnit = v => {
+    addNode({ data: {
+      id: props.building.id,
+      name: props.building.name,
+      type: 'unit',
+      nodeNumber: v,
+      communityId: props.community,
+    }}).then((res) => {
+      // 构造房间数据
+      const roomInfo = {
+        ...res,
+        unitId: res.id,
+        unitName: res.name,
+        id: undefined,
+        name: undefined,
+        levelId: undefined,
+        levelName: undefined,
+      }
+
+      setRoomList(roomList.concat(roomInfo))
+      notification.success({message: '添加成功'})
+    })
+    setUnitVisible(false)
+  }
+
+  const handleDeleteUnit = room => {
+    setRoomList(roomList.filter(r => r.unitId !== room.unitId))
+  }
+
+  const addHouse = useCallback(
+    room => {
+      // 如果有空房间, 直接替换空房间，否则新增一条记录
+      let nvlRoom = false
+  
+      let newList = roomList.map(item => {
+        if (room.phaseId === item.phaseId &&
+          room.buildingId === item.buildingId &&
+          room.unitId === item.unitId &&
+          room.levelId === item.levelId &&
+          !item.id && !nvlRoom) {
+            nvlRoom = true
+            return room
+          } else {
+            return item
+          }
+      })
+  
+      if (!nvlRoom) {
+        newList = newList.concat(room)
+      }
+  
+      setRoomList(sortRoomList(newList))
+    },
+    [roomList],
+  )
+
+  const handleHouseAdd = room => {
+    addHouse(room)
+  }
+
+  // 如果编辑 # 的房间, 实际上是新增房间
+  const handleHouseEdit = room => {
+    let edited = false
+    const newList = roomList.map(r => {
+      if (r.id === room.id) {
+        edited = true
+        return room
+      } else {
+        return r
+      }
+    })
+
+    if (edited) {
+      setRoomList(newList)
+    } else {
+      addHouse(room)
+    }
+  }
+
+  const handleHouseDelete = room => {
+    let newList = []
+    // 如果本层只有一个房间, 那么替换为空, 不删除数据
+    const sameLevelRooms = roomList.filter(r => r.levelId === room.levelId)
+    if (sameLevelRooms.length === 1) {
+      newList = roomList.map(item => {
+        if (item.id === room.id) {
+          return {
+            ...room,
+            id: undefined,
+            name: undefined,
+          }
+        } else {
+          return item
+        }
+      })
+    } else {
+      newList = roomList.filter(r => r.id !== room.id)
+    }
+    setRoomList(newList)
+  }
+
+  const handleLevelAdd = room => {
+    // 如果有空房间，替换空房间
+    let nvlRoom = false
+  
+    let newList = roomList.map(item => {
+      if (room.phaseId === item.phaseId &&
+        room.buildingId === item.buildingId &&
+        room.unitId === item.unitId &&
+        !item.levelId && !nvlRoom) {
+          nvlRoom = true
+          return room
+        } else {
+          return item
+        }
+    })
+
+    if (!nvlRoom) {
+      newList = newList.concat(room)
+    }
+
+    setRoomList(sortRoomList(newList))
+  }
+
+  const handleLevelEdit = room => {
+    setRoomList(roomList.map(item => {
+      return item.levelId === room.levelId ?
+        {...item, levelName: room.levelName} :
+        item
+    }))
+  }
+
+  const handleLevelDelete = room => {
+    setRoomList(roomList.filter(r => r.levelId !== room.levelId))
+  }
+
+  useEffect(() => {
+    if (props.building && props.phase && props.building.id && props.phase.id) {
+      setLoading(true)
+      fetchBuildingList({pageNum: 1, pageSize: 9999, phaseId: props.phase.id, buildingId: props.building.id}).then(res => {
+        const [list = []] = res || []
+        setRoomList(sortRoomList(list))
+        setLoading(false)
+      }).catch(e => console.error(e) || setLoading(false))
+    }
+  }, [props.building, props.phase])
+
+  useEffect(() => {
+    const groupByUnit = groupBy(roomList, row => [row.unitId, row.unitName].join(','))
+    const groupByLevel = Object.keys(groupByUnit).reduce((acc, key) => {
+      const groupWithLevelKey = groupBy(groupByUnit[key], row => [row.levelId, row.levelName].join(','))
+      const pureLevelArr = Object.keys(groupWithLevelKey).map(k => groupWithLevelKey[k])
+
+      return {
+        ...acc,
+        [key]: pureLevelArr
+      }
+    }, {})
+
+    setRoomGroup(groupByLevel)
+  }, [roomList])
+
+  return (
+    <div>
+      <Button style={{marginLeft: 24}} onClick={() => setUnitVisible(true)}><Icon type="plus" />单元</Button>
+      <Spin spinning={loading}>
+        <div style={{display: 'flex', overflowX: 'auto'}}>
+        {
+          Object.keys(roomGroup).map(key => {
+            return (
+              <div style={{flex: 'none', marginLeft: 48}} key={key}>
+                <BuildingLevelRow
+                  dataSource={roomGroup[key]}
+                  community={props.community}
+                  onUnitDelete={handleDeleteUnit}
+                  onHouseAdd={handleHouseAdd}
+                  onHouseEdit={handleHouseEdit}
+                  onHouseDelete={handleHouseDelete}
+                  onLevelAdd={handleLevelAdd}
+                  onLevelEdit={handleLevelEdit}
+                  onLevelDelete={handleLevelDelete}
+                />
+              </div>
+            )
+          })
+        }
+        </div>
+      </Spin>
+      <Prompt visible={unitVisible} onOk={handleAddUnit} onCancel={() => setUnitVisible(false)} placeholder="请填写单元名称" />
+    </div>
+  )
+}

src/pages/property/building/components/BuildingUnitCell.jsx

+import React, { useEffect, useState } from 'react'
+import { Menu, Dropdown, Button, Popconfirm, Icon, notification } from 'antd'
+import Prompt from '@/components/Prompt'
+import { fetchList, fetch, apis } from '@/utils/request'
+
+const addNode = fetch(apis.buildingOwnerInfo.addNode)
+const updateNode = fetch(apis.buildingOwnerInfo.updateNode)
+const deleteNode = fetch(apis.buildingOwnerInfo.deleteNode)
+
+export default props => {
+  const [roomInfo, setRoomInfo] = useState({})
+  const [unitVisible, setUnitVisible] = useState(false)
+  const [levelVisible, setLevelVisible] = useState(false)
+  
+  const handleEdit = val => {
+    updateNode({ data: {
+      id: roomInfo.unitId,
+      name: val,
+      type: 'unit',
+    }}).then(() => {
+      const room = {
+        ...roomInfo,
+        unitName: val
+      }
+      if (props.onEdit) {
+        props.onEdit(room)
+      }
+      notification.success({message: '修改成功'})
+    })
+    setUnitVisible(false)
+  }
+
+  const handleDelete = () => {
+    deleteNode({ data: {
+      id: roomInfo.unitId,
+      name: roomInfo.unitName,
+      type: 'level',   // 删除单元传 level
+      nodeNumber: undefined,
+    }}).then(() => {
+      if (props.onDelete) {
+        props.onDelete(roomInfo)
+      }
+      notification.success({message: '删除成功'})
+    })
+  }
+
+  const handleLevelAdd = val => {
+    addNode({ data: {
+      id: roomInfo.unitId,
+      name: roomInfo.unitName,
+      type: 'level',
+      nodeNumber: val,
+      communityId: props.community,
+    }}).then((res) => {
+      // 构造房间数据
+      const room = {
+        ...res,
+        levelId: res.id,
+        levelName: res.name,
+        id: undefined,
+        name: undefined,
+      }
+
+      if (props.onLevelAdd) {
+        props.onLevelAdd(room)
+      }
+      notification.success({message: '添加成功'})
+    })
+
+    setLevelVisible(false)
+  }
+
+  useEffect(() => {
+    setRoomInfo(props.dataSource || {})
+  }, [props.dataSource])
+
+  const menu = (
+    <Menu>
+      <Menu.Item>
+        <Button type="link" onClick={() => setLevelVisible(true)}><Icon type="plus"/>层</Button>
+      </Menu.Item>
+      <Menu.Item>
+        <Button type="link" onClick={() => setUnitVisible(true)}>编辑</Button>
+      </Menu.Item>
+      <Menu.Item>
+        <Popconfirm
+         title={`确认删除 ${roomInfo.unitName} ?`}
+         onConfirm={handleDelete}
+         okText="是"
+         cancelText="否"
+        >
+          <Button type="danger" ghost style={{border: 'none', boxShadow: 'none'}}>删除</Button>
+        </Popconfirm>
+      </Menu.Item>
+    </Menu>
+  )
+
+  return (
+    <div style={{textAlign: 'center', fontSize: '1.2em', lineHeight: '3.5em'}} >
+      <Dropdown overlay={menu} trigger={['contextMenu']} placement="topCenter">
+        <div style={{cursor: 'pointer', height: 60}}>{roomInfo.unitName}</div>
+      </Dropdown>
+      <Prompt visible={unitVisible} onOk={handleEdit} onCancel={() => setUnitVisible(false)} placeholder="请填写单元名称" />
+      <Prompt visible={levelVisible} onOk={handleLevelAdd} onCancel={() => setLevelVisible(false)} placeholder="请填写楼层名称" />
+    </div>
+  )
+}

src/pages/property/building/components/NodeLabel.jsx

       {
         props.data.type !== 'end' && (<Menu.Item key="add">增加子节点</Menu.Item>)
       }
-      <Menu.Item key="delete">删除</Menu.Item>
+      {/* <Menu.Item key="delete">删除</Menu.Item> */}
     </Menu>
   );
 

src/pages/property/building/list.jsx

+import React, { useEffect, useState } from 'react'
+import { PageHeader, Tabs, Spin, Button, Icon, Modal, notification } from 'antd'
+import router from 'umi/router'
+import { fetch, fetchList, apis } from '@/utils/request'
+import Prompt from '@/components/Prompt'
+import Building from './components/Building'
+import CommunitySelect from '@/components/CommunitySelect'
+
+const fetchPhaseList = fetch(apis.buildingOwnerInfo.getPhaseList)
+const addNode = fetch(apis.buildingOwnerInfo.addNode)
+const deleteNode = fetch(apis.buildingOwnerInfo.deleteNode)
+
+export default props => {
+  const [phaseList, setPhaseList] = useState([])
+  const [loading, setLoading] = useState(false)
+  const [phaseVisible, setPhaseVisible] = useState(false)
+  const [community, setCommunity] = useState()
+
+  const handleEdit = (key, act) => {
+    const phase = phaseList[key - 0]
+
+    if (act === 'remove') {
+      Modal.confirm({
+        title: `确认删除 ${phase.name} 数据?`,
+        content: '谨慎操作, 数据不可恢复',
+        onOk: () => {
+          deleteNode({ data: {
+            id: phase.id,
+            name: phase.name,
+            type: 'building', // 删除的时候, type 是 building 。这个接口比较诡异
+            nodeNumber: phase.name,
+          }}).then(() => {
+            notification.success({message: '删除成功'})
+            setPhaseList(phaseList.filter(x => x.id !== phase.id))
+          })
+
+        }
+      })
+    }
+  }
+
+  const handleBatchImport = () => {
+    router.push(`/property/buildingInfo/importExcel?community=${community}`)
+  }
+
+  const handleAddPhase = v => {
+    addNode({ data: {
+      type: 'phase',
+      nodeNumber: v,
+      communityId: community,
+    }}).then((res) => {
+      notification.success({message: '添加成功'})
+      setPhaseList(phaseList.concat(res))
+    })
+    setPhaseVisible(false)
+  }
+
+  // 获取期
+  useEffect(() => {
+    if (community) {
+      setLoading(true)
+      fetchPhaseList({params: {communityId: community}}).then(res => {
+        setPhaseList(res)
+        setLoading(false)
+      }).catch(() => setLoading(false))
+    }
+  }, [community])
+
+  return (
+    <div>
+      <PageHeader
+        title="楼栋管理"
+        backIcon={false}
+        extra={<Button type="link" onClick={handleBatchImport}><Icon type="upload"/>批量导入</Button>}
+      />
+      <div style={{marginTop: 16}}>
+        <span style={{display: 'inline-block', marginRight: '1em'}}>选择小区: </span>
+        <CommunitySelect style={{minWidth: 200}} value={community} autoInited onChange={v => setCommunity(v)} />
+      </div>
+      <div style={{marginTop: 16}}>
+        <Spin spinning={loading}>
+          <Tabs
+            defaultActiveKey="0"
+            type="editable-card"
+            onEdit={handleEdit}
+            tabBarExtraContent={<Button type="link" onClick={() => setPhaseVisible(true)}><Icon type="plus" />期</Button>}
+            hideAdd={true}
+            >
+          {
+            phaseList.map((phase, index) => {
+              return (
+                <Tabs.TabPane tab={phase.name} key={`${index}`}>
+                  <Building phase={phase} community={community} />
+                </Tabs.TabPane>
+              )
+            })
+          }
+          </Tabs>
+        </Spin>
+      </div>
+      <Prompt visible={phaseVisible} onOk={handleAddPhase} onCancel={() => setPhaseVisible(false)} placeholder="请填写期数名称" />
+    </div>
+  )
+}

src/pages/property/community/index.jsx

+import React, { useEffect, useRef, useState } from 'react'
+import { fetchList, fetch, apis } from '@/utils/request'
+import moment from 'moment'
+import { Icon, Table, Button, Popconfirm, Divider, notification } from 'antd'
+import Prompt from '@/components/Prompt'
+
+const getList = fetchList(apis.community.list)
+const updateCommunity = fetch(apis.community.update)
+const saveCommunity = fetch(apis.community.save)
+const deleteCommunity = fetch(apis.community.delete)
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [showPrompt, setShowPrompt] = useState(false)
+  const [listData, setListData] = useState([])
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 100 })
+  const selectedRow = useRef()
+
+  const handleRowPrepare = row => {
+    selectedRow.current = row
+    setShowPrompt(true)
+  }
+
+  const handleStatusTrigger = row => {
+    // 发布 -> 取消发布
+    // 取消发布 -> 发布
+    const status = Math.abs(row.status - 1)
+    const data = { ...row, status }
+    updateCommunity({data, urlData: {id: row.id}}).then(res => {
+      notification.success({message: "操作成功"})
+      // 触发数据刷新
+      setQueryParams({...queryParams})
+    })
+  }
+
+  const handleRowEdit = v => {
+    if (!selectedRow.current) {
+      // 新增
+      const data = {name: v}
+      saveCommunity({data}).then(res => {
+        // 刷新页面
+        setQueryParams({...queryParams})
+      })
+    } else {
+      // 修改
+      const data = {
+        ...selectedRow.current,
+        name: v
+      }
+      updateCommunity({data, urlData: {id: data.id}}).then(res => {
+        // 刷新页面
+        setQueryParams({...queryParams})
+      })
+    }
+
+    setShowPrompt(false)
+  }
+
+  const handleDeleteRow = row => {
+    deleteCommunity({ urlData: {id: row.id} }).then(res => {
+      Modal.success({
+        content: '删除内容成功',
+        onOk: () => {
+          // 触发数据刷新
+          setQueryParams({...queryParams})
+        }
+      })
+    })
+  }
+
+  useEffect(() => {
+    setLoading(true)
+    getList(queryParams).then(res => {
+      const [list] = res
+      setListData(list)
+      setLoading(false)
+    }).catch(e => console.error(e) || setLoading(false))
+  }, [queryParams])
+
+  return (
+    <div>
+      <div style={{marginBottom: 16}}>
+        <Button type="primary" onClick={() => handleRowPrepare()}><Icon type="plug" />新增社区</Button>
+      </div>
+      <Table loading={loading} dataSource={listData} rowKey="id">
+        <Table.Column title="名称" dataIndex="name" key="name" width={480} />
+        <Table.Column title="状态" dataIndex="status" key="status" render={t => t === 1 ? '正常' : '未发布'} />
+        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" render={t => moment(t).format('YYYY-MM-DD HH:mm')} />
+        <Table.Column
+          title="操作"
+          key="action"
+          align="center"
+          render={(_, row) => {
+            return (
+              <>
+                <Popconfirm
+                  title="确认进行删除操作?"
+                  onConfirm={() => handleDeleteRow(row)}
+                  okText="删除"
+                  cancelText="取消"
+                >
+                  <Button type="link">删除</Button>
+                </Popconfirm>
+                <Divider type="vertical" />
+                {/* <Popconfirm
+                  title={`确认进行${row.status === 1? '取消发布' : '发布'}操作`}
+                  onConfirm={() => handleStatusTrigger(row)}
+                  okText={row.status === 1? '取消发布' : '发布'}
+                  cancelText="取消"
+                >
+                  <Button type="link">{row.status === 1? '取消发布' : '发布'}</Button>
+                </Popconfirm>
+                <Divider type="vertical" /> */}
+                <Button type="link" onClick={() => handleRowPrepare(row) }>编辑</Button>
+              </>
+            )
+          }}
+        />
+      </Table>
+      <Prompt visible={showPrompt} onOk={handleRowEdit} placeholder="请输入小区名称" />
+    </div>
+  )
+}

src/pages/property/contact/PublicServ.jsx

+import React, { useState, useEffect } from 'react'
+import { Select, Spin, Table, Button, Form, Input, Divider, Typography, Popconfirm, notification } from 'antd'
+import NavLink from 'umi/navlink'
+import { fetchList, apis, fetch } from '@/utils/request'
+import Search from '../components/Search'
+import List from '../components/List'
+import Editor from './components/Editor'
+
+const listTel = fetch(apis.announcement.getTelList)
+const deleteTel = fetch(apis.announcement.deleteTel)
+const saveTel = fetch(apis.announcement.saveTel)
+const updateTel = fetch(apis.announcement.updateTel)
+
+const Condition = props => {
+  return (
+    <Search
+      onSearch={props.onSearch}
+      onReset={props.onReset}
+      render={form => {
+        const { getFieldDecorator, setFieldsValue } = form
+        
+        return (
+          <>
+            <Form.Item label="名称">
+            {
+              getFieldDecorator('name')(<Input placeholder="名称" />)
+            }
+            </Form.Item>
+            <Form.Item label="电话">
+            {
+              getFieldDecorator('tel')(<Input placeholder="电话" />)
+            }
+            </Form.Item>
+          </>
+        )
+      }}
+    />
+  )
+}
+
+export default props => {
+  const telType = "common"
+  const [loading, setLoading] = useState(false)
+  const [listData, setListData] = useState([])
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10, type: telType })
+  const [showEditor, setShowEditor] = useState(false)
+  const [currentRow, setCurrentRow] = useState()
+
+  const handleSearch = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1,
+    })
+  }
+
+  const handlePageChange = (pageNum, pageSize) => {
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
+  }
+
+  const triggerShowEditor = row => {
+    setShowEditor(!showEditor)
+    setCurrentRow({...(row || {})})
+  }
+
+  const handleEditor = vals => {
+    if (vals.id) {
+      updateTel({data: vals}).then(res => {
+        notification.success({message: '信息更新成功'})
+        triggerShowEditor()
+        setQueryParams({...queryParams})
+      })
+    } else {
+      saveTel({data: vals}).then(res => {
+        notification.success({message: '信息保存成功'})
+        triggerShowEditor()
+        setQueryParams({...queryParams})
+      })
+    }
+  }
+
+  const handleDeleteRow = row => {
+    deleteTel({data: [row.id]}).then(res => {
+      notification.success({ message: '删除成功' })
+      setQueryParams({...queryParams})
+    })
+  }
+
+  useEffect(() => {
+    setLoading(true)
+    listTel({params: queryParams}).then(res => {
+      const {list, ...pagi} = res
+      setListData(list)
+      setPagination(pagi)
+      setLoading(false)
+    }).catch(e => setLoading(false))
+  }, [queryParams])
+
+  return (
+    <div>
+      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <div style={{ margin: '24px 0' }}>
+        <Button type="primary" onClick={() => triggerShowEditor()}>添加</Button>
+      </div>
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
+        <Table.Column title="名称" dataIndex="name" key="name" />
+        <Table.Column title="电话" dataIndex="tel" key="tel" />
+        {/* <Table.Column title="物业类型" dataIndex="type" key="type" render={(item, row) => (
+          <span>{item == "prop" ? "物业电话" : "公共服务电话"}</span>
+        )}/> */}
+        <Table.Column title="备注" dataIndex="remark" key="remark" />
+        <Table.Column title="操作" dataIndex="id" key="id" width="200px" render={(_, row) => (
+          <>
+            <Popconfirm
+              title="确认进行删除操作?"
+              onConfirm={() => handleDeleteRow(row)}
+              okText="删除"
+              cancelText="取消"
+            >
+              <Button type="link">删除</Button>
+            </Popconfirm>
+            <Divider type="vertical" />
+            <Button type="link" onClick={() => triggerShowEditor(row)}>编辑</Button>
+          </>
+        )} />
+      </List>
+      <Editor visible={showEditor} type={telType} dataSource={currentRow} onSubmit={handleEditor} onCancel={triggerShowEditor} />
+    </div>
+  )
+}

src/pages/property/contact/components/Editor.jsx

       if (!err) {
         props.onSubmit({
           ...(props.dataSource || {}),
-          ...values
+          ...values,
+          type: props.type,
         })
       }
     })
             props.form.getFieldDecorator('remark')(<Input placeholder="请填写备注" />)
           }
         </Form.Item>
-        <Form.Item label="物业类型">
-          {props.form.getFieldDecorator('type')(
-            <Select defaultValue="prop" placeholder="物业类型">
-              <Option value="prop">物业电话</Option>
-              <Option value="common">公共服务</Option>
-            </Select>,
-          )}
-        </Form.Item>
+        {/* <Form.Item label="类型">
+          <Select value={props.type} disabled placeholder="物业类型">
+            <Option value="prop">物业电话</Option>
+            <Option value="common">公共服务</Option>
+          </Select>,
+        </Form.Item> */}
         <Form.Item {...tailFormItemLayout}>
           <Button type="primary" htmlType="submit">确定</Button>
           <Button onClick={props.onCancel} style={{ marginLeft: '48px' }}>取消</Button>

src/pages/property/contact/index.jsx

 import { Select, Spin, Table, Button, Form, Input, Divider, Typography, Popconfirm, notification } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetchList, apis, fetch } from '@/utils/request'
+import CommunitySelect from '@/components/CommunitySelect'
 import Search from '../components/Search'
 import List from '../components/List'
 import Editor from './components/Editor'
 const updateTel = fetch(apis.announcement.updateTel)
 
 const Condition = props => {
+  const [communityId, setCommunityId] = useState()
+
+  const handleCommunityChange = v => {
+    setCommunityId(v)
+
+    props.onCommunityChange(v)
+  }
+
   return (
     <Search
       onSearch={props.onSearch}
         
         return (
           <>
+            <Form.Item label="小区">
+              <CommunitySelect value={communityId} onChange={handleCommunityChange} autoInited />
+            </Form.Item>
             <Form.Item label="名称">
             {
               getFieldDecorator('name')(<Input placeholder="名称" />)
 }
 
 export default props => {
+  const telType = "prop"
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
   const [pagination, setPagination] = useState({})
-  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10, type: telType })
   const [showEditor, setShowEditor] = useState(false)
   const [currentRow, setCurrentRow] = useState()
+  const [communityId, setCommunityId] = useState()
 
   const handleSearch = vals => {
     setQueryParams({
   }
 
   const handleEditor = vals => {
+    if (!communityId) {
+      notification.warn({message: '请选择小区'})
+      return
+    }
+
     if (vals.id) {
       updateTel({data: vals}).then(res => {
         notification.success({message: '信息更新成功'})
         setQueryParams({...queryParams})
       })
     } else {
-      saveTel({data: vals}).then(res => {
+      saveTel({data: {...vals, communityId}}).then(res => {
         notification.success({message: '信息保存成功'})
         triggerShowEditor()
         setQueryParams({...queryParams})
   }
 
   useEffect(() => {
+    if (!communityId) {
+      return
+    }
     setLoading(true)
-    listTel({params: queryParams}).then(res => {
+    listTel({params: {...queryParams, communityId}}).then(res => {
       const {list, ...pagi} = res
       setListData(list)
       setPagination(pagi)
       setLoading(false)
     }).catch(e => setLoading(false))
-  }, [queryParams])
+  }, [queryParams, communityId])
 
   return (
     <div>
-      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <Condition onSearch={handleSearch} onReset={handleSearch} onCommunityChange={v => setCommunityId(v)} />
       <div style={{ margin: '24px 0' }}>
         <Button type="primary" onClick={() => triggerShowEditor()}>添加</Button>
       </div>
       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
         <Table.Column title="名称" dataIndex="name" key="name" />
         <Table.Column title="电话" dataIndex="tel" key="tel" />
-        <Table.Column title="物业类型" dataIndex="type" key="type" render={(item, row) => (
+        {/* <Table.Column title="物业类型" dataIndex="type" key="type" render={(item, row) => (
           <span>{item == "prop" ? "物业电话" : "公共服务电话"}</span>
-        )}/>
+        )}/> */}
         <Table.Column title="备注" dataIndex="remark" key="remark" />
         <Table.Column title="操作" dataIndex="id" key="id" width="200px" render={(_, row) => (
           <>
           </>
         )} />
       </List>
-      <Editor visible={showEditor} dataSource={currentRow} onSubmit={handleEditor} onCancel={triggerShowEditor} />
+      <Editor visible={showEditor} type={telType} dataSource={currentRow} onSubmit={handleEditor} onCancel={triggerShowEditor} />
     </div>
   )
 }

src/pages/property/lifeConsultant/index.jsx

 import { Select, Spin, Table, Button, Form, Input, Divider, Modal, Rate, Popconfirm } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetchList, apis, fetch } from '@/utils/request'
+import CommunitySelect from '@/components/CommunitySelect'
 import Search from '../components/Search'
 import List from '../components/List'
 
 const lifeConsultant = fetchList(apis.propUser.lifeConsultant)
 
 const Condition = props => {
+  const [communityId, setCommunityId] = useState()
+
+  const handleCommunityChange = v => {
+    setCommunityId(v)
+
+    props.onCommunityChange(v)
+  }
   return (
     <Search
       onSearch={props.onSearch}
         
         return (
           <>
+            <Form.Item label="小区">
+              <CommunitySelect value={communityId} onChange={handleCommunityChange} autoInited />
+            </Form.Item>
             <Form.Item label="管家名称">
             {
               getFieldDecorator('userName')(<Input placeholder="管家名称" />)
   const [listData, setListData] = useState([])
   const [pagination, setPagination] = useState({})
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  const [communityId, setCommunityId] = useState()
 
   const handleSearch = vals => {
     setQueryParams({
 
   useEffect(() => {
     setLoading(true)
-    lifeConsultant(queryParams).then(res => {
+    lifeConsultant({...queryParams, communityId}).then(res => {
       const [list, pageInfo] = res || {}
       setListData(list)
       setPagination(pageInfo)
       setLoading(false)
     }).catch(() => setLoading(false))
-  }, [queryParams])
+  }, [queryParams, communityId])
 
   return (
     <div>
-      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <Condition onSearch={handleSearch} onReset={handleSearch} onCommunityChange={v => setCommunityId(v)} />
       <div style={{ margin: '24px 0' }}>
         {/* <NavLink to={`/staff/editStaff`}>
           <Button type="primary">添加管家</Button>

src/pages/property/message/event/components/Preview.jsx

 import moment from 'moment'
 import { Modal } from 'antd'
 import Styles from './style.less'
+import { APIBaseURL } from '@/utils/constant'
 
 export default props => {
   const baseURL = props.dataSource.evtType === 'birthday'
-    ? 'https://xs.ycjcjy.com/shengrih5.html'
-    : 'https://xs.ycjcjy.com/jierih5.html'
+    ? `${APIBaseURL}shengrih5.html`
+    : `${APIBaseURL}jierih5.html`
 
   const queryString = [
     `name=${encodeURIComponent(' 张xx (先生)')}`,

src/pages/property/news/index.jsx

 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider, Modal, Popconfirm, Typography, notification } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal, Popconfirm, Typography, notification, DatePicker } from 'antd'
 import NavLink from 'umi/navlink'
+import moment from 'moment';
 import { fetch, fetchList, apis } from '@/utils/request'
 import Search from '../components/Search'
 import List from '../components/List'
 
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
 const getNewsList = fetchList(apis.propNews.getNewsList)
 const updateNews = fetch(apis.propNews.updateNews)
 const deleteNews = fetch(apis.propNews.deleteNews)
               getFieldDecorator('newsName')(<Input placeholder="标题" />)
             }
             </Form.Item>
+            <Form.Item>
+            <span style={{ marginRight: '10px' }}>创建时间：</span>
+            {getFieldDecorator('createTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
           </>
         )
       }}
   const [typeList, setTypeList] = useState([])
 
   const handleSearch = vals => {
+    let { createTime, ...submitValue  } = vals
+    if (null != createTime && createTime.length > 0) {
+      const [startCreateDate, endCreateDate] = createTime
+      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+    } else {
+      submitValue.startCreateDate = null
+      submitValue.endCreateDate = null
+    }
     setQueryParams({
       ...queryParams,
-      ...vals,
+      ...submitValue,
       pageNum: 1,
     })
   }
         </NavLink>
       </div>
       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="newsId">
-        <Table.Column title="#ID" dataIndex="newsId" key="newsId" />
+        {/* <Table.Column title="#ID" dataIndex="newsId" key="newsId" /> */}
         <Table.Column
           title="分类"
           dataIndex="newsTypeId"

src/pages/property/notice/Edit.jsx

 import React, { useEffect, useState } from 'react'
 import router from 'umi/router'
 import { fetch, apis } from '@/utils/request'
-import { Button, Form, Input, InputNumber, Modal, Radio, Select } from 'antd'
+import { Button, Form, Input, InputNumber, Modal, notification, Radio, Select } from 'antd'
 import Wangedit from '@/components/Wangedit/Wangedit'
 import ImageUpload from '@/components/uploadImage/ImageUpload'
+import CommunitySelect from '@/components/CommunitySelect'
 
 const formItemLayout = {
   labelCol: {
   return (
     <div>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="小区">
+        {
+          getFieldDecorator('communityId', {
+            rules: [
+              {
+                required: true,
+                message: '请选择小区',
+              },
+            ],
+          })(<CommunitySelect />)
+        }
+        </Form.Item>
         <Form.Item label="类型">
         {
           getFieldDecorator('annType')(

src/pages/property/notice/index.jsx

 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm, notification } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm, notification, DatePicker } from 'antd'
 import NavLink from 'umi/navlink'
+import moment from 'moment';
 import { fetch, apis } from '@/utils/request'
+import CommunitySelect from '@/components/CommunitySelect'
 import Search from '../components/Search'
 import List from '../components/List'
 
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
 const listAnnouncement = fetch(apis.announcement.listAnnouncement)
 const deleteAnnouncement = fetch(apis.announcement.deleteAnnouncement)
 const updateannouncement = fetch(apis.announcement.updateannouncement)
 
 const Condition = props => {
+  const [communityId, setCommunityId] = useState()
+  
+  const handleCommunityChange = v => {
+    setCommunityId(v)
+
+    props.onCommunityChange(v)
+  }
+
   return (
     <Search
       onSearch={props.onSearch}
         
         return (
           <>
+            <Form.Item label="小区">
+            {
+              <CommunitySelect value={communityId} onChange={handleCommunityChange} autoInited />
+            }
+            </Form.Item>
             <Form.Item label="公告编号">
             {
               getFieldDecorator('announcementNumber')(<Input placeholder="公告编号" />)
               )
             }
             </Form.Item>
+            <Form.Item label="状态">
+            {
+              getFieldDecorator('status')(
+                <Select style={{minWidth: '120px'}}>
+                  <Select.Option value="">全部</Select.Option>
+                  <Select.Option value="0">未发布</Select.Option>
+                  <Select.Option value="1">已发布</Select.Option>
+                </Select>
+              )
+            }
+            </Form.Item>
+            <Form.Item label="创建时间">
+            {getFieldDecorator('createTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
           </>
         )
       }}
 export default props => {
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
+  const [communityId, setCommunityId] = useState()
   const [pagination, setPagination] = useState({})
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
 
   const handleSearch = vals => {
+    let { createTime, ...submitValue  } = vals
+    if (null != createTime && createTime.length > 0) {
+      const [startCreateDate, endCreateDate] = createTime
+      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+    } else {
+      submitValue.startCreateDate = null
+      submitValue.endCreateDate = null
+    }
     setQueryParams({
       ...queryParams,
-      ...vals,
+      ...submitValue,
       pageNum: 1,
     })
   }
 
   const handleEditRow = row => {
-    updateannouncement({data: {
-      ...row,
-      status: Math.abs(row.status - 1)
-    }}).then(res => {
-      notification.success({message: '操作成功'})
-      setQueryParams({...queryParams})
-    })
+    // 发布改为不发布, 调用删除接口
+    if (1 === row.status - 0) {
+      deleteAnnouncement({data: {id: [row.id]}}).then(res => {
+        notification.success({message: '取消发布成功'})
+        setQueryParams({...queryParams})
+      })
+    } else {
+      // 未发布修改为已发布
+      updateannouncement({data: {
+        ...row,
+        status: '1'
+      }}).then(res => {
+        notification.success({message: '发布成功'})
+        setQueryParams({...queryParams})
+      })
+    }
   }
 
   const handlePageChange = (pageNum, pageSize) => {
 
   useEffect(() => {
     setLoading(true)
-    listAnnouncement({ data: queryParams }).then(res => {
+    listAnnouncement({ data: {...queryParams, communityId} }).then(res => {
       const { list, ...pageInfo } = res || {}
       setListData(list)
       setPagination(pageInfo)
       setLoading(false)
     }).catch(() => setLoading(false))
-  }, [queryParams])
+  }, [queryParams, communityId])
 
   return (
     <div>
-      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <Condition onSearch={handleSearch} onReset={handleSearch} onCommunityChange={v => setCommunityId(v)} />
       <div style={{ margin: '24px 0' }}>
         <NavLink to={`/property/notice/edit`}>
           <Button type="primary">添加</Button>
         </NavLink>
       </div>
       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
-        <Table.Column title="编号" dataIndex="id" key="id" />
+        {/* <Table.Column title="编号" dataIndex="id" key="id" /> */}
         <Table.Column title="类型" dataIndex="annType" key="annType" render={t => t === 'notice' ? '提醒' : null} />
         <Table.Column
           title="标题"
           dataIndex="status"
           key="status"
           render={(_, row) => StatusDict[row.status]}
+          sorter={(a, b) => a.status - b.status}
         />
-        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" />
+        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" 
+        sorter={(a, b) => new Date(a.createDate).getTime() - new Date(b.createDate).getTime()}/>
         {/* <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
         <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
         <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" /> */}

src/pages/property/proprietor/Add.jsx

 import router from 'umi/router'
 import { fetch, apis } from '@/utils/request'
 import useRoomSelect from '../utils/hooks/useRoomSelect'
+import CommunitySelect from '@/components/CommunitySelect'
 
 const addPerson = fetch(apis.buildingOwnerInfo.addBuilding)
 const taUserHasOwner = fetch(apis.propUser.taUserHasOwner)
 const isEmpty = o => !o || (Array.isArray(o) && !o.length) || (typeof o === 'object' && !Object.keys(o).length)
 
 export default Form.create()(props => {
+  const [communityId, setCommunityId] = useState()
   const {
     phaseId,
     setPhaseId,
     unitList,
     levelList,
     roomNoList
-  } = useRoomSelect()
+  } = useRoomSelect(communityId)
 
   const [owerExist, setOwnerExist] = useState(false)
   const [telAccUser, setTelAccUser] = useState()
 
   useEffect(() => {
     if (roomNoId) {
-      taUserHasOwner({ params: {phaseId, buildingId, unitId, levelId, roomNoId} }).then(res => {
+      taUserHasOwner({ params: {communityId, phaseId, buildingId, unitId, levelId, roomNoId} }).then(res => {
         setOwnerExist(res.boolRole)
       })
     }
   }, [roomNoId])
   
-  useEffect(() => {
-    if (roomNoId) {
-      taUserHasOwner({ params: {phaseId, buildingId, unitId, levelId, roomNoId} }).then(res => {
-        setOwnerExist(res.boolRole)
-      })
-    }
-  }, [roomNoId])
-
-
   const handleSubmit = e => {
     e.preventDefault();
     if (!isEmpty(telAccUser)) {
       if (!err) {
         const data = {
           ...values,
+          communityId,
           phaseId,
           buildingId,
           unitId,
   return (
     <div>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="小区" required>
+          <CommunitySelect value={communityId} onChange={v => setCommunityId(v)} autoInited />
+        </Form.Item>
         <Form.Item label="期/区" required>
           <Select value={phaseId} onChange={handlePhaseChange} style={{ minWidth: '120px' }} placeholder="期/区">
             {
             props.form.getFieldDecorator('ownerName')(<Input />)
           }
         </Form.Item>
+        <Form.Item label="身份证号">
+          {
+            props.form.getFieldDecorator('idCard', {
+              rules: [
+                {
+                  len: 18, message: '身份证号长度为18位'
+                }
+              ]
+            })(<Input />)
+          }
+        </Form.Item>
         <Form.Item label="性别">
           {
             props.form.getFieldDecorator('gender')(

src/pages/property/proprietor/Audit.jsx

 import Search from '../components/Search'
 import List from '../components/List'
 import AuditNot from './components/AuditNot'
+import CommunitySelect from '@/components/CommunitySelect'
 
 const Condition = props => {
+  const [communityId, setCommunityId] = useState()
+
+  const handleCommunityChange = v => {
+    props.onCommunityChange(v)
+    setCommunityId(v)
+  }
+
   return (
     <Search
       onSearch={props.onSearch}
 
         return (
           <>
+            <Form.Item label="小区">
+            {
+              <CommunitySelect autoInited value={communityId} onChange={handleCommunityChange} />
+            }
+            </Form.Item>
             <Form.Item label="姓名">
             {
               getFieldDecorator('userName')(<Input style={{ width: '160px' }} placeholder="姓名" />)
   const [loading, setLoading] = useState(false)
   const [noPassShow, setNoPassShow] = useState(false)
   const [listData, setListData] = useState([])
+  const [selectedKeys, setSelectedKeys] = useState([])
   const [pagination, setPagination] = useState({})
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  const [communityId, setCommunityId] = useState()
 
   const currentRow = useRef()
   
     setQueryParams({
       ...queryParams,
       ...vals,
+      communityId,
       pageNum: 1
     })
   }
 
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      // console.log('------>', selectedRowKeys)
+      setSelectedKeys(selectedRowKeys)
+    }
+  }
+
   const handleDeleteRow = row => {}
 
   const showAuditDialog = row => {
     const row = {
       ...currentRow.current,
       ...vals,
+      communityId,
     }
 
     handleVerfiy(row, false)
     })
   }
 
+  const handleChangeSelected = (verifyStatus) => {
+      selectedKeys.map(x => {
+         const params = {
+            verifyStatus,
+            remark: ''
+          }
+      
+          userVerifyAudit({ urlData: { id: x }, params }).then(res => {
+              console.log(res)
+          })
+      })
+      Modal.success({
+        content: '审核提交成功',
+        onOk: () => {
+          // 触发数据刷新
+          setQueryParams({...queryParams})
+        }
+      })
+  }
+
   useEffect(() => {
     setLoading(true)
-    userVerifyAll(queryParams).then(res => {
+    userVerifyAll({...queryParams, communityId}).then(res => {
       const [records, pagi] = res || []
       setListData(records)
       setPagination({total: pagi.total, pageSize: pagi.size, pageNum: pagi.current})
       setLoading(false)
     }).catch(() => setLoading(false))
-  }, [queryParams])
+  }, [queryParams, communityId])
 
   return (
     <div>
-      <Condition onSearch={handleSearch} onSearch={handleSearch} />
+      <Condition onSearch={handleSearch} onSearch={handleSearch} onCommunityChange={v => setCommunityId(v)} />
+      <div style={{ margin: '24px 0' }}>
+        <div style={{marginLeft: 16, display: 'inline-block'}}>
+          <Popconfirm
+            title="确认进行批量审核通过操作?"
+            onConfirm={() => handleChangeSelected(true)}
+            okText="确定"
+            cancelText="取消"
+          >
+            <Button type="danger" disabled={!selectedKeys.length}>批量通过</Button>
+          </Popconfirm>
+        </div>
+        <div style={{marginLeft: 16, display: 'inline-block'}}>
+          <Popconfirm
+            title="确认进行批量审核不通过操作?"
+            onConfirm={() => handleChangeSelected(false)}
+            okText="确定"
+            cancelText="取消"
+          >
+            <Button type="danger" disabled={!selectedKeys.length}>批量不通过</Button>
+          </Popconfirm>
+        </div>
+      </div>
       <div style={{ marginTop: '24px' }}>
         <p style={{color: '#888', fontSize: '0.8em'}}>注意，审核后无法修改审核结果，请仔细确认</p>
       </div>
-      <List dataSource={listData} onPageChange={handlePageChange} pagination={pagination} loading={loading} rowKey="id">
+      <List dataSource={listData} onPageChange={handlePageChange} pagination={pagination} rowSelection={rowSelection} loading={loading} rowKey="id">
         <Table.Column title="姓名" dataIndex="ownerName" key="ownerName" />
         <Table.Column title="手机号" dataIndex="phone" key="phone" />
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />

src/pages/property/proprietor/BatchImport.jsx

   const [dataList, setDataList] = useState([])
   const [pagenavi, setPagenavi] = useState({ pageSize: 10, total: 0 })
 
+  const communityId = props.location.query.community
   const excelRef = useRef()
 
+  const checkCommunity = () => {
+    if (!communityId) {
+      notification.warn({message: '没有选择小区'})
+      return false
+    }
+
+    return true
+  }
+
   const downloadExcel = () => {
-    buildingDownloadExcel().then(res => {
+    if (!checkCommunity()) {
+      return
+    }
+
+    buildingDownloadExcel({params: {communityId}}).then(res => {
       const url = window.URL.createObjectURL(new Blob([res]))
       const link = document.createElement('a')
       link.href = url
   }
 
   const importExcel = () => {
+    if (!checkCommunity()) {
+      return
+    }
+
     const input = document.createElement('input')
     input.setAttribute('type', 'file')
     input.addEventListener('input', e => {
         excelRef.current = files[0]
         const formData = new FormData()
         formData.append('file', excelRef.current)
+        formData.append('communityId', communityId)
         
         setLoading(true)
         uploadBuildingExcel({ data: formData }).then(res => {
   }
 
   const submitExcel = () => {
+    if (!checkCommunity()) {
+      return
+    }
+
     if (!excelRef.current) {
       notification.warning({ message: '没有选择文件' })
       return
 
     const formData = new FormData()
     formData.append('file', excelRef.current)
+    formData.append('communityId', communityId)
 
     setLoading(true)
     submitBuildingExcel({ data: formData }).then(res => {
         <Column key="levelName" title="楼层" dataIndex="levelName" />
         <Column key="roomNoName" title="户号" dataIndex="roomNoName" />
         <Column key="ownerName" title="户主姓名" dataIndex="ownerName" />
-        <Column key="roleName" title="身份" dataIndex="roleName" />
+        {/* <Column key="roleName" title="身份" dataIndex="roleName" /> */}
         <Column key="ownerTel" title="手机号码" dataIndex="ownerTel" />
       </Table>
     </div>

src/pages/property/proprietor/Detail.jsx

       <Section title="基本信息">
         <Descriptions column={3}>
           <Descriptions.Item label="姓名">{userData.ownerName}</Descriptions.Item>
-          <Descriptions.Item label="性别">{userData.gender === '2' ? '女' : '男'}</Descriptions.Item>
+          <Descriptions.Item label="性别">{!userData.idCard ? '' : (userData.idCard.substring(-2, 1) - 0) % 2 === 1 ? '男' : '女'}</Descriptions.Item>
           <Descriptions.Item label="手机号">{userData.phone}</Descriptions.Item>
           <Descriptions.Item label="微信昵称">{userData.nickname}</Descriptions.Item>
           <Descriptions.Item label="微信ID">{userData.openid}</Descriptions.Item>

src/pages/property/proprietor/index.jsx

 import { Select, Spin, Table, Button, Form, Input, Icon, Modal, Popconfirm } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetch, fetchList, apis } from '@/utils/request'
+import { exportExcel } from '@/utils/utils'
+import CommunitySelect from '@/components/CommunitySelect'
 import Search from '../components/Search'
 import List from '../components/List'
 import useRoomSelect from '../utils/hooks/useRoomSelect'
 
 const buildingInfoList = fetch(apis.buildingOwnerInfo.buildingList)
+const buildingInfoListExport = fetch(apis.buildingOwnerInfo.buildingListExport)
 const deleteBuilding = fetch(apis.buildingOwnerInfo.deleteBuilding)
 
 const Condition = props => {
+  const [communityId, setCommunityId] = useState()
+
   const {
     phaseId,
     setPhaseId,
     unitList,
     levelList,
     roomNoList
-  } = useRoomSelect()
+  } = useRoomSelect(communityId)
 
   const handleSearch = vals => {
     const data = {
       ...vals,
+      communityId,
       phaseId,
       buildingId,
       unitId,
     }
   }
 
+  const handleCommunityChange = v => {
+    setCommunityId(v)
+
+    props.onCommunityChange(v)
+  }
+
   return (
     <Search
       onSearch={handleSearch}
 
         return (
           <>
+            <Form.Item>
+              <CommunitySelect value={communityId} onChange={handleCommunityChange} autoInited />
+            </Form.Item>
             <Form.Item>
               <Select value={phaseId} onChange={handlePhaseChange} style={{ minWidth: '120px' }} placeholder="期/区">
                 {
               getFieldDecorator('idCard')(<Input style={{ width: '200px' }} placeholder="身份证" />)
             }
             </Form.Item>
+            <Form.Item>
+            {
+              getFieldDecorator('roleName')(
+                <Select style={{ width: '200px' }} placeholder="身份">
+                  <Select.Option value={1}>户主</Select.Option>
+                  <Select.Option value={3}>家属</Select.Option>
+                  <Select.Option value={2}>租客</Select.Option>
+                </Select>
+              )
+            }
+            </Form.Item>
+            <Form.Item>
+            {
+              getFieldDecorator('verifyStatus')(
+                <Select style={{ width: '200px' }} placeholder="审核状态">
+                  <Select.Option value={0}>未审核</Select.Option>
+                  <Select.Option value={1}>审核通过</Select.Option>
+                  <Select.Option value={2}>审核不通过</Select.Option>
+                </Select>
+              )
+            }
+            </Form.Item>
           </>
         )
       }}
 export default props => {
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
+  const [selectedKeys, setSelectedKeys] = useState([])
   const [pagination, setPagination] = useState({})
+  const [communityId, setCommunityId] = useState()
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
 
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      // console.log('------>', selectedRowKeys)
+      setSelectedKeys(selectedRowKeys)
+    }
+  }
+
   const handleSearch = (vals) => {
     setQueryParams({
       ...vals,      
     })
   }
 
+  const handleDeleteSelected = () => {
+    deleteBuilding({ data: selectedKeys }).then(res => {
+      Modal.success({
+        content: '数据删除成功',
+        onOk: () => {
+          window.location.reload()
+        }
+      })
+    })
+  }
+
   const handlePageChange = (pageNum, pageSize) => {
     setQueryParams({
       ...queryParams,      
     })
   }
 
+  const handleExport = () => {
+    setLoading(true)
+    buildingInfoListExport({ data: {...queryParams, communityId, pageNum: 1, pageSize: 9999} }).then(res => {
+      setLoading(false)
+      exportExcel(res, "业主列表")
+    }).catch(() => setLoading(false))
+  }
+
   useEffect(() => {
     setLoading(true)
-    buildingInfoList({ data: queryParams }).then(res => {
+    buildingInfoList({ data: {...queryParams, communityId} }).then(res => {
       const { list, ...pageInfo } = res || {}
       setListData(list)
       setPagination(pageInfo)
       setLoading(false)
     }).catch(() => setLoading(false))
-  }, [queryParams])
+  }, [queryParams, communityId])
 
   return (
     <div>
-      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <Condition onSearch={handleSearch} onReset={handleSearch} onCommunityChange={v => setCommunityId(v)} />
       <div style={{ margin: '24px 0' }}>
         <NavLink to={`/property/proprietor/add`}>
           <Button type="primary">添加</Button>
         </NavLink>
-        <NavLink to={`/property/proprietor/batch`}>
+        <div style={{marginLeft: 16, display: 'inline-block'}}>
+          <Popconfirm
+            title="确认进行批量删除操作?"
+            onConfirm={handleDeleteSelected}
+            okText="确定"
+            cancelText="取消"
+          >
+            <Button type="danger" disabled={!selectedKeys.length}>批量删除</Button>
+          </Popconfirm>
+        </div>
+        <div style={{marginLeft: 16, display: 'inline-block'}}>
+          <Button onClick={handleExport}>导出</Button>
+        </div>
+        <NavLink to={`/property/proprietor/batch?community=${communityId}`}>
           <Button type="link"><Icon type="upload"/>批量导入业主资料</Button>
         </NavLink>
       </div>
-      <List dataSource={listData} loading={loading} onPageChange={handlePageChange} pagination={pagination} rowKey="userVerifyId">
-        <Table.Column title="编号" dataIndex="userVerifyId" key="userVerifyId" />
+      <List
+        dataSource={listData}
+        loading={loading}
+        pagination={pagination}
+        rowSelection={rowSelection} 
+        onPageChange={handlePageChange}
+        rowKey="id"
+      >
         <Table.Column
           title="姓名"
           dataIndex="ownerName"
         />
         <Table.Column title="手机号" dataIndex="ownerTel" key="ownerTel" />
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />
+        <Table.Column title="性别" dataIndex="idCard" key="idCard1" render={t => !t ? '' : (t.substring(-2, 1) - 0) % 2 === 1 ? '男' : '女'} />
         <Table.Column
           title="房间号"
           dataIndex="roomNoName"
               </span>
             )
           }}
+          sorter={(a, b) => a.verifyStatus - b.verifyStatus}
         />
-        <Table.Column title="编辑人" dataIndex="updateName" key="updateName" />
+        <Table.Column title="审核人" dataIndex="updateName" key="updateName" />
         <Table.Column title="编辑时间" dataIndex="createDate" key="createDate" />
         <Table.Column
           title="操作"

src/pages/property/ticket/index.jsx

 import { Select, Spin, Table, Button, Form, Input, Divider, Typography } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetchList, apis, fetch } from '@/utils/request'
+import CommunitySelect from '@/components/CommunitySelect'
 import Search from '../components/Search'
 import List from '../components/List'
 
     label: '已评价',
     value: '5',
   },
-  {
-    label: '已终止',
-    value: '6',
-  },
+  // {
+  //   label: '已终止',
+  //   value: '6',
+  // },
 ]
 
 const getDictValue = (dict, val) => (dict.filter(x => x.value === val)[0] || {}).label
 const listTicket = fetch(apis.ticket.listTicket)
 
 const Condition = props => {
+  const [communityId, setCommunityId] = useState()
+  
+  const handleCommunityChange = v => {
+    setCommunityId(v)
+
+    props.onCommunityChange(v)
+  }
+
   return (
     <Search
       onSearch={props.onSearch}
         
         return (
           <>
+            <Form.Item label="小区">
+            {
+              <CommunitySelect value={communityId} onChange={handleCommunityChange} autoInited />
+            }
+            </Form.Item>
             <Form.Item label="工单编号">
             {
               getFieldDecorator('id')(<Input placeholder="工单编号" />)
               getFieldDecorator('status')(
                 <Select placeholder="选择状态" style={{ width: '120px' }}>
                   {
-                    TypeDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
+                    StatusDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
                   }
                 </Select>
               )
 export default props => {
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
+  const [communityId, setCommunityId] = useState()
   const [pagination, setPagination] = useState({})
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
 
 
   useEffect(() => {
     setLoading(true)
-    listTicket({data: queryParams}).then(res => {
+    listTicket({data: {...queryParams, communityId}}).then(res => {
       const {list, ...pagi} = res
       setListData(list)
       setPagination(pagi)
       setLoading(false)
     }).catch(e => setLoading(false))
-  }, [queryParams])
+  }, [queryParams, communityId])
 
   return (
     <div>
-      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <Condition onSearch={handleSearch} onReset={handleSearch} onCommunityChange={v => setCommunityId(v)} />
       <div style={{ margin: '24px 0' }}>
         {/* <NavLink to={`/property/notice/edit`}>
           <Button type="primary">添加</Button>
           }}
         />
         <Table.Column title="发起人" dataIndex="createUserNmae" key="createUserNmae" />
+        <Table.Column title="业主楼栋信息" dataIndex="address" key="address" />
         <Table.Column title="发起时间" dataIndex="createDate" key="createDate" />
-        <Table.Column title="流转状态" dataIndex="status" key="status" render={x => getDictValue(StatusDict, x)} />
+        <Table.Column title="流转状态" dataIndex="status" key="status" render={x => getDictValue(StatusDict, x)}/>
         <Table.Column title="当前处理人" dataIndex="tpUserNmae" key="tpUserNmae" />
         <Table.Column title="最近操作时间" dataIndex="updateDate" key="updateDate" />
       </List>

src/pages/property/utils/hooks/useRoomSelect.js

 const fetchLevelList = fetch(apis.buildingOwnerInfo.getLevelList)
 const fetchRoomNoList = fetch(apis.buildingOwnerInfo.getRoomNoList)
 
-export default function useRoomSelect() {
+export default function useRoomSelect(communityId) {
   const [phaseList, setPhaseList] = useState([])
   const [buildingList, setBuildingList] = useState([])
   const [unitList, setUnitList] = useState([])
 
   // 获取期
   useEffect(() => {
-    fetchPhaseList().then(res => setPhaseList(res))
-  }, [])
+    if (communityId) {
+      fetchPhaseList({params: {communityId}}).then(res => setPhaseList(res))
+    }
+  }, [communityId])
 
   // 楼栋
   useEffect(() => {

src/pages/staff/list/editStaff.jsx

 
 import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert, Modal } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '@/components/SelectButton/BuildSelect'
 import router from 'umi/router';
-import styles from '../../style/GoodsList.less';
-import { FieldTypes, createForm } from '../../../components/XForm';
-import Wangedit from '../../../components/Wangedit/Wangedit'
+import { FieldTypes, createForm } from '@/components/XForm';
+import Wangedit from '@/components/Wangedit/Wangedit'
+import CommunitySelect from '@/components/CommunitySelect';
 import channels from './channelList.less';
 import Tagss from '../components/Tagss.jsx';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import BuildingSelection from '../components/BuildingSelection'
+import styles from '../../style/GoodsList.less';
 
 const { TextArea } = Input;
 const { Option } = Select;
 
 const XForm = createForm({ onValuesChange: handleFormValueChange })
 
+const AuthCommunity = props => {
+  const value = (props.value || []).map(x => x.id)
+  const handleChange = vals => {
+    const data = (vals || []).map(x => ({id: x}))
+    props.onChange(data)
+  }
+
+  return (
+    <CommunitySelect
+      mode="multiple"
+      value={value}
+      onChange={handleChange}
+    />
+  )
+}
+
 /**
  *
  *
         { required: true, message: '请选择头像' },
       ]
     },
+    {
+      label: '授权小区',
+      name: 'communityList',
+      render: <AuthCommunity />,
+      value: userData.communityList,
+      rules: [
+        { required: true, message: '请选择授权小区' },
+      ]
+    },
     {
       label: '简介',
       name: 'description',
       render: <TextArea className={channels.inpuitTxt} placeholder="生活管家请在此填写服务范围" ></TextArea>,
       value: userData.description
-
     },
     {
       label: '状态',
     // },
   ]
 
-  console.log('--------->', fields)
-
   return <div>
             <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
             {/* <Modal

src/pages/user/login/components/Login/CaptchaImg.jsx

+import React, { useEffect, useState } from 'react'
+import { fetch, apis } from '@/utils/request'
+
+const getCaptcha = fetch(apis.image.captcha)
+
+export default props => {
+  const [ver, setVer] = useState(0)
+  const [captcha, setCaptcha] = useState({image: '验证码'})
+
+  const handleClick = () => {
+    setVer(ver + 1)
+  }
+
+  useEffect(() => {
+    getCaptcha().then(res => {
+      setCaptcha(res)
+      if (props.onChange) {
+        props.onChange(res.key)
+      }
+    })
+  }, [ver])
+
+  return (
+    <img src={captcha.image} width="100%" height="40" onClick={handleClick} style={{cursor: 'pointer'}} />
+  )
+}

src/pages/user/login/components/Login/LoginItem.jsx

 import ItemMap from './map';
 import LoginContext from './LoginContext';
 import styles from './index.less';
+import CaptchaImg from './CaptchaImg'
+
 const FormItem = Form.Item;
 
 class WrapFormItem extends Component {
               {getFieldDecorator(name, options)(<Input {...customProps} {...inputProps} />)}
             </Col>
             <Col span={8}>
-              <Button
+              {/* <Button
                 disabled={!!count}
                 className={styles.getCaptcha}
                 size="large"
                 onClick={this.onGetCaptcha}
               >
                 {count ? `${count} ${getCaptchaSecondText}` : getCaptchaButtonText}
-              </Button>
+              </Button> */}
+              {getFieldDecorator('captchaKey')(<CaptchaImg />)}
             </Col>
           </Row>
         </FormItem>

src/pages/user/login/components/Login/index.jsx

 
     if (form) {
       form.validateFields(
-        activeFields,
+        activeFields.concat('captchaKey'),
         {
           force: true,
         },
           <div className={styles.con}>
             <p className={styles.welcome}>欢迎使用</p>
             <div className={styles.title}>
-              <p className={styles.name}>远道汇 · 系统</p>
+              <p className={styles.name}>远道荟 · 系统</p>
               {/* <span style={{fontSize:' 0.106rem',lineHeight:' 0.106rem'}}>YUANDAO HUI</span> */}
             </div>
           </div>

src/pages/user/login/components/Login/map.jsx

       },
     ],
   },
+  Captcha: {
+    props: {
+      size: 'large',
+      id: 'captcha',
+      placeholder: '888888',
+    },
+    rules: [
+      {
+        required: true,
+        message: '请输入验证码!',
+      },
+    ],
+  },
 };

src/pages/user/login/index.jsx

               }
             }}
           />
+          <Captcha name="captcha" placeholder="请填写验证码" />
           <Submit loading={submitting}>
             <FormattedMessage id="user-login.login.login" />
           </Submit>

src/services/apis.js

 import announcement from './announcement_api'
 import ticket from './ticket_api'
 import propNews from './prop_news_api'
+import dashboard from './dashboard_api'
+import community from './community_api'
 
 const prefix = `${APIBaseURL}api/admin`
 
   announcement: announcement(prefix),
   ticket: ticket(prefix),
   propNews: propNews(prefix),
+  dashboard: dashboard(prefix),
+  community: community(prefix),
   mp: {
     detail: {
       url: `${prefix}/taMpInfo`,
       url: `${prefix}/person-list`,
       method: 'GET',
       action: 'admin.person.list',
+    },
+    export: {
+      url: `${prefix}/person-list/export`,
+      method: 'GET',
+      action: 'admin.person.export',
     }
   },
   image: {
       url: `${prefix}/qrcode`,
       method: 'POST',
       action: 'upload',
+    },
+    captcha: {
+      url: `${prefix}/image-captcha`,
+      method: 'GET',
+      action: 'upload',
     }
   },
   user: {
       method: 'GET',
       action: 'admin.taPointsExchange.get',
     },
+    taPointsExchangeExport: {
+      url: `${prefix}/taPointsExchange/export`,
+      method: 'GET',
+      action: 'admin.taPointsExchange.get',
+    },
     getTaGoods: {
       url: `${prefix}/taGoods`,
       method: 'GET',

src/services/buildingOwnerInfo_api.js

       action: `admin.${moduleName}.roomno`
     },
 
+    //  查询 楼栋/单元/楼层/户号
+    getAllRoomNoList: {
+      url: `${prefix}/${moduleName}/building-room/list`,
+      method: 'get',
+      action: `admin.${moduleName}.all-room`
+    },
+
     // 获取楼栋户主信息列表
     buildingList: {
       url: `${prefix}/${moduleName}/list`,
       action: `admin.${moduleName}.list.post`
     },
 
+    // 导出楼栋户主信息列表
+    buildingListExport: {
+      url: `${prefix}/${moduleName}/list/export`,
+      method: 'post',
+      action: `admin.${moduleName}.list-export.post`
+    },
+
     // 认证通过户主信息
     userPassCertification: {
       url: `${prefix}/${moduleName}/userPassCertification`,
       action: `admin.${moduleName}.addnode`
     },
 
+    // 编辑当前期/栋/单元/层/户/节点
+    updateNode: {
+      url: `${prefix}/${moduleName}/updatenode`,
+      method: 'post',
+      action: `admin.${moduleName}.updatenode`
+    },
+
     // 删除当前期/栋/单元/层/户/节点
     deleteNode: {
       url: `${prefix}/${moduleName}/deletenode`,

src/services/community_api.js

+
+export default prefix => ({
+  list: {
+    url: `${prefix}/tpCommunity`,
+    method: 'GET',
+    action: 'admin.community.list'
+  },
+  detail: {
+    url: `${prefix}/tpCommunity/:id`,
+    method: 'GET',
+    action: 'admin.community.detail'
+  },
+  update: {
+    url: `${prefix}/tpCommunity/:id`,
+    method: 'PUT',
+    action: 'admin.community.update'
+  },
+  save: {
+    url: `${prefix}/tpCommunity`,
+    method: 'POST',
+    action: 'admin.community.save'
+  },
+  delete: {
+    url: `${prefix}/tpCommunity/:id`,
+    method: 'DELETE',
+    action: 'admin.community.delete'
+  },
+})

src/services/dashboard_api.js

+
+export default prefix => {
+  return {
+    statis: {
+      url: `${prefix}/dashboard/statis`,
+      method: 'get',
+      action: `admin.dashboard.statis`
+    },
+    dynamic: {
+      url: `${prefix}/dashboard/dynamic`,
+      method: 'get',
+      action: `admin.dashboard.dynamic`
+    },
+    houseVerified: {
+      url: `${prefix}/dashboard/house-verified`,
+      method: 'get',
+      action: `admin.dashboard.house-verified`
+    },
+    tips: {
+      url: `${prefix}/dashboard/tips`,
+      method: 'get',
+      action: `admin.dashboard.tips`
+    }
+  }
+}

src/utils/constant.js

 
-export const APIBaseURL = process.env.NODE_ENV === 'production' ? 'https://xs.ycjcjy.com/' : '/'
+export const APIBaseURL = process.env.NODE_ENV === 'production' ? 'https://xs.njyunzhi.com/' : '/'
 
 export const AMapAPIPrefix = `${APIBaseURL}gaode_amap`

src/utils/utils.js

 export function ObjSpEqual(a = {}, b = {}) {
   return JSON.stringify(a) === JSON.stringify(b)
 }
+
+
+export function exportExcel(data, title) {  
+  const url = window.URL.createObjectURL(new Blob([data]))
+  const link = document.createElement('a')
+  link.style.display = 'none'
+  link.href = url
+  link.setAttribute('download', `${title}.xlsx`)
+  document.body.append(link)
+  link.click()
+}