新需求

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
@@ -12,6 +12,12 @@ import request from '@/utils/request';
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 const { TextArea } = Input;
 
+function HouseBatch(props) {
+
+const [data, setData] = useState({list: [], total: 0})
+
+const [uploadFile, setUploadFile] = useState(null)
+
 const uploadExcel = fetch(apis.house.uploadExcel)
 
 const uploaderProps = {
@@ -27,12 +33,16 @@ const uploaderProps = {
     onSuccess,
     withCredentials,
   }) {
-    console.log(uploadExcel,"11")
+     
     const data = new FormData()
     data.append('file', file)
+    data.append('salesBatchId', props.salesBatchId)
+    data.append('buildingId', props.buildingId)
+
+    setUploadFile(file)
 
     uploadExcel({ data }).then((res) => {
-      console.log(res,"fileuda");
+      setData(res)
       onSuccess(res, file);
     }).catch(onError);
 
@@ -44,13 +54,81 @@ const uploaderProps = {
   },
 }
 
-function HouseBatch(props) {
+//取消
+function handleCancel(){
+    props.onSuccess({type: "house"})
+}
+
+function batchSaveHouse() {
+  const uploadData = new FormData()
+  uploadData.append('file', uploadFile)
+  uploadData.append('salesBatchId', props.salesBatchId)
+  uploadData.append('buildingId', props.buildingId)
+
+  request({ ...apis.house.saveExcelValue, data: uploadData,headers: "content-type=multipart/form-data" }).then(res => {
+    message.info('上传成功')
+    props.onSuccess({type: "house"})
+  }).catch(err => {
+    // openNotificationWithIcon('error', err.message)
+  })
+}
+
+const columns = [
+  {
+    title: '期/区',
+    dataIndex: 'termName',
+    key: 'termName',
+  },
+  {
+    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: 'heat',
+    key: 'heat',
+  },
+  {
+    title: '发布状态',
+    dataIndex: 'status',
+    key: 'status',
+    render: status => <><span>{status == 0 ? '否' : status == 1 ? '是' : ''}</span></>,
+  },
+]
+
   return (
     <>
       <span>1.导入房源先下载模板--></span><Button type="primary" htmlType="submit">下载模板</Button><br/>
       <span>2.使用excel打开模板文件，编辑房源数据并保存</span><br/>
       <span>3.将编辑好的文件上传--></span><Upload {...uploaderProps}><Button type="primary" htmlType="submit">上传</Button></Upload><br/>
       <span>4.检查导入的数据是否正常 ↓，不正常则重新编辑保存再次上传，请仔细阅读模板中的编辑规则</span>
+      <Table dataSource={data.list} columns={columns} pagination={{ total: data.total}}  rowKey="House" />
+      
+      <span>5.全部正常请点击提交</span>
+      <Button type="primary" onClick={() => batchSaveHouse()}>提交</Button>
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+      <Button onClick={() => handleCancel()}>取消</Button>
     </>
   )
 }

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

@@ -141,6 +141,11 @@ function House(props) {
       dataIndex: 'houseId',
       key: 'houseId',
     },
+    {
+      title: '期/区',
+      dataIndex: 'termName',
+      key: 'termName',
+    },
     {
       title: '楼栋',
       dataIndex: 'blockName',
@@ -264,7 +269,7 @@ function House(props) {
       <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" />
+      <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ total: data.total, onChange: e => changePageNum(e) }} rowKey="House" />
       <Modal
             title="批量修改对应户型"
             width={400}

src/services/apis.js

@@ -1178,6 +1178,11 @@ export default {
     url: `${prefix}/house/uploadExcel`,
     method: 'POST',
     action: 'upload',
+  },
+  saveExcelValue: {
+    url: `${prefix}/house/saveExcelValue`,
+    method: 'POST',
+    action: 'upload',
   }
  },
 }