bug fix

src/pages/house/house/add/HouseBatchAdd.jsx

@@ -127,11 +127,11 @@ const columns = [
     dataIndex: 'price',
     key: 'price',
   },
-  {
-    title: '预选基础热度',
-    dataIndex: 'heat',
-    key: 'heat',
-  },
+  // {
+  //   title: '预选基础热度',
+  //   dataIndex: 'heat',
+  //   key: 'heat',
+  // },
   {
     title: '发布状态',
     dataIndex: 'status',

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

@@ -143,30 +143,34 @@ function House(props) {
       key: 'houseId',
     },
     {
-      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: '房源',
+      render:  (x, row) => <><span>{row.termName}/{row.blockName}/{row.blockName}/{row.unitName}/{row.floorName}/{row.roomName}</span></>,
     },
+    // {
+    //   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',
@@ -177,17 +181,17 @@ function House(props) {
       dataIndex: 'apartmentName',
       key: 'apartmentName',
     },
-    {
-      title: '预选基础热度',
-      dataIndex: 'heat',
-      key: 'heat',
-    },
-    {
-      title: '预选实际热度',
-      dataIndex: 'realHeat',
-      key: 'realHeat',
-      render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => showEdi({type: "preselection",houseId: row.houseId})}>{row.realHeat}</span></>,
-    },
+    // {
+    //   title: '预选基础热度',
+    //   dataIndex: 'heat',
+    //   key: 'heat',
+    // },
+    // {
+    //   title: '预选实际热度',
+    //   dataIndex: 'realHeat',
+    //   key: 'realHeat',
+    //   render:  (x, row) => <><span style={{color: 'blue',cursor: 'pointer'}} onClick={() => showEdi({type: "preselection",houseId: row.houseId})}>{row.realHeat}</span></>,
+    // },
     {
       title: '发布状态',
       dataIndex: 'status',

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

@@ -156,7 +156,7 @@ function HouseAdd(props) {
           ],
         })(<Input placeholder="填写房源总价"/>)}万元
         </Form.Item>
