Merge branch 'master' of http://git.ycjcjy.com/xiangsong/xs-manage

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

@@ -1,10 +1,13 @@
 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider, Icon } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Icon, DatePicker } from 'antd'
 import NavLink from 'umi/navlink'
+import moment from 'moment';
 import { fetchList, apis, fetch } from '@/utils/request'
 import Search from '../../components/Search'
 import List from '../../components/List'
 
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
 const exportStatementExcel = fetch(apis.bill.exportStatementExcel)
 const getBillStatementAll = fetch(apis.bill.getBillStatementAll)
 
@@ -108,6 +111,11 @@ const Condition = props => {
               )
             }
             </Form.Item>
+            <Form.Item label="缴费时间">
+            {getFieldDecorator('createTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
           </>
         )
       }}
@@ -122,9 +130,18 @@ export default props => {
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
 
   const handleSearch = vals => {
+    let { createTime, ...submitValue  } = vals
+    if (null != createTime && createTime.length > 0) {
+      const [startCreateDate, endCreateDate] = createTime
+      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+    } else {
+      submitValue.startCreateDate = null
+      submitValue.endCreateDate = null
+    }
     setQueryParams({
       ...queryParams,
-      ...vals,
+      ...submitValue,
       pageNum: 1,
     })
   }
@@ -203,12 +220,15 @@ export default props => {
           dataIndex="orderStatus"
           key="orderStatus"
           render={(_, row) => StatusDict[row.orderStatus]}
+          sorter={(a, b) => a.orderStatus - b.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="createDate" key="createDate" />
-        <Table.Column title="缴费完成时间" dataIndex="createTime" key="createTime" />
+        <Table.Column title="订单生成时间" dataIndex="createDate" key="createDate" 
+          sorter={(a, b) => new Date(a.createDate).getTime() - new Date(b.createDate).getTime()}/>
+        <Table.Column title="缴费完成时间" dataIndex="createTime" key="createTime" 
+          sorter={(a, b) => new Date(a.createTime).getTime() - new Date(b.createTime).getTime()}/>
       </List>
 
     </div>

src/pages/property/notice/index.jsx

@@ -1,11 +1,14 @@
 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm, notification } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm, notification, DatePicker } from 'antd'
 import NavLink from 'umi/navlink'
+import moment from 'moment';
 import { fetch, apis } from '@/utils/request'
 import CommunitySelect from '@/components/CommunitySelect'
 import Search from '../components/Search'
 import List from '../components/List'
 
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
 const listAnnouncement = fetch(apis.announcement.listAnnouncement)
 const deleteAnnouncement = fetch(apis.announcement.deleteAnnouncement)
 const updateannouncement = fetch(apis.announcement.updateannouncement)
@@ -53,6 +56,22 @@ const Condition = props => {
               )
             }
             </Form.Item>
+            <Form.Item label="状态">
+            {
+              getFieldDecorator('status')(
+                <Select style={{minWidth: '120px'}}>
+                  <Select.Option value="">全部</Select.Option>
+                  <Select.Option value="0">未发布</Select.Option>
+                  <Select.Option value="1">已发布</Select.Option>
+                </Select>
+              )
+            }
+            </Form.Item>
+            <Form.Item label="创建时间">
+            {getFieldDecorator('createTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
           </>
         )
       }}
@@ -74,9 +93,18 @@ export default props => {
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
 
   const handleSearch = vals => {
+    let { createTime, ...submitValue  } = vals
+    if (null != createTime && createTime.length > 0) {
+      const [startCreateDate, endCreateDate] = createTime
+      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
+      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
+    } else {
+      submitValue.startCreateDate = null
+      submitValue.endCreateDate = null
+    }
     setQueryParams({
       ...queryParams,
-      ...vals,
+      ...submitValue,
       pageNum: 1,
     })
   }
@@ -147,8 +175,10 @@ export default props => {
           dataIndex="status"
           key="status"
           render={(_, row) => StatusDict[row.status]}
+          sorter={(a, b) => a.status - b.status}
         />
-        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" />
+        <Table.Column title="创建时间" dataIndex="createDate" key="createDate" 
+        sorter={(a, b) => new Date(a.createDate).getTime() - new Date(b.createDate).getTime()}/>
         {/* <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
         <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" />
         <Table.Column title="修改人" dataIndex="updateDateName" key="updateDateName" /> */}

src/pages/property/proprietor/Detail.jsx

@@ -63,7 +63,7 @@ export default props => {
       <Section title="基本信息">
         <Descriptions column={3}>
           <Descriptions.Item label="姓名">{userData.ownerName}</Descriptions.Item>
-          <Descriptions.Item label="性别">{userData.gender === '2' ? '女' : '男'}</Descriptions.Item>
+          <Descriptions.Item label="性别">{!userData.idCard ? '' : (userData.idCard.substring(-2, 1) - 0) % 2 === 1 ? '男' : '女'}</Descriptions.Item>
           <Descriptions.Item label="手机号">{userData.phone}</Descriptions.Item>
           <Descriptions.Item label="微信昵称">{userData.nickname}</Descriptions.Item>
           <Descriptions.Item label="微信ID">{userData.openid}</Descriptions.Item>

src/pages/property/proprietor/index.jsx

@@ -155,6 +155,17 @@ const Condition = props => {
               )
             }
             </Form.Item>
+            <Form.Item>
+            {
+              getFieldDecorator('verifyStatus')(
+                <Select style={{ width: '200px' }} placeholder="审核状态">
+                  <Select.Option value={0}>未审核</Select.Option>
+                  <Select.Option value={1}>审核通过</Select.Option>
+                  <Select.Option value={2}>审核不通过</Select.Option>
+                </Select>
+              )
+            }
+            </Form.Item>
           </>
         )
       }}
@@ -310,8 +321,9 @@ export default props => {
               </span>
             )
           }}
+          sorter={(a, b) => a.verifyStatus - b.verifyStatus}
         />
-        <Table.Column title="编辑人" dataIndex="updateName" key="updateName" />
+        <Table.Column title="审核人" dataIndex="updateName" key="updateName" />
         <Table.Column title="编辑时间" dataIndex="createDate" key="createDate" />
         <Table.Column
           title="操作"

src/pages/property/ticket/index.jsx

@@ -181,8 +181,9 @@ export default props => {
           }}
         />
         <Table.Column title="发起人" dataIndex="createUserNmae" key="createUserNmae" />
+        <Table.Column title="业主楼栋信息" dataIndex="address" key="address" />
         <Table.Column title="发起时间" dataIndex="createDate" key="createDate" />
-        <Table.Column title="流转状态" dataIndex="status" key="status" render={x => getDictValue(StatusDict, x)} />
+        <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>