浏览代码

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

张延森 4 年前
父节点
当前提交
77aa20240b

+ 55
- 3
src/pages/property/bill/order/index.jsx 查看文件

15
   '3': '已关闭',
15
   '3': '已关闭',
16
 }
16
 }
17
 
17
 
18
+const PayStatusDict = [
19
+  {
20
+    label: '未支付',
21
+    value: '0',
22
+  },
23
+  {
24
+    label: '已支付',
25
+    value: '1',
26
+  },
27
+  {
28
+    label: '支付中',
29
+    value: '2',
30
+  },
31
+  {
32
+    label: '已关闭',
33
+    value: '3',
34
+  },
35
+]
36
+
18
 const PayTypeDict = {
37
 const PayTypeDict = {
19
   '0': '微信缴费',
38
   '0': '微信缴费',
20
   '1': '线下缴费',
39
   '1': '线下缴费',
21
-  '2': '支付宝缴费',
40
+  // '2': '支付宝缴费',
22
 }
41
 }
23
 
42
 
43
+const PayTypesDict = [
44
+  {
45
+    label: '微信缴费',
46
+    value: '0',
47
+  },
48
+  {
49
+    label: '线下缴费',
50
+    value: '1',
51
+  },
52
+]
53
+
24
 const Condition = props => {
54
 const Condition = props => {
25
   return (
55
   return (
26
     <Search
56
     <Search
56
               getFieldDecorator('payPhone')(<Input placeholder="缴费人手机号" />)
86
               getFieldDecorator('payPhone')(<Input placeholder="缴费人手机号" />)
57
             }
87
             }
58
             </Form.Item>
88
             </Form.Item>
89
+            <Form.Item label="订单状态">
90
+            {
91
+              getFieldDecorator('orderStatus')(
92
+                <Select placeholder="选择订单状态" style={{ width: '120px' }}>
93
+                  {
94
+                    PayStatusDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
95
+                  }
96
+                </Select>
97
+              )
98
+            }
99
+            </Form.Item>
100
+            <Form.Item label="缴费方式">
101
+            {
102
+              getFieldDecorator('payType')(
103
+                <Select placeholder="选择缴费方式" style={{ width: '120px' }}>
104
+                  {
105
+                    PayTypesDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
106
+                  }
107
+                </Select>
108
+              )
109
+            }
110
+            </Form.Item>
59
           </>
111
           </>
60
         )
112
         )
61
       }}
113
       }}
155
         <Table.Column title="缴费人手机号" dataIndex="payPhone" key="payPhone" />
207
         <Table.Column title="缴费人手机号" dataIndex="payPhone" key="payPhone" />
156
         <Table.Column title="缴费备注" dataIndex="payRemark" key="payRemark" />
208
         <Table.Column title="缴费备注" dataIndex="payRemark" key="payRemark" />
157
         <Table.Column title="缴费方式" dataIndex="payType" key="payType" render={payType => PayTypeDict[payType]}/>
209
         <Table.Column title="缴费方式" dataIndex="payType" key="payType" render={payType => PayTypeDict[payType]}/>
158
-        <Table.Column title="订单生成时间" dataIndex="createTime" key="createTime" />
159
-        <Table.Column title="缴费完成时间" dataIndex="updateDate" key="updateDate" />
210
+        <Table.Column title="订单生成时间" dataIndex="createDate" key="createDate" />
211
+        <Table.Column title="缴费完成时间" dataIndex="createTime" key="createTime" />
160
       </List>
212
       </List>
161
 
213
 
162
     </div>
214
     </div>

+ 21
- 3
src/pages/property/news/index.jsx 查看文件

1
 import React, { useState, useEffect } from 'react'
1
 import React, { useState, useEffect } from 'react'
2
-import { Select, Spin, Table, Button, Form, Input, Divider, Modal, Popconfirm, Typography, notification } from 'antd'
2
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal, Popconfirm, Typography, notification, DatePicker } from 'antd'
3
 import NavLink from 'umi/navlink'
3
 import NavLink from 'umi/navlink'
4
+import moment from 'moment';
4
 import { fetch, fetchList, apis } from '@/utils/request'
5
 import { fetch, fetchList, apis } from '@/utils/request'
5
 import Search from '../components/Search'
6
 import Search from '../components/Search'
6
 import List from '../components/List'
7
 import List from '../components/List'
7
 
8
 
9
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
10
+
8
 const getNewsList = fetchList(apis.propNews.getNewsList)
11
 const getNewsList = fetchList(apis.propNews.getNewsList)
9
 const updateNews = fetch(apis.propNews.updateNews)
