feats

src/pages/customer/personlist/index.jsx

@@ -122,6 +122,7 @@ export default props => {
 
           return sex == 1 ? '男' : '女'
         }} />
+        <Table.Column title="生日" dataIndex="birthday" key="birthday" />
         <Table.Column title="推荐人" dataIndex="sharePersonName" key="sharePersonName" />
         {/* <Table.Column title="总积分" dataIndex="points" key="points" /> */}
         <Table.Column title="创建时间" dataIndex="createDate" key="createDate" render={t => moment(t).format('YYYY-MM-DD HH:mm')} />

src/pages/mpSetting/components/TemplateItem.jsx

@@ -10,6 +10,7 @@ export default props => {
     {typeCode: 'birthday', typeName: '生日'},
     {typeCode: 'festival', typeName: '节日'},
     {typeCode: 'ticket', typeName: '工单'},
+    {typeCode: 'property-fee', typeName: '物业费'},
   ])
 
   const handleChange = e => {

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

@@ -1,5 +1,5 @@
 import React, { useRef, useState, useEffect } from 'react'
-import { Spin, Form, Input, Divider, Button, Row, Col, Popconfirm, DatePicker, Select } from 'antd'
+import { Spin, Form, Input, Divider, Button, Row, Col, Popconfirm, DatePicker, Select, notification } from 'antd'
 import router from 'umi/router'
 import NavLink from 'umi/navlink'
 import moment from 'moment'
@@ -210,9 +210,11 @@ export default props => {
   }
 
   const collectionBill = row => {
+    setLoading(true)
     collectionBillList({ data: {billId: row.id}}).then(res => {
-      notification.success({ message: '催缴成功' })
-    })
+      notification.success({ message: '催缴任务启动成功' })
+      setLoading(false)
+    }).catch(e => console.error(e) || setLoading(false))
   }
 
   const handleDeleteRow = row => {

src/pages/property/proprietor/ListWithPoints.jsx

@@ -10,6 +10,7 @@ import useRoomSelect from '../utils/hooks/useRoomSelect'
 import NumRange from './components/NumRange'
 
 const getListWithPoints = fetchList(apis.propUser.listWithPoints)
+const exportListWithPoints = fetch(apis.propUser.listWithPointsExport)
 
 const Condition = props => {
   const [communityId, setCommunityId] = useState()
@@ -182,11 +183,11 @@ export default props => {
   }
 
   const handleExport = () => {
-    // setLoading(true)
-    // buildingInfoListExport({ data: {...queryParams, communityId, pageNum: 1, pageSize: 9999} }).then(res => {
-    //   setLoading(false)
-    //   exportExcel(res, "业主列表")
-    // }).catch(() => setLoading(false))
+    setLoading(true)
+    exportListWithPoints({params: {...queryParams, communityId}}).then(res => {
+      setLoading(false)
+      exportExcel(res, "业主积分")
+    }).catch(() => setLoading(false))
   }
 
   useEffect(() => {
@@ -206,7 +207,7 @@ export default props => {
       <Condition onSearch={handleSearch} onReset={handleSearch} onCommunityChange={v => setCommunityId(v)} />
       <div style={{ margin: '24px 0' }}>
         <div style={{display: 'inline-block'}}>
-          {/* <Button onClick={handleExport}>导出</Button> */}
+          <Button onClick={handleExport}>导出</Button>
         </div>
       </div>
       <List

src/services/prop_user_api.js

@@ -47,6 +47,12 @@ export default prefix => {
       url: `${prefix}/${moduleName}/points`,
       method: 'get',
       action: `admin.${moduleName}.points`
+    },
+
+    listWithPointsExport: {
+      url: `${prefix}/${moduleName}/points/export`,
+      method: 'get',
+      action: `admin.${moduleName}.points-export`
     }
   }
 }