feats

config/routes.js

@@ -613,11 +613,23 @@ export default [
                 component: './property/bill/edit',
                 hideInMenu: true,
               },
+              {
+                path: 'bill/management/info',
+                name: '收费组详情',
+                component: './property/bill/info',
+                hideInMenu: true,
+              },
               {
                 path: 'bill/order',
                 name: '订单管理',
                 component: './property/bill/order',
               },
+              {
+                path: 'bill/order/info',
+                name: '订单信息',
+                component: './property/bill/order/Info',
+                hideInMenu: true,
+              },
               {
                 path: 'bill/ticket',
                 name: '工单管理',

src/global.less

@@ -68,6 +68,10 @@ ol {
     padding-left: 40px;
   }
 }
+
+.ant-pro-grid-content .ant-pro-page-header-wrap-children-content {
+  margin-top: 8px !important;
+}
  
 .ant-layout{
 //   .ant-menu-vertical .ant-menu-item,
@@ -123,50 +127,50 @@ ol {
     font-size: 0.096rem;
   }
 } 
-  .ant-pro-global-header-trigger{
-    display: none;
-  }
-  .ant-pro-sider-menu-sider.light{
-    box-shadow: none;
-    .ant-pro-sider-menu-logo h1{
-      color: #fff;
-    }
-  }
+  // .ant-pro-global-header-trigger{
+  //   display: none;
+  // }
+  // .ant-pro-sider-menu-sider.light{
+  //   box-shadow: none;
+  //   .ant-pro-sider-menu-logo h1{
+  //     color: #fff;
+  //   }
+  // }
   .ant-pro-page-header-wrap-page-header-warp{
     background:rgba(240,240,240,1);
   }
-   .ant-menu:not(.ant-menu-horizontal)  .ant-menu-item-selected{
-    // background:rgb(230, 227, 227)!important;
-    // background: #1890ff !important;
-    border: none!important;
-  }
-  .ant-menu-inline .ant-menu-selected::after, .ant-menu-inline .ant-menu-item-selected::after{
-    opacity: 0;
-  }
-  .ant-menu-inline > .ant-menu-item{
-    height: 45px;
-    line-height: 45px;
+  //  .ant-menu:not(.ant-menu-horizontal)  .ant-menu-item-selected{
+  //   // background:rgb(230, 227, 227)!important;
+  //   // background: #1890ff !important;
+  //   border: none!important;
+  // }
+  // .ant-menu-inline .ant-menu-selected::after, .ant-menu-inline .ant-menu-item-selected::after{
+  //   opacity: 0;
+  // }
+  // .ant-menu-inline > .ant-menu-item{
+  //   height: 45px;
+  //   line-height: 45px;
     
-    margin: 0;
-    .ant-menu-submenu-title{
-      font-size: 16px!important;
-    }
-  }
-  .ant-menu.ant-pro-sider-menu{
-    padding: 0!important;
-  }
+  //   margin: 0;
+  //   .ant-menu-submenu-title{
+  //     font-size: 16px!important;
+  //   }
+  // }
+  // .ant-menu.ant-pro-sider-menu{
+  //   padding: 0!important;
+  // }
   
   .ant-breadcrumb + .ant-page-header-heading{
     display: none;
   }
   .ant-page-header{
-    height: 50px;
-    padding:0 30px;
-    line-height: 50px;
+    // height: 50px;
+    // padding:0 30px;
+    // line-height: 50px;
     
-    .ant-breadcrumb{
-      color: #333;
-    }
+    // .ant-breadcrumb{
+    //   color: #333;
+    // }
   }
   .ant-pro-sider-menu-logo img{
     height: 41px;

src/layouts/BlankLayout.jsx

@@ -7,8 +7,9 @@ const Layout = ({ children }) => (
       style={{
         backgroundColor: '#fff',
         padding: '32PX 28px',
-        boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
-        borderRadius: '12px',
+        border: '1px solid rgba(0, 0, 0, 0.12)',
+        boxShadow: '0 1px 4px rgba(0, 21, 41, 0.08)',
+        borderRadius: '2px',
         minHeight:'60vh'
       }}
     >

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

@@ -1,7 +1,11 @@
-import React, { useState } from 'react'
+import React, { useEffect, useState } from 'react'
 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 Section = props => {
   return (
     <p style={{ color: '#99a9bf', fontSize: '13px' }}>
@@ -11,19 +15,65 @@ const Section = props => {
 }
 
 export default props => {
+  const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
+  const [pagination, setPagination] = useState({})
+
+  const handleDownloadExcel = () => {
+    billDownloadExcel().then(res => {
+      const url = window.URL.createObjectURL(new Blob([res]))
+      const link = document.createElement('a')
+      link.href = url
+      link.setAttribute('download', '缴费单模板.xls')
+      link.click()
+    })
+  }
+
+  const handleUploadExcel = () => {
+    const input = document.createElement('input')
+    input.setAttribute('type', 'file')
+    input.addEventListener('input', e => {
+      const file = e.target.files[0]
+      if (!file) {
+        return
+      }
+
+      const data = new FormData()
+      data.append('file', file)
+
+      if (props.onFileInput) {
+        props.onFileInput(file)
+      }
+
+      setLoading(true)
+      billUploadExcel({data}).then(res => {
+        setListData(res.list)
+        setPagination({ total: res.total })
+        setLoading(false)
+      }).catch(() => setLoading(false))
+    })
+
+    input.click()
+  }
+
+  useEffect(() => {
+    if (props.dataSource) {
+      setListData(props.dataSource.billInvoice)
+      setPagination({ total: props.dataSource.total })
+    }
+  }, [props.dataSource])
 
   return (
     <div>
       <Section>
         <span>如果还未制作账单，请先下载账单模板，按规则填写费用后再上传</span>
-        <Button type="link" size="small" style={{ marginLeft: '6px' }}><Icon type="download" />下载模板</Button>
-        <Button type="link" size="small"><Icon type="upload" />选取账单文件并预览</Button>
+        <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>
         <span>如果想修改下表的内容，请重新下载excel模板填写金额后上传，系统会直接删除下表所有旧数据，以新的excel内容为准</span>
       </Section>
-      <List dataSource={listData} size="small" bordered>
+      <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))} />

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

@@ -1,6 +1,7 @@
-import React from 'react'
+import React, { useEffect, useState, useRef } from 'react'
 import router from 'umi/router'
-import { Button, Form, Input, DatePicker } from 'antd'
+import { fetch, apis } from '@/utils/request'
+import { Button, Form, Input, DatePicker, notification, Modal } from 'antd'
 import AddOn from './components/AddOn'
 
 const formItemLayout = {
@@ -27,65 +28,103 @@ const tailFormItemLayout = {
   },
 }
 
+const billUploadExcelAdd = fetch(apis.bill.billUploadExcelAdd)
+const billInvoiceGetInvoiceInvalid = fetch(apis.bill.billInvoiceGetInvoiceInvalid)
+
 export default Form.create()(props => {
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  const [formData, setFormData] = useState()
+  const [addOnData, setAddOnData] = useState()
+  const file = useRef()
+  
+  const { id } = props.location.query
+  const { getFieldDecorator, setFieldsValue } = props.form
+
+  const handleSubmit = billStatus => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        if (!file.current) {
+          notification.warn({
+            message: '请先上传账单文件'
+          })
+          return
+        }
 
-  const handleSubmit = values => {
+        const data = new FormData()
+        data.append('file', file.current)
+        data.append('billExplain', values.billExplain)
+        data.append('billName', values.billName)
+        data.append('endDate', values.endDate)
+        data.append('billStatus', billStatus)
 
+        if (id) {
+          data.append('billId', id)
+        }
+
+        billUploadExcelAdd({ data }).then(res => {
+          Modal.success({
+            content: '生成数据成功',
+            onOk: () => router.go(-1)
+          })
+        })
+      }
+    })
   }
 
-  const { getFieldDecorator } = props.form
+  useEffect(() => {
+    if (id) {
+      billInvoiceGetInvoiceInvalid({
+        data: {
+          ...queryParams,
+          billId: id,
+        }
+      }).then(res => {
+        setFormData(res.bill)
+        setAddOnData(res)
+      })
+    }
+  }, [id, queryParams])
+
+  useEffect(() => {
+    setFieldsValue(formData || {})
+  }, [formData])
 
   return (
     <div>
-      <Form {...formItemLayout} onSubmit={handleSubmit}>
+      <Form {...formItemLayout} onSubmit={e => e.preventDefault()}>
         <Form.Item label="收费组名称">
         {
           getFieldDecorator('billName', {
             rules: [
-              {
-                required: true,
-                message: '请填写收费组名称',
-              },
+              { required: true, message: '请填写收费组名称', },
             ],
-          })(
-            <Input />
-          )
+          })(<Input />)
         }
         </Form.Item>
         <Form.Item label="收费组说明">
         {
           getFieldDecorator('billExplain', {
             rules: [
-              {
-                required: true,
-                message: '请填写收费组说明',
-              },
+              { required: true, message: '请填写收费组说明', },
             ],
-          })(
-            <Input />
-          )
+          })(<Input />)
         }
         </Form.Item>
         <Form.Item label="截止时间">
         {
           getFieldDecorator('endDate', {
             rules: [
-              {
-                required: true,
-                message: '请填写公告内容',
-              },
+              { required: true, message: '请填写公告内容', },
             ],
-          })(
-            <DatePicker />
-          )
+          })(<DatePicker />)
         }
         </Form.Item>
         <Form.Item label=" " colon={false}>
