Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

# Conflicts:
#	src/pages/house/edit/index.jsx

src/components/HouseSelect/BlockSelect.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 BuildingSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getBuildList();
+  }, [props.value])
+
+
+  const getBuildList = e => {
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).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(building => (
+            <Option key={building.buildingId} value={building.buildingId}>{building.buildingName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default BuildingSelect

src/pages/house/edit/components/house.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 { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification, Modal } from 'antd';
 import moment from 'moment';
-import router from 'umi/router';
+import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
+import Styles from './style.less';
+import { router } from 'umi';
 
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+function House(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([])
 
-const House = props => {
-  return <div><span>房源信息</span></div>
-}
+  useEffect(() => {
+    getList()
+  }, [])
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.house.taHousingResources, params: { ...params,salesBatchId: props.salesBatchId,buildingId: props.buildingId } }).then(res => {
+      console.log(res,"resresres")
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+    // 重置搜索
+    function handleReset () {
+      props.form.resetFields();
+      getList({ pageNumber: 1, pageSize: 10 })
+    }
+
+      // 分页
+  function changePageNum(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    getList({ pageNumber: pageNumber, pageSize: 10})
+  }
 
-export default House
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+    },
+  };
+
+  function showEdi() {
+    window.location.href = "/house/add";
+  }
+
+  /**
+   * 删除
+   *
+   * @param {*} record
+   */
+  function deleteApartment(record) {
+    confirm({
+      title: '确认删除当前数据?',
+      content: '确定后成功删除，点击取消则放弃当前操作',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        // 网路请求
+        request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
+          getList()
+          openNotificationWithIcon('success', '操作成功')
+        }).catch(err => {
+          // openNotificationWithIcon('error', err.message)
+        })
+      },
+      onCancel() {},
+    });
+  }
+
+
+  const columns = [
+    {
+      title: '房源编号',
+      dataIndex: 'houseId',
+      key: 'houseId',
+    },
+    {
+      title: '楼栋',
+      dataIndex: 'blockName',
+      key: 'blockName',
+    },
+    {
+      title: '单元',
+      dataIndex: 'unitName',
+      key: 'unitName',
+    },
+    {
+      title: '层',
+      dataIndex: 'floorName',
+      key: 'floorName',
+    },
+    {
+      title: '房号',
+      dataIndex: 'roomName',
+      key: 'roomName',
+    },
+    {
+      title: '价格（万元）',
+      dataIndex: 'price',
+      key: 'price',
+    },
+    {
+      title: '对应户型',
+      dataIndex: 'apartmentName',
+      key: 'apartmentName',
+    },
+    {
+      title: '预选基础热度',
+      dataIndex: 'heat',
+      key: 'heat',
+    },
+    {
+      title: '预选实际热度',
+      dataIndex: 'realHeat',
+      key: 'realHeat',
+    },
+    {
+      title: '发布状态',
+      dataIndex: 'status',
+      key: 'status',
+    },
+    {
+      title: '最后修改人',
+      dataIndex: 'updateName',
+      key: 'updateName',
+    },
+    {
+      title: '操作',
+      dataIndex: 'apartmentId',
+      key: 'apartmentId',
+      render: (_, record) => (
+        <>
+          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi(record)}>编辑</Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => deleteApartment(record)}>删除</Button>
+        </>
+      ),
+    },
+  ]
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+    <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="请输入标题"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="请输入标题"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('title')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" onClick={() => showEdi()}>新增房源</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>
+      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ total: data.total, onChange: e => this.changePageNum(e) }} rowKey="House" />
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'House' })(House);
+export default WrappedHeader

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

+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import { router } from 'umi';
+
+import House from './house'
+
+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) {
+
+  const [tab, setTab] = useState('house')
+
+  return (
+    <>
+      <div style={{ marginTop: '20px' }}>
+        { (tab === 'house' && <House salesBatchId="1" buildingId="1" />)} 
+      </div>
+    </>
+  )
+}
+
+const WrappedEditHouseForm = Form.create({ name: 'editHouse' })(EditHouse);
+
+export default WrappedEditHouseForm

src/pages/house/edit/index.jsx

 import { router } from 'umi';
 
 import Base from './components/base'
-import House from './components/house'
+import HouseTab from './components/houseTab'
 import Poster from './components/poster'
 import Share from './components/share'
 import PreselectionImg from './components/preselectionImg'
   console.log(props.location.query.id)
   const [tab, setTab] = useState('base')
   const [salesBatchData, setSalesBatchData] = useState({ salesBatchId: undefined })
+
+  // const [tab, setTab] = useState('house')
   
   function tabsCallback(e) {
     setTab(e.target.value)
       </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' && <House />)}
+        { (tab === 'house' && <HouseTab salesBatchId="1" buildingId="1"/>)}
         { (tab === 'poster' && <Poster />)}
         { (tab === 'share' && <Share />)}
         { (tab === 'preselectionImg' && <PreselectionImg />)}

src/services/apis.js

     url: `${prefix}/iBuildingDynamicList`,
     action: 'admin.iBuildingDynamicList.get',
   },
+  taHousingResources: {
+    method: 'GET',
+    url: `${prefix}/taHousingResources`,
+    action: 'admin.taHousingResources.id.get',
+  }
  },
 }