feats

config/config.js

@@ -75,6 +75,7 @@ export default {
   targets: {
     ie: 11,
   },
+  history: 'hash',
   // umi routes: https://umijs.org/zh/guide/router.html
   routes,
   // Theme for antd: https://ant.design/docs/react/customize-theme-cn

src/pages/building/Edit/Apartment/Form.jsx

@@ -1,22 +1,59 @@
-import React from 'react'
-import { Button, Form, Input, Select } from 'antd'
+import React, { useEffect, useState } from 'react'
+import { Button, Form, Input, message, Select } from 'antd'
 import ImageUpload from '@/components/XForm/ImageUpload'
+import { fetch, apis } from '@/utils/request'
 import ModalForm from '../components/ModalForm'
 import InputNumber from '../components/InputNumber'
 import { validMinNum } from '../utils'
 
 const Option = Select.Option
 const fullWidth = { width: '100%' }
+const saveData = fetch(apis.building.buildingApartmentAdd)
+const updateData = fetch(apis.building.buildingApartmentUpdate)
 
 const AMForm = (props) => {
-  const { visible, onCancel, form } = props
-  const { getFieldDecorator } = form
+  const { visible, onCancel, form, onSubmit } = props
+  const { getFieldDecorator, setFieldsValue, resetFields, validateFields } = form
+
+  const [loading, setLoading] = useState(false)
+
+  const handleSubmit = (e) => {
+    e.preventDefault();
+    validateFields((err, values) => {
+      if (err) {
+        console.error(err)
+        return
+      }
+
+      const request = props.formData.apartmentId ? updateData : saveData
+      const data = {
+        ...(props.formData),
+        ...values,
+      }
+
+      setLoading(true)
+      request({ data }).then((res) => {
+        setLoading(false)
+        message.success('操作成功')
+        props.onSuccess(res)
+      }).catch((err) => {
+        setLoading(false)
+        console.error(err)
+      })
+    })
+  }
+
+  useEffect(() => {
+    resetFields()
+    setFieldsValue(props.formData || {})
+  }, [props.formData])
 
   return (
     <ModalForm
       title="户型设置"
       visible={visible}
       onCancel={onCancel}
+      onSubmit={handleSubmit}
     >
       <Form.Item label="编号" style={{ display: 'none' }}>
           {getFieldDecorator('apartmentId')(<Input />)}
@@ -68,7 +105,7 @@ const AMForm = (props) => {
           })(<InputNumber min={0} step={1} style={fullWidth} />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
-        <Button style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
+        <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
         <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button>
       </Form.Item>
     </ModalForm>

src/pages/building/Edit/Apartment/List.jsx

@@ -1,8 +1,8 @@
 import React from 'react'
-import { Button, Table } from 'antd'
+import { Button, Table, Popconfirm } from 'antd'
+import moment from 'moment'
 
 export default (props) => {
-  
   const columns = [
     {
       title: '户型名称',
@@ -56,6 +56,12 @@ export default (props) => {
   ]
 
   return (
-    <Table columns={columns} style={{marginTop: '1em', width: '100%'}} rowKey="apartmentId" />
+    <Table
+      loading={props.loading}
+      dataSource={props.dataSource}
+      columns={columns}
+      style={{marginTop: '1em', width: '100%'}}
+      rowKey="apartmentId"
+    />
   )
 }

src/pages/building/Edit/Apartment/index.jsx

@@ -1,18 +1,71 @@
-import React, { useState } from 'react'
-import { Button } from 'antd'
+import React, { useEffect, useState, useRef } from 'react'
+import { Button, message } from 'antd'
+import { fetch, apis } from '@/utils/request'
 import Form from './Form'
 import List from './List'
 
+const fetchList = fetch(apis.building.buildingApartment)
+const deleteData = fetch(apis.building.buildingApartmentDelete)
+
 export default (props) => {
+  const { history } = props;
+  const { query } = history.location;
+  const { id } = query;
+
   const [visible, setVisible] = useState(false)
+  const [loading, setLoading] = useState(false)
+  const [list, setList] = useState([])
+  const apartmentRef = useRef()
+
+  const getList = () => {
+    const urlData = { id }
+    const params = { apartmentType: 'apart' }
+
+    setLoading(true)
+    fetchList({ urlData, params }).then((res) => {
+      setList(res || [])
+      setLoading(false)
+    }).catch((err) => {
+      console.error(err.message || err)
+      setLoading(false)
+    })
+  }
+
+  const handleEdit = (record) => {
+    apartmentRef.current = record
+    setVisible(true)
+  }
+
+  const handleDelete = (record) => {
+    const urlData = { id: record.apartmentId }
+
+    setLoading(true)
+    deleteData({ urlData }).then(() => {
+      getList()
+      message.success('删除成功')
+      setLoading(false)
+    }).catch((err) => {
+      console.error(err.message || err)
+      setLoading(false)
+    })
+  }
+
+  const handleSuccess = () => {
+    getList()
+    setVisible(false)
+  }
+
+  useEffect(() => {
+    getList()
+  }, [id])
 
   return (
     <div>
       <div>
-        <Button type="primary" onClick={() => setVisible(true)}>新增户型</Button>
+        <Button type="primary" onClick={handleEdit}>新增户型</Button>
       </div>
-      <Form visible={visible} onCancel={() => setVisible(false)} />
-      <List />
+      <Form visible={visible} onCancel={() => setVisible(false)} formData={apartmentRef.current} onSuccess={handleSuccess} />
+      <List loading={loading} dataSource={list} onEdit={handleEdit} onDelete={handleDelete} />
     </div>
   )
 }

src/pages/building/Edit/Basic/index.jsx

@@ -17,6 +17,7 @@ import usePois from './usePois'
 import useQuery from './useQuery'
 import useBrands from './useBrands'
 import { initForm, saveData } from './form'
+import { router } from 'umi'
 
 const fullWidth= { width: '100%' }
 const Item = Form.Item
@@ -101,9 +102,13 @@ const BuildingBasic = React.forwardRef((props, ref) => {
           ...values,
           pois,
           arrounds,
-        }).then(() => {
+        }).then((res) => {
           updateFormLoading(false)
           notification.success({ message: '保存项目基础信息成功' })
+
+          if (!id) {
+            router.replace(`/building/add?id=${res.buildingId}`)
+          }
         }).catch((err) => {
           console.error(err)
           updateFormLoading(false)

src/utils/request.js

@@ -46,7 +46,7 @@ request.interceptors.request.use((url, options) => {
 
   return (
     {
-      // url: 'http://81.69.196.8:8567' + apiURL,
+      // url: 'https://xlk.njyz.tech' + apiURL,
       url: apiURL,
       options: {
         ...opts,