feats

config/routes.js

@@ -65,15 +65,128 @@ export default [
           //     },
           //   ],
           // },
+          {
+            path: '/property',
+            name: '物业管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: 'buildingInfo',
+                name: '楼栋管理',
+                component: './property/building'
+              },
+              {
+                path: 'buildingInfo/importExcel',
+                name: '楼栋导入',
+                component: './property/building/BatchImport',
+                hideInMenu: true,
+              },
+              {
+                path: 'proprietor',
+                name: '业主管理',
+                component: './property/proprietor'
+              },
+              {
+                path: 'proprietor/add',
+                name: '增加业主',
+                component: './property/proprietor/Add',
+                hideInMenu: true,
+              },
+              {
+                path: 'proprietor/detail',
+                name: '业主详情',
+                component: './property/proprietor/Detail',
+                hideInMenu: true,
+              },
+              {
+                path: 'proprietor/audit',
+                name: '资料审核',
+                component: './property/proprietor/Audit',
+              },
+              {
+                path: 'proprietor/batch',
+                name: '业主导入',
+                component: './property/proprietor/BatchImport',
+                hideInMenu: true,
+              },
+              {
+                path: 'notice',
+                name: '公告管理',
+                component: './property/notice'
+              },
+              {
+                path: 'notice/edit',
+                name: '公告管理详情',
+                component: './property/notice/Edit',
+                hideInMenu: true,
+              },
+              {
+                path: 'news',
+                name: '服务内容',
+                component: './property/news'
+              },
+              {
+                path: 'news/edit',
+                name: '服务内容详情',
+                component: './property/news/Edit',
+                hideInMenu: true,
+              },
+              {
+                path: 'bill/management',
+                name: '收费组管理',
+                component: './property/bill/list',
+              },
+              {
+                path: 'bill/management/add',
+                name: '新增收费组',
+                component: './property/bill/edit',
+                hideInMenu: true,
+              },
+              {
+                path: 'bill/management/info',
+                name: '收费组详情',
+                component: './property/bill/info',
+                hideInMenu: true,
+              },
+              {
+                path: 'bill/management/info/add',
+                name: '新增收费',
+                component: './property/bill/info/Add',
+                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: '工单管理',
+                component: './property/ticket',
+              },
+              {
+                path: 'bill/ticket/detail',
+                name: '工单详情',
+                component: './property/ticket/Detail',
+                hideInMenu: true,
+              },
+            ]
+          },
           {
             path: '/customer',
             name: '会员管理',
             component: '../layouts/BlankLayout',
             routes: [
               {
-                path: '/customer/customerlist/list',
+                path: '/customer/personlist',
                 name: '会员列表',
-                component: './customer/customerlist/index',
+                component: './customer/personlist/index',
               },
               {
                 path: '/customer/customerlist/customerDetail',
@@ -547,119 +660,7 @@ export default [
               },
             ],
           },
-          {
-            path: '/property',
-            name: '物业管理',
-            component: '../layouts/BlankLayout',
-            routes: [
-              {
-                path: 'buildingInfo',
-                name: '楼栋管理',
-                component: './property/building'
-              },
-              {
-                path: 'buildingInfo/importExcel',
-                name: '楼栋导入',
-                component: './property/building/BatchImport',
-                hideInMenu: true,
-              },
-              {
-                path: 'proprietor',
-                name: '业主管理',
-                component: './property/proprietor'
-              },
-              {
-                path: 'proprietor/add',
-                name: '增加业主',
-                component: './property/proprietor/Add',
-                hideInMenu: true,
-              },
-              {
-                path: 'proprietor/detail',
-                name: '业主详情',
-                component: './property/proprietor/Detail',
-                hideInMenu: true,
-              },
-              {
-                path: 'proprietor/audit',
-                name: '资料审核',
-                component: './property/proprietor/Audit',
-              },
-              {
-                path: 'proprietor/batch',
-                name: '业主导入',
-                component: './property/proprietor/BatchImport',
-                hideInMenu: true,
-              },
-              {
-                path: 'notice',
-                name: '公告管理',
-                component: './property/notice'
-              },
-              {
-                path: 'notice/edit',
-                name: '公告管理详情',
-                component: './property/notice/Edit',
-                hideInMenu: true,
-              },
-              {
-                path: 'news',
-                name: '服务内容',
-                component: './property/news'
-              },
-              {
-                path: 'news/edit',
-                name: '服务内容详情',
-                component: './property/news/Edit',
-                hideInMenu: true,
-              },
-              {
-                path: 'bill/management',
-                name: '收费组管理',
-                component: './property/bill/list',
-              },
-              {
-                path: 'bill/management/add',
-                name: '新增收费组',
-                component: './property/bill/edit',
-                hideInMenu: true,
-              },
-              {
-                path: 'bill/management/info',
-                name: '收费组详情',
-                component: './property/bill/info',
-                hideInMenu: true,
-              },
-              {
-                path: 'bill/management/info/add',
-                name: '新增收费',
-                component: './property/bill/info/Add',
-                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: '工单管理',
-                component: './property/ticket',
-              },
-              {
-                path: 'bill/ticket/detail',
-                name: '工单详情',
-                component: './property/ticket/Detail',
-                hideInMenu: true,
-              },
-            ]
-          },
+          
           // {
           //   path: '/system',
           //   name: '系统管理',

src/pages/customer/customerlist/components/integralRecord.jsx

@@ -92,10 +92,14 @@ class ModalIntegralRecord extends React.Component {
           return '资料审核'  
       case 'recommend-customer':
         return '推荐客户'
-        case 'group':
+      case 'group':
         return '拼团'
-        case 'recommend-customer':
-        return '推荐客户'
+      case 'ticket_evaluation':
+        return '报修评价'
+      case 'payment':
+        return '物业缴费'
+      case 'user_verify':
+        return '业主认证'
       default:
         return '未知类型'
     }

src/pages/customer/personlist/index.jsx

@@ -0,0 +1,118 @@
+import React, { useState, useEffect } from 'react'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm } from 'antd'
+import NavLink from 'umi/navlink'
+import { fetch, apis, fetchList } from '@/utils/request'
+import IntegralRecord from '../customerlist/components/integralRecord'
+
+const getPersonList = fetchList(apis.person.getPersonList)
+
+const Condition = Form.create()(props => {
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err && props.onSearch) {
+        props.onSearch(values)
+      }
+    });
+  }
+
+  const handleReset = e => {
+    props.form.resetFields()
+    if (props.onReset) {
+      props.onReset(props.form.getFieldsValue())
+    }
+  }
+
+  const { getFieldDecorator } = props.form
+
+  return (
+    <Form layout="inline" onSubmit={handleSubmit}>
+      <div style={{ display: 'flex', width: '100%' }}>
+        <div style={{ flex: 'none', maxWidth: 'calc(100% - 180px)' }}>
+            <Form.Item label="姓名">
+            {
+              getFieldDecorator('name')(<Input placeholder="姓名" />)
+            }
+            </Form.Item>
+            <Form.Item label="手机号">
+            {
+              getFieldDecorator('phone')(<Input placeholder="手机号" />)
+            }
+            </Form.Item>
+        </div>
+        <div style={{ flex: 'none', width: '180px' }}>
+          <Form.Item>
+            <Button type="primary" htmlType="submit">搜索</Button>
+          </Form.Item>
+          <Form.Item>
+            <Button onClick={handleReset}>重置</Button>
+          </Form.Item>
+        </div>
+      </div>
+    </Form>
+  )
+})
+
+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 [showPoints, setShowPoints] = useState({visible: false, customerId: ''})
+
+  const handleSearch = vals => {
+    setQueryParams({
+      ...queryParams,
+      ...vals,
+      pageNum: 1,
+    })
+  }
+
+  const handlePageChange = (pageNum, pageSize) => {
+    setQueryParams({
+      ...queryParams,      
+      pageNum,
+      pageSize,
+    })
+  }
+
+  useEffect(() => {
+    setLoading(true)
+    getPersonList(queryParams).then(res => {
+      const [list, pageInfo] = res || {}
+      setListData(list)
+      setPagination(pageInfo)
+      setLoading(false)
+    }).catch(() => setLoading(false))
+  }, [queryParams])
+
+  return (
+    <div>
+      <Condition onSearch={handleSearch} onReset={handleSearch} />
+      <div style={{margin: '24px 0'}}> </div>
+      <Table dataSource={listData} loading={loading} pagination={{...pagination, onChange: handlePageChange}} rowKey="personId">
+        <Table.Column
+          title="头像"
+          dataIndex="avatarurl"
+          key="avatarurl"
+          render={t => <img src={t} alt="" style={{width: '64px', height: '64px'}} />}
+        />
+        <Table.Column title="姓名" dataIndex="nickname" key="nickname" />
+        <Table.Column title="电话" dataIndex="phone" key="phone" render={t => t ? t.replace(/(\d{3})\d*(\d{4})/,'$1****$2') : ''} />
+        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" />
+        <Table.Column
+          title="操作"
+          key="action"
+          render={(_, row) => {
+            return (
+              <>
+                <Button type="link" onClick={() => setShowPoints({visible: true, customerId: row.personId})}>积分</Button>
+              </>
+            )
+          }}
+        />
+      </Table>
+      <IntegralRecord visibleData={showPoints} onCancel={() => setShowPoints({visible: false, customerId: ''})} />
+    </div>
+  )
+}

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

