feats

config/routes.js

@@ -619,6 +619,12 @@ export default [
                 component: './property/bill/info',
                 hideInMenu: true,
               },
+              {
+                path: 'bill/management/info/add',
+                name: '新增收费',
+                component: './property/bill/info/Add',
+                hideInMenu: true,
+              },
               {
                 path: 'bill/order',
                 name: '订单管理',

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

@@ -1,5 +1,5 @@
-import React, { useEffect, useState } from 'react'
-import { Button, Icon, Modal, Table, Popconfirm } from 'antd'
+import React, { useEffect, useState, useCallback } from 'react'
+import { Button, Icon, Modal, Table, Popconfirm, notification } from 'antd'
 import { fetch, fetchList, apis } from '@/utils/request'
 import NavLink from 'umi/navlink'
 import List from '../../components/List'
@@ -8,6 +8,7 @@ import AddOne from './components/AddOne'
 const getTempBillInvoice = fetch(apis.bill.getTempBillInvoice)
 const addTempBillInvoice = fetch(apis.bill.addTempBillInvoice)
 const deleteTempBillInvoice = fetch(apis.bill.deleteTempBillInvoice)
+const updateBillInvoiceStatus = fetch(apis.bill.updateBillInvoiceStatus)
 
 export default props => {
   const [loading, setLoading] = useState(false)
@@ -46,6 +47,19 @@ export default props => {
     })
   }
 