-          <AddOn />
+          <AddOn dataSource={addOnData} onFileInput={f => file.current = f}/>
         </Form.Item>
         <Form.Item {...tailFormItemLayout} >
-          <Button type="primary" htmlType="submit">草稿</Button>
-          <Button type="danger" style={{ marginLeft: '24px' }}>发布</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>

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

@@ -0,0 +1,91 @@
+import React, { useEffect, useState } from 'react'
+import { Button, Icon, Modal, Table, Popconfirm } from 'antd'
+import { fetch, fetchList, apis } from '@/utils/request'
+import NavLink from 'umi/navlink'
+import List from '../../components/List'
+import AddOne from './components/AddOne'
+
+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 [listData, setListData] = useState([])
+  const [formData, setFormData] = useState({})
+
+  const { id } = props.location.query
+  
+  const getListData = useCallback(
+    () => {
+      setLoading(true)
+      getTempBillInvoice({urlData: {id}}).then(res => {
+        setListData(res)
+        setLoading(false)
+      }).catch(e => setLoading(false))
+    },
+    [id],
+  )
+
+  const handleAdd = (vals, callback) => {
+    addTempBillInvoice({
+      billId: id,
+      ...vals,
+    }).then(res => {
+      callback()
+      getListData()
+      setShowAdd(false)
+    }).catch(() => setShowAdd(false))
+  }
+
+  const handleDeleteRow = row => {
+    deleteTempBillInvoice({urlData: {id: row.id}}).then(res => {
+      notification.success({ message: '删除费用信息成功' })
+      getListData()
+    })
+  }
+
+  useEffect(() => {
+    if (id) {
+      getListData()
+    }
+    getListData()
+  }, [])
+
+
+  return (
+    <div>
+      <div>
+        <Button type="primary" onClick={() => setShowAdd(true)}><Icon type="plus"/>新增记录</Button>
+        <Button type="danger" style={{marginLeft: '48px'}} onClick={}><Icon type="save"/>提交全部</Button>
+      </div>
+      <List dataSource={listData} loading={loading} rowKey="id">
+        <Table.Column title="房屋信息" dataIndex="roomNo" key="roomNo" render={(_, row) => row.phase + row.building + row.unit + row.roomNo} />
+        <Table.Column title="收费单说明" dataIndex="billInvoiceExplain" key="billInvoiceExplain" />
+        <Table.Column title="收费金额(元)" dataIndex="payPrice" key="payPrice" render={x => x/100} />
+        <Table.Column
+          title="操作"
+          key="action"
+          render={(_, row) => {
+            return (
+              <>
+                <Popconfirm
+                  title="确认进行删除操作?"
+                  onConfirm={() => handleDeleteRow(row)}
+                  okText="删除"
+                  cancelText="取消"
+                >
+                  <Button type="link">删除</Button>
+                </Popconfirm>
+              </>
+            )
+          }}
+        />
+      </List>
+      <Modal title="收费组信息" visible={showAdd} footer={null} maskClosable={false} destroyOnClose onCancel={() => setShowAdd(false)}>
+        <AddOne onSubmit={handleAdd} onCancel={() => setShowAdd(false)} />
+      </Modal>
+    </div>
+  )
+}

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

@@ -0,0 +1,179 @@
+import React, { useEffect, useState } from 'react'
+import { Form, Button, Input, Select } from 'antd'
+import useRoomSelect from '../../../utils/hooks/useRoomSelect'
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 },
+  },
+}
+
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0,
+    },
+    sm: {
+      span: 16,
+      offset: 6,
+    },
+  },
+}
+
+export default Form.create()(props => {
+  const {
+    phaseId,
+    setPhaseId,
+    buildingId,
+    setBuildingId,
+    unitId,
+    setUnitId,
+    levelId,
+    setLevelId,
+    roomNoId,
+    setRoomNoId,
+    phaseList,
+    buildingList,
+    unitList,
+    levelList,
+    roomNoList
+  } = useRoomSelect()
+  const [formData, setFormData] = useState({})
+
+  const [phaseErr, setPhaseErr] = useState('')
+  const [buildingErr, setBuildingErr] = useState('')
+  const [unitErr, setUnitErr] = useState('')
+  const [levelErr, setLevelErr] = useState('')
+  const [roomNoErr, setRoomNoErr] = useState('')
+
+  const resetForm = () => {
+    setPhaseId()
+    setBuildingId()
+    setUnitId()
+    setLevelId()
+    setRoomNoId()
+    setFormData({})
+  }
+
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err && !phaseId && !buildingId && !unitId && !levelId && !roomNoId) {
+        props.onSubmit({
+          phaseId,
+          buildingId,
+          unitId,
+          levelId,
+          roomNoId,
+          ...values,
+        }, () => resetForm())
+      }
+    });
+  }
+
+  const handleReset = e => {
+    resetForm()
+    if (props.onReset) {
+      props.onReset({
+        phaseId,
+        buildingId,
+        unitId,
+        levelId,
+        roomNoId,
+        ...formData,
+      })
+    }
+  }
+
+  useEffect(() => {
+    props.form.setFieldsValue(formData)
+  }, [formData])
+
+  useEffect(() => {
+    setPhaseErr(phaseId ? '请选择期数': undefined)
+  }, [phaseId])
+
+  useEffect(() => {
+    setBuildingErr(buildingId ? '请选择楼栋': undefined)
+  }, [buildingId])
+
+  useEffect(() => {
+    setUnitErr(setUnitId ? '请选择单元': undefined)
+  }, [setUnitId])
+
+  useEffect(() => {
+    setLevelErr(levelId ? '请选择层数': undefined)
+  }, [levelId])
+
+  useEffect(() => {
+    setRoomNoErr(roomNoId ? '请选择户号': undefined)
+  }, [roomNoId])
+
+  return (
+    <Form {...formItemLayout} onSubmit={handleSubmit}>
+      <Form.Item label="请选择期数" required validateStatus={phaseErr ? 'error' : undefined} help={phaseErr}>
+        <Select value={phaseId} onChange={handlePhaseChange} style={{ minWidth: '120px' }} placeholder="期/区">
+          {
+            phaseList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+          }
+        </Select>
+      </Form.Item>
+      <Form.Item label="请选择楼栋" required validateStatus={buildingErr ? 'error' : undefined} help={buildingErr}>
+        <Select value={buildingId} onChange={handleBuildingChange} style={{ minWidth: '120px' }} placeholder="栋">
+          {
+            buildingList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+          }
+        </Select>
+      </Form.Item>
+      <Form.Item label="请选择单元" required validateStatus={unitErr ? 'error' : undefined} help={unitErr}>
+        <Select value={unitId} onChange={handleUnitChange} style={{ minWidth: '120px' }} placeholder="单元">
+          {
+            unitList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+          }
+        </Select>
+      </Form.Item>
+      <Form.Item label="请选择楼层" required validateStatus={levelErr ? 'error' : undefined} help={levelErr}>
+        <Select value={levelId} onChange={handleLevelChange} style={{ minWidth: '120px' }} placeholder="楼层">
+          {
+            levelList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+          }
+        </Select>
+      </Form.Item>
+      <Form.Item label="请选择户号" required validateStatus={roomNoErr ? 'error' : undefined} help={roomNoErr}>
+        <Select value={roomNoId} onChange={handleRoomChange} style={{ minWidth: '120px' }} placeholder="户号">
+          {
+            roomNoList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+          }
+        </Select>
+      </Form.Item>
+      <Form.Item label="收费单说明">
+      {
+        getFieldDecorator('billInvoiceExplain', {
+          rules: [
+            {required: true, message: '请填写收费单说明'}
+          ]
+        })(<Input placeholder="收费单说明" />)
+      }
+      </Form.Item>
+      <Form.Item label="收费金额(元)">
+      {
+        getFieldDecorator('payPrice', {
+          rules: [
+            {required: true, message: '请填写收费金额'}
+          ]
+        })(<Input placeholder="收费金额(元)" />)
+      }
+      </Form.Item>
+      <Form.Item {...tailFormItemLayout} >
+        <Button type="primary" htmlType="submit">添加到列表</Button>
+        <Button style={{ marginLeft: '24px' }} onClick={props.onCancel}>取消</Button>
+      </Form.Item>
+    </Form>
+  )
+})

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

