feats

config/routes.js

@@ -154,18 +154,18 @@ export default [
               },
               {
                 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,
               },

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

@@ -1,18 +1,16 @@
 import React, { useEffect, useState } from 'react'
-import { Button, Upload, Icon, Table, Select } from 'antd'
+import { Button, Upload, Icon, Table } from 'antd'
 import { fetch, apis } from '@/utils/request'
 import List from '../../../components/List'
 
 const billDownloadExcel = fetch(apis.bill.billDownloadExcel)
 const billUploadExcel = fetch(apis.bill.billUploadExcel)
-const fetchPhaseList = fetch(apis.buildingOwnerInfo.getPhaseList)
-const fetchBuildingList = fetch(apis.buildingOwnerInfo.getBuildingList)
 
 const Section = props => {
   return (
-    <p style={{ color: '#99a9bf', fontSize: '13px' }}>
+    <div style={{ color: '#99a9bf', fontSize: '13px' }}>
       {props.children}
-    </p>
+    </div>
   )
 }
 
@@ -20,13 +18,11 @@ export default props => {
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
   const [pagination, setPagination] = useState({})
-  const [phaseId, setPhaseId] = useState(null)
-  const [buildingId, setBuildingId] = useState(null)
-  const [phaseList, setPhaseList] = useState([])
-  const [buildingList, setBuildingList] = useState([])
+
+  const {communityId, phaseId, buildingId, dataSource} = props
 
   const handleDownloadExcel = () => {
-    billDownloadExcel({params: {phaseId,buildingId}}).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
@@ -62,52 +58,18 @@ export default props => {
     input.click()
   }
 
-  const handlePhaseChange = (e) => {
-    setPhaseId(e)
-  }
-
-  const handleBuildingChange = (e) => {
-    setBuildingId(e)
-  }
-
-
-  // 获取期
-  useEffect(() => {
-    fetchPhaseList().then(res => setPhaseList(res))
-  }, [])
-
-  // 楼栋
-  useEffect(() => {
-    if (phaseId) {
-      fetchBuildingList({params: {phaseId}}).then(res => setBuildingList(res))
-    }
-    setBuildingId()
-  }, [phaseId])
-
   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>
-        <Select onChange={handlePhaseChange} style={{ width: '120px' }} placeholder="期/区">
-          {
-            phaseList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
-          }
-        </Select>
-             
-        <Select onChange={handleBuildingChange} style={{ width: '120px' }} placeholder="栋">
-          {
-            buildingList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
-          }
-        </Select>
-            
+        <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>
@@ -116,8 +78,8 @@ export default props => {
       </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

@@ -1,7 +1,8 @@
 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 = {
@@ -30,11 +31,20 @@ const tailFormItemLayout = {
 
 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
@@ -50,38 +60,53 @@ export default Form.create()(props => {
           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])
 
@@ -89,19 +114,51 @@ export default Form.create()(props => {
     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: [
@@ -109,18 +166,12 @@ export default Form.create()(props => {
             ],
           })(<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> */}
@@ -128,6 +179,6 @@ export default Form.create()(props => {
           <Button style={{ marginLeft: '24px' }} onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>
       </Form>
-    </div>
+    </Spin>
   )
 })

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

@@ -5,6 +5,7 @@ import NavLink from 'umi/navlink'
 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)
@@ -13,7 +14,9 @@ const updateBillInvoiceStatus = fetch(apis.bill.updateBillInvoiceStatus)
 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
@@ -32,6 +35,7 @@ export default props => {
   const handleAdd = (vals, callback) => {
     addTempBillInvoice({data: {
       billId: id,
+      communityId: billInfo.communityId,
       ...vals,
     }}).then(res => {
       callback()
@@ -63,6 +67,7 @@ export default props => {
   useEffect(() => {
     if (id) {
       getListData()
+      getBillInfoBydId({urlData: {id}}).then(x => setBillInfo(x))
     }
     getListData()
   }, [])
@@ -98,7 +103,7 @@ export default props => {
         />
       </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

@@ -43,7 +43,8 @@ export default Form.create()(props => {
     unitList,
     levelList,
     roomNoList
-  } = useRoomSelect()
+  } = useRoomSelect(props.communityId)
+
   const [formData, setFormData] = useState({})
 
   const [phaseErr, setPhaseErr] = useState('')
@@ -159,13 +160,13 @@ export default Form.create()(props => {
           }
         </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

@@ -1,4 +1,4 @@
-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'
 
@@ -31,37 +31,41 @@ export default Form.create()(props => {
     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="截止时间">
@@ -71,7 +75,7 @@ export default Form.create()(props => {
               { required: true, message: '请选择截止时间' },
             ],
           })(
-            <DatePicker showTime placeholder="请选择截止时间" />
+            <DatePicker placeholder="请选择截止时间" />
           )
         }
         </Form.Item>

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

@@ -49,7 +49,7 @@ const Condition = props => {
     unitList,
     levelList,
     roomNoList
-  } = useRoomSelect()
+  } = useRoomSelect(props.communityId)
   
   const handleSearch = vals => {
     const data = {
@@ -284,16 +284,14 @@ export default props => {
         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'}}>
@@ -317,10 +315,10 @@ export default props => {
           <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 => 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 => t ? moment(t).format('YYYY-MM-DD HH:mm'): ''}/>
-          <Table.Column title="修改人" dataIndex="updateUserName" key="updateUserName" />
+          <Table.Column title="修改人" dataIndex="updateUserName" key="updateUserName" /> */}
           <Table.Column
             title="操作"
             key="action"

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

@@ -1,35 +1,74 @@
 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>
           </>
@@ -42,20 +81,27 @@ const Condition = props => {
 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: '应缴户数',
@@ -73,14 +119,14 @@ const TableList = props => {
       key: 'unpayedNum',
     },
     {
-      title: '收费组状态',
+      title: '收费状态',
       key: 'billStatus',
       render: (t, row) => {
         switch (row.billStatus) {
           case '0':
-            return '正在收费'
+            return '进行中'
           case '1':
-            return '收费完成'
+            return '完成'
           case '2':
             return '草稿'
           default:
@@ -88,18 +134,6 @@ const TableList = props => {
         }
       }
     },
-    {
-      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',
@@ -139,6 +173,7 @@ export default props => {
   const [listData, setListData] = useState([])
   const [pagination, setPagination] = useState({})
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  const [communityId, setCommunityId] = useState()
   
   const handleQuery = vals => {
     setQueryParams({
@@ -173,18 +208,20 @@ export default props => {
   }
 
   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>