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

# Conflicts:
#	src/services/apis.js

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

@@ -81,16 +81,16 @@ function House(props) {
    *
    * @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 +165,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>
         </>
       ),
     },

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/services/apis.js

@@ -1163,6 +1163,10 @@ export default {
     url: `${prefix}/taPreselectRecord`,
     method: 'GET',
     action: 'admin.taPreselectRecord.get',
+  houseDelete: {
+    url: `${prefix}/houseDelete/:id`,
+    method: 'DELETE',
+    action: 'admin.houseDelete.id.put',
   }
  },
 }