bug fix

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

@@ -144,7 +144,7 @@ function House(props) {
     },
     {
       title: '房源',
-      render:  (x, row) => <><span>{row.termName}/{row.blockName}/{row.blockName}/{row.unitName}/{row.floorName}/{row.roomName}</span></>,
+      render:  (x, row) => <><span>{row.termName}/{row.blockName}/{row.unitName}/{row.floorName}/{row.roomName}</span></>,
     },
     // {
     //   title: '期/区',

src/pages/house/preSelect/edit/components/BasicHeat/index.jsx

@@ -12,9 +12,8 @@ const BasicHeat = props => {
 
   const houseIdList = props.houseId;
   const salesBatchId = props.salesBatchId;
-
+  console.log('houseIdList', houseIdList)
   function handleSubmit (e) {
-    console.log(houseIdList, salesBatchId)
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err){
@@ -34,7 +33,7 @@ const BasicHeat = props => {
   return (
     <>
       <Modal footer={null} title="批量修改基础热度" visible={props.visible} onCancel={props.onCancel} width={600}>
-        <span>将所选XX条房源预选基础热度信息修改为</span>
+        <span>将所选{houseIdList.length}条房源预选基础热度信息修改为</span>
         <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
           <Form.Item label="基础热度值" labelAlign='left'>
             {getFieldDecorator('heat')(<Input placeholder='填写预选基础热度，建议为0' label='left'/>)}

src/pages/house/preSelect/edit/components/preselectionHouse.jsx

@@ -207,7 +207,7 @@ function PreselectionRecord(props) {
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div>   
-      <BasicHeat visible={basicHeat.visable} houseId={basicHeat.houseId} salesBatchId={basicHeat.salesBatchId} onCancel={() => setBasicHeat({visable:false, salesBatchId:''})} onSuccess={()=>getList()}/>
+      <BasicHeat visible={basicHeat.visable} houseId={basicHeat.houseId} salesBatchId={basicHeat.salesBatchId} onCancel={() => setBasicHeat({visable:false, salesBatchId:'',houseId:''})} onSuccess={()=>getList()}/>
     </>
   )
 }

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

@@ -0,0 +1,52 @@
+import React, { PureComponent, useState, useEffect } from 'react'
+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 apis from '../../../../../../services/apis';
+import request from '../../../../../../utils/request';
+
+const Refund = props => {
+  const raiseRecordId = props.raiseRecordId;
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.house.refund, data: {targetId:raiseRecordId, targetType:"house", refundReason:values.refundReason}, }).then((data) => {
+            message.info("操作成功")
+            getList({ pageNum: 1, pageSize: 10 });
+        }).catch((err) => {
+            // message.info(err.msg)
+        })        
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="退款" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item label="退款原因" labelAlign='left'>
+            {getFieldDecorator('refundReason', {
+              rules: [{ required: true, message: ' 退款原因' }],
+            })(<Input label='left'/>)}
+          </Form.Item>
+          <Form.Item wrapperCol={{ span: 15, offset: 10 }}>
+            <Button type="primary" htmlType="submit" >
+              提交
+            </Button>
+          </Form.Item>
+        </Form>
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'Refund' })(Refund);
+
+export default WrappedBase

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

@@ -16,6 +16,7 @@ import HouseInfo from './HouseInfo';
 import BatchInvalid from './BatchRaise/BatchInvalid';
 import BatchPay from './BatchRaise/BatchPay';
 import BatchRefund from './BatchRaise/BatchRefund';
+import Refund from './BatchRaise/Refund';
 
 /**
  *图片设置
@@ -31,6 +32,7 @@ function PreselectionRecord(props) {
   const [pay, setPay] = useState({visable:false,houseIds:''})
   const [refund, setRefund] = useState({visable:false,houseIds:''})
   const [taRaiseRecords, setTaRaiseRecords] = useState([])
+  const [singleRefund, setSingleRefund] = useState({visable:false, raiseRecordId:''})
   const raiseId = props.raiseId.raiseId
   const salesBatchId = props.salesBatchId
   const buildingId = props.buildingId
@@ -117,21 +119,24 @@ function PreselectionRecord(props) {
     setRefund(e)
   }
 
-  const raiseRefund = rowData => () => {
-    Modal.confirm({
-      title: '确定退费吗',
-      okText: '确定',
-      cancelText: '取消',
-      onOk () {
-        request({ ...apis.house.refund, data: {targetId:rowData.raiseRecordId, targetType:"house"}, }).then((data) => {
-          message.info("操作成功")
-          getList({ pageNum: 1, pageSize: 10 });
-        }).catch((err) => {
-          // message.info(err.msg)
-        })
-      },
-    });
+  function raiseRefund(e){
+    setSingleRefund({visable:true,raiseRecordId:e.raiseRecordId});
   }
+  // const raiseRefund = rowData => () => {
+  //   Modal.confirm({
+  //     title: '确定退费吗',
+  //     okText: '确定',
+  //     cancelText: '取消',
+  //     onOk () {
+  //       request({ ...apis.house.refund, data: {targetId:rowData.raiseRecordId, targetType:"house"}, }).then((data) => {
+  //         message.info("操作成功")
+  //         getList({ pageNum: 1, pageSize: 10 });
+  //       }).catch((err) => {
+  //         // message.info(err.msg)
+  //       })
+  //     },
+  //   });
+  // }
 
   function toDelBatch(){
     console.log(taRaiseRecords, 'houseIdListhouseIdList')
@@ -274,7 +279,7 @@ function PreselectionRecord(props) {
       align: 'center',
       render: (text, record) => (
         <AuthButton name="admin.salesBatch.detail.get" noRight={null}>
-          <a style={{ color: '#66B3FF' }} onClick={raiseRefund(record)} >退费</a>
+          <a style={{ color: '#66B3FF' }} onClick={() => raiseRefund({visable:true, raiseRecordId: record.raiseRecordId})} >退费</a>
         </AuthButton>
       ),
     },
@@ -415,6 +420,7 @@ function PreselectionRecord(props) {
       <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)}/>
+      <Refund visible={singleRefund.visable} raiseRecordId={singleRefund.raiseRecordId} onCancel={() => setSingleRefund({visable:false, raiseRecordId:''})}></Refund>
       <br/>
       <span>共筛选出{data.total}条数据</span>      
       <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>

src/services/apis.js

@@ -1247,7 +1247,7 @@ export default {
     action: 'admin.taPreselection.put',
   },
   batchUpdateHeat: {
-    url: `${prefix}/house/batchUpdateRaiseHeat`,
+    url: `${prefix}/house/batchUpdateHeat`,
     method: 'PUT',
     action: 'admin.taPreselection.put',
   },