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

src/components/HouseSelect/ApartmentSelect.jsx

@@ -38,7 +38,7 @@ const ApartmentSelect = props => {
 
   const checkValue = (data) => {
     if (props.value) {
-      const tempData = data.filter(f => f.buildingId == props.value)
+      const tempData = data.filter(f => f.apartmentId == props.value)
       const va = (tempData.length > 0) ? props.value : '已删除，请重新选择'
       props.onChange(va)
 

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

@@ -20,6 +20,8 @@ import ApartmentSelect from '../../../../components/HouseSelect/ApartmentSelect'
 function House(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState([])
+  const [viable, setViable] = useState(false)
+  const [houseIdList, setHouseIdList] = useState([])
 
   useEffect(() => {
     getList()
@@ -58,6 +60,7 @@ function House(props) {
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
       console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+      setHouseIdList(selectedRows)
     },
   };
 
@@ -65,6 +68,19 @@ function House(props) {
     props.onSuccess(e);
   }
 
+  //打开model
+  function showAparement() {
+    if(houseIdList.length < 1){
+      openNotificationWithIcon('error', '请先选择需要改变的房源')
+      return
+    }
+    setViable(true)
+  }
+
+  function handleCancel() {
+    setViable(false)
+  }
+
   // 提交事件
   const handleSubmit = e => {
     e.preventDefault();
@@ -76,21 +92,39 @@ function House(props) {
     });
   }
 
+    // model提交事件
+    const handleSubmitApartMent = e => {
+      props.form.validateFields((err, values) => {
+        if (!err) {
+          if(!values.apartmentIdSelected){
+            openNotificationWithIcon('error', '请选择户型')
+            return
+          }
+          request({ ...apis.house.changeApartment, data: { apartmentId: values.apartmentIdSelected, houseIdList } }).then(res => {
+            setViable(false)
+            getList({ pageNumber: 1, pageSize: 10 })
+            openNotificationWithIcon('success', '操作成功')
+          }).catch(err => {
+            openNotificationWithIcon('error', err.message)
+          })
+        }
+      });
+    }
   /**
    * 删除
    *
    * @param {*} record
    */
-  function deleteApartment(record) {
-    confirm({
+  function deleteHouseResource(record) {
+    Modal.confirm({
       title: '确认删除当前数据?',
       content: '确定后成功删除，点击取消则放弃当前操作',
       okText: '确定',
       cancelText: '取消',
       onOk() {
         // 网路请求
-        request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
-          getList()
+        request({ ...apis.house.houseDelete, urlData: { id: record.houseId } }).then(res => {
+          getList({ pageNumber: 1, pageSize: 10 })
           openNotificationWithIcon('success', '操作成功')
         }).catch(err => {
           // openNotificationWithIcon('error', err.message)
@@ -165,7 +199,7 @@ function House(props) {
       render: (_, record) => (
         <>
           <Button type="link" style={{ color: 'red' }} onClick={() => showEdi({type: "add",houseId: record.houseId})}>编辑</Button>
-          <Button type="link" style={{ color: 'red' }} onClick={() => deleteApartment(record)}>删除</Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => deleteHouseResource(record)}>删除</Button>
         </>
       ),
     },
@@ -227,10 +261,32 @@ function House(props) {
         </Form.Item>
       </Form>
       <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="primary" onClick={() => showEdi({type: "batch"})} style={{ marginLeft: '18px'}}>批量导入房源</Button>
+      <Button type="primary" onClick={() => showAparement()} 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" />
+      <Modal
+            title="批量修改对应户型"
+            width={400}
+            destroyOnClose="true"
+            footer={null}
+            visible={viable}
+            onOk={() => this.handleOk()}
+            onCancel={e => handleCancel(e)}
+          >
+            <Form onSubmit={e => handleSubmitApartMent(e)}>
+              <Form.Item label="将所选房源对应户型信息修改为" >
+                {getFieldDecorator('apartmentIdSelected')(
+                <ApartmentSelect buildingId={props.buildingId} />
+                )}
+              </Form.Item>
+              <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                <Button type="primary" htmlType="submit">保存</Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => handleCancel()}>取消</Button>
+              </Form.Item>
+            </Form>
+        </Modal>
     </>
   )
 }

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

@@ -49,7 +49,7 @@ function HouseAdd(props) {
       if (!err) {
           if(houseId){
             request({ ...apis.house.houseEdit,urlData: {id: houseId}, data: { ...values,buildingId: props.buildingId, salesBatchId: props.salesBatchId } }).then((data) => {
-              message.info('保存成功')
+              message.info('修改成功')
               props.onSuccess({type: "house"})
             }).catch((err) => {
               // message.info(err.msg || err.message)
@@ -74,7 +74,7 @@ function HouseAdd(props) {
   return (
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
-      <Form.Item label="期">
+      <Form.Item label="期" >
         {getFieldDecorator('termName', {
           rules: [
             {
@@ -82,7 +82,7 @@ function HouseAdd(props) {
               message: '请输入楼栋',
             },
           ],
-        })(<Input/>)}
+        })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
         </Form.Item>
         <Form.Item label="楼栋">
         {getFieldDecorator('blockName', {
@@ -92,7 +92,7 @@ function HouseAdd(props) {
               message: '请输入楼栋',
             },
           ],
-        })(<Input/>)}
+        })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
         </Form.Item>
         <Form.Item label="单元">
         {getFieldDecorator('unitName', {
@@ -102,7 +102,7 @@ function HouseAdd(props) {
               message: '请输入单元',
             },
           ],
-        })(<Input/>)}
+        })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
         </Form.Item>
         <Form.Item label="层">
         {getFieldDecorator('floorName', {
@@ -112,7 +112,7 @@ function HouseAdd(props) {
               message: '请输入楼层',
             },
           ],
-        })(<Input/>)}
+        })(<Input disabled={houseId && houseId !== '' ? true : false}/>)}
         </Form.Item>
         <Form.Item label="房号">
         {getFieldDecorator('roomName', {
@@ -160,8 +160,8 @@ function HouseAdd(props) {
           ],
         })(
           <Select placeholder="发布状态">
-            <Option value="0">否</Option>
-            <Option value="1">是</Option>
+            <Option value={0}>否</Option>
+            <Option value={1}>是</Option>
           </Select>,
         )}
         </Form.Item>

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

@@ -7,6 +7,7 @@ import { router } from 'umi';
 
 import House from './house'
 import HouseAdd from './houseAdd'
+import HouseBatch from './HouseBatch'
 
 
 
@@ -26,6 +27,7 @@ function EditHouse(props) {
       <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} houseId={houseId} onSuccess={e => changeTab(e)}/>)} 
+        { (tab === 'batch' && <HouseBatch salesBatchId={props.salesBatchId} buildingId={props.buildingId} onSuccess={e => changeTab(e)}/>)} 
       </div>
     </>
   )

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

@@ -1,15 +1,192 @@
 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';
+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';
 
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+function PreselectionRecord(props) {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [data, setData] = useState([])
+  const {salesBatchId} = props.salesBatchId
+  console.log(salesBatchId,'updateNameupdateNameupdateName');
+  useEffect(() => {
+    getList()
+  }, [])
 
-const PreselectionRecord = props => {
-  return <div><span>预选记录</span></div>
-}
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.house.taPreselectRecord, params: { ...params,salesBatchId: salesBatchId } }).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 PreselectionRecord
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+    },
+  };
+
+  // 提交事件
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNumber: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+
+  const columns = [
+    {
+      title: '房源编号',
+      dataIndex: 'houseId',
+      key: 'houseId',
+    },
+    {
+      title: '楼栋',
+      dataIndex: 'blockName',
+      key: 'blockName',
+      render: blockName => <><span>{blockName}幢</span></>,
+    },
+    {
+      title: '单元',
+      dataIndex: 'unitName',
+      key: 'unitName',
+      render: unitName => <><span>{unitName}单元</span></>,
+    },
+    {
+      title: '层',
+      dataIndex: 'floorName',
+      key: 'floorName',
+      render: floorName => <><span>{floorName}层</span></>,
+    },
+    {
+      title: '房号',
+      dataIndex: 'roomName',
+      key: 'roomName',
+    },
+    {
+      title: '对应户型',
+      dataIndex: 'apartmentName',
+      key: 'apartmentName',
+    },
+    {
+      title: '用户昵称',
+      dataIndex: 'nameOrnick',
+      key: 'nameOrnick',
+    },
+    {
+      title: '用户姓名',
+      dataIndex: 'name',
+      key: 'name',
+    },
+    {
+      title: '用户头像',
+      dataIndex: 'avatarurl',
+      key: 'avatarurl',
+      render: (text, records) => <img src={records.avatarurl} width={50} height={50} />,
+    },
+    {
+      title: '用户手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+    },
+    
+    {
+      title: '预选状态',
+      dataIndex: 'status',
+      key: 'status',
+      render: status => <><span>{status == 0 ? '否' : status == 1 ? '是' : ''}</span></>,
+    },
+    {
+      title: '状态修改时间',
+      dataIndex: 'updateDate',
+      key: 'updateDate',
+    },
+    {
+      title: '最后修改人',
+      dataIndex: 'updateName',
+      key: 'updateName',
+    },
+  ]
+  const { getFieldDecorator } = props.form
+  return (
+    <>
+    <Form layout="inline" onSubmit={e => handleSubmit(e)}>
+        <Form.Item>
+          {getFieldDecorator('houseId')(
+            <Input placeholder="房源编号"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input placeholder="用户手机号"/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('apartmentId')(
+             <ApartmentSelect buildingId={props.buildingId} />
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+             <Select placeholder="预选状态" style={{width: '120px'}}>
+             <Option value="0">否</Option>
+             <Option value="1">是</Option>
+           </Select>,
+          )}
+        </Form.Item>
+        
+        <Form.Item>
+          <Button type="primary" htmlType="submit" >
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ total: data.total, onChange: e => this.changePageNum(e) }} rowKey="House" />
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'PreselectionRecord' })(PreselectionRecord);
+export default WrappedHeader