@@ -0,0 +1,81 @@
+import React, { useEffect, useState } from 'react'
+import { Modal, Form, Input, DatePicker, Button } from 'antd'
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 6 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 12 },
+  },
+}
+
+const tailFormItemLayout = {
+  wrapperCol: {
+    xs: {
+      span: 24,
+      offset: 0,
+    },
+    sm: {
+      span: 16,
+      offset: 6,
+    },
+  },
+}
+
+export default Form.create()(props => {
+  const handleSubmit = e => {
+    e.preventDefault()
+    props.form.validateFields((err, values) => {
+      if (!err && props.onSubmit) {
+        props.onSubmit(values)
+      }
+    })
+  }
+
+  useEffect(() => {
+    props.form.setFieldsValue(props.initialData || {})
+  }, [props.initialData])
+
+  return (
+    <Modal title="收费组信息" visible={props.visible} footer={null} maskClosable={false} destroyOnClose onCancel={props.onCancel}>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="收费组名称">
+        {
+          props.form.getFieldDecorator('billName', {
+            rules: [
+              { required: true, message: '请填写收费组名称' },
+            ],
+          })(<Input placeholder="收费组名称" />)
+        }
+        </Form.Item>
+        <Form.Item label="收费组说明">
+        {
+          props.form.getFieldDecorator('billExplain', {
+            rules: [
+              { required: true, message: '请填写收费组说明' },
+            ],
+          })(<Input placeholder="收费组说明" />)
+        }
+        </Form.Item>
+        <Form.Item label="截止时间">
+        {
+          props.form.getFieldDecorator('endDate', {
+            rules: [
+              { required: true, message: '请选择截止时间' },
+            ],
+          })(
+            <DatePicker showTime placeholder="请选择截止时间" />
+          )
+        }
+        </Form.Item>
+        <Form.Item {...tailFormItemLayout} >
+          <Button type="primary" htmlType="submit">确定</Button>
+          <Button style={{ marginLeft: '24px' }} onClick={props.onCancel}>取消</Button>
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+})

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

@@ -0,0 +1,360 @@
+import React, { useEffect, useRef, useState } from 'react'
+import { PageHeader, Button, Descriptions, Typography, Select, Icon, Table, Modal, Form, Input, notification } from 'antd'
+import { fetch, fetchList, apis } from '@/utils/request'
+import NavLink from 'umi/navlink'
+import Prompt from '@/components/Prompt'
+import Search from '../../components/Search'
+import List from '../../components/List'
+import Edit from './components/Edit'
+import useRoomSelect from '../../utils/hooks/useRoomSelect'
+
+const BillStatusDict = [
+  { value: '0', label: '未缴费' },
+  { value: '1', label: '已线上缴费' },
+  { value: '2', label: '已线下缴费' },
+]
+
+const PayTypeDict = [
+  { value: '0', label: '微信支付' },
+  { value: '1', label: '线下支付' },
+  { value: '2', label: '支付宝支付' },
+]
+
+const getDictLabel = (dict, v) => (dict.filter(x => x.value === v)[0] || {}).label
+
+const getBillInvoiceList = fetch(apis.bill.getBillInvoiceList)
+const deleteBillInvoiceById = fetch(apis.bill.deleteBillInvoiceById)
+const billInvoiceOfflinePayment = fetch(apis.bill.billInvoiceOfflinePayment)
+const updateBillInvoiceIdPayPrice = fetch(apis.bill.updateBillInvoiceIdPayPrice)
+const updateBillInvoiceIdBillInvoiceExplain = fetch(apis.bill.updateBillInvoiceIdBillInvoiceExplain)
+const updateBillNameAndBillExplainAndEndDate = fetch(apis.bill.updateBillNameAndBillExplainAndEndDate)
+const exportBillInvoiceExcel = fetch(apis.bill.exportBillInvoiceExcel)
+
+const Condition = props => {
+  const {
+    phaseId,
+    setPhaseId,
+    buildingId,
+    setBuildingId,
+    unitId,
+    setUnitId,
+    levelId,
+    setLevelId,
+    roomNoId,
+    setRoomNoId,
+    phaseList,
+    buildingList,
+    unitList,
+    levelList,
+    roomNoList
+  } = useRoomSelect()
+  
+  const handleSearch = vals => {
+    const data = {
+      ...vals,
+      phaseId,
+      buildingId,
+      unitId,
+      levelId,
+      roomNoId
+    }
+
+    if (props.onSearch) {
+      props.onSearch(data)
+    }
+  }
+
+  const handleReset = vals => {
+    const data = {
+      ...vals,
+      phaseId: '',
+      buildingId: '',
+      unitId: '',
+      levelId: '',
+      roomNoId: ''
+    }
+
+    setPhaseId()
+    setBuildingId()
+    setUnitId()
+    setLevelId()
+    setRoomNoId()
+
+    if (props.onReset) {
+      props.onReset(data)
+    }
+  }
+
+  return (
+    <Search
+      onSearch={handleSearch}
+      onReset={handleReset}
+      render={form => {
+        const { getFieldDecorator } = form
+        
+        const handlePhaseChange = e => setPhaseId(e)
+        const handleBuildingChange = e => setBuildingId(e)
+        const handleUnitChange = e => setUnitId(e)
+        const handleLevelChange = e => setLevelId(e)
+        const handleRoomChange = e => setRoomNoId(e)
+
+        return (
+          <>
+            <Form.Item label="选择房子">
+              <Select value={phaseId} onChange={handlePhaseChange} style={{ minWidth: '120px' }} placeholder="期/区">
+                {
+                  phaseList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+                }
+              </Select>
+            </Form.Item>
+            <Form.Item>
+              <Select value={buildingId} onChange={handleBuildingChange} style={{ minWidth: '120px' }} placeholder="栋">
+                {
+                  buildingList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+                }
+              </Select>
+            </Form.Item>
+            <Form.Item>
+              <Select value={unitId} onChange={handleUnitChange} style={{ minWidth: '120px' }} placeholder="单元">
+                {
+                  unitList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+                }
+              </Select>
+            </Form.Item>
+            <Form.Item>
+              <Select value={levelId} onChange={handleLevelChange} style={{ minWidth: '120px' }} placeholder="楼层">
+                {
+                  levelList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+                }
+              </Select>
+            </Form.Item>
+            <Form.Item>
+              <Select value={roomNoId} onChange={handleRoomChange} style={{ minWidth: '120px' }} placeholder="户号">
+                {
+                  roomNoList.map(x => (<Select.Option key={x.id} value={x.id}>{x.name}</Select.Option>))
+                }
+              </Select>
+            </Form.Item>
+            <Form.Item label="缴费状态">
+            {
+              getFieldDecorator('billStatus')(
+                <Select style={{ width: '160px' }} placeholder="缴费状态">
+                  {
+                    BillStatusDict.map(x => <Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>)
+                  }
+                </Select>
+              )
+            }
+            </Form.Item>
+            <Form.Item label="缴费人姓名">
+            {
+              getFieldDecorator('payName')(<Input style={{ width: '160px' }} placeholder="缴费人姓名" />)
+            }
+            </Form.Item>
+          </>
+        )
+      }}
+    />
+  )
+}
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [showEditor, setShowEditor] = useState(false)
+  const [showPrompt, setShowPrompt] = useState(false)
+  const [billData, setBillData] = useState({})
+  const [listData, setListData] = useState([])
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+  
+  const { id } = props.location.query
+  const editData = useRef({ type: undefined, data: undefined })
+
+  const handleSearch = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1,
+    })
+  }
+
+  const handlePageChange = (pageNum, pageSize) => {
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
+  }
+
+  const handleExplainChange = row => {
+    editData.current = {type: 'explain', data: row}
+    setShowPrompt(true)
+  }
+
+  const handlePriceChange = row => {
+    editData.current = {type: 'price', data: row}
+    setShowPrompt(true)
+  }
+
+  const handleDeleteRow = row => {
+    deleteBillInvoiceById({data: [row.id]}).then(res => {
+      notification.success({ message: '删除数据成功' })
+
+      // 触发数据刷新
+      setQueryParams({...queryParams})   
+    })
+  }
+
+  const handleOffline = row => {
+    billInvoiceOfflinePayment({data: [row.id]}).then(res => {
+      notification.success({ message: '设置线下缴费成功' })
+
+      // 触发数据刷新
+      setQueryParams({...queryParams})
+    })
+  }
+
+  const handlePrompt = val => {
+    const {type, data} = editData.current
+    if (type === 'explain') {
+      updateBillInvoiceIdBillInvoiceExplain({urlData: {id: data.id}, data: {billInvoiceExplain: val}}).then(res => {
+        notification.success({ message: '修改费用说明成功' })
+  
+        // 触发数据刷新
+        setQueryParams({...queryParams})
+        setShowPrompt(false)
+      })
+    } else if (type === 'price') {
+      updateBillInvoiceIdPayPrice({urlData: {id: data.id}, data: {payPrice: val}}).then(res => {
+        notification.success({ message: '修改费用成功' })
+  
+        // 触发数据刷新
+        setQueryParams({...queryParams})
+        setShowPrompt(false)
+      })
+    }
+  }
+
+  const handleEditorSubmit = vals => {
+    updateBillNameAndBillExplainAndEndDate({data: {id, ...vals}}).then(res => {
+      notification.success({ message: '修改费用信息成功' })
+
+      // 触发数据刷新
+      setQueryParams({...queryParams})
+      setShowEditor(false)
+    })
+  }
+
+  const exportExcel = () => {
+    exportBillInvoiceExcel({ urlData: {id} }).then(res => {
+      const link = document.createElement('a')
+      link.href = window.URL.createObjectURL(new Blob([res]))
+      link.setAttribute('download', '缴费单.xls')
+      link.click()
+    })
+  }
+
+  useEffect(() => {
+    setLoading(true)
+    getBillInvoiceList({data: {
+      billId: id,
+      ...queryParams,
+    }}).then(res => {
+      const {list, pageNum, pageSize, total, ...billInfo} = res || {}
+      setListData(list)
+      setPagination({
+        ...pagination,
+        current: pageNum,
+        pageSize,
+        total,
+      })
+      setBillData(billInfo)
+      setLoading(false)
+    }).catch(e => setLoading(false))
+  }, [id, queryParams])
+
+  return (
+    <div>
+      <PageHeader
+        title="收费情况"
+        backIcon={false}
+        extra={[<Button key="1" onClick={() => setShowEditor(true)}>修改</Button>]}
+        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>
+      </PageHeader>
+
+      <div style={{margin: '36px 0'}}>
+        <Condition onSearch={handleSearch} onReset={handleSearch} />
+      </div>
+
+      <div style={{margin: '24px 0'}}>
+        <NavLink to=""><Button type="primary"><Icon type="plus" />添加更多收费单</Button></NavLink>
+        <Button type="link" onClick={exportExcel}><Icon type="export" />导出数据</Button>
+        <div style={{height: '40px', lineHeight: '40px', marginLeft: '10px', fontSize: '14px', color: '#888' }}>未缴户主费用可以直接点击 收费金额数字 修改，已缴费户主无法修改，需要线下多退少补</div>
+      </div>
+
+      <div>
+        <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
+          <Table.Column title="收费单号" dataIndex="id" key="id" />
+          <Table.Column title="房屋信息" dataIndex="roomNo" key="roomNo" render={(_, row) => row.phase + row.building + row.unit + row.roomNo} />
+          <Table.Column title="收费单说明" dataIndex="billInvoiceExplain" key="billInvoiceExplain" render={(t, row) => (
+            <Button type="link" onClick={() => handleExplainChange(row)}><Icon type="edit" />{t}</Button>
+          )} />
+          <Table.Column title="金额(元)" dataIndex="payPrice" key="payPrice" render={(t, row) => (
+            <Button type="link" onClick={() => handlePriceChange(row)}><Icon type="edit" />{t/100}</Button>
+          )} />
+          <Table.Column title="订单号" dataIndex="billStatement" key="billStatement" />
+          <Table.Column title="缴费状态" dataIndex="billStatus" key="billStatus" render={t => getDictLabel(BillStatusDict, t)} />
+          <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" />
+          <Table.Column title="新建人" dataIndex="createUserName" key="createUserName" />
+          <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
+          <Table.Column title="修改人" dataIndex="updateUserName" key="updateUserName" />
+          <Table.Column
+            title="操作"
+            key="action"
+            render={(_, row) => {
+              return (
+                <>
+                  <Popconfirm
+                    title="确认进行删除操作?"
+                    onConfirm={() => handleDeleteRow(row)}
+                    okText="删除"
+                    cancelText="取消"
+                  >
+                    <Button type="link">删除</Button>
+                  </Popconfirm>
+                  <Divider type="vertical" />
+                  <Popconfirm
+                    title="确认设置为线下缴费?"
+                    onConfirm={() => handleOffline(row)}
+                    okText="缴费"
+                    cancelText="取消"
+                  >
+                    <Button type="link">线下缴费</Button>
+                  </Popconfirm>
+                </>
+              )
+            }}
+          />
+        </List>
+      </div>
+      <Prompt visible={showPrompt} onOk={handlePrompt} onCancel={() => setShowPrompt(false)} />
+      <Edit
+        visible={showEditor}
+        initialData={billData}
+        onSubmit={handleEditorSubmit}
+        onCancel={() => setShowEditor(false)}
+      />
+    </div>
+  )
+}

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

