bug fix

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

@@ -0,0 +1,55 @@
+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 BatchDel = props => {
+  const taRaiseRecords = props.houseIds;
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        request({ ...apis.house.batchDeleteRaiseRecord, data: { ...values,taRaiseRecords }, }).then((data) => {
+          message.info("保存成功")
+          props.onSuccess(false);
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Modal footer={null} title="批量删除" visible={props.visible} onCancel={props.onCancel} width={600}>
+        <span style={{textAlign:'center'}}>将所选{taRaiseRecords.length}条认筹记录批量删除？</span>
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item wrapperCol={{ span: 15, offset: 10 }}>
+            <Button type="primary" htmlType="submit" >
+              提交
+            </Button>
+          </Form.Item>
+        </Form>
+        <div>
+          <font>警告：</font><br/>
+          <font>1.删除功能建议仅用于删除测试数据，正常业务数据使用作废功能。</font><br/>
+          <font>2.删除前请确认缴退费业务是否全部处理完成。</font><br/>
+          <font>3.若认筹单中含认筹人锁定的房源，删除认筹单后会解锁此房源。</font><br/>
+          <font>4.请优先使用作废操作。删除数据可能会导致关联业务异常。</font>
+        </div>
+        
+      </Modal>
+    </>
+  );
+}
+
+const WrappedBase = Form.create({ name: 'BatchDel' })(BatchDel);
+
+export default WrappedBase

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

@@ -14,6 +14,7 @@ import AuthButton from '@/components/AuthButton';
 import UserInfo from './UserInfo';
 import HouseInfo from './HouseInfo';
 import BatchInvalid from './BatchRaise/BatchInvalid';
+import BatchDel from './BatchRaise/BatchDel';
 import BatchPay from './BatchRaise/BatchPay';
 import BatchRefund from './BatchRaise/BatchRefund';
 import Refund from './BatchRaise/Refund';
@@ -29,6 +30,7 @@ function PreselectionRecord(props) {
   const [userInfo, setUserInfo] = useState({visable:false, raiseId:'', raiseRecord: {}})
   const [houseInfo, setHouseInfo] = useState({visable:false, raiseRecordId:''})
   const [invalid, setInvalid] = useState({visable:false,houseIds:''})
+  const [batchDel, setBatchDel] = useState({visable:false,houseIds:''})
   const [pay, setPay] = useState({visable:false,houseIds:''})
   const [refund, setRefund] = useState({visable:false,houseIds:''})
   const [taRaiseRecords, setTaRaiseRecords] = useState([])
@@ -101,6 +103,17 @@ function PreselectionRecord(props) {
         return;
       }
       setInvalid(e);
+      getList();
+  }
+
+  function showBatchDel(e){
+    console.log(e,'eeeeeee')
+    if (taRaiseRecords.length <= 0){
+      message.info("请选择数据");
+      return;
+    }
+    setBatchDel(e);
+    getList();
   }
   
   function showPay(e){
@@ -188,7 +201,7 @@ function PreselectionRecord(props) {
       title: '房源锁定状态',
       dataIndex: 'houseLockingStatus',
       key: 'houseLockingStatus',
-      // render: blockName => <><span>{blockName}幢</span></>,
+      render: (text, record) => (<><span>{record.houseLockingStatus == 'unlocked' ? '未锁定':'已锁定'}</span></>),
     },
     {
       title: '账户手机号',
@@ -213,7 +226,7 @@ function PreselectionRecord(props) {
       title: '是否作废',
       dataIndex: 'status',
       key: 'status',
-      render: (text, record) => (<><span>{record.status == 0 ? '否':'是'}</span></>),
+      render: (text, record) => (<><span>{record.status == 0 ? '是':'否'}</span></>),
     },
     {
       title: '作废原因',
@@ -259,13 +272,13 @@ function PreselectionRecord(props) {
         title: '认筹单提交时间',
         dataIndex: 'createDate',
         key: 'createDate',
-        render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        render: (x, row) => <><span>{row.createDate != null ? `${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
     },
     {
         title: '最后修改时间',
         dataIndex: 'updateDate',
         key: 'updateDate',
-        render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+        render: (x, row) => <><span>{row.updateDate != null ? `${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
     },
     {
         title: '最后修改人',
@@ -279,7 +292,7 @@ function PreselectionRecord(props) {
       align: 'center',
       render: (text, record) => (
         <AuthButton name="admin.salesBatch.detail.get" noRight={null}>
-          <a style={{ color: '#66B3FF' }} onClick={() => raiseRefund({visable:true, raiseRecordId: record.raiseRecordId})} >退费</a>
+          <a style={{ color: '#66B3FF' }} onClick={() => raiseRefund({visable:true, raiseRecordId: record.raiseRecordId})} ><span>{record.payStatus === 'paid' ? '退费':''}</span></a>
         </AuthButton>
       ),
     },
@@ -413,12 +426,13 @@ function PreselectionRecord(props) {
         </Form.Item>
       </Form>
       <Button type="primary" onClick={() => showInvalid({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量作废</Button>
-      <Button type="primary" onClick={() => toDelBatch({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量删除</Button>
+      <Button type="primary" onClick={() => showBatchDel({visable:true, houseIds: taRaiseRecords})} style={{ marginTop: '20px', marginRight:'20px'}}>批量删除</Button>
       <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} raiseId={userInfo.raiseId} raiseRecordId={userInfo.raiseRecord} onCancel={e => setUserInfo(e)} />
       <HouseInfo visible={houseInfo.visable} salesBatchId={houseInfo.salesBatchId} raiseRecordId={houseInfo.raiseRecordId} buildingId={houseInfo.buildingId} onCancel={() => setHouseInfo({visable:false, raiseRecordId: houseInfo.raiseRecordId})} />
       <BatchInvalid visible={invalid.visable} houseIds={invalid.houseIds} onCancel={() => showInvalid(false)} onSuccess={() => showInvalid(false)}/>
+      <BatchDel visible={batchDel.visable} houseIds={batchDel.houseIds} onCancel={() => showBatchDel({visable:false, houseIds: taRaiseRecords})} onSuccess={() => showBatchDel({visable:false, houseIds:'' })}/>
       <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>

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

@@ -147,7 +147,7 @@ const Base = props => {
         })(<DatePicker showTime={{ format: 'HH:mm:ss' }} format="YYYY-MM-DD HH:mm:ss" />)}
         </Form.Item>
         <Form.Item label="锁房方式" help="自动锁房仅适用于线上支付认筹且每次只能认筹一套房源且认筹后其他人无法认筹此房源。其他情况请使用手动锁房。">
-          {getFieldDecorator('houseLockingType', {initialValue: saleBatchData.houseLockingType == 'auto' ? '自动锁房':'手动锁房',
+          {getFieldDecorator('houseLockingType', {initialValue: saleBatchData.houseLockingType,
               rules: [{ required: true, message: '请选择锁房方式' }], onChange:changeHouseLockingType
             })(<Select placeholder="发布状态" style={{ width: '300px' }} disabled>  
             <Option value="auto">自动锁房</Option>