Browse Source

新需求

weichaochao 5 years ago
parent
commit
e44bed4eff

+ 0
- 1
src/pages/house/raise/edit/components/BatchRaise/BatchInvalid.jsx View File

10
 
10
 
11
 const BatchInvalid = props => {
11
 const BatchInvalid = props => {
12
   const taRaiseRecords = props.houseIds;
12
   const taRaiseRecords = props.houseIds;
13
-  console.log(props.taRaiseRecords, '111123213')
14
   function handleSubmit (e) {
13
   function handleSubmit (e) {
15
     e.preventDefault();
14
     e.preventDefault();
16
     props.form.validateFields((err, values) => {
15
     props.form.validateFields((err, values) => {

+ 30
- 3
src/pages/house/raise/edit/components/HouseInfo/index.jsx View File

1
 import React, { PureComponent, useState, useEffect } from 'react'
1
 import React, { PureComponent, useState, useEffect } from 'react'
2
-import { Modal, Row, Col, Table, Pagination, Button } from 'antd'
2
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
3
 import EnDash from '../EnDash'
3
 import EnDash from '../EnDash'
4
 import AuthButton from '@/components/AuthButton';
4
 import AuthButton from '@/components/AuthButton';
5
 
5
 
6
 import Style from './style.less'
6
 import Style from './style.less'
7
 import HotBlock from '../HotBlock'
7
 import HotBlock from '../HotBlock'
8
 import HouseListInfo from '../HouseListInfo'
8
 import HouseListInfo from '../HouseListInfo'
9
+import request from '../../../../../../utils/request';
10
+import apis from '../../../../../../services/apis';
9
 
11
 
10
-export default function UserInfo(props) {
11
-  console.log(props.visible, 'houseINfo');
12
+const HouseInfo = props => {
13
+  console.log(props, '123123123');
12
   const [data, setData] = useState({ list: [], total: 0 })
14
   const [data, setData] = useState({ list: [], total: 0 })
13
   const [house, setHouse] = useState(false);
15
   const [house, setHouse] = useState(false);
16
+  const raiseRecordId = props.raiseRecordId
17
+  useEffect(() => {
18
+    console.log(1111111)
19
+    getList({ pageNum: 1, pageSize: 10 });
20
+  }, [])
21
+
22
+  function getList(params) {
23
+    console.log(1111111)
24
+    // 网路请求
25
+    request({ ...apis.house.listHouseByRaiseRecordId, params: { ...params,raiseRecordId: raiseRecordId} }).then(res => {
26
+      console.log(res,"houseInfohouseInfohouseInfohouseInfo")
27
+      setData(res)
28
+    }).catch(err => {
29
+      openNotificationWithIcon('error', err.message)
30
+    })
31
+  }
32
+
14
   const columns = [
33
   const columns = [
15
     {
34
     {
16
       title: '销售批次名',
35
       title: '销售批次名',
79
     </>
98
     </>
80
   );
99
   );
81
 }
100
 }
101
+
102
+
103
+const WrappedBase = Form.create({ name: 'HouseInfo' })(HouseInfo);
104
+
105
+export default WrappedBase
106
+
107
+// export default function UserInfo(props) {
108
+// }

+ 11
- 11
src/pages/house/raise/edit/components/IdentifyingChips.jsx View File

26
 function PreselectionRecord(props) {
26
 function PreselectionRecord(props) {
27
   const [data, setData] = useState([])
27
   const [data, setData] = useState([])
28
   const [userInfo, setUserInfo] = useState({visable:false, name:''})
28
   const [userInfo, setUserInfo] = useState({visable:false, name:''})
29
-  const [houseInfo, setHouseInfo] = useState({visable:false, raiseId:''})
29
+  const [houseInfo, setHouseInfo] = useState({visable:false, raiseRecordId:''})
30
   const [invalid, setInvalid] = useState({visable:false,houseIds:''})
30
   const [invalid, setInvalid] = useState({visable:false,houseIds:''})
31
   const [pay, setPay] = useState({visable:false,houseIds:''})
31
   const [pay, setPay] = useState({visable:false,houseIds:''})
32
   const [refund, setRefund] = useState({visable:false,houseIds:''})
32
   const [refund, setRefund] = useState({visable:false,houseIds:''})
168
       dataIndex: 'houseNum',
168
       dataIndex: 'houseNum',
169
       key: 'houseNum',
169
       key: 'houseNum',
170
       render: (text, record) => (
170
       render: (text, record) => (
171
-        <a style={{ color: '#66B3FF' }} onClick={() => showHouseInfo({visable:true})} >{record.houseNum}</a>
171
+        <a style={{ color: '#66B3FF' }} onClick={() => showHouseInfo({visable:true,raiseRecordId:record.raiseRecordId})} >{record.houseNum}</a>
172
         ),
172
         ),
173
     },
173
     },
174
     {
174
     {
209
     },
209
     },
210
     {
210
     {
211
       title: '缴费状态',
211
       title: '缴费状态',
212
-      dataIndex: 'payStatus',
213
-      key: 'payStatus',
212
+      dataIndex: 'payStatus1',
213
+      key: 'payStatus1',
214
       render: (text, record) => (<><span>{record.payStatus === 'paid' ? '已缴费':record.payStatus === 'unpaid'?'未缴费':record.payStatus === 'refunded'?'已退费':'正在支付'}</span></>),
214
       render: (text, record) => (<><span>{record.payStatus === 'paid' ? '已缴费':record.payStatus === 'unpaid'?'未缴费':record.payStatus === 'refunded'?'已退费':'正在支付'}</span></>),
215
     },
215
     },
216
     {
216
     {
221
     },
221
     },
222
     {
222
     {
223
       title: '缴费结果',
223
       title: '缴费结果',
224
-      dataIndex: 'payStatus',
225
-      key: 'payStatus',
224
+      dataIndex: 'payStatus2',
225
+      key: 'payStatus2',
226
       render: (text, record) => (<><span>{record.payStatus === 'paid' ? '已缴费':record.payStatus === 'unpaid'?'未缴费':record.payStatus === 'refunded'?'已退费':'正在支付'}</span></>),
226
       render: (text, record) => (<><span>{record.payStatus === 'paid' ? '已缴费':record.payStatus === 'unpaid'?'未缴费':record.payStatus === 'refunded'?'已退费':'正在支付'}</span></>),
227
     },
227
     },
228
     {
228
     {
229
       title: '退费状态',
229
       title: '退费状态',
230
-      dataIndex: 'payStatus',
231
-      key: 'payStatus',
230
+      dataIndex: 'payStatus3',
231
+      key: 'payStatus3',
232
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
232
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
233
     },
233
     },
234
     {
234
     {
238
     },
238
     },
239
     {
239
     {
240
         title: '退费结果',
240
         title: '退费结果',
241
-        dataIndex: 'payStatus',
242
-        key: 'payStatus',
241
+        dataIndex: 'payStatus4',
242
+        key: 'payStatus4',
243
         render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
243
         render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
244
     },
244
     },
245
     {
245
     {
393
       <Button type="primary" onClick={() => showPay({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量线下缴费</Button>
393
       <Button type="primary" onClick={() => showPay({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量线下缴费</Button>
394
       <Button type="primary" onClick={() => showRefund({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量线下退费</Button>
394
       <Button type="primary" onClick={() => showRefund({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量线下退费</Button>
395
       <UserInfo visible={userInfo.visable} phone={userInfo.name} onCancel={() => setUserInfo({visable:false, name:'111'})} />
395
       <UserInfo visible={userInfo.visable} phone={userInfo.name} onCancel={() => setUserInfo({visable:false, name:'111'})} />
396
-      <HouseInfo visible={houseInfo.visable} houseId={houseInfo.houseId} onCancel={() => setHouseInfo({visable:false, houseId:'111'})} />
396
+      <HouseInfo visible={houseInfo.visable} houseId={houseInfo.houseId} raiseRecordId={houseInfo.raiseRecordId} onCancel={() => setHouseInfo({visable:false, houseId:''})} />
397
       <BatchInvalid visible={invalid.visable} houseIds={invalid.houseIds} onCancel={() => showInvalid(false)} onSuccess={() => showInvalid(false)}/>
397
       <BatchInvalid visible={invalid.visable} houseIds={invalid.houseIds} onCancel={() => showInvalid(false)} onSuccess={() => showInvalid(false)}/>
398
       <BatchPay visible={pay.visable} houseIds={pay.houseIds} onCancel={() => showPay(false)} onSuccess={() => showPay(false)} />
398
       <BatchPay visible={pay.visable} houseIds={pay.houseIds} onCancel={() => showPay(false)} onSuccess={() => showPay(false)} />
399
       <BatchRefund visible={refund.visable} houseIds={refund.houseIds} onCancel={() => setRefund(false)} onSuccess={() => setRefund(false)}/>
399
       <BatchRefund visible={refund.visable} houseIds={refund.houseIds} onCancel={() => setRefund(false)} onSuccess={() => setRefund(false)}/>

+ 4
- 4
src/pages/house/raise/edit/components/PaymentChips.jsx View File

70
     },
70
     },
71
     {
71
     {
72
       title: '退费状态',
72
       title: '退费状态',
73
-      dataIndex: 'payStatus',
74
-      key: 'payStatus',
73
+      dataIndex: 'payStatus1',
74
+      key: 'payStatus1',
75
       align: 'center',
75
       align: 'center',
76
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
76
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
77
     },
77
     },
78
     {
78
     {
79
       title: '退费结果',
79
       title: '退费结果',
80
-      dataIndex: 'payStatus',
81
-      key: 'payStatus',
80
+      dataIndex: 'payStatus2',
81
+      key: 'payStatus2',
82
       align: 'center',
82
       align: 'center',
83
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
83
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
84
     },
84
     },

+ 4
- 4
src/pages/house/raise/edit/components/Refund.jsx View File

63
     },
63
     },
64
     {
64
     {
65
       title: '退费状态',
65
       title: '退费状态',
66
-      dataIndex: 'payStatus',
67
-      key: 'payStatus',
66
+      dataIndex: 'payStatus1',
67
+      key: 'payStatus1',
68
       align: 'center',
68
       align: 'center',
69
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
69
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
70
     },
70
     },
71
     {
71
     {
72
       title: '退费结果',
72
       title: '退费结果',
73
-      dataIndex: 'payStatus',
74
-      key: 'payStatus',
73
+      dataIndex: 'payStatus2',
74
+      key: 'payStatus2',
75
       align: 'center',
75
       align: 'center',
76
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
76
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
77
     },
77
     },

+ 0
- 1
src/pages/house/raise/edit/components/UserInfo/index.jsx View File

7
 
7
 
8
 
8
 
9
 export default function UserInfo(props) {
9
 export default function UserInfo(props) {
10
-  console.log(props.phone, 'userInfo')
11
   return (
10
   return (
12
     <Modal footer={null} title="个人信息" visible={props.visible} onCancel={props.onCancel} width={800}>
11
     <Modal footer={null} title="个人信息" visible={props.visible} onCancel={props.onCancel} width={800}>
13
       <div className={Style.cardBox}>
12
       <div className={Style.cardBox}>

+ 5
- 0
src/services/apis.js View File

1313
     url: `${prefix}/checkHavingRecord/:id`,
1313
     url: `${prefix}/checkHavingRecord/:id`,
1314
     method: 'GET',
1314
     method: 'GET',
1315
     action: 'admin.taRaise.get',
1315
     action: 'admin.taRaise.get',
1316
+  },
1317
+  listHouseByRaiseRecordId: {
1318
+    url: `${prefix}/house/listHouseByRaiseRecordId/`,
1319
+    method: 'GET',
1320
+    action: 'admin.taRaise.get',
1316
   }
1321
   }
1317
  },
1322
  },
1318
  taliveActivity: {
1323
  taliveActivity: {