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

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

@@ -15,12 +15,42 @@ const StatusDict = {
   '3': '已关闭',
 }
 
+const PayStatusDict = [
+  {
+    label: '未支付',
+    value: '0',
+  },
+  {
+    label: '已支付',
+    value: '1',
+  },
+  {
+    label: '支付中',
+    value: '2',
+  },
+  {
+    label: '已关闭',
+    value: '3',
+  },
+]
+
 const PayTypeDict = {
   '0': '微信缴费',
   '1': '线下缴费',
-  '2': '支付宝缴费',
+  // '2': '支付宝缴费',
 }
 
+const PayTypesDict = [
+  {
+    label: '微信缴费',
+    value: '0',
+  },
+  {
+    label: '线下缴费',
+    value: '1',
+  },
+]
+
 const Condition = props => {
   return (
     <Search
@@ -56,6 +86,28 @@ const Condition = props => {
               getFieldDecorator('payPhone')(<Input placeholder="缴费人手机号" />)
             }
             </Form.Item>
+            <Form.Item label="订单状态">
+            {
+              getFieldDecorator('orderStatus')(
+                <Select placeholder="选择订单状态" style={{ width: '120px' }}>
+                  {
+                    PayStatusDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
+                  }
+                </Select>
+              )
+            }
+            </Form.Item>
+            <Form.Item label="缴费方式">
+            {
+              getFieldDecorator('payType')(
+                <Select placeholder="选择缴费方式" style={{ width: '120px' }}>
+                  {
+                    PayTypesDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
+                  }
+                </Select>
+              )
+            }
+            </Form.Item>
           </>
         )
       }}
@@ -155,8 +207,8 @@ export default props => {
         <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" />
+        <Table.Column title="订单生成时间" dataIndex="createDate" key="createDate" />
+        <Table.Column title="缴费完成时间" dataIndex="createTime" key="createTime" />
       </List>
 
     </div>

src/pages/property/news/index.jsx

@@ -1,10 +1,13 @@
 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider, Modal, Popconfirm, Typography, notification } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal, Popconfirm, Typography, notification, DatePicker } from 'antd'
 import NavLink from 'umi/navlink'
+import moment from 'moment';
 import { fetch, fetchList, apis } from '@/utils/request'
 import Search from '../components/Search'
 import List from '../components/List'
 
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
 const getNewsList = fetchList(apis.propNews.getNewsList)
 const updateNews = fetch(apis.propNews.updateNews)
 const deleteNews = fetch(apis.propNews.deleteNews)
@@ -36,6 +39,12 @@ const Condition = props => {
               getFieldDecorator('newsName')(<Input placeholder="标题" />)
             }
             </Form.Item>
+            <Form.Item>
+            <span style={{ marginRight: '10px' }}>创建时间：</span>
+            {getFieldDecorator('createTime')(
+              <RangePicker placeholder={['开始时间', '结束时间']} />
+            )}
+          </Form.Item>
           </>
         )
       }}
@@ -56,9 +65,18 @@ export default props => {
   const [typeList, setTypeList] = useState([])
 
   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,
     })
   }
@@ -120,7 +138,7 @@ export default props => {
         </NavLink>
       </div>
       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="newsId">
-        <Table.Column title="#ID" dataIndex="newsId" key="newsId" />
+        {/* <Table.Column title="#ID" dataIndex="newsId" key="newsId" /> */}
         <Table.Column
           title="分类"
           dataIndex="newsTypeId"

src/pages/property/proprietor/Audit.jsx

@@ -50,6 +50,7 @@ export default props => {
   const [loading, setLoading] = useState(false)
   const [noPassShow, setNoPassShow] = useState(false)
   const [listData, setListData] = useState([])
+  const [selectedKeys, setSelectedKeys] = useState([])
   const [pagination, setPagination] = useState({})
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
 
@@ -63,6 +64,13 @@ export default props => {
     })
   }
 
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('------>', selectedRowKeys)
+      setSelectedKeys(selectedRowKeys)
+    }
+  }
+
   const handleDeleteRow = row => {}
 
   const showAuditDialog = row => {
@@ -113,6 +121,26 @@ export default props => {
     })
   }
 