-        <Form.Item label="预选基础热度">
+        {/* <Form.Item label="预选基础热度">
         {getFieldDecorator('heat', {
           rules: [
             {
@@ -166,7 +166,7 @@ function HouseAdd(props) {
             },
           ],
         })(<Input placeholder="填写基础预选热度，建议为0"/>)}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item label="户型" help="户型不存在时，请到楼盘详情中查看是否存在户型，不存在时请新增户型。">
         {getFieldDecorator('apartmentId')(<ApartmentSelect buildingId={props.buildingId} />)}
         </Form.Item>

src/pages/house/preSelect/add/index.jsx

@@ -5,8 +5,7 @@ import XForm, { FieldTypes } from '../../../../components/XForm';
 import router from 'umi/router';
 import moment from 'moment';
 import styles from '../../../style/GoodsList.less';
-import SelectCity from '../../../../components/SelectButton/CitySelect'
-import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../raise/edit/components/BuildSelect/BuildSelect'
 import ImageUpload from '../../../../components/XForm/ImageUpload'
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
@@ -75,15 +74,15 @@ const header = props => {
   return (
     <>
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-        <Form.Item label="销售批次">
-          {getFieldDecorator('salesBatchId', {
-            rules: [{ required: true, message: '请输入销售批次名' }],
-          })(<SalesBatch type='true'/>)}
-        </Form.Item>
         <Form.Item label="销售楼盘">
           {getFieldDecorator('buildingId', {
             rules: [{ required: true, message: ' 请输入销售楼盘' }],
-          })(<BuildSelect />)}
+          })(<BuildSelect type='false' salesBatchId={props.form.getFieldValue('salesBatchId')}/>)}
+        </Form.Item>
+        <Form.Item label="销售批次">
+          {getFieldDecorator('salesBatchId', {
+            rules: [{ required: true, message: '请输入销售批次名' }],
+          })(<SalesBatch type='true' buildingId={props.form.getFieldValue('buildingId')}/>)}
         </Form.Item>
         <Form.Item label="预选开始时间">  
           {getFieldDecorator('preselectionStartTime', {

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

@@ -23,13 +23,14 @@ const SalesBatch = props => {
   const [data, setData] = useState([])
   const [value, setValue] = useState([])
   const disabledType = props.type;
+  const buildingId = props.buildingId
   useEffect(() => {
     getSalesBatchList();
-  }, [props.value])
+  }, [props.buildingId])
 
 
   const getSalesBatchList = e => {
-    request({ ...apis.house.salesBatchList, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+    request({ ...apis.house.salesBatchList, params: { pageNum: 1, pageSize: 999, buildingId: buildingId } }).then(data => {
         setData(data)
         checkValue(data)
         // 默认选中第一个

src/pages/house/raise/add/index.jsx

@@ -6,7 +6,8 @@ import router from 'umi/router';
 import moment from 'moment';
 import styles from '../../../style/GoodsList.less';
 import SelectCity from '../../../../components/SelectButton/CitySelect'
-import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+// import BuildSelect from '../../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../edit/components/BuildSelect/BuildSelect';
 import ImageUpload from '../../../../components/XForm/ImageUpload'
 import apis from '../../../../services/apis';
 import request from '../../../../utils/request';
@@ -114,13 +115,13 @@ const header = props => {
       <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
         <Form.Item label="销售楼盘">
           {getFieldDecorator('buildingId', {
-            rules: [{ required: true, message: ' 请输入销售楼盘' }],
-          })(<BuildSelect />)}
+            rules: [{ required: true, message: ' 请输入销售楼盘' }], 
+          })(<BuildSelect type='false' salesBatchId={props.form.getFieldValue('salesBatchId')}/>)}
         </Form.Item>
         <Form.Item label="销售批次" help="销售批次请在房源管理中新增">
           {getFieldDecorator('salesBatchId', {
             rules: [{ required: true, message: ' 请输入销售批次' }], onChange: onChangeValue
-          })(<SalesBatch type='true' />)}
+          })(<SalesBatch type='true' buildingId={props.form.getFieldValue('buildingId')}/>)}
         </Form.Item>
         <Form.Item label="认筹开始时间">
         {getFieldDecorator('raiseStartTime', {

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

@@ -22,17 +22,29 @@ function usePrevious(props) {
 const BuildingSelect = props => {
   const [data, setData] = useState([])
   const [value, setValue] = useState([])
+  const type = props.type
+  const salesBatchId = props.salesBatchId
+
   useEffect(() => {
     getBuildList();
-  }, [props.value])
+  }, [props.salesBatchId])
 
 
   const getBuildList = e => {
-    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+    if (salesBatchId && salesBatchId != 'undefine'){
+      request({ ...apis.house.buildingIdBySalesBatchId, urlData:{id: salesBatchId}, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setData(data)
+        checkValue(data)
+        // 默认选中第一个
+      })
+    }
+    else{
+      request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
         setData(data)
         checkValue(data)
         // 默认选中第一个
-    })
+      })
+    }
   }
 
 
@@ -47,7 +59,7 @@ const BuildingSelect = props => {
 
   return (
       <Select
-      disabled
+      disabled={type == 'false'?false:true}
       showSearch
       value={props.value}
       style={{ width: '300px' }}

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

@@ -76,7 +76,8 @@ const Base = props => {
           message.info("请填写线下缴费说明");
           return;
         }
-        if (values.payDescriptionOffline == '' || values.payDescriptionOffline == null || values.payDescriptionOnline == '' || values.payDescriptionOnline == null){
+        if ((values.payType == 'onLine' && (values.payDescriptionOnline == '' || values.payDescriptionOnline == null)) ||
+            (values.payType == 'offLine' && (values.payDescriptionOffline == '' || values.payDescriptionOffline == null))){
           message.info("请填写缴费说明");
           return;
         }

src/services/apis.js

@@ -1351,6 +1351,11 @@ export default {
     method: 'POST',
     action: 'admin.taRaise.post',
   },
+  buildingIdBySalesBatchId: {
+    url: `${prefix}/taSalesBatch/getBuildingById/:id`,
+    method: 'GET',
+    action: 'admin.taRaise.get',
+  },
  },
  taliveActivity: {
   taLiveShare:{