新需求

src/pages/house/raise/edit/components/BatchRaise/BatchInvalid.jsx

@@ -10,7 +10,6 @@ import request from '../../../../../../utils/request';
 
 const BatchInvalid = props => {
   const taRaiseRecords = props.houseIds;
-  console.log(props.taRaiseRecords, '111123213')
   function handleSubmit (e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {

src/pages/house/raise/edit/components/HouseInfo/index.jsx

@@ -1,16 +1,35 @@
 import React, { PureComponent, useState, useEffect } from 'react'
-import { Modal, Row, Col, Table, Pagination, Button } from 'antd'
+import { Modal, Row, Col, Table, Pagination, Button, Form, Input,message } from 'antd'
 import EnDash from '../EnDash'
 import AuthButton from '@/components/AuthButton';
 
 import Style from './style.less'
 import HotBlock from '../HotBlock'
 import HouseListInfo from '../HouseListInfo'
+import request from '../../../../../../utils/request';
+import apis from '../../../../../../services/apis';
 
-export default function UserInfo(props) {
-  console.log(props.visible, 'houseINfo');
+const HouseInfo = props => {
+  console.log(props, '123123123');
   const [data, setData] = useState({ list: [], total: 0 })
   const [house, setHouse] = useState(false);
+  const raiseRecordId = props.raiseRecordId
+  useEffect(() => {
+    console.log(1111111)
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  function getList(params) {
+    console.log(1111111)
+    // 网路请求
+    request({ ...apis.house.listHouseByRaiseRecordId, params: { ...params,raiseRecordId: raiseRecordId} }).then(res => {
+      console.log(res,"houseInfohouseInfohouseInfohouseInfo")
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
   const columns = [
     {
       title: '销售批次名',
@@ -79,3 +98,11 @@ export default function UserInfo(props) {
     </>
   );
 }
+
+
+const WrappedBase = Form.create({ name: 'HouseInfo' })(HouseInfo);
+
+export default WrappedBase
+
+// export default function UserInfo(props) {
+// }

src/pages/house/raise/edit/components/IdentifyingChips.jsx

@@ -26,7 +26,7 @@ import BatchRefund from './BatchRaise/BatchRefund';
 function PreselectionRecord(props) {
   const [data, setData] = useState([])
   const [userInfo, setUserInfo] = useState({visable:false, name:''})
-  const [houseInfo, setHouseInfo] = useState({visable:false, raiseId:''})
+  const [houseInfo, setHouseInfo] = useState({visable:false, raiseRecordId:''})
   const [invalid, setInvalid] = useState({visable:false,houseIds:''})
   const [pay, setPay] = useState({visable:false,houseIds:''})
   const [refund, setRefund] = useState({visable:false,houseIds:''})
@@ -168,7 +168,7 @@ function PreselectionRecord(props) {
       dataIndex: 'houseNum',
       key: 'houseNum',
       render: (text, record) => (
-        <a style={{ color: '#66B3FF' }} onClick={() => showHouseInfo({visable:true})} >{record.houseNum}</a>
+        <a style={{ color: '#66B3FF' }} onClick={() => showHouseInfo({visable:true,raiseRecordId:record.raiseRecordId})} >{record.houseNum}</a>
         ),
     },
     {
@@ -209,8 +209,8 @@ function PreselectionRecord(props) {
     },
     {
       title: '缴费状态',
-      dataIndex: 'payStatus',
-      key: 'payStatus',
+      dataIndex: 'payStatus1',
+      key: 'payStatus1',
       render: (text, record) => (<><span>{record.payStatus === 'paid' ? '已缴费':record.payStatus === 'unpaid'?'未缴费':record.payStatus === 'refunded'?'已退费':'正在支付'}</span></>),
     },
     {
@@ -221,14 +221,14 @@ function PreselectionRecord(props) {
     },
     {
       title: '缴费结果',
-      dataIndex: 'payStatus',
-      key: 'payStatus',
+      dataIndex: 'payStatus2',
+      key: 'payStatus2',
       render: (text, record) => (<><span>{record.payStatus === 'paid' ? '已缴费':record.payStatus === 'unpaid'?'未缴费':record.payStatus === 'refunded'?'已退费':'正在支付'}</span></>),
     },
     {
       title: '退费状态',
-      dataIndex: 'payStatus',
-      key: 'payStatus',
+      dataIndex: 'payStatus3',
+      key: 'payStatus3',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
     {
@@ -238,8 +238,8 @@ function PreselectionRecord(props) {
     },
     {
         title: '退费结果',
-        dataIndex: 'payStatus',
-        key: 'payStatus',
+        dataIndex: 'payStatus4',
+        key: 'payStatus4',
         render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
     {
@@ -393,7 +393,7 @@ function PreselectionRecord(props) {
       <Button type="primary" onClick={() => showPay({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量线下缴费</Button>
       <Button type="primary" onClick={() => showRefund({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量线下退费</Button>
       <UserInfo visible={userInfo.visable} phone={userInfo.name} onCancel={() => setUserInfo({visable:false, name:'111'})} />
-      <HouseInfo visible={houseInfo.visable} houseId={houseInfo.houseId} onCancel={() => setHouseInfo({visable:false, houseId:'111'})} />
+      <HouseInfo visible={houseInfo.visable} houseId={houseInfo.houseId} raiseRecordId={houseInfo.raiseRecordId} onCancel={() => setHouseInfo({visable:false, houseId:''})} />
       <BatchInvalid visible={invalid.visable} houseIds={invalid.houseIds} onCancel={() => showInvalid(false)} onSuccess={() => showInvalid(false)}/>
       <BatchPay visible={pay.visable} houseIds={pay.houseIds} onCancel={() => showPay(false)} onSuccess={() => showPay(false)} />
       <BatchRefund visible={refund.visable} houseIds={refund.houseIds} onCancel={() => setRefund(false)} onSuccess={() => setRefund(false)}/>

src/pages/house/raise/edit/components/PaymentChips.jsx

@@ -70,15 +70,15 @@ const header = (props) => {
     },
     {
       title: '退费状态',
-      dataIndex: 'payStatus',
-      key: 'payStatus',
+      dataIndex: 'payStatus1',
+      key: 'payStatus1',
       align: 'center',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
     {
       title: '退费结果',
-      dataIndex: 'payStatus',
-      key: 'payStatus',
+      dataIndex: 'payStatus2',
+      key: 'payStatus2',
       align: 'center',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },

src/pages/house/raise/edit/components/Refund.jsx

@@ -63,15 +63,15 @@ const header = (props) => {
     },
     {
       title: '退费状态',
-      dataIndex: 'payStatus',
-      key: 'payStatus',
+      dataIndex: 'payStatus1',
+      key: 'payStatus1',
       align: 'center',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },
     {
       title: '退费结果',
-      dataIndex: 'payStatus',
-      key: 'payStatus',
+      dataIndex: 'payStatus2',
+      key: 'payStatus2',
       align: 'center',
       render: (text, record) => (<><span>{record.payStatus === 'refunded' ? '已退费':'未退费'}</span></>),
     },

src/pages/house/raise/edit/components/UserInfo/index.jsx

@@ -7,7 +7,6 @@ import HotBlock from '../HotBlock'
 
 
 export default function UserInfo(props) {
-  console.log(props.phone, 'userInfo')
   return (
     <Modal footer={null} title="个人信息" visible={props.visible} onCancel={props.onCancel} width={800}>
       <div className={Style.cardBox}>

src/services/apis.js

@@ -1313,6 +1313,11 @@ export default {
     url: `${prefix}/checkHavingRecord/:id`,
     method: 'GET',
     action: 'admin.taRaise.get',
+  },
+  listHouseByRaiseRecordId: {
+    url: `${prefix}/house/listHouseByRaiseRecordId/`,
+    method: 'GET',
+    action: 'admin.taRaise.get',
   }
  },
  taliveActivity: {