+  const handleChangeSelected = (verifyStatus) => {
+      selectedKeys.map(x => {
+         const params = {
+            verifyStatus,
+            remark: ''
+          }
+      
+          userVerifyAudit({ urlData: { id: x }, params }).then(res => {
+              console.log(res)
+          })
+      })
+      Modal.success({
+        content: '审核提交成功',
+        onOk: () => {
+          // 触发数据刷新
+          setQueryParams({...queryParams})
+        }
+      })
+  }
+
   useEffect(() => {
     setLoading(true)
     userVerifyAll(queryParams).then(res => {
@@ -126,10 +154,32 @@ export default props => {
   return (
     <div>
       <Condition onSearch={handleSearch} onSearch={handleSearch} />
+      <div style={{ margin: '24px 0' }}>
+        <div style={{marginLeft: 16, display: 'inline-block'}}>
+          <Popconfirm
+            title="确认进行批量审核通过操作?"
+            onConfirm={() => handleChangeSelected(true)}
+            okText="确定"
+            cancelText="取消"
+          >
+            <Button type="danger" disabled={!selectedKeys.length}>批量通过</Button>
+          </Popconfirm>
+        </div>
+        <div style={{marginLeft: 16, display: 'inline-block'}}>
+          <Popconfirm
+            title="确认进行批量审核不通过操作?"
+            onConfirm={() => handleChangeSelected(false)}
+            okText="确定"
+            cancelText="取消"
+          >
+            <Button type="danger" disabled={!selectedKeys.length}>批量不通过</Button>
+          </Popconfirm>
+        </div>
+      </div>
       <div style={{ marginTop: '24px' }}>
         <p style={{color: '#888', fontSize: '0.8em'}}>注意，审核后无法修改审核结果，请仔细确认</p>
       </div>
-      <List dataSource={listData} onPageChange={handlePageChange} pagination={pagination} loading={loading} rowKey="id">
+      <List dataSource={listData} onPageChange={handlePageChange} pagination={pagination} rowSelection={rowSelection} loading={loading} rowKey="id">
         <Table.Column title="姓名" dataIndex="ownerName" key="ownerName" />
         <Table.Column title="手机号" dataIndex="phone" key="phone" />
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />

src/pages/property/proprietor/BatchImport.jsx

@@ -89,7 +89,7 @@ export default props => {
         <Column key="levelName" title="楼层" dataIndex="levelName" />
         <Column key="roomNoName" title="户号" dataIndex="roomNoName" />
         <Column key="ownerName" title="户主姓名" dataIndex="ownerName" />
-        <Column key="roleName" title="身份" dataIndex="roleName" />
+        {/* <Column key="roleName" title="身份" dataIndex="roleName" /> */}
         <Column key="ownerTel" title="手机号码" dataIndex="ownerTel" />
       </Table>
     </div>

src/pages/property/proprietor/index.jsx

@@ -253,7 +253,7 @@ export default props => {
         dataSource={listData}
         loading={loading}
         pagination={pagination}
-        rowSelection={rowSelection}
+        rowSelection={rowSelection} 
         onPageChange={handlePageChange}
         rowKey="id"
       >

src/pages/property/ticket/index.jsx

@@ -41,10 +41,10 @@ const StatusDict = [
     label: '已评价',
     value: '5',
   },
-  {
-    label: '已终止',
-    value: '6',
-  },
+  // {
+  //   label: '已终止',
+  //   value: '6',
+  // },
 ]
 
 const getDictValue = (dict, val) => (dict.filter(x => x.value === val)[0] || {}).label
@@ -92,7 +92,7 @@ const Condition = props => {
               getFieldDecorator('status')(
                 <Select placeholder="选择状态" style={{ width: '120px' }}>
                   {
-                    TypeDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
+                    StatusDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
                   }
                 </Select>
               )