bug fix

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

@@ -181,6 +181,7 @@ function PreselectionRecord(props) {
       title: '状态修改时间',
       dataIndex: 'updateDate',
       key: 'updateDate',
+      render: (x, row) => <><span>{row.updateDate != null ? `${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}` : null}</span></>,
     },
     // {
     //   title: '最后修改人',

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

@@ -29,7 +29,7 @@ const BatchPay = props => {
 
   return (
     <>
-      <Modal footer={null} title="批量作废" visible={props.visible} onCancel={props.onCancel} width={600}>
+      <Modal footer={null} title="批量线下缴费" visible={props.visible} onCancel={props.onCancel} width={600}>
         <span>所选XX条数据中，符合批量设置线下缴费条件的有YY条，不符合条件的有ZZ条。确认将YY条数据设置为：</span>
         <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
           <Form.Item label="缴费状态" labelAlign='left'>
@@ -63,7 +63,7 @@ const BatchPay = props => {
           <font style={{color:'#999'}}>可批量设置线下缴费的认筹单条件必须满足以下全部：</font><br/>
           <font style={{color:'#999'}}>0.认筹单未作废。</font><br/>
           <font style={{color:'#999'}}>1.当前销售批次缴费方式包含但不限于线下缴费。</font><br/>
-          <font style={{color:'#999'}}>2.认筹单缴费状态为未缴费 或 认筹单缴费状态为已缴费但缴费结果为失败的。</font>
+          <font style={{color:'#999'}}>2.认筹单缴费状态为未缴费。</font>
         </div>
         
       </Modal>

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

@@ -29,7 +29,7 @@ const BatchRefund = props => {
 
   return (
     <>
-      <Modal footer={null} title="批量作废" visible={props.visible} onCancel={props.onCancel} width={600}>
+      <Modal footer={null} title="批量线下退费" visible={props.visible} onCancel={props.onCancel} width={600}>
         <span>所选XX条数据中，符合批量设置线下缴费条件的有YY条，不符合条件的有ZZ条。确认将YY条数据设置为：</span>
         <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
           <Form.Item label="退费状态" labelAlign='left'>
@@ -68,8 +68,8 @@ const BatchRefund = props => {
         </Form>
         <div>
           <font style={{color:'#999'}}>可批量设置线下退费的认筹单条件必须满足以下全部：</font><br/>
-          <font style={{color:'#999'}}>1.认筹单缴费状态为已缴费且缴费结果为成功。</font><br/>
-          <font style={{color:'#999'}}>2.退费状态为未退费 或 退费状态为已退费但退费结果为失败。</font><br/>
+          <font style={{color:'#999'}}>1.认筹单缴费状态为已缴费。</font><br/>
+          <font style={{color:'#999'}}>2.退费状态为未退费。</font><br/>
         </div>
         
       </Modal>

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

@@ -12,14 +12,16 @@ import apis from '../../../../../../services/apis';
 
 const HouseInfo = props => {
   const [data, setData] = useState({ list: [], total: 0 })
+  const [raiseData, setRaiseData ] = useState({})
   const [house, setHouse] = useState({visable:false, salesBatchId:'',buildingId:'', raiseRecordId:''});
   const raiseRecordId = props.raiseRecordId
   const salesBatchId = props.salesBatchId
   const buildingId = props.buildingId
+  const raiseId = props.raiseId
 
   useEffect(() => {
-    console.log(buildingId, 'buildingIdbuildingId')
     getList({ pageNum: 1, pageSize: 10 });
+    getRaiseInfo();
   }, [raiseRecordId])
 
   function getList(params) {
@@ -31,6 +33,13 @@ const HouseInfo = props => {
     })
   }
 
+  function getRaiseInfo(){
+    request({ ...apis.house.taRaiseById, urlData: {id: raiseId} }).then((data) => {
+      setRaiseData(data)
+      console.log(raiseData, 'raiseDataraiseDataraiseData')
+    })
+  }
+
   function refreshList(e){
     setHouse(e)
     getList()
@@ -111,7 +120,7 @@ const HouseInfo = props => {
     <>
       <Modal footer={null} title="认筹单房源清单" visible={props.visible} onCancel={() => infoOnCancel()} width={800}>
         <AuthButton noRight={null}>
-          <Button type="danger" style={{marginLeft:'663px'}} onClick={() => setHouse({visable:true, salesBatchId:salesBatchId, raiseRecordId:raiseRecordId, buildingId:buildingId})}>添加房源</Button>
+          {raiseData.houseLockingType === 'auto' ? null : <Button type="danger" style={{marginLeft:'663px'}} onClick={() => setHouse({visable:true, salesBatchId:salesBatchId, raiseRecordId:raiseRecordId, buildingId:buildingId})}>添加房源</Button>}
         </AuthButton>
         <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

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

@@ -424,7 +424,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} raiseId={userInfo.raiseId} raiseRecordId={userInfo.raiseRecord} onCancel={e => setUserInfo(e)} />
-      <HouseInfo visible={houseInfo.visable} salesBatchId={houseInfo.salesBatchId} raiseRecordId={houseInfo.raiseRecordId} buildingId={houseInfo.buildingId} onCancel={(e) => hideHouseInfo({visable:false, raiseRecordId:''})} />
+      <HouseInfo visible={houseInfo.visable} salesBatchId={houseInfo.salesBatchId} raiseRecordId={houseInfo.raiseRecordId} raiseId={raiseId} buildingId={houseInfo.buildingId} onCancel={(e) => hideHouseInfo({visable:false, 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)} />

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

@@ -218,7 +218,13 @@ const Base = props => {
         <Form.Item label="认筹单注意事项">
           {getFieldDecorator('raisePrecautions', {initialValue:saleBatchData.raisePrecautions})(<Input maxLength={100} placeholder="客户提交认筹单后的注意事项"/>)}
         </Form.Item>
-        <Form.Item label="选房协议">
+        <Form.Item label="选房协议" help="若想在协议中自动引用客户信息生成带客户信息的协议，请在选房协议中按如下格式引用:
+                                         ${name}其中name代表客户姓名,
+                                         ${idcard}其中idcard代表身份证号,
+                                         ${phone}其中phone代表手号,
+                                         ${date}其中date代表日期（如2020/03/10）,
+                                         举例，若想在协议中“乙方：”后显示当前客户姓名，在“乙方：”后输入${name}即可。
+                                         注意，在提交认筹单后在认筹单详情中查看协议才能看到这些引用的具体信息，在认筹过程中，因阅读协议在填写个人信息之前，这些信息会为空白。">
         {getFieldDecorator('payProtocol', {
             rules: [{ required: true, message: '请输入选房协议' }],
           initialValue:saleBatchData.payProtocol})(<Wangedit />)}