+  const handleCommitAll = () => {
+    if (!listData.length) {
+      notification.warn({ message: '没有需要提交的数据' })
+      return
+    }
+
+    setLoading(true)
+    updateBillInvoiceStatus({data: listData.map(x => x.id)}).then(res => {
+      notification.success({ message: '全部提交成功' })
+      setLoading(false)
+    }).catch(e => setLoading(false))
+  }
+
   useEffect(() => {
     if (id) {
       getListData()
@@ -56,9 +70,9 @@ export default props => {
 
   return (
     <div>
-      <div>
+      <div style={{marginBottom: '24PX'}}>
         <Button type="primary" onClick={() => setShowAdd(true)}><Icon type="plus"/>新增记录</Button>
-        <Button type="danger" style={{marginLeft: '48px'}} onClick={}><Icon type="save"/>提交全部</Button>
+        <Button type="danger" style={{marginLeft: '48px'}} onClick={handleCommitAll}><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} />

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

@@ -90,29 +90,35 @@ export default Form.create()(props => {
       })
     }
   }
+  
+  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)
 
   useEffect(() => {
     props.form.setFieldsValue(formData)
   }, [formData])
 
   useEffect(() => {
-    setPhaseErr(phaseId ? '请选择期数': undefined)
+    setPhaseErr(!phaseId ? '请选择期数': undefined)
   }, [phaseId])
 
   useEffect(() => {
-    setBuildingErr(buildingId ? '请选择楼栋': undefined)
+    setBuildingErr(!buildingId ? '请选择楼栋': undefined)
   }, [buildingId])
 
   useEffect(() => {
-    setUnitErr(setUnitId ? '请选择单元': undefined)
-  }, [setUnitId])
+    setUnitErr(!unitId ? '请选择单元': undefined)
+  }, [unitId])
 
   useEffect(() => {
-    setLevelErr(levelId ? '请选择层数': undefined)
+    setLevelErr(!levelId ? '请选择层数': undefined)
   }, [levelId])
 
   useEffect(() => {
-    setRoomNoErr(roomNoId ? '请选择户号': undefined)
+    setRoomNoErr(!roomNoId ? '请选择户号': undefined)
   }, [roomNoId])
 
   return (
@@ -154,7 +160,7 @@ export default Form.create()(props => {
       </Form.Item>
       <Form.Item label="收费单说明">
       {
-        getFieldDecorator('billInvoiceExplain', {
+        props.form.getFieldDecorator('billInvoiceExplain', {
           rules: [
             {required: true, message: '请填写收费单说明'}
           ]
@@ -163,7 +169,7 @@ export default Form.create()(props => {
       </Form.Item>
       <Form.Item label="收费金额(元)">
       {
-        getFieldDecorator('payPrice', {
+        props.form.getFieldDecorator('payPrice', {
           rules: [
             {required: true, message: '请填写收费金额'}
           ]

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

@@ -295,7 +295,7 @@ export default props => {
       </div>
 
       <div style={{margin: '24px 0'}}>
-        <NavLink to=""><Button type="primary"><Icon type="plus" />添加更多收费单</Button></NavLink>
+        <NavLink to="/property/bill/management/info/add"><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>

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Icon } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetchList, apis, fetch } from '@/utils/request'
 import Search from '../../components/Search'
@@ -108,7 +108,7 @@ export default props => {
     <div>
       <Condition onSearch={handleSearch} onReset={handleSearch} />
       <div style={{ margin: '24px 0' }}>
-        <Button type="primary" onClick={exportExcel}>导出数据</Button>
+        <Button type="link" onClick={exportExcel}><Icon type="download"/>导出数据</Button>
       </div>
       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="id">
         <Table.Column

src/pages/property/building/BatchImport.jsx

@@ -72,10 +72,10 @@ export default props => {
   return (
     <div>
       <div style={{ marginBottom: '24px' }}>
-        <Button onClick={downloadExcel}><Icon type="download" />下载模板</Button>
-        <Button onClick={importExcel} style={spaceStyle}><Icon type="upload" />选取文件并预览</Button>
-        <Button type="primary" onClick={submitExcel} style={spaceStyle}>提交</Button>
+        <Button type="primary" onClick={importExcel}><Icon type="upload" />选取文件并预览</Button>
+        <Button type="danger" onClick={submitExcel} style={spaceStyle}>提交</Button>
         <Button style={spaceStyle} onClick={() => router.go(-1)}>取消</Button>
+        <Button type="link" onClick={downloadExcel} style={spaceStyle}><Icon type="download" />下载模板</Button>
       </div>
 
       <Table dataSource={dataList} pagination={pagenavi} loading={loading}>

src/pages/property/building/index.jsx

@@ -142,7 +142,7 @@ export default props => {
     <>
       <div style={{ marginBottom: '24px' }}>
         <Button onClick={() => showPrompt({ type: 'phase' })}><Icon type="plus" />增加顶级节点</Button>
-        <Button type="link" onClick={handleBatchImport} style={{ marginLeft: '24px' }}>批量导入小区楼栋信息</Button>
+        <Button type="link" onClick={handleBatchImport} style={{ marginLeft: '24px' }}><Icon type="upload"/>批量导入小区楼栋信息</Button>
       </div>
       {
         treeData && treeData.length ? (

src/pages/property/proprietor/Add.jsx

@@ -2,12 +2,8 @@ import React, { useRef, useState, useEffect } from 'react'
 import { Form, Input, Select, Button, Radio, Modal, Descriptions } from 'antd'
 import router from 'umi/router'
 import { fetch, apis } from '@/utils/request'
+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 addPerson = fetch(apis.buildingOwnerInfo.addBuilding)
 const taUserHasOwner = fetch(apis.propUser.taUserHasOwner)
 const taUserHas = fetch(apis.propUser.taUserHas)
@@ -37,17 +33,23 @@ const tailFormItemLayout = {
 }
 
 export default Form.create()(props => {
-  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()
+  const {
+    phaseId,
+    setPhaseId,
+    buildingId,
+    setBuildingId,
+    unitId,
+    setUnitId,
+    levelId,
+    setLevelId,
+    roomNoId,
+    setRoomNoId,
+    phaseList,
+    buildingList,
+    unitList,
+    levelList,
+    roomNoList
+  } = useRoomSelect()
 
   const [owerExist, setOwnerExist] = useState(false)
   const [telAccUser, setTelAccUser] = useState()
@@ -66,43 +68,6 @@ export default Form.create()(props => {
     }
   }
 
-  // 获取期
-  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])
-
   useEffect(() => {
     if (roomNoId) {
       taUserHasOwner({ params: {phaseId, buildingId, unitId, levelId, roomNoId} }).then(res => {

src/pages/property/proprietor/BatchImport.jsx

@@ -76,10 +76,10 @@ export default props => {
   return (
     <div>
       <div style={{ marginBottom: '24px' }}>
-        <Button onClick={downloadExcel}><Icon type="download" />下载模板</Button>
-        <Button onClick={importExcel} style={spaceStyle}><Icon type="upload" />选取文件并预览</Button>
-        <Button type="primary" onClick={submitExcel} style={spaceStyle}>提交</Button>
+        <Button type="primary" onClick={importExcel} style={spaceStyle}><Icon type="upload" />选取文件并预览</Button>
+        <Button type="danger" onClick={submitExcel} style={spaceStyle}>提交</Button>
         <Button style={spaceStyle} onClick={() => router.go(-1)}>取消</Button>
+        <Button type="link" style={spaceStyle} onClick={downloadExcel}><Icon type="download" />下载模板</Button>
       </div>
 
       <Table dataSource={dataList} pagination={pagenavi} loading={loading}>