src/pages/house/edit/index.jsx

@@ -70,7 +70,7 @@ function EditHouse(props) {
         { (tab === 'poster' && <Poster salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
         { (tab === 'share' && <Share salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
         { (tab === 'preselectionImg' && <PreselectionImg />)}
-        { (tab === 'preselectionRecord' && <PreselectionRecord />)}
+        { (tab === 'preselectionRecord' && <PreselectionRecord buildingId={props.location.query.buildingId} salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
         { (tab === 'shareRecord' && <ShareRecord salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
         { (tab === 'visitRecord' && <VisitRecord salesBatchId={{ salesBatchId: salesBatchData.salesBatchId || (props.location.query && props.location.query.id) }}/>)}
       </div>

src/services/apis.js

@@ -1158,6 +1158,21 @@ export default {
     url: `${prefix}/taHousingResources/:id`,
     method: 'PUT',
     action: 'admin.taHousingResources.id.put',
-  }
+  },
+  taPreselectRecord: {
+    url: `${prefix}/taPreselectRecord`,
+    method: 'GET',
+    action: 'admin.taPreselectRecord.get',
+  },
+  houseDelete: {
+    url: `${prefix}/houseDelete/:id`,
+    method: 'DELETE',
+    action: 'admin.houseDelete.id.put',
+  },
+  changeApartment: {
+    method: 'PUT',
+    url: `${prefix}/house/changeApartment`,
+    action: 'admin.house.changeApartment.get',
+  },
  },
 }