bug fix

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

@@ -203,6 +203,12 @@ function House(props) {
       dataIndex: 'updateName',
       key: 'updateName',
     },
+    {
+      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: '操作',
       dataIndex: 'apartmentId',

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

@@ -107,7 +107,7 @@ const handleSubmit = (e, props) => {
   return (
 
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form style={{marginBottom:'20px'}} layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('shareType')(
             <Select style={{ width: '180px' }} placeholder="分享方式">

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

@@ -108,7 +108,7 @@ const handleSubmit = (e, props) => {
   return (
 
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form style={{marginBottom:'20px'}} layout="inline" onSubmit={e => handleSubmit(e, props)}>
         {/* <Form.Item>
           {getFieldDecorator('sceneType')(
             <Select style={{ width: '180px' }} placeholder="进入场景">

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

@@ -129,11 +129,12 @@ function PreselectionRecord(props) {
         dataIndex: 'updateName',
         key: 'updateName',
     },
-    // {
-    //     title: '最后修改时间',
-    //     dataIndex: 'updateTime',
-    //     key: 'updateTime',
-    // },
+    {
+        title: '最后修改时间',
+        dataIndex: 'updateDate',
+        key: 'updateDate',
+        render: (x, row) => <><span>{row.updateDate != null ? `${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}` : null}</span></>,
+    },
   ]
   const { getFieldDecorator } = props.form
   return (

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

@@ -265,7 +265,7 @@ function PreselectionRecord(props) {
         </Form.Item>
       </Form>
       <AuthButton noRight={null}>
-        <Button type="primary" onClick={toDelBatch()}>批量删除</Button>
+        <Button style={{marginBottom:'20px', marginTop:'20px'}} type="primary" onClick={toDelBatch()}>批量删除</Button>
       </AuthButton>
       <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/house/raise/add/index.jsx

@@ -124,7 +124,7 @@ const header = props => {
             rules: [{ required: true, message: ' 请输入销售批次' }], onChange: onChangeValue
           })(<SalesBatch type='true' buildingId={props.form.getFieldValue('buildingId')}/>)}
         </Form.Item>
-        <Form.Item label="认筹开始时间">
+        <Form.Item style={{marginTop:'20px'}} label="认筹开始时间">
         {getFieldDecorator('raiseStartTime', {
           rules: [
             {
@@ -152,12 +152,12 @@ const header = props => {
             <Option value="manual">手动锁房</Option>
           </Select>)}
         </Form.Item>
-        <Form.Item label="认筹金额" help="最高50000元(需要微信商户号配置的行业为房地产行业：房地产开发，物业，房产中介。若微信商户号配置为其他行业则为3000元若不确定请联系平台相关运营人员。">
+        <Form.Item style={{marginTop:'20px'}} label="认筹金额" help="最高50000元(需要微信商户号配置的行业为房地产行业：房地产开发，物业，房产中介。若微信商户号配置为其他行业则为3000元若不确定请联系平台相关运营人员。">
           {getFieldDecorator('raisePrice', {
             rules: [{ required: true, message: '请输入认筹金额' }],
           })(<InputNumber min={0.01} max={50000} step={0.01} placeholder="认筹缴费金额" style={{width:'200px'}} />)}<span>元</span>
         </Form.Item>
-        <Form.Item label="认筹需预选" help="设置是否需要客户之前预选了房源才能认筹。">
+        <Form.Item style={{marginTop:'20px'}} label="认筹需预选" help="设置是否需要客户之前预选了房源才能认筹。">
           {getFieldDecorator('needPreselection', {initialValue:preSelectFlag === true?'true':'false',
               rules: [{ required: true, message: '请选择认筹需预选' }],
             })(<Select placeholder="预选方式" style={{ width: '300px' }} disabled={preSelectFlag?false:true}>
@@ -165,7 +165,7 @@ const header = props => {
             <Option value="true">是</Option>
           </Select>)}
         </Form.Item>
-        <Form.Item label="缴费方式" help="锁房方式为自动锁房，缴费方式仅支持线上缴费。锁房方式为手动锁房，缴费方式可多选，线上缴费使用微信支付，线下缴费客户可提交后去线下缴费。">
+        <Form.Item style={{marginTop:'20px'}} label="缴费方式" help="锁房方式为自动锁房，缴费方式仅支持线上缴费。锁房方式为手动锁房，缴费方式可多选，线上缴费使用微信支付，线下缴费客户可提交后去线下缴费。">
           {getFieldDecorator('payType', {
             initialValue: houseLockingType,
           })(
@@ -177,7 +177,7 @@ const header = props => {
             </Checkbox.Group>,
           )}
         </Form.Item>
-        <Form.Item label="线上缴费说明">
+        <Form.Item style={{marginTop:'20px'}} label="线上缴费说明">
           {getFieldDecorator('payDescriptionOnline')(<TextArea placeholder="向客户说明线上缴费相关业务需求" style={{height:'300px'}}></TextArea>)}
         </Form.Item>
         <Form.Item label="线下缴费说明">
@@ -186,7 +186,13 @@ const header = props => {
         <Form.Item label="认筹单注意事项">
           {getFieldDecorator('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: '请输入选房协议' }],
           })(<Wangedit />)}

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

@@ -108,7 +108,7 @@ const HouseListInfo = 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>可选房源仅包括当前销售批次中已发布且未被锁定的房源</span>
         <Form layout="inline" onSubmit={handleSubmit}>
             <Form.Item>

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

@@ -39,9 +39,11 @@ function PreselectionRecord(props) {
   const salesBatchId = props.salesBatchId
   const buildingId = props.buildingId
   const raiseRecordId = props.raiseRecordId
+  const houseId = props.houseId
 
   useEffect(() => {
-    getList()
+    console.log('houseIdhouseIdhouseIdhouseId', houseId)
+    getList({houseId:houseId.toString()})
   }, [])
 
   function openNotificationWithIcon(type, message) {
@@ -54,6 +56,7 @@ function PreselectionRecord(props) {
 
   function getList(params) {
     // 网路请求
+    console.log(params,'params')
     request({ ...apis.house.houseRaiseRecord, params: { ...params, salesBatchId: salesBatchId, raiseId: raiseId } }).then(res => {
       setData(res)
     }).catch(err => {
@@ -85,10 +88,10 @@ function PreselectionRecord(props) {
     props.form.validateFields((err, values) => {
       if (!err) {
         let {liveTime, ...submitValue} = values
-        if (submitValue.payStartTime != null){
+        if (submitValue.startTime != null){
           submitValue.startTime = moment(submitValue.startTime).format('YYYY-MM-DD HH:mm:ss')
         }
-        if (submitValue.payEndTime != null){
+        if (submitValue.endTime != null){
           submitValue.endTime = moment(submitValue.endTime).format('YYYY-MM-DD HH:mm:ss')
         }
         console.log('提交数据: ', values)
@@ -197,9 +200,9 @@ function PreselectionRecord(props) {
       render: (text, record) => (<><span>{record.houseLockingStatus == 'unlocked' ? '未锁定':'已锁定'}</span></>),
     },
     {
-      title: '账户手机号',
-      dataIndex: 'personTel',
-      key: 'personTel',
+      title: '认筹人姓名',
+      dataIndex: 'name',
+      key: 'name',
       // render: unitName => <><span>{unitName}单元</span></>,
     },
     {
@@ -333,8 +336,8 @@ function PreselectionRecord(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('tel')(
-            <Input placeholder="账户手机号"/>,
+          {getFieldDecorator('personName')(
+            <Input placeholder="认筹人姓名"/>,
           )}
         </Form.Item>
         <Form.Item>
@@ -399,12 +402,12 @@ function PreselectionRecord(props) {
         </Form.Item>    */}
         <Form.Item>
           {getFieldDecorator('startTime')(
-            <DatePicker placeholder="认筹开始时间"/>,
+            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="认筹提交时间从"/>,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('endTime')(
-            <DatePicker placeholder="认筹结束时间"/>,
+            <DatePicker showTime={{ format: 'HH:mm:ss' }} placeholder="认筹提交时间到"/>,
           )}
         </Form.Item>  
         <Form.Item>
@@ -427,8 +430,7 @@ function PreselectionRecord(props) {
       <BatchPay visible={pay.visable} houseIds={pay.houseIds} onCancel={() => showPay(false)} onSuccess={() => showPay(false)} />
       <BatchRefund visible={refund.visable} houseIds={refund.houseIds} onCancel={() => setRefund(false)} onSuccess={() => showRefund(false)}/>
       <Refund visible={singleRefund.visable} raiseRecordId={singleRefund.raiseRecordId} onCancel={() => raiseRefund({visable:false, raiseRecordId:''})} onSuccess={() => raiseRefund({visable:false, raiseRecordId:''})}></Refund>
-      <br/>
-      <span>共筛选出{data.total}条数据</span>      
+      <div style={{marginTop:'20px', marginBottom:'20px'}}><span>共筛选出{data.total}条数据</span></div>
       <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

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

@@ -216,8 +216,7 @@ const handleSubmit = (e, values) => {
             </Button>
         </Form.Item>
       </Form>
-      <br/>
-      <span>共筛选出{data.total}条数据</span>     
+      <div style={{marginTop:'20px', marginBottom:'20px'}}><span>共筛选出{data.total}条数据</span></div>  
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

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

@@ -54,6 +54,10 @@ function RaiseHouse(props) {
       getList({ pageNumber: 1, pageSize: 10 })
     }
 
+    function showEdi(e) {
+      props.onSuccess(e);
+    }
+    
   // 分页
   const changePageNum = (pageNumber) => {
     getList({ pageNumber: pageNumber, pageSize: 10,raiseId:raiseId, salesBatchId: salesBatchId, buildingId: buildingId, ...props.form.getFieldsValue() })
@@ -121,6 +125,7 @@ function RaiseHouse(props) {
         title: '认筹实际热度',
         dataIndex: 'raiseRealHeat',
         key: 'raiseRealHeat',
+        render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => showEdi({type: "identifyingChips",houseId: row.houseId})}>{row.raiseRealHeat}</span></>,
     },
     {
       title: '锁定状态',
@@ -211,8 +216,7 @@ function RaiseHouse(props) {
 
       </Form>
       <Button type="primary" onClick={() => showBaseModal({visable:true, houseId: houseId, salesBatchId:salesBatchId})} style={{ marginTop: '20px', marginRight:'20px'}}>批量修改基础热度</Button>
-      <br/>
-      <span>共筛选出{data.total}条数据</span>
+      <div style={{marginTop:'20px', marginBottom:'20px'}}><span>共筛选出{data.total}条数据</span></div>
       <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

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

@@ -228,8 +228,7 @@ const handleSubmit = (e, props) => {
             </Button>
         </Form.Item>
       </Form>
-      <br/>
-      <span>共筛选出{data.total}条数据</span>     
+      <div style={{marginTop:'20px', marginBottom:'20px'}}><span>共筛选出{data.total}条数据</span></div>  
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

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

@@ -184,12 +184,12 @@ const Base = props => {
             <Option value="manual">手动锁房</Option>
           </Select>)}
         </Form.Item>
-        <Form.Item label="认筹金额" help="最高50000元(需要微信商户号配置的行业为房地产行业：房地产开发，物业，房产中介。若微信商户号配置为其他行业则为3000元若不确定请联系平台相关运营人员。">
+        <Form.Item style={{marginTop:'20px'}} label="认筹金额" help="最高50000元(需要微信商户号配置的行业为房地产行业：房地产开发，物业，房产中介。若微信商户号配置为其他行业则为3000元若不确定请联系平台相关运营人员。">
           {getFieldDecorator('raisePrice', {initialValue:regFenToYuan(saleBatchData.raisePrice),
             rules: [{ required: true, message: '请输入认筹金额' }],
           })(<InputNumber max={50000} min={0.01} step={0.01} placeholder="认筹缴费金额" style={{width:'200px'}} />)}<span>元</span>
         </Form.Item>
-        <Form.Item label="认筹需预选" help="设置是否需要客户之前预选了房源才能认筹。">
+        <Form.Item style={{marginTop:'20px'}} label="认筹需预选" help="设置是否需要客户之前预选了房源才能认筹。">
           {getFieldDecorator('needPreselection', {initialValue:saleBatchData.needPreselection === false?'false':'true',
               rules: [{ required: true, message: '请选择认筹需预选' }],
             })(<Select placeholder="预选方式" style={{ width: '300px' }} disabled={preSelectFlag?false:true}>
@@ -197,7 +197,7 @@ const Base = props => {
             <Option value="true">是</Option>
           </Select>)}
         </Form.Item>
-        <Form.Item label="缴费方式" help="锁房方式为自动锁房，缴费方式仅支持线上缴费。锁房方式为手动锁房，缴费方式可多选，线上缴费使用微信支付，线下缴费客户可提交后去线下缴费。">
+        <Form.Item style={{marginTop:'20px'}} label="缴费方式" help="锁房方式为自动锁房，缴费方式仅支持线上缴费。锁房方式为手动锁房，缴费方式可多选，线上缴费使用微信支付，线下缴费客户可提交后去线下缴费。">
           {getFieldDecorator('payType', {rules: [{ required: true, message: '请选择缴费方式' }],
             initialValue: saleBatchData.payType === 'onLine'?'onLine':saleBatchData.payType === 'offLine'?"offLine":['offLine','onLine'] ,
           })(
@@ -209,7 +209,7 @@ const Base = props => {
             </Checkbox.Group>,
           )}
         </Form.Item>
-        <Form.Item label="线上缴费说明">
+        <Form.Item style={{marginTop:'20px'}} label="线上缴费说明">
           {getFieldDecorator('payDescriptionOnline', {initialValue:saleBatchData.payDescriptionOnline})(<TextArea placeholder="向客户说明线上缴费相关业务需求" style={{height:'300px'}}></TextArea>)}
         </Form.Item>
         <Form.Item label="线下缴费说明">

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

@@ -52,7 +52,7 @@ function EditHouse(props) {
 
   function housTabChange(e) {
     setHouseId(e.houseId)
-    setTab('preselectionRecord')
+    setTab('identifyingChips')
   }
 
   const raiseId = raiseData.raiseId || (props.location.query && props.location.query.id)