feats

config/defaultSettings.js

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

config/routes.js

             name: '物业管理',
             component: '../layouts/BlankLayout',
             routes: [
+              {
+                path: 'community',
+                name: '社区管理',
+                component: './property/community'
+              },
               {
                 path: 'buildingInfo',
                 name: '楼栋管理',
                 component: './property/news/Edit',
                 hideInMenu: true,
               },
+              {
+                path: 'public-service',
+                name: '公共服务',
+                component: './property/contact/PublicServ'
+              },
               {
                 path: 'bill/management',
                 name: '收费组管理',
               },
               {
                 path: 'contact',
-                name: '联系方式',
+                name: '联系物业',
                 component: './property/contact'
               },
               {

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/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/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/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'
         title="工作台"
         backIcon={false}
         ghost={false}
+        extra={[
+          <CommunitySelect key="1" style={{minWidth: 200}} autoInited />
+        ]}
       >
         <ABPart
           align="middle"

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

       name: props.phase.name,
       type: 'building',
       nodeNumber: v,
+      communityId: props.community,
     }}).then((res) => {
       notification.success({message: '添加成功'})
       setBuildingList(buildingList.concat(res))
                 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} />
+                <BuildingUnit building={building} phase={props.phase} community={props.community} />
               </Tabs.TabPane>
             )
           })

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

       name: roomInfo.levelName,
       type: 'roomNo',
       nodeNumber: val,
+      communityId: props.community,
     }}).then((res) => {
       if (props.onHouseAdd) {
         props.onHouseAdd(res)

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

         render: (t, row) => (
           <BuildingLevelCell
             dataSource={row}
+            community={props.community}
             onHouseAdd={props.onHouseAdd}
             onEdit={props.onLevelEdit}
             onDelete={props.onLevelDelete}
               id: row[`id-${index}`],
               name: row[`name-${index}`]
             }}
+            community={props.community}
             onEdit={props.onHouseEdit}
             onDelete={props.onHouseDelete}
           />
     <div>
       <BuildingUnitCell
         dataSource={anyRoom}
+        community={props.community}
         onLevelAdd={props.onLevelAdd}
         onEdit={props.onUnitEdit}
         onDelete={props.onUnitDelete}

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

         name: roomInfo.levelName,
         type: 'roomNo',
         nodeNumber: val,
+        communityId: props.community,
       }}).then((res) => {
         if (props.onEdit) {
           props.onEdit(res)

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

       name: props.building.name,
       type: 'unit',
       nodeNumber: v,
+      communityId: props.community,
     }}).then((res) => {
       // 构造房间数据
       const roomInfo = {
               <div style={{flex: 'none', marginLeft: 48}} key={key}>
                 <BuildingLevelRow
                   dataSource={roomGroup[key]}
+                  community={props.community}
                   onUnitDelete={handleDeleteUnit}
                   onHouseAdd={handleHouseAdd}
                   onHouseEdit={handleHouseEdit}

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

       name: roomInfo.unitName,
       type: 'level',
       nodeNumber: val,
+      communityId: props.community,
     }}).then((res) => {
       // 构造房间数据
       const room = {
   return (
     <div style={{textAlign: 'center', fontSize: '1.2em', lineHeight: '3.5em'}} >
       <Dropdown overlay={menu} trigger={['contextMenu']} placement="topCenter">
-        <div style={{cursor: 'pointer'}}>{roomInfo.unitName}</div>
+        <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="请填写楼层名称" />

src/pages/property/building/list.jsx

 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 [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]
   }
 
   const handleBatchImport = () => {
-    router.push('/property/buildingInfo/importExcel')
+    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))
 
   // 获取期
   useEffect(() => {
-    setLoading(true)
-    fetchPhaseList().then(res => {
-      setPhaseList(res)
-      setLoading(false)
-    }).catch(() => setLoading(false))
-  }, [])
+    if (community) {
+      setLoading(true)
+      fetchPhaseList({params: {communityId: community}}).then(res => {
+        setPhaseList(res)
+        setLoading(false)
+      }).catch(() => setLoading(false))
+    }
+  }, [community])
 
   return (
     <div>
         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
             phaseList.map((phase, index) => {
               return (
                 <Tabs.TabPane tab={phase.name} key={`${index}`}>
-                  <Building phase={phase} />
+                  <Building phase={phase} community={community} />
                 </Tabs.TabPane>
               )
             })

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/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 { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm, notification } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetch, apis } from '@/utils/request'
+import CommunitySelect from '@/components/CommunitySelect'
 import Search from '../components/Search'
 import List from '../components/List'
 
 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="公告编号" />)
 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)
-    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>

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="期/区">
             {

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 [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)
+      // console.log('------>', selectedRowKeys)
       setSelectedKeys(selectedRowKeys)
     }
   }
     const row = {
       ...currentRow.current,
       ...vals,
+      communityId,
     }
 
     handleVerfiy(row, false)
 
   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

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 => {

src/pages/property/proprietor/index.jsx

 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 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="期/区">
                 {
   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)
+      // console.log('------>', selectedRowKeys)
       setSelectedKeys(selectedRowKeys)
     }
   }
 
   const handleExport = () => {
     setLoading(true)
-    buildingInfoListExport({ data: {...queryParams, pageNum: 1, pageSize: 9999} }).then(res => {
+    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>
         <div style={{marginLeft: 16, display: 'inline-block'}}>
           <Button onClick={handleExport}>导出</Button>
         </div>
-        <NavLink to={`/property/proprietor/batch`}>
+        <NavLink to={`/property/proprietor/batch?community=${communityId}`}>
           <Button type="link"><Icon type="upload"/>批量导入业主资料</Button>
         </NavLink>
       </div>

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'
 
 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="工单编号" />)
 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>

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/services/apis.js

 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`
 
   ticket: ticket(prefix),
   propNews: propNews(prefix),
   dashboard: dashboard(prefix),
+  community: community(prefix),
   mp: {
     detail: {
       url: `${prefix}/taMpInfo`,

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'
+  },
+})