@@ -158,9 +158,9 @@ export default props => {
 
   const handleDetail = row => {
     if (row.billStatus === '2') {
-      router.push(`/property/bill/management/edi?id=${row.billId}`)
+      router.push(`/property/bill/management/edi?id=${row.id}`)
     } else {
-      router.push(`/property/bill/management/info?id=${row.billId}`);
+      router.push(`/property/bill/management/info?id=${row.id}`);
     }
   }
 
@@ -175,7 +175,6 @@ export default props => {
   useEffect(() => {
     setLoading(true)
     FetchBillList(queryParams).then(res => {
-      console.log(res,"2323")
       const {list, ...pagi} = res[1]
       setListData(list)
       setPagination(pagi)

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

@@ -1,13 +1,11 @@
 import React, { useEffect, useState } from 'react'
-import { Button, Collapse, Icon, Descriptions, Typography, Spin } from 'antd'
+import { Button, Collapse, Icon, Descriptions, Typography, Spin, Table } 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([])
@@ -17,34 +15,35 @@ export default props => {
   useEffect(() => {
     if (id) {
       getByOrderNumberBillInvoice({urlData: {id}}).then(res => {
-        setBillList(res)
+        const { billOrderList = []} = res || {}
+        setBillList(billOrderList)
       })
     }
   }, [id])
 
+  console.log(billList)
+
   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>
+    <div>
+      <Spin spinning={loading}>
+        <Collapse>
+          {
+            (billList || []).map(bill => (
+              <Collapse.Panel
+                key={bill.id}
+                header={`收费组: ${bill.billName||'无'}`}
+                // extra={<NavLink to=""><Button type="link">导出</Button></NavLink>}
+              >
+                <Table size="small" dataSource={bill.billInvoiceList || []} pagination={false}>
+                  <Table.Column title="收费单号" dataIndex="id" key="id" />
+                  <Table.Column title="金额（元）" dataIndex="payPrice" key="payPrice" render={t => t/100} />
+                  <Table.Column title="收费单说明" dataIndex="billInvoiceExplain" key="billInvoiceExplain" />
+                </Table>
+              </Collapse.Panel>
+            ))
+          }
+        </Collapse>
+      </Spin>
+    </div>
   )
 }

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

@@ -117,7 +117,7 @@ export default props => {
           key="id"
           render={(_, row) => {
             return (
-              <NavLink to={`/property/bill/order/info?id=${row.id}`}>
+              <NavLink to={`/property/bill/order/info?id=${row.orderBumber}`}>
                 <Button type="link">{row.orderBumber}</Button>
               </NavLink>
             )

src/services/apis.js

@@ -19,6 +19,13 @@ export default {
   announcement: announcement(prefix),
   ticket: ticket(prefix),
   propNews: propNews(prefix),
+  person: {
+    getPersonList: {
+      url: `${prefix}/person-list`,
+      method: 'GET',
+      action: 'admin.person.list',
+    }
+  },
   image: {
     uploadForAnt: {
       url: `${prefix}/antd/image`,