新需求

src/pages/house/add/index.jsx

@@ -35,7 +35,7 @@ const header = props => {
 
   const cancelPage = () =>{
     router.push({
-      pathname: '/system/housingPolicy',
+      pathname: '/house/list',
     });
   }
     const fields = [
@@ -85,8 +85,9 @@ const header = props => {
       {
         label: '预选时间',
         name: 'preSelectTime',
-        type: FieldTypes.RangePicker,
-        value: saleBatchData.preselectionStartTime != null ? [moment(saleBatchData.preselectionStartTime, 'YYYY-MM-DD HH:mm'), moment(saleBatchData.preselectionEndTime, 'YYYY-MM-DD HH:mm')] : null,
+        type: FieldTypes.RangePicker,       
+        value: saleBatchData.preselectionStartTime != null ? [moment(saleBatchData.preselectionStartTime, 'YYYY-MM-DD HH:mm:ss'), moment(saleBatchData.preselectionEndTime, 'YYYY-MM-DD HH:mm')] : null,
+        props: { showTime: { format: 'HH:mm:ss' }},
         rules: [
           { required: true, message: '请选择预选时间' },
         ],
@@ -106,30 +107,26 @@ const header = props => {
       },
     ]
   
-    const handleSubmit = val => { 
-      console.log('submit data --->', val)
-      console.log(val.body, 'val.body')
-      if (val.body == '<p><br></p>'){
-        message.info("政策详情必填")
-        return
-      }
+    const handleSubmit = values => { 
+     console.log('submit data --->', values)
       
-      if(policyId){
-        val.policyId = policyId
-        request({ ...apis.system.updateTaPolicy, urlData: {id: policyId},data: val, }).then((data) => {
+     let {preSelectTime, ...submitValue} = values
+        if(null != preSelectTime && preSelectTime.length > 0){
+          const [preselectionStartTime, preselectionEndTime] = preSelectTime
+          submitValue.preselectionStartTime = moment(preselectionStartTime).format('YYYY-MM-DD HH:mm:ss');
+          submitValue.preselectionEndTime = moment(preselectionEndTime).format('YYYY-MM-DD HH:mm:ss');
+        }else{
+          submitValue.preselectionStartTime = null
+          submitValue.preselectionEndTime = null
+        }        
+        // getList({ pageNum: pageNumber, pageSize: 10, ...submitValue })
+        console.log(submitValue)
+        request({ ...apis.house.addTaSalesBatch, data: { ...submitValue },}).then((data) => {
           message.info("保存成功")
           cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }else{
-        request({ ...apis.system.addTaPolicy,data: val, }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
     }
      
 

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

@@ -24,7 +24,7 @@ const Base = props => {
 
   // 查询列表
   const getSaleBatchData = (salesBatchId) => {
-    request({ ...apis.system.taPolicy, urlData: {id: salesBatchId} }).then((data) => {
+    request({ ...apis.house.getTaSalesBatch, urlData: {id: salesBatchId} }).then((data) => {
         console.log(data)
         setSaleBatchData(data)
     })
@@ -33,7 +33,7 @@ const Base = props => {
 
   const cancelPage = () =>{
     router.push({
-      pathname: '/system/housingPolicy',
+      pathname: '/house/list',
     });
   }
   const fields = [
@@ -104,30 +104,23 @@ const Base = props => {
     },
   ]
   
-    const handleSubmit = val => { 
-      console.log('submit data --->', val)
-      console.log(val.body, 'val.body')
-      if (val.body == '<p><br></p>'){
-        message.info("政策详情必填")
-        return
-      }
-      
-      if(policyId){
-        val.policyId = policyId
-        request({ ...apis.system.updateTaPolicy, urlData: {id: policyId},data: val, }).then((data) => {
+    const handleSubmit = values => { 
+      let {preSelectTime, ...submitValue} = values
+        if(null != preSelectTime && preSelectTime.length > 0){
+          const [preselectionStartTime, preselectionEndTime] = preSelectTime
+          submitValue.preselectionStartTime = moment(preselectionStartTime).format('YYYY-MM-DD HH:mm:ss');
+          submitValue.preselectionEndTime = moment(preselectionEndTime).format('YYYY-MM-DD HH:mm:ss');
+        }else{
+          submitValue.preselectionStartTime = null
+          submitValue.preselectionEndTime = null
+        }        
+        console.log(submitValue)
+        request({ ...apis.house.updateTaSalesBatch, urlData: {id: salesBatchId},data: values, }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }else{
-        request({ ...apis.system.addTaPolicy,data: val, }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }
+        message.info(err.msg || err.message)
+      })
     }
      
 

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

@@ -22,7 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({ ...apis.activity.taHouseShare, params: { ...params },}).then((data) => {
+    request({ ...apis.house.taHouseShare, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })

src/pages/house/list/index.jsx

@@ -22,7 +22,7 @@ const header = props => {
   //==========看这里-- 新功能都用house为中间单词，我已经创建好了，你只要修改list的指向链接就行，看完删除=========
   // 查询列表
   const getList = params => {
-    request({ ...apis.house.list, params: { ...params } }).then(data => {
+    request({ ...apis.house.taSalesBatch, params: { ...params } }).then(data => {
       console.log(data)
       setData(data)
     })
@@ -94,8 +94,7 @@ const header = props => {
       dataIndex: 'salesBatchName',
       key: 'salesBatchName',
       align: 'center',
-      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
-                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={toAddHouse(7)}>{row.title}</span></div></>,
+      render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={toAddHouse(row.salesBatchId)}>{row.salesBatchName}</span></>,
     },
     {
       title: '楼盘名称',
@@ -114,14 +113,14 @@ const header = props => {
       dataIndex: 'preselectionStartTime',
       key: 'preselectionStartTime',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.preselectionStartTime).format('YYYY-MM-DD')}`}</span></>,
+      render: (x, row) => <><span>{`${moment(row.preselectionStartTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '预选结束时间',
       dataIndex: 'preselectionEndTime',
       key: 'preselectionEndTime',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.preselectionEndTime).format('YYYY-MM-DD')}`}</span></>,
+      render: (x, row) => <><span>{`${moment(row.preselectionEndTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '发布状态',
@@ -284,7 +283,7 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('title')(
+          {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="发布状态">
             <Option value="1">是</Option>
             <Option value="0">否</Option>
@@ -306,7 +305,7 @@ const header = props => {
         <Button type="danger" className={styles.addBtn} onClick={toAddHouse()}>新增</Button>
       </AuthButton>
       <Table
-       dataSource={data.list} columns={columns} pagination={false} rowKey="activityList" />
+       dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
       </div>

src/services/apis.js

@@ -562,12 +562,7 @@ export default {
         url: `${prefix}/clickCountList`,
         method: 'GET',
         action: 'admin.clickCountList.get',
-      },
-      taHouseShare:{
-        url: `${prefix}/taHouseShare`,
-        method: 'GET',
-        action: 'admin.taHouseShare.get',
-      },
+      },      
   },
   integralMall: {
     tdPointsRules: {
@@ -1089,15 +1084,35 @@ export default {
    },
  },
  house: {
-  list: {
+  taSalesBatch: {
+    method: 'GET',
+    url: `${prefix}/taSalesBatch`,
+    action: 'admin.taSalesBatch.get',
+  },
+  addTaSalesBatch: {
+    method: 'POST',
+    url: `${prefix}/taSalesBatch`,
+    action: 'admin.taSalesBatch.post',
+  },
+  taHouseShare:{
+    url: `${prefix}/taHouseShare`,
     method: 'GET',
-    url: `${prefix}/iBuildingDynamicList`,
-    action: 'admin.iBuildingDynamicList.get',
+    action: 'admin.taHouseShare.get',
+  },
+  getTaSalesBatch:{
+    url: `${prefix}/taSalesBatch/:id`,
+    method: 'get',
+    action: 'admin.taHouseShare.get',
+  },
+  updateTaSalesBatch:{
+    url: `${prefix}/taSalesBatch/:id`,
+    method: 'put',
+    action: 'admin.taHouseShare.put',
   },
   taHousingResources: {
     method: 'GET',
     url: `${prefix}/taHousingResources`,
     action: 'admin.taHousingResources.id.get',
-  }
+  },
  },
 }