新需求

src/pages/building/list/add/components/base.jsx

@@ -45,6 +45,7 @@ function AddBuilding(props) {
 
   const [poi, setPoi] = useState([])
   const [videoImage, setVideoImage] = useState(false)
+  const [priceTypeList, setPriceTypeList] = useState([])
 
   // 存放所以 buildingData 基础信息
   const [buildingData, setBuildingData] = useState({})
@@ -86,6 +87,8 @@ function AddBuilding(props) {
       // if (res.openingDate !== null) {
       //   res.openingDate = moment(res.openingDate)
       // }
+      //构造下拉框
+      setPriceTypeList(res.buildingProjectType)
       if (res.receivedDate !== null) {
         res.receivedDate = moment(res.receivedDate)
       }
@@ -304,6 +307,12 @@ function AddBuilding(props) {
     return newPoi
   }
 
+  //组装项目类型
+  function getBuildingProjectTypeList(e) {
+    console.log(e,"项目类型------")
+    setPriceTypeList(e)
+  }
+
   function setFormMapScopeTagValue(keyType, item) {
     const tag = item.data.map(t => ({ tagName: t.name, delete: true, automatic: true }))
     switch (keyType) {
@@ -357,10 +366,16 @@ function AddBuilding(props) {
           <Form.Item label="项目类型">
             {getFieldDecorator('buildingProjectType', {
               rules: [{ required: true, message: '请选择项目类型' }],
-            })(<BudildingProjectType />)}
-          </Form.Item>
-          <Form.Item label="均价" >
-            {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m²
+            })(<BudildingProjectType onChange={e => getBuildingProjectTypeList(e)}/>)}
+          </Form.Item>
+          <Form.Item label="列表展示均价" >
+            {/* {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m² */}
+            {getFieldDecorator('buildingTypeId')(
+              <Select placeholder="请选择项目类型的价格">
+                    {
+                      priceTypeList.map((item, _) => <Option value={item.buildingTypeId}>{item.buildingTypeName}</Option>)
+                    }
+              </Select>)}
           </Form.Item>
           <Form.Item label="开盘时间" >
             {getFieldDecorator('openingDate')(<Input placeholder="预计xxxx年xx月开盘" maxLength = "15"/>)}

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox, InputNumber } from 'antd';
+import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox, Select, InputNumber } from 'antd';
 import { render } from 'react-dom';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
@@ -28,11 +28,11 @@ class TypeForm extends React.Component {
   }
 
   onChange(e, name) {
-    // console.log(e.target.value)
+    // console.log(e)
     this.props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
         // console.log('Received values of form: ', values);
-        const currentValue = e.target.value
+        const currentValue = name === 'marketStatus' ? e : e.target.value
         if (currentValue === '') {
           values[name] = null
         } else {
@@ -54,7 +54,7 @@ class TypeForm extends React.Component {
     const { getFieldDecorator } = this.props.form;
 
     // this.props.form.setFieldsValue(this.props.type)
-    console.log(this.props.type)
+    // console.log(this.props.type,"33333333")
     return (
       <>
         <Col span={11} style={{
@@ -66,16 +66,34 @@ class TypeForm extends React.Component {
 
           <p style={{ padding: '20px', borderBottom: '1px solid #eee' }}>{this.props.type.buildingTypeName || ''}  <Button type="link" style={{ position: 'absolute', right: '16px' }} icon="close" onClick={() => this.close()} /></p>
 
-          <Form {...formItemLayout} style={{ padding: '10px 0px 10px 10px' }}>
+          <Form {...formItemLayout} style={{ padding: '5px 0px 5px 5px' }}>
             <Form.Item label="类型编号" style={{ display: 'none' }}>
               {getFieldDecorator('buildingTypeId')(<Input disabled />)}
             </Form.Item>
             <Form.Item label="状态" style={{ display: 'none' }}>
               {getFieldDecorator('status')(<Input disabled />)}
             </Form.Item>
-            <Form.Item label="价格">
-              {getFieldDecorator('price')(<Input placeholder="元/㎡" maxLength="9" onChange={e => this.onChange(e, 'price')} />)}
+            <Form.Item label="价格类型">
+                {getFieldDecorator('priceType')(
+                  <Radio.Group onChange={e => this.onChange(e, 'priceType')} >
+                    <Radio value="average">均价</Radio>
+                    <Radio value="total">总价</Radio>
+                  </Radio.Group>
+                )}
+              </Form.Item>
+            <Form.Item label="价格区间" help='最高价与最低价一致时，只展示一个'>
+              {getFieldDecorator('startPrice')(<Input placeholder="最低价" style={{width: '60px'}} maxLength="9" onChange={e => this.onChange(e, 'startPrice')} />)} --
+              {getFieldDecorator('endPrice')(<Input placeholder="最高价" style={{width: '60px'}} maxLength="9" onChange={e => this.onChange(e, 'endPrice')} />)}{this.props.type.priceType === "average" ? "元/㎡" : "万元/套"}
             </Form.Item>
+            <Form.Item label="销售状态" >
+            {getFieldDecorator('marketStatus')(
+              <Select placeholder="销售状态" onChange={e => this.onChange(e, 'marketStatus')} >
+                <Option value="待售">待售</Option>
+                <Option value="在售">在售</Option>
+                <Option value="售罄">售罄</Option>
+              </Select>,
+            )}
+          </Form.Item>
             <Form.Item label="装修标准">
               {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')} />)}
             </Form.Item>
@@ -136,7 +154,7 @@ class ProjectTypeBody extends React.Component {
     const { projectType } = this.state
     const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
 
-    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: null, decoration: null, rightsYear: null, status: '1' }))
+    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, startPrice: null,endPrice: null,priceType: "average", decoration: null, rightsYear: null, status: '1' }))
     const updateProjectDate = this.updateProjectType(tempDate)
     console.log('updateProjectDate: ', updateProjectDate)
     this.setState({ data: updateProjectDate })