新需求

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

@@ -9,6 +9,7 @@ import BlockSelect from '../../../../components/HouseSelect/BlockSelect'
 import UnitSelect from '../../../../components/HouseSelect/UnitSelect'
 import FloorSelect from '../../../../components/HouseSelect/FloorSelect'
 import RoomSelect from '../../../../components/HouseSelect/RoomSelect'
+import ApartmentSelect from '../../../../components/HouseSelect/ApartmentSelect';
 
 /**
  *图片设置
@@ -150,6 +151,7 @@ function House(props) {
       title: '发布状态',
       dataIndex: 'status',
       key: 'status',
+      render: status => <><span>{status == 0 ? '否' : status == 1 ? '是' : ''}</span></>,
     },
     {
       title: '最后修改人',
@@ -162,7 +164,7 @@ function House(props) {
       key: 'apartmentId',
       render: (_, record) => (
         <>
-          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi({type: "edit",record})}>编辑</Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi({type: "add",houseId: record.houseId})}>编辑</Button>
           <Button type="link" style={{ color: 'red' }} onClick={() => deleteApartment(record)}>删除</Button>
         </>
       ),
@@ -173,33 +175,41 @@ function House(props) {
     <>
     <Form layout="inline" onSubmit={e => handleSubmit(e)}>
         <Form.Item>
-          {getFieldDecorator('blockId')(
+          {getFieldDecorator('termName')(
+            <Input placeholder="请输入期/区"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('blockName')(
             <Input placeholder="请输入楼栋"/>
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('unitId')(
+          {getFieldDecorator('unitName')(
             <Input placeholder="请输入单元"/>
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('floorId')(
+          {getFieldDecorator('floorName')(
             <Input placeholder="请输入楼层"/>
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('roomId')(
+          {getFieldDecorator('roomName')(
              <Input placeholder="请输入房间号"/>
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('roomId')(
-             <Input placeholder="请输入户型"/>
+          {getFieldDecorator('apartmentId')(
+             <ApartmentSelect buildingId={props.buildingId} />
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('roomId')(
-             <Input placeholder="发布状态"/>
+          {getFieldDecorator('status')(
+             <Select placeholder="发布状态" style={{width: '120px'}}>
+             <Option value="0">否</Option>
+             <Option value="1">是</Option>
+           </Select>,
           )}
         </Form.Item>
         <Form.Item>
@@ -216,7 +226,7 @@ function House(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => showEdi({type: "add"})}>新增房源</Button>
+      <Button type="primary" onClick={() => showEdi({type: "add",houseId: ''})}>新增房源</Button>
       <Button type="primary" onClick={() => showEdi()} style={{ marginLeft: '18px'}}>批量导入房源</Button>
       <Button type="primary" onClick={() => showEdi()} style={{ marginLeft: '18px'}}>批量修改对应户型</Button>
       <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>

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

@@ -3,8 +3,10 @@ import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Up
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
+import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
 import XForm, { FieldTypes } from '../../../../components/XForm';
+import ApartmentSelect from '../../../../components/HouseSelect/ApartmentSelect';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
@@ -15,64 +17,73 @@ const formItemLayout = {
 };
 
 function HouseAdd(props) {
+  console.log(props,"props222")
+  const houseId = props.houseId
+    
+  useEffect(() => {
+    if (houseId && houseId !== '') {
+      getById(houseId)
+    }
+  }, [houseId])
+
+  function getById(houseId) {
+    request({ ...apis.house.getById, urlData: { id: houseId } }).then(data => {
+      props.form.setFieldsValue(data)
+    }).catch((err) => {
+      message.info(err.msg || err.message)
+    })
+  }
+
+  //校验房源
   function checkValues() {
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log(values,"valuesvaluesvalues")
-      }
-    });
+    request({ ...apis.house.checked, data: { ...props.form.getFieldsValue(), buildingId: props.buildingId } }).then(data => {
+      message.warn(data)
+    }).catch((err) => {
+      message.info(err.msg || err.message)
+    })
   }
 
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        console.log('Received values of form: ', values);
-        const { activityTime, signupTime } = values
-        const [startDate, endDate] = activityTime
-        values.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
-        values.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
-        if (signupTime) {
-          const [enlistStart, enlistEnd] = signupTime
-          values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
-          values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
-        }
-        
-        console.log('submit data --->', values)
-        if (dynamicId) {
-          values.dynamicId = dynamicId
-          request({ ...apis.activity.update, data: values }).then(data => {
-            message.info('保存成功')
-            // router.go(-1)
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        } else {
-          request({ ...apis.activity.add, data: { ...values } }).then((data) => {
-            message.info('保存成功')
-            router.push({
-              pathname: '/activity/editActivity',
-              query: {
-                dynamicId: data.dynamicId,
-              },
-            });
-            // router.go(-1)
-          }).catch((err) => {
-            message.info(err.msg || err.message)
-          })
-        }
+          if(houseId){
+            request({ ...apis.house.houseEdit,urlData: {id: houseId}, data: { ...values,buildingId: props.buildingId, salesBatchId: props.salesBatchId } }).then((data) => {
+              message.info('保存成功')
+              props.onSuccess({type: "house"})
+            }).catch((err) => {
+              // message.info(err.msg || err.message)
+            })
+          }else{
+            request({ ...apis.house.houseAdd, data: { ...values,buildingId: props.buildingId, salesBatchId: props.salesBatchId } }).then((data) => {
+              message.info('保存成功')
+              props.onSuccess({type: "house"})
+            }).catch((err) => {
+              // message.info(err.msg || err.message)
+            })
+          }
       }
     });
   }
 
   function cancelPage(e) {
-    
+    props.onSuccess({type: "house"})
   }
 
   const { getFieldDecorator } = props.form;
   return (
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
+      <Form.Item label="期">
+        {getFieldDecorator('termName', {
+          rules: [
+            {
+              required: true,
+              message: '请输入楼栋',
+            },
+          ],
+        })(<Input/>)}
+        </Form.Item>
         <Form.Item label="楼栋">
         {getFieldDecorator('blockName', {
           rules: [
@@ -111,9 +122,12 @@ function HouseAdd(props) {
               message: '请输入房号',
             },
           ],
-        })(<Input/>)}
+        })(<Input/> )}
+         <Button type="primary" onClick={() => checkValues()}>
+            校验房源
+          </Button>
         </Form.Item>
-        <Form.Item label="价格">
+        <Form.Item label="价格" help="单位：万元">
         {getFieldDecorator('price', {
           rules: [
             {
@@ -134,14 +148,7 @@ function HouseAdd(props) {
         })(<Input/>)}
         </Form.Item>
         <Form.Item label="户型">
-        {getFieldDecorator('apartmentId', {
-          rules: [
-            {
-              required: true,
-              message: '请输入楼栋',
-            },
-          ],
-        })(<Input/>)}
+        {getFieldDecorator('apartmentId')(<ApartmentSelect buildingId={props.buildingId} />)}
         </Form.Item>
         <Form.Item label="发布状态">
         {getFieldDecorator('status', {
@@ -163,10 +170,6 @@ function HouseAdd(props) {
             确认
           </Button>
           &nbsp;&nbsp;&nbsp;&nbsp;
-          <Button type="primary" onClick={() => checkValues()}>
-            校验
-          </Button>
-          &nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => cancelPage({type: "house"})}>
             取消
           </Button>

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

@@ -12,17 +12,20 @@ import HouseAdd from './houseAdd'
 
 function EditHouse(props) {
   const [tab, setTab] = useState('house')
+  const [houseId, setHouseId] = useState('')
 
   function changeTab(e) {
-    console.log(e,"eeeee")
     setTab(e.type)
+    if(e.type === "add"){
+      setHouseId(e.houseId)
+    }
   }
 
   return (
     <>
       <div style={{ marginTop: '20px' }}>
         { (tab === 'house' && <House salesBatchId={props.salesBatchId} buildingId={props.buildingId} onSuccess={e => changeTab(e)}/>)} 
-        { (tab === 'add' && <HouseAdd salesBatchId={props.salesBatchId} buildingId={props.buildingId} onSuccess={e => changeTab(e)}/>)} 
+        { (tab === 'add' && <HouseAdd salesBatchId={props.salesBatchId} buildingId={props.buildingId} houseId={houseId} onSuccess={e => changeTab(e)}/>)} 
       </div>
     </>
   )

src/pages/house/edit/index.jsx

@@ -40,11 +40,9 @@ function openNotificationWithIcon(type, message) {
 function EditHouse(props) {
   const {salesBatchId} = props.location.query.id;
   console.log(props.location.query.id)
-  const [tab, setTab] = useState('base')
+  const [tab, setTab] = useState('house')
   const [salesBatchData, setSalesBatchData] = useState({ salesBatchId: undefined })
 
-  // const [tab, setTab] = useState('house')
-  
   function tabsCallback(e) {
     setTab(e.target.value)
   }
@@ -68,7 +66,7 @@ function EditHouse(props) {
       </Radio.Group>
       <div style={{ marginTop: '20px' }}>
         { (tab === 'base' && <Base salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }} onSuccess={e => buildingOnSuccess(e)}/>)} 
-        { (tab === 'house' && <HouseTab salesBatchId="1" buildingId="1"/>)}
+        { (tab === 'house' && <HouseTab salesBatchId={props.location.query.id} buildingId={props.location.query.buildingId}/>)}
         { (tab === 'poster' && <Poster />)}
         { (tab === 'share' && <Share />)}
         { (tab === 'preselectionImg' && <PreselectionImg />)}

src/pages/house/list/index.jsx

@@ -34,12 +34,13 @@ const header = props => {
   }, [])
 
   // 跳转到编辑商品
-  const toAddHouse = id => () => {
-    if(id) {
+  const toAddHouse = rowData => () => {
+    if(rowData) {
       router.push({
       pathname: '/house/edit',
       query: {
-        id
+        id: rowData.salesBatchId,
+        buildingId: rowData.buildingId,
       },
     });
       return
@@ -94,7 +95,7 @@ const header = props => {
       dataIndex: 'salesBatchName',
       key: 'salesBatchName',
       align: 'center',
-      render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={toAddHouse(row.salesBatchId)}>{row.salesBatchName}</span></>,
+      render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={toAddHouse(row)}>{row.salesBatchName}</span></>,
     },
     {
       title: '楼盘名称',

src/services/apis.js

@@ -1128,6 +1128,31 @@ export default {
     method: 'GET',
     url: `${prefix}/taBuildingFloor`,
     action: 'admin.taBuildingFloor.get',
+  },
+  apartmentList: {
+    method: 'GET',
+    url: `${prefix}/apartmentList`,
+    action: 'admin.apartmentList.get',
+  },
+  checked: {
+    method: 'PUT',
+    url: `${prefix}/house/checked`,
+    action: 'admin.house.checked.get',
+  },
+  houseAdd: {
+    url: `${prefix}/taHousingResources`,
+    method: 'POST',
+    action: 'admin.taHousingResources.get',
+  },
+  getById: {
+    method: 'GET',
+    url: `${prefix}/taHousingResources/:id`,
+    action: 'admin.taHousingResources.id.get',
+  },
+  houseEdit: {
+    url: `${prefix}/taHousingResources/:id`,
+    method: 'PUT',
+    action: 'admin.taHousingResources.id.put',
   }
  },
 }