12
 const updateNews = fetch(apis.propNews.updateNews)
10
 const deleteNews = fetch(apis.propNews.deleteNews)
13
 const deleteNews = fetch(apis.propNews.deleteNews)
36
               getFieldDecorator('newsName')(<Input placeholder="标题" />)
39
               getFieldDecorator('newsName')(<Input placeholder="标题" />)
37
             }
40
             }
38
             </Form.Item>
41
             </Form.Item>
42
+            <Form.Item>
43
+            <span style={{ marginRight: '10px' }}>创建时间:</span>
44
+            {getFieldDecorator('createTime')(
45
+              <RangePicker placeholder={['开始时间', '结束时间']} />
46
+            )}
47
+          </Form.Item>
39
           </>
48
           </>
40
         )
49
         )
41
       }}
50
       }}
56
   const [typeList, setTypeList] = useState([])
65
   const [typeList, setTypeList] = useState([])
57
 
66
 
58
   const handleSearch = vals => {
67
   const handleSearch = vals => {
68
+    let { createTime, ...submitValue  } = vals
69
+    if (null != createTime && createTime.length > 0) {
70
+      const [startCreateDate, endCreateDate] = createTime
71
+      submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
72
+      submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
73
+    } else {
74
+      submitValue.startCreateDate = null
75
+      submitValue.endCreateDate = null
76
+    }
59
     setQueryParams({
77
     setQueryParams({
60
       ...queryParams,
78
       ...queryParams,
61
-      ...vals,
79
+      ...submitValue,
62
       pageNum: 1,
80
       pageNum: 1,
63
     })
81
     })
64
   }
82
   }
120
         </NavLink>
138
         </NavLink>
121
       </div>
139
       </div>
122
       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="newsId">
140
       <List dataSource={listData} loading={loading} pagination={pagination} onPageChange={handlePageChange} rowKey="newsId">
123
-        <Table.Column title="#ID" dataIndex="newsId" key="newsId" />
141
+        {/* <Table.Column title="#ID" dataIndex="newsId" key="newsId" /> */}
124
         <Table.Column
142
         <Table.Column
125
           title="分类"
143
           title="分类"
126
           dataIndex="newsTypeId"
144
           dataIndex="newsTypeId"

+ 51
- 1
src/pages/property/proprietor/Audit.jsx 查看文件

50
   const [loading, setLoading] = useState(false)
50
   const [loading, setLoading] = useState(false)
51
   const [noPassShow, setNoPassShow] = useState(false)
51
   const [noPassShow, setNoPassShow] = useState(false)
52
   const [listData, setListData] = useState([])
52
   const [listData, setListData] = useState([])
53
+  const [selectedKeys, setSelectedKeys] = useState([])
53
   const [pagination, setPagination] = useState({})
54
   const [pagination, setPagination] = useState({})
54
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
55
   const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 })
55
 
56
 
63
     })
64
     })
64
   }
65
   }
65
 
66
 
67
+  const rowSelection = {
68
+    onChange: (selectedRowKeys, selectedRows) => {
69
+      console.log('------>', selectedRowKeys)
70
+      setSelectedKeys(selectedRowKeys)
71
+    }
72
+  }
73
+
66
   const handleDeleteRow = row => {}
74
   const handleDeleteRow = row => {}
67
 
75
 
68
   const showAuditDialog = row => {
76
   const showAuditDialog = row => {
113
     })
121
     })
114
   }
122
   }
115
 
123
 