@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react'
+import React, { useRef, useState, useEffect } from 'react'
 import { Spin, Form, Input, Divider, Button, Row, Col } from 'antd'
 import router from 'umi/router'
 import NavLink from 'umi/navlink'
@@ -131,52 +131,28 @@ const TableList = props => {
   )
 }
 
-const defaultPage = { pageNum: 1, pageSize: 10, total: 0 }
 const FetchBillList = fetchList(apis.bill.fetchBillList)
 const deleteBillBeach = fetch(apis.bill.deleteBillBeach)
 
 export default props => {
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
-  const [pagination, setPagination] = useState(defaultPage)
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
   
-  const queryRef = useRef()
-
-  const getListData = params => {
-    setLoading(true)
-
-    const opts = params || {
-      pageNum: pagination.pageNum,
-      pageSize: pagination.pageSize,
-      ...queryRef.current
-    }
-
-    FetchBillList(opts).then(res => {
-      setListData(res.billList)
-      setPagination({
-        ...pagination,
-        total: res.total
-      })
-      setLoading(false)
-    })
-  }
-
-  const handleQuery = (vals) => {
-    queryRef.current = vals
-    setPagination(defaultPage)
-    getListData({
-      ...defaultPage,
-      ...queryRef.current,
+  const handleQuery = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1
     })
   }
 
   const handlePageChange = (pageNum, pageSize) => {
-    setPagination({ pageNum, pageSize, ...pagination })
-    
-    getListData({
-      pageNum,
+    setQueryParams({
+      ...queryParams,
       pageSize,
-      ...queryRef.current,
+      pageNum
     })
   }
 
@@ -196,6 +172,16 @@ export default props => {
     })
   }
 
+  useEffect(() => {
+    setLoading(true)
+    FetchBillList(queryParams).then(res => {
+      const [records, pagi] = res || []
+      setListData(records)
+      setPagination(pagi)
+      setLoading(false)
+    })
+  }, [queryParams])
+
   return (
     <div>
       <Condition onReset={handleQuery} onSearch={handleQuery} />

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

@@ -0,0 +1,50 @@
+import React, { useEffect, useState } from 'react'
+import { Button, Collapse, Icon, Descriptions, Typography, Spin } from 'antd'
+import NavLink from 'umi/navlink'
+import { fetch, apis } from '@/utils/request'
+// import List from '../components/List'
+
+const getByOrderNumberBillInvoice = fetch(apis.bill.getByOrderNumberBillInvoice)
+
+const renderBillLink = bill => () => <NavLink><Button type="link"><Icon type="export" /></Button></NavLink>
+
+export default props => {
+  const [loading, setLoading] = useState(false)
+  const [billList, setBillList] = useState([])
+
+  const { id } = props.location.query
+
+  useEffect(() => {
+    if (id) {
+      getByOrderNumberBillInvoice({urlData: {id}}).then(res => {
+        setBillList(res)
+      })
+    }
+  }, [id])
+
+  return (
+    <Spin spinning={loading}>
+      <Collapse>
+        {
+          billList.map(bill => {
+            <Collapse.Panel key={bill.id} header={bill.billName} extra={renderBillLink(bill)}>
+              <Descriptions bordered column={3}>
+              {
+                (bill.billInvoiceList || []).map(item => (
+                  <>
+                    <Descriptions.Item key={`${item.id}-1`} label="收费单号">{item.id}</Descriptions.Item>
+                    <Descriptions.Item key={`${item.id}-2`} label="金额（元）">{ item.payPrice / 100 }</Descriptions.Item>
+                    <Descriptions.Item key={`${item.id}-3`} label="收费单说明">
+                      <Typography.Text ellipsis>{item.billInvoiceExplain}</Typography.Text>
+                    </Descriptions.Item>
+                  </>
+                ))
+              }
+              </Descriptions>
+            </Collapse.Panel>
+          })
+        }
+      </Collapse>
+    </Spin>
+  )
+}

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

@@ -1,10 +1,26 @@
 import React, { useState, useEffect } from 'react'
 import { Select, Spin, Table, Button, Form, Input, Divider } from 'antd'
 import NavLink from 'umi/navlink'
-import { fetchList, apis } from '@/utils/request'
+import { fetchList, apis, fetch } from '@/utils/request'
 import Search from '../../components/Search'
 import List from '../../components/List'
 
+const exportStatementExcel = fetch(apis.bill.exportStatementExcel)
+const getBillStatementAll = fetch(apis.bill.getBillStatementAll)
+
+const StatusDict = {
+  '0': '未支付',
+  '1': '已支付',
+  '2': '支付中',
+  '3': '已关闭',
+}
+
+const PayTypeDict = {
+  '0': '微信缴费',
+  '1': '线下缴费',
+  '2': '支付宝缴费',
+}
+
 const Condition = props => {
   return (
     <Search
@@ -17,7 +33,7 @@ const Condition = props => {
           <>
             <Form.Item label="订单号">
             {
-              getFieldDecorator('orderBumber')(<Input placeholder="公告编号" />)
+              getFieldDecorator('orderBumber')(<Input placeholder="订单号" />)
             }
             </Form.Item>
             <Form.Item label="缴费项目编号">
@@ -47,99 +63,101 @@ const Condition = props => {
   )
 }
 
-const StatusDict = {
-  '0': '未支付',
-  '1': '已支付',
-  '2': '支付中',
-  '3': '已关闭',
-}
-
-const PayTypeDict = {
-  '0': '微信缴费',
-  '1': '线下缴费',
-  '2': '支付宝缴费',
-}
-
 export default props => {
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
-
-  const handleSearch = () => {
-
-  }
-
-  const handleDeleteRow = row => {
-
-  }
-
-  const handleEditRow = row => {
-
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
+
+  const handleSearch = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1,
+    })
   }
 
   const handlePageChange = (pageNum, pageSize) => {
-
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
   }
 
   const exportExcel = () => {
-
+    exportStatementExcel().then(res => {
+      const link = document.createElement('a')
+      link.href = window.URL.createObjectURL(new Blob([res]))
+      link.setAttribute('download', '流水信息.xls')
+      link.click()
+    })
   }
 
+  useEffect(() => {
+    setLoading(true)
+    getBillStatementAll({ data: queryParams }).then(res => {
+      const {list, ...pagi} = res || {}
+      setListData(list)
+      setPagination(pagi)
+      setLoading(false)
+    }).catch(err => setLoading(false))
+  }, [queryParams])
+
   return (
     <div>
       <Condition onSearch={handleSearch} onReset={handleSearch} />
       <div style={{ margin: '24px 0' }}>
         <Button type="primary" onClick={exportExcel}>导出数据</Button>
       </div>
-      <Spin spinning={loading}>
-        <List dataSource={listData} onPageChange={handlePageChange} rowKey="id">
-          <Table.Column
-            title="订单号"
-            dataIndex="id"
-            key="id"
-            render={(_, row) => {
-              return (
-                <NavLink to={`/xxx?id=${row.id}`}>
-                  <Button type="link">{row.orderBumber}</Button>
-                </NavLink>
-              )
-            }}
-          />
-          <Table.Column
-            title="收费组编号"
-            dataIndex="billId"
-            key="billId"
-            render={(_, row) => {
-              return (row.billIdList || []).map(item => (
-                <NavLink key={item} to={`/xxx?id=${item}`}>
-                  <Button type="link">{item}</Button>
-                </NavLink>
-              ))
-            }}
-          />
-          <Table.Column
-            title="收费单号"
-            dataIndex="billInvoiceId"
-            key="billInvoiceId"
-            render={(_, row) => {
-              return (row.billInvoiceIdList || []).map(item => (
-                <span key={item}>{item}</span>
-              ))
-            }}
-          />
-          <Table.Column title="总费用金额" dataIndex="sumPrice" key="sumPrice" render={sumPrice => (sumPrice === null || sumPrice === undefined ? '' : Number(sumPrice).toFixed(2))} />
-          <Table.Column
-            title="订单状态"
-            dataIndex="orderStatus"
-            key="orderStatus"
-            render={(_, row) => StatusDict[row.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" />
-        </List>
-      </Spin>
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
+        <Table.Column
+          title="订单号"
+          dataIndex="id"
+          key="id"
+          render={(_, row) => {
+            return (
+              <NavLink to={`/property/bill/order/info?id=${row.id}`}>
+                <Button type="link">{row.orderBumber}</Button>
+              </NavLink>
+            )
+          }}
+        />
+        <Table.Column
+          title="收费组编号"
+          dataIndex="billId"
+          key="billId"
+          render={(_, row) => {
+            return (row.billIdList || []).map(item => (
+              <NavLink key={item} to={`/xxx?id=${item}`}>
+                <Button type="link">{item}</Button>
+              </NavLink>
+            ))
+          }}
+        />
+        <Table.Column
+          title="收费单号"
+          dataIndex="billInvoiceId"
+          key="billInvoiceId"
+          render={(_, row) => {
+            return (row.billInvoiceIdList || []).map(item => (
+              <span key={item}>{item}</span>
+            ))
+          }}
+        />
+        <Table.Column title="总费用金额" dataIndex="sumPrice" key="sumPrice" render={sumPrice => (sumPrice === null || sumPrice === undefined ? '' : Number(sumPrice).toFixed(2))} />
+        <Table.Column
+          title="订单状态"
+          dataIndex="orderStatus"
+          key="orderStatus"
+          render={(_, row) => StatusDict[row.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" />
+      </List>
 
     </div>
   )

src/pages/property/components/List.jsx

@@ -7,7 +7,9 @@ export default props => {
   const pgSetting = {
     ...props.pagination,
     onChange: (page, pageSize) => {
-      props.onPageChange(page, pageSize)
+      if (props.onPageChange) {
+        props.onPageChange(page, pageSize)
+      }
     }
   }
 

src/pages/property/notice/Edit.jsx

@@ -1,8 +1,9 @@
-import React from 'react'
+import React, { useEffect, useState } from 'react'
 import router from 'umi/router'
-import { Button, Form, Input } from 'antd'
+import { fetch, apis } from '@/utils/request'
+import { Button, Form, Input, InputNumber, Modal, Radio } from 'antd'
 import Wangedit from '@/components/Wangedit/Wangedit'
-import ImageListUpload from '@/components/XForm/ImageListUpload'
+import ImageUpload from '@/components/uploadImage/ImageUpload'
 
 const formItemLayout = {
   labelCol: {
@@ -28,13 +29,59 @@ const tailFormItemLayout = {
   },
 }
 
+const announcementById = fetch(apis.announcement.announcementById)
+const addAnnouncement = fetch(apis.announcement.addAnnouncement)
+const updateannouncement = fetch(apis.announcement.updateannouncement)
+
 export default Form.create()(props => {
+  const [noticeData, setNoticeData] = useState()
 
-  const handleSubmit = values => {
+  const { id } = props.location.query
+  const { getFieldDecorator, setFieldsValue } = props.form
 
+  const handleSubmit = e => {
+    e.preventDefault()
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        if (!id) {
+          addAnnouncement({ data: {contentImg:[], ...values } }).then(() => {
+            Modal.success({
+              content: '保存内容成功',
+              onOk: () => {
+                router.go(-1)
+              }
+            })
+          })
+        } else {
+          updateannouncement({
+            data: {
+              ...noticeData,
+              ...values,
+            }
+          }).then(res => {
+            Modal.success({
+              content: '修改内容成功',
+              // onOk: () => {
+              //   router.go(-1)
+              // }
+            })
+          })
+        }
+      }
+    })
   }
 
-  const { getFieldDecorator } = props.form
+  useEffect(() => {
+    if (id) {
+      announcementById({ data: {id} }).then(res => {
+        setNoticeData(res.tpAnnouncement)
+      })
+    }
+  }, [id])
+
+  useEffect(() => {
+    setFieldsValue(noticeData)
+  }, [noticeData])
 
   return (
     <div>
@@ -63,7 +110,7 @@ export default Form.create()(props => {
               },
             ],
           })(
-            <ImageListUpload />
+            <ImageUpload />
           )
         }
         </Form.Item>
@@ -81,6 +128,28 @@ export default Form.create()(props => {
           )
         }
         </Form.Item>
+        <Form.Item label="权重值" help="权重值越大，在活动列表中排序越靠前，权重相同时按发布时间排序">
+        {
+          getFieldDecorator('sort', {
+            rules: [
+              {
+                required: true,
+                message: '请填写权重值',
+              },
+            ],
+          })(<InputNumber />)
+        }
+        </Form.Item>
+        <Form.Item label="是否发布">
+        {
+          getFieldDecorator('status')(
+            <Radio.Group>
+              <Radio value="1">发布</Radio>
+              <Radio value="0">不发布</Radio>
+            </Radio.Group>
+          )
+        }
+        </Form.Item>
         <Form.Item {...tailFormItemLayout} >
           <Button type="primary" htmlType="submit">确定</Button>
           <Button style={{ marginLeft: '24px' }} onClick={() => router.go(-1)}>取消</Button>

src/pages/property/notice/index.jsx

@@ -1,17 +1,20 @@
 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal } from 'antd'
 import NavLink from 'umi/navlink'
-import { fetchList, apis } from '@/utils/request'
+import { fetch, apis } from '@/utils/request'
 import Search from '../components/Search'
 import List from '../components/List'
 
+const listAnnouncement = fetch(apis.announcement.listAnnouncement)
+const deleteAnnouncement = fetch(apis.announcement.deleteAnnouncement)
+
 const Condition = props => {
   return (
     <Search
       onSearch={props.onSearch}
       onReset={props.onReset}
       render={form => {
-        const { getFieldDecorator, setFieldsValue } = form
+        const { getFieldDecorator } = form
         
         return (
           <>
@@ -41,23 +44,47 @@ const StatusDict = {
 export default props => {
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
 
-  const handleSearch = () => {
-
+  const handleSearch = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1,
+    })
   }
 
   const handleDeleteRow = row => {
-
-  }
-
-  const handleEditRow = row => {
-
+    deleteAnnouncement({ data: [row.id] }).then(res => {
+      Modal.success({
+        content: '删除内容成功',
+        onOk: () => {
+          // 触发数据刷新
+          setQueryParams({...queryParams})
+        }
+      })
+    })
   }
 
   const handlePageChange = (pageNum, pageSize) => {
-
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
   }
 
+  useEffect(() => {
+    setLoading(true)
+    listAnnouncement({ data: queryParams }).then(res => {
+      const { records, ...pageInfo } = res || {}
+      setListData(records)
+      setPagination(pageInfo)
+      setLoading(false)
+    }).catch(() => setLoading(false))
+  }, [queryParams])
+
   return (
     <div>
       <Condition onSearch={handleSearch} onReset={handleSearch} />
@@ -66,60 +93,60 @@ export default props => {
           <Button type="primary">添加</Button>
         </NavLink>
       </div>
-      <Spin spinning={loading}>
-        <List dataSource={listData} onPageChange={handlePageChange} rowKey="id">
-          <Table.Column title="编号" dataIndex="id" key="id" />
-          <Table.Column
-            title="标题"
-            dataIndex="announcementTitle"
-            key="announcementTitle"
-            render={(_, row) => {
-              return (
-                <NavLink to={`/xxx?id=${row.id}`}>
-                  <Button type="link">{row.announcementTitle}</Button>
-                </NavLink>
-              )
-            }}
-          />
-          <Table.Column title="查看数量" dataIndex="viewCount" key="viewCount" />
-          <Table.Column
-            title="状态"
-            dataIndex="status"
-            key="status"
-            render={(_, row) => {
-              if (row.status === '1' && (row.updateDate > row.createDate)) {
-                return '已修改'
-              }
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
+        <Table.Column title="编号" dataIndex="id" key="id" />
+        <Table.Column
+          title="标题"
+          dataIndex="announcementTitle"
+          key="announcementTitle"
+          render={(_, row) => {
+            return (
+              <NavLink to={`/property/notice/edit?id=${row.id}`}>
+                <Button type="link">{row.announcementTitle}</Button>
+              </NavLink>
+            )
+          }}
+        />
+        <Table.Column title="查看数量" dataIndex="viewCount" key="viewCount" />
+        <Table.Column
+          title="状态"
+          dataIndex="status"
+          key="status"
+          render={(_, row) => {
+            if (row.status === '1' && (row.updateDate > row.createDate)) {
+              return '已修改'
+            }
 
-              return StatusDict[row.status]
-            }}
-          />
-          <Table.Column title="发布时间" dataIndex="createDate" key="createDate" />
-          <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
-          <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
-          <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" />
-          <Table.Column
-            title="操作"
-            key="action"
-            render={(_, row) => {
-              return (
-                <>
-                  <Popconfirm
-                    title="确认进行作废操作?"
-                    onConfirm={() => handleDeleteRow(row)}
-                    okText="作废"
-                    cancelText="取消"
-                  >
-                    <Button type="link">删除</Button>
-                  </Popconfirm>
-                  <Divider type="vertical" />
-                  <Button type="link" onClick={() => handleEdit(row)}>编辑</Button>
-                </>
-              )
-            }}
-          />
-        </List>
-      </Spin>
+            return StatusDict[row.status]
+          }}
+        />
+        <Table.Column title="发布时间" dataIndex="createDate" key="createDate" />
+        <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
+        <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
+        <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" />
+        <Table.Column
+          title="操作"
+          key="action"
+          render={(_, row) => {
+            return (
+              <>
+                <Popconfirm
+                  title="确认进行作废操作?"
+                  onConfirm={() => handleDeleteRow(row)}
+                  okText="作废"
+                  cancelText="取消"
+                >
+                  <Button type="link">删除</Button>
+                </Popconfirm>
+                <Divider type="vertical" />
+                <NavLink to={`/property/notice/edit?id=${row.id}`}>
+                  <Button type="link">编辑</Button>
+                </NavLink>
+              </>
+            )
+          }}
+        />
+      </List>
 
     </div>
   )

src/pages/property/proprietor/Audit.jsx

@@ -121,7 +121,7 @@ export default props => {
       <div style={{ marginTop: '24px' }}>
         <p style={{color: '#888', fontSize: '0.8em'}}>注意，审核后无法修改审核结果，请仔细确认</p>
       </div>
-      <List dataSource={listData} loading={loading} rowKey="id">
+      <List dataSource={listData} pagination={pagination} loading={loading} rowKey="id">
         <Table.Column title="姓名" dataIndex="userName" key="userName" />
         <Table.Column title="手机号" dataIndex="phone" key="phone" />
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />

src/pages/property/proprietor/index.jsx

@@ -4,69 +4,70 @@ import NavLink from 'umi/navlink'
 import { fetch, fetchList, apis } from '@/utils/request'
 import Search from '../components/Search'
 import List from '../components/List'
+import useRoomSelect from '../utils/hooks/useRoomSelect'
 
-const fetchPhaseList = fetch(apis.buildingOwnerInfo.getPhaseList)
-const fetchBuildingList = fetch(apis.buildingOwnerInfo.getBuildingList)
-const fetchUnitList = fetch(apis.buildingOwnerInfo.getUnitList)
-const fetchLevelList = fetch(apis.buildingOwnerInfo.getLevelList)
-const fetchRoomNoList = fetch(apis.buildingOwnerInfo.getRoomNoList)
 const buildingInfoList = fetch(apis.buildingOwnerInfo.buildingList)
 const deleteBuilding = fetch(apis.buildingOwnerInfo.deleteBuilding)
 
 const Condition = props => {
-  const [phaseList, setPhaseList] = useState([])
-  const [buildingList, setBuildingList] = useState([])
-  const [unitList, setUnitList] = useState([])
-  const [levelList, setLevelList] = useState([])
-  const [roomNoList, setRoomNoList] = useState([])
+  const {
+    phaseId,
+    setPhaseId,
+    buildingId,
+    setBuildingId,
+    unitId,
+    setUnitId,
+    levelId,
+    setLevelId,
+    roomNoId,
+    setRoomNoId,
+    phaseList,
+    buildingList,
+    unitList,
+    levelList,
+    roomNoList
+  } = useRoomSelect()
 
-  const [phaseId, setPhaseId] = useState()
-  const [buildingId, setBuildingId] = useState()
-  const [unitId, setUnitId] = useState()
-  const [levelId, setLevelId] = useState()
-  const [roomNoId, setRoomNoId] = useState()
-
-  // 获取期
-  useEffect(() => {
-    fetchPhaseList().then(res => setPhaseList(res))
-  }, [])
-
-  // 楼栋
-  useEffect(() => {
-    if (phaseId) {
-      fetchBuildingList({params: {phaseId}}).then(res => setBuildingList(res))
+  const handleSearch = vals => {
+    const data = {
+      ...vals,
+      phaseId,
+      buildingId,
+      unitId,
+      levelId,
+      roomNoId
     }
-    setBuildingId()
-  }, [phaseId])
 
-  // 单元
-  useEffect(() => {
-    if (phaseId && buildingId) {
-      fetchUnitList({params: {phaseId, buildingId}}).then(res => setUnitList(res))
+    if (props.onSearch) {
+      props.onSearch(data)
     }
-    setUnitId()
-  }, [phaseId, buildingId])
+  }
 
-  // 楼层
-  useEffect(() => {
-    if (phaseId && buildingId && unitId) {
-      fetchLevelList({params: {phaseId, buildingId, unitId}}).then(res => setLevelList(res))
+  const handleReset = vals => {
+    const data = {
+      ...vals,
+      phaseId: '',
+      buildingId: '',
+      unitId: '',
+      levelId: '',
+      roomNoId: ''
     }
+
+    setPhaseId()
+    setBuildingId()
+    setUnitId()
     setLevelId()
-  }, [phaseId, buildingId, unitId])
+    setRoomNoId()
 
-  // 房号
-  useEffect(() => {
-    if (phaseId && buildingId && unitId && levelId) {
-      fetchRoomNoList({params: {phaseId, buildingId, unitId, levelId}}).then(res => setRoomNoList(res))
+    if (props.onReset) {
+      props.onReset(data)
     }
-    setRoomNoId()
-  }, [phaseId, buildingId, unitId, levelId])
+  }
 
   return (
     <Search
-      onSearch={props.onSearch}
-      onReset={props.onReset}
+      onSearch={handleSearch}
+      onReset={handleReset}
       render={form => {
         const { getFieldDecorator } = form
         

src/pages/property/ticket/index.jsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import { Select, Spin, Table, Button, Form, Input, Divider, Typography } from 'antd'
 import NavLink from 'umi/navlink'
-import { fetchList, apis } from '@/utils/request'
+import { fetchList, apis, fetch } from '@/utils/request'
 import Search from '../components/Search'
 import List from '../components/List'
 
@@ -49,6 +49,8 @@ const StatusDict = [
 
 const getDictValue = (dict, val) => dict.filter(x => x.value === val)[0]
 
+const listTicket = fetch(apis.ticket.listTicket)
+
 const Condition = props => {
   return (
     <Search
@@ -111,23 +113,35 @@ const Condition = props => {
 export default props => {
   const [loading, setLoading] = useState(false)
   const [listData, setListData] = useState([])
+  const [pagination, setPagination] = useState({})
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
 
-  const handleSearch = () => {
-
-  }
-
-  const handleDeleteRow = row => {
-
-  }
-
-  const handleEditRow = row => {
-
+  const handleSearch = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1,
+    })
   }
 
   const handlePageChange = (pageNum, pageSize) => {
-
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
   }
 
+  useEffect(() => {
+    setLoading(true)
+    listTicket({data: 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} />
@@ -136,49 +150,27 @@ export default props => {
           <Button type="primary">添加</Button>
         </NavLink> */}
       </div>
-      <Spin spinning={loading}>
-        <List dataSource={listData} onPageChange={handlePageChange} rowKey="id">
-          <Table.Column title="编号" dataIndex="id" key="id" />
-          <Table.Column title="类型" dataIndex="type" key="type" render={x => getDictValue(TypeDict, x)} />
-          <Table.Column
-            title="标题"
-            dataIndex="ticketTitle"
-            key="ticketTitle"
-            render={(_, row) => {
-              return (
-                <NavLink to={`/xxx?id=${row.id}`}>
-                  <Typography.Text ellipsis>{row.ticketTitle}</Typography.Text>
-                </NavLink>
-              )
-            }}
-          />
-          <Table.Column title="发起人" dataIndex="createUserNmae" key="createUserNmae" />
-          <Table.Column title="发起时间" dataIndex="createDate" key="createDate" />
-          <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" />
-          <Table.Column
-            title="操作"
-            key="action"
-            render={(_, row) => {
-              return (
-                <>
-                  <Popconfirm
-                    title="确认进行作废操作?"
-                    onConfirm={() => handleDeleteRow(row)}
-                    okText="作废"
-                    cancelText="取消"
-                  >
-                    <Button type="link">删除</Button>
-                  </Popconfirm>
-                  <Divider type="vertical" />
-                  <Button type="link" onClick={() => handleEdit(row)}>编辑</Button>
-                </>
-              )
-            }}
-          />
-        </List>
-      </Spin>
+      <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
+        <Table.Column title="编号" dataIndex="id" key="id" />
+        <Table.Column title="类型" dataIndex="type" key="type" render={x => getDictValue(TypeDict, x)} />
+        <Table.Column
+          title="标题"
+          dataIndex="ticketTitle"
+          key="ticketTitle"
+          render={(_, row) => {
+            return (
+              <NavLink to={`/property/bill/ticket/detail?id=${row.id}`}>
+                <Typography.Text ellipsis>{row.ticketTitle}</Typography.Text>
+              </NavLink>
+            )
+          }}
+        />
+        <Table.Column title="发起人" dataIndex="createUserNmae" key="createUserNmae" />
+        <Table.Column title="发起时间" dataIndex="createDate" key="createDate" />
+        <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>
 
     </div>
   )

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

@@ -0,0 +1,77 @@
+import React, { useState, useEffect } from 'react'
+import { fetch, apis } from '@/utils/request'
+
+const fetchPhaseList = fetch(apis.buildingOwnerInfo.getPhaseList)
+const fetchBuildingList = fetch(apis.buildingOwnerInfo.getBuildingList)
+const fetchUnitList = fetch(apis.buildingOwnerInfo.getUnitList)
+const fetchLevelList = fetch(apis.buildingOwnerInfo.getLevelList)
+const fetchRoomNoList = fetch(apis.buildingOwnerInfo.getRoomNoList)
+
+export default function useRoomSelect() {
+  const [phaseList, setPhaseList] = useState([])
+  const [buildingList, setBuildingList] = useState([])
+  const [unitList, setUnitList] = useState([])
+  const [levelList, setLevelList] = useState([])
+  const [roomNoList, setRoomNoList] = useState([])
+
+  const [phaseId, setPhaseId] = useState()
+  const [buildingId, setBuildingId] = useState()
+  const [unitId, setUnitId] = useState()
+  const [levelId, setLevelId] = useState()
+  const [roomNoId, setRoomNoId] = useState()
+
+  // 获取期
+  useEffect(() => {
+    fetchPhaseList().then(res => setPhaseList(res))
+  }, [])
+
+  // 楼栋
+  useEffect(() => {
+    if (phaseId) {
+      fetchBuildingList({params: {phaseId}}).then(res => setBuildingList(res))
+    }
+    setBuildingId()
+  }, [phaseId])
+
+  // 单元
+  useEffect(() => {
+    if (phaseId && buildingId) {
+      fetchUnitList({params: {phaseId, buildingId}}).then(res => setUnitList(res))
+    }
+    setUnitId()
+  }, [phaseId, buildingId])
+
+  // 楼层
+  useEffect(() => {
+    if (phaseId && buildingId && unitId) {
+      fetchLevelList({params: {phaseId, buildingId, unitId}}).then(res => setLevelList(res))
+    }
+    setLevelId()
+  }, [phaseId, buildingId, unitId])
+
+  // 房号
+  useEffect(() => {
+    if (phaseId && buildingId && unitId && levelId) {
+      fetchRoomNoList({params: {phaseId, buildingId, unitId, levelId}}).then(res => setRoomNoList(res))
+    }
+    setRoomNoId()
+  }, [phaseId, buildingId, unitId, levelId])
+
+  return {
+    phaseId,
+    setPhaseId,
+    buildingId,
+    setBuildingId,
+    unitId,
+    setUnitId,
+    levelId,
+    setLevelId,
+    roomNoId,
+    setRoomNoId,
+    phaseList,
+    buildingList,
+    unitList,
+    levelList,
+    roomNoList
+  }
+}

src/services/announcement_api.js

@@ -0,0 +1,41 @@
+
+export default prefix => {
+  return {
+    
+    // 获取当前小区的所有公告
+    listAnnouncement: {
+      url: `${prefix}/tpAnnouncement`,
+      method: 'post',
+      action: 'admin.announcement.post'
+    },
+
+    // 添加公告
+    addAnnouncement: {
+      url: `${prefix}/addAnnouncement`,
+      method: 'post',
+      action: 'admin.announcement.add'
+    },
+
+    // 根据id查询公告
+    announcementById: {
+      url: `${prefix}/announcementById`,
+      method: 'post',
+      action: 'admin.announcement.detail'
+    },
+
+    // 修改公告
+    updateannouncement: {
+      url: `${prefix}/updateAnnouncement`,
+      method: 'post',
+      action: 'admin.announcement.update'
+    },
+
+    // 批量删除(data)里面是单子字段的多个id
+    deleteAnnouncement: {
+      url: `${prefix}/deleteAnnouncement`,
+      method: 'post',
+      action: 'admin.announcement.delete'
+    },
+
+  }
+}

src/services/apis.js

@@ -2,6 +2,8 @@ import { APIBaseURL, AMapAPIPrefix } from '../utils/constant'
 import bill from './bill_api'
 import buildingOwnerInfo from './buildingOwnerInfo_api'
 import propUser from './prop_user_api'
+import announcement from './announcement_api'
+import ticket from './ticket_api'
 
 const prefix = `${APIBaseURL}api/admin`
 
@@ -13,6 +15,8 @@ export default {
   bill: bill(prefix),
   propUser: propUser(prefix),
   buildingOwnerInfo: buildingOwnerInfo(prefix),
+  announcement: announcement(prefix),
+  ticket: ticket(prefix),
   image: {
     uploadForAnt: {
       url: `${prefix}/antd/image`,

src/services/bill_api.js

@@ -34,11 +34,123 @@ export default prefix => ({
     action: 'admin.bill.downloadExcel'
   },
 
+  // 上传 excel 模板
+  billUploadExcel: {
+    url: `${prefix}/bill/uploadExcel/get`,
+    method: 'post',
+    action: 'admin.bill.uploadExcel'
+  },
+
   // 根据收费项ID查询,收费项详情
   getBillInfoBydId: {
     url: `${prefix}/bill/:id`,
     method: 'get',
     action: 'admin.bill.get'
+  },
+
+  // 根据缴费项id, 查询草稿
+  billInvoiceGetInvoiceInvalid: {
+    url: `${prefix}/bill/invoice/getInvoiceInvalid`,
+    method: 'post',
+    action: 'admin.bill-invoice.getInvoiceInvalid'
+  },
+
+  // 获取流水信息
+  getBillStatementAll: {
+    url: `${prefix}/bill/statement/all`,
+    method: 'post',
+    action: 'admin.bill-statement.all'
+  },
+
+  // 下载excel
+  exportStatementExcel: {
+    url: `${prefix}/bill/statement/exportExcel`,
+    method: 'get',
+    action: 'admin.bill-statement.export'
+  },
+
+  // 根据点单查询，缴费单
+  getByOrderNumberBillInvoice: {
+    url: `${prefix}/bill/order/getByOrderNumberBillInvoice/:id`,
+    method: 'get',
+    action: 'admin.bill-statement.getByOrderNumberBillInvoice'
+  },
+
+  // 查询缴费单
+  getBillInvoiceList: {
+    url: `${prefix}/bill/invoice/list`,
+    method: 'post',
+    action: 'admin.bill-invoice.list'
+  },
+
+  //  根据 id 批量删除 缴费单
+  deleteBillInvoiceById: {
+    url: `${prefix}/bill/invoice/delete`,
+    method: 'post',
+    action: 'admin.bill-invoice.delete'
+  },
+
+  // 设置线下缴费
+  billInvoiceOfflinePayment: {
+    url: `${prefix}/bill/invoice/offlinePayment`,
+    method: 'post',
+    action: 'admin.bill-invoice.offlinePayment'
+  },
+
+  // 根据缴费单id, 修改金额
+  updateBillInvoiceIdPayPrice: {
+    url: `${prefix}/bill/invoice/updateBillInvoiceIdPayPrice/:id`,
+    method: 'post',
+    action: 'admin.bill-invoice.updatePrice'
+  },
+  
+// 根据收费单id, 修改收费说明
+  updateBillInvoiceIdBillInvoiceExplain: {
+    url: `${prefix}/bill/invoice/updateBillInvoiceIdBillInvoiceExplain/:id`,
+    method: 'post',
+    action: 'admin.bill-invoice.updateExplain'
+  },
+
+  // 修改缴费项 收费项名称,缴费项说明,截止时间
+  updateBillNameAndBillExplainAndEndDate: {
+    url: `${prefix}/bill/invoice/updateBill`,
+    method: 'put',
+    action: 'admin.bill-invoice.updateBill'
+  },
+
+  // 导出excel
+  exportBillInvoiceExcel: {
+    url: `${prefix}/bill/invoice/exportExcel/:id`,
+    method: 'get',
+    action: 'admin.bill-invoice.exportExcel'
+  },
+
+// 由前台批量添加收费单, 默认定为 作废
+  addTempBillInvoice: {
+    url: `${prefix}/bill/invoice/addTempBillInvoice`,
+    method: 'post',
+    action: 'admin.bill-invoice.addTempBill'
+  },
+
+  // 查询前台批量添加的收费单, 状态是作废
+  getTempBillInvoice: {
+    url: `${prefix}/bill/invoice/getTempBillInvoice/:id`,
+    method: 'get',
+    action: 'admin.bill-invoice.tempBill'
+  },
+
+  // 根据id删除收费单, 只能删除作废的
+  deleteTempBillInvoice: {
+    url: `${prefix}/bill/invoice/deleteTempBillInvoice/:id`,
+    method: 'delete',
+    action: 'admin.bill-invoice.deleteTempBill'
+  },
+
+  // 由前台批量添加收费单, 进行统一的提交, 修改为有效
+  updateBillInvoiceStatus: {
+    url: '/bill/invoice/updateBillInvoiceStatus',
+    method: 'post',
+    action: 'admin.bill-invoice.updateStatus'
   }
 
 })

src/services/ticket_api.js

@@ -0,0 +1,40 @@
+
+export default prefix => {
+  return {
+    listTicket: {
+      url: `${prefix}/ticketLiset`,
+      method: 'post',
+      action: 'admin.ticket.list'
+    },
+
+    ticketEdit: {
+      url: `${prefix}/ticketDetails`,
+      method: 'post',
+      action: 'admin.ticket.detail'
+    },
+
+    addRecordComment: {
+      url: `${prefix}/addRecordComment`,
+      method: 'post',
+      action: 'admin.comment.add'
+    },
+
+    addRecord: {
+      url: `${prefix}/addRecord`,
+      method: 'post',
+      action: 'admin.record.add'
+    },
+
+    updateTicketStatus: {
+      url: `${prefix}/updateTicketStatus`,
+      method: 'post',
+      action: 'admin.ticket-status.update'
+    },
+
+    updateTicket: {
+      url: `${prefix}/updateTicket`,
+      method: 'post',
+      action: 'admin.ticket.update'
+    }
+  }
+}