新需求

src/components/HouseSelect/BlockSelect.jsx

  * @param {*} props
  * @returns
  */
-const BuildingSelect = props => {
+const BlockSelect = props => {
   const [data, setData] = useState([])
   const [value, setValue] = useState([])
   useEffect(() => {
-    getBuildList();
+    getList();
   }, [props.value])
 
 
-  const getBuildList = e => {
-    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+  const getList = e => {
+    request({ ...apis.house.block, params: { pageNum: 1, pageSize: 999, buildingId: props.buildingId} }).then(data => {
         setData(data.records)
         checkValue(data.records)
         // 默认选中第一个
   const checkValue = (data) => {
     if (props.value) {
       const tempData = data.filter(f => f.buildingId == props.value)
-      const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
+      const va = (tempData.length > 0) ? props.value : '已删除，请重新选择'
       props.onChange(va)
 
     }
       showSearch
       value={props.value}
       style={{ width: '300px' }}
-      placeholder="请选择项目"
+      placeholder="请选择楼栋"
       onChange={props.onChange}
       filterOption={(input, option) =>
         option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
       }>
-          {data.map(building => (
-            <Option key={building.buildingId} value={building.buildingId}>{building.buildingName}</Option>
+          {data.map(block => (
+            <Option key={block.blockId} value={block.blockId}>{block.blockName}</Option>
           ))}
       </Select>
   )
 }
-export default BuildingSelect
+export default BlockSelect

src/components/HouseSelect/FloorSelect.jsx

+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const FloorSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getList();
+  }, [props.value])
+
+
+  const getList = e => {
+    request({ ...apis.house.floor, params: { pageNum: 1, pageSize: 999, buildingId: props.buildingId, blockId: props.blockId, unitId: props.unitId} }).then(data => {
+        setData(data.records)
+        checkValue(data.records)
+        // 默认选中第一个
+    })
+  }
+
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.buildingId == props.value)
+      const va = (tempData.length > 0) ? props.value : '已删除，请重新选择'
+      props.onChange(va)
+
+    }
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '300px' }}
+      placeholder="请选择楼层"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {data.map(floor => (
+            <Option key={floor.floorId} value={floor.floorId}>{floor.floorName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default FloorSelect

src/components/HouseSelect/RoomSelect.jsx

+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const RoomSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getList();
+  }, [props.value])
+
+
+  const getList = e => {
+    request({ ...apis.house.room, params: { pageNum: 1, pageSize: 999, buildingId: props.buildingId, blockId: props.blockId, unitId: props.unitId, floorId: props.floorId} }).then(data => {
+        setData(data.records)
+        checkValue(data.records)
+        // 默认选中第一个
+    })
+  }
+
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.buildingId == props.value)
+      const va = (tempData.length > 0) ? props.value : '已删除，请重新选择'
+      props.onChange(va)
+
+    }
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '300px' }}
+      placeholder="请选择房号"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {data.map(room => (
+            <Option key={room.roomId} value={room.roomId}>{room.roomName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default RoomSelect

src/components/HouseSelect/UnitSelect.jsx

+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const UnitSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getList();
+  }, [props.value])
+
+
+  const getList = e => {
+    request({ ...apis.house.unit, params: { pageNum: 1, pageSize: 999, buildingId: props.buildingId, blockId: props.blockId} }).then(data => {
+        setData(data.records)
+        checkValue(data.records)
+        // 默认选中第一个
+    })
+  }
+
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.buildingId == props.value)
+      const va = (tempData.length > 0) ? props.value : '已删除，请重新选择'
+      props.onChange(va)
+
+    }
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '300px' }}
+      placeholder="请选择单元"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {data.map(unit => (
+            <Option key={unit.unitId} value={unit.unitId}>{unit.unitName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default UnitSelect

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

 import apis from '../../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
+import BlockSelect from '../../../../components/HouseSelect/BlockSelect'
+import UnitSelect from '../../../../components/HouseSelect/UnitSelect'
+import FloorSelect from '../../../../components/HouseSelect/FloorSelect'
+import RoomSelect from '../../../../components/HouseSelect/RoomSelect'
 
 /**
  *图片设置
     },
   };
 
-  function showEdi() {
-    window.location.href = "/house/add";
+  function showEdi(e) {
+    props.onSuccess(e);
+  }
+
+  // 提交事件
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNumber: 1, pageSize: 10, ...values })
+      }
+    });
   }
 
   /**
       key: 'apartmentId',
       render: (_, record) => (
         <>
-          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi(record)}>编辑</Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi({type: "edit",record})}>编辑</Button>
           <Button type="link" style={{ color: 'red' }} onClick={() => deleteApartment(record)}>删除</Button>
         </>
       ),
     <>
     <Form layout="inline" onSubmit={e => handleSubmit(e)}>
         <Form.Item>
-          {getFieldDecorator('cityId')(
-            <Input
-            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-            placeholder="请输入标题"
-          />,
+          {getFieldDecorator('blockId')(
+            <Input placeholder="请输入楼栋"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('unitId')(
+            <Input placeholder="请输入单元"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('floorId')(
+            <Input placeholder="请输入楼层"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('roomId')(
+             <Input placeholder="请输入房间号"/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('roomId')(
+             <Input placeholder="请输入户型"/>
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <Input
-            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-            placeholder="请输入标题"
-          />,
+          {getFieldDecorator('roomId')(
+             <Input placeholder="发布状态"/>
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('title')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="请输入标题"
-            />,
+          {getFieldDecorator('houseId')(
+            <Input placeholder="请输入房源编号"/>,
           )}
         </Form.Item>
         <Form.Item>
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => showEdi()}>新增房源</Button>
+      <Button type="primary" onClick={() => showEdi({type: "add"})}>新增房源</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

+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import apis from '../../../../services/apis';
+import XForm, { FieldTypes } from '../../../../components/XForm';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+function HouseAdd(props) {
+  function checkValues() {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log(values,"valuesvaluesvalues")
+      }
+    });
+  }
+
+  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)
+          })
+        }
+      }
+    });
+  }
+
+  function cancelPage(e) {
+    
+  }
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="楼栋">
+        {getFieldDecorator('blockName', {
+          rules: [
+            {
+              required: true,
+              message: '请输入楼栋',
+            },
+          ],
+        })(<Input/>)}
+        </Form.Item>
+        <Form.Item label="单元">
+        {getFieldDecorator('unitName', {
+          rules: [
+            {
+              required: true,
+              message: '请输入单元',
+            },
+          ],
+        })(<Input/>)}
+        </Form.Item>
+        <Form.Item label="层">
+        {getFieldDecorator('floorName', {
+          rules: [
+            {
+              required: true,
+              message: '请输入楼层',
+            },
+          ],
+        })(<Input/>)}
+        </Form.Item>
+        <Form.Item label="房号">
+        {getFieldDecorator('roomName', {
+          rules: [
+            {
+              required: true,
+              message: '请输入房号',
+            },
+          ],
+        })(<Input/>)}
+        </Form.Item>
+        <Form.Item label="价格">
+        {getFieldDecorator('price', {
+          rules: [
+            {
+              required: true,
+              message: '请输入价格',
+            },
+          ],
+        })(<Input type="Number"/>)}
+        </Form.Item>
+        <Form.Item label="预选基础热度">
+        {getFieldDecorator('heat', {
+          rules: [
+            {
+              required: true,
+              message: '请输入楼栋',
+            },
+          ],
+        })(<Input/>)}
+        </Form.Item>
+        <Form.Item label="户型">
+        {getFieldDecorator('apartmentId', {
+          rules: [
+            {
+              required: true,
+              message: '请输入楼栋',
+            },
+          ],
+        })(<Input/>)}
+        </Form.Item>
+        <Form.Item label="发布状态">
+        {getFieldDecorator('status', {
+          rules: [
+            {
+              required: true,
+              message: '请输入楼栋',
+            },
+          ],
+        })(
+          <Select placeholder="发布状态">
+            <Option value="0">否</Option>
+            <Option value="1">是</Option>
+          </Select>,
+        )}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
+          <Button type="primary" htmlType="submit">
+            确认
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button type="primary" onClick={() => checkValues()}>
+            校验
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => cancelPage({type: "house"})}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+const WrappedHouseAdd = Form.create({ name: 'house_add' })(HouseAdd);
+export default WrappedHouseAdd

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

 import { router } from 'umi';
 
 import House from './house'
+import HouseAdd from './houseAdd'
 
-const { Option } = Select
-const { TabPane } = Tabs;
-
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 2 },
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 16 },
-  },
-};
-
-function openNotificationWithIcon(type, message) {
-  notification[type]({
-    message,
-    description:
-      '',
-  });
-}
 
-function EditHouse(props) {
 
+function EditHouse(props) {
   const [tab, setTab] = useState('house')
 
+  function changeTab(e) {
+    console.log(e,"eeeee")
+    setTab(e.type)
+  }
+
   return (
     <>
       <div style={{ marginTop: '20px' }}>
-        { (tab === 'house' && <House salesBatchId="1" buildingId="1" />)} 
+        { (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)}/>)} 
       </div>
     </>
   )

src/services/apis.js

     method: 'GET',
     url: `${prefix}/taHousingResources`,
     action: 'admin.taHousingResources.id.get',
+  },
+  block: {
+    method: 'GET',
+    url: `${prefix}/taBuildingBlock`,
+    action: 'admin.taBuildingBlock.get',
+  },
+  unit: {
+    method: 'GET',
+    url: `${prefix}/taBuildingUnit`,
+    action: 'admin.taBuildingUnit.get',
+  },
+  floor: {
+    method: 'GET',
+    url: `${prefix}/taBuildingFloor`,
+    action: 'admin.taBuildingFloor.get',
   }
  },
 }