124
+  const handleChangeSelected = (verifyStatus) => {
125
+      selectedKeys.map(x => {
126
+         const params = {
127
+            verifyStatus,
128
+            remark: ''
129
+          }
130
+      
131
+          userVerifyAudit({ urlData: { id: x }, params }).then(res => {
132
+              console.log(res)
133
+          })
134
+      })
135
+      Modal.success({
136
+        content: '审核提交成功',
137
+        onOk: () => {
138
+          // 触发数据刷新
139
+          setQueryParams({...queryParams})
140
+        }
141
+      })
142
+  }
143
+
116
   useEffect(() => {
144
   useEffect(() => {
117
     setLoading(true)
145
     setLoading(true)
118
     userVerifyAll(queryParams).then(res => {
146
     userVerifyAll(queryParams).then(res => {
126
   return (
154
   return (
127
     <div>
155
     <div>
128
       <Condition onSearch={handleSearch} onSearch={handleSearch} />
156
       <Condition onSearch={handleSearch} onSearch={handleSearch} />
157
+      <div style={{ margin: '24px 0' }}>
158
+        <div style={{marginLeft: 16, display: 'inline-block'}}>
159
+          <Popconfirm
160
+            title="确认进行批量审核通过操作?"
161
+            onConfirm={() => handleChangeSelected(true)}
162
+            okText="确定"
163
+            cancelText="取消"
164
+          >
165
+            <Button type="danger" disabled={!selectedKeys.length}>批量通过</Button>
166
+          </Popconfirm>
167
+        </div>
168
+        <div style={{marginLeft: 16, display: 'inline-block'}}>
169
+          <Popconfirm
170
+            title="确认进行批量审核不通过操作?"
171
+            onConfirm={() => handleChangeSelected(false)}
172
+            okText="确定"
173
+            cancelText="取消"
174
+          >
175
+            <Button type="danger" disabled={!selectedKeys.length}>批量不通过</Button>
176
+          </Popconfirm>
177
+        </div>
178
+      </div>
129
       <div style={{ marginTop: '24px' }}>
179
       <div style={{ marginTop: '24px' }}>
130
         <p style={{color: '#888', fontSize: '0.8em'}}>注意,审核后无法修改审核结果,请仔细确认</p>
180
         <p style={{color: '#888', fontSize: '0.8em'}}>注意,审核后无法修改审核结果,请仔细确认</p>
131
       </div>
181
       </div>
132
-      <List dataSource={listData} onPageChange={handlePageChange} pagination={pagination} loading={loading} rowKey="id">
182
+      <List dataSource={listData} onPageChange={handlePageChange} pagination={pagination} rowSelection={rowSelection} loading={loading} rowKey="id">
133
         <Table.Column title="姓名" dataIndex="ownerName" key="ownerName" />
183
         <Table.Column title="姓名" dataIndex="ownerName" key="ownerName" />
134
         <Table.Column title="手机号" dataIndex="phone" key="phone" />
184
         <Table.Column title="手机号" dataIndex="phone" key="phone" />
135
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />
185
         <Table.Column title="身份证" dataIndex="idCard" key="idCard" />

+ 1
- 1
src/pages/property/proprietor/BatchImport.jsx 查看文件

89
         <Column key="levelName" title="楼层" dataIndex="levelName" />
89
         <Column key="levelName" title="楼层" dataIndex="levelName" />
90
         <Column key="roomNoName" title="户号" dataIndex="roomNoName" />
90
         <Column key="roomNoName" title="户号" dataIndex="roomNoName" />
91
         <Column key="ownerName" title="户主姓名" dataIndex="ownerName" />
91
         <Column key="ownerName" title="户主姓名" dataIndex="ownerName" />
92
-        <Column key="roleName" title="身份" dataIndex="roleName" />
92
+        {/* <Column key="roleName" title="身份" dataIndex="roleName" /> */}
93
         <Column key="ownerTel" title="手机号码" dataIndex="ownerTel" />
93
         <Column key="ownerTel" title="手机号码" dataIndex="ownerTel" />
94
       </Table>
94
       </Table>
95
     </div>
95
     </div>

+ 1
- 1
src/pages/property/proprietor/index.jsx 查看文件

253
         dataSource={listData}
253
         dataSource={listData}
254
         loading={loading}
254
         loading={loading}
255
         pagination={pagination}
255
         pagination={pagination}
256
-        rowSelection={rowSelection}
256
+        rowSelection={rowSelection} 
257
         onPageChange={handlePageChange}
257
         onPageChange={handlePageChange}
258
         rowKey="id"
258
         rowKey="id"
259
       >
259
       >

+ 5
- 5
src/pages/property/ticket/index.jsx 查看文件

41
     label: '已评价',
41
     label: '已评价',
42
     value: '5',
42
     value: '5',
43
   },
43
   },
44
-  {
45
-    label: '已终止',
46
-    value: '6',
47
-  },
44
+  // {
45
+  //   label: '已终止',
46
+  //   value: '6',
47
+  // },
48
 ]
48
 ]
49
 
49
 
50
 const getDictValue = (dict, val) => (dict.filter(x => x.value === val)[0] || {}).label
50
 const getDictValue = (dict, val) => (dict.filter(x => x.value === val)[0] || {}).label
92
               getFieldDecorator('status')(
92
               getFieldDecorator('status')(
93
                 <Select placeholder="选择状态" style={{ width: '120px' }}>
93
                 <Select placeholder="选择状态" style={{ width: '120px' }}>
94
                   {
94
                   {
95
-                    TypeDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
95
+                    StatusDict.map(x => (<Select.Option key={x.value} value={x.value}>{x.label}</Select.Option>))
96
                   }
96
                   }
97
                 </Select>
97
                 </Select>
98
               )
98
               )