diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index d2ba1279e..b7a0d18c1 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -13,6 +13,12 @@
           <span>{{ gridName }}</span>
         </el-form-item>
 
+        <el-form-item label="姓名"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{ dataForm.ownerName }}</span>
+        </el-form-item>
+
           <el-form-item label="迁出时间" prop="outOfTime" label-width="150px">
               <el-date-picker v-model="dataForm.outOfTime"
                               type="date"
@@ -228,9 +234,10 @@ export default {
 
     }
   },
-  components: {},
-  mounted () {
+  components: {
 
+  },
+  mounted () {
   },
     computed: {
         dataRule () {
@@ -555,7 +562,8 @@ export default {
         homeId: '', //调动到的房屋Id
         transferTime: '', //调动时间【日期类型】
         reason: '', //备注
-        outOfTime: ''
+        outOfTime: '',
+        welfareFlag: false
       }
 
       this.customerId = ''//客户id
diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 33161588c..965084d62 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -85,7 +85,7 @@
             <!--}}-->
           <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column prop="joinDate" label="死亡时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deathDate" label="死亡时间" header-align="center" align="center"></el-table-column>
         <!--<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="removeDate" label="移除时间" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="removeReason" label="移除原因" header-align="center" align="center"></el-table-column>-->
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index 06b0f2749..b859d42fe 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -267,6 +267,17 @@
         <br/>
       </div>
       <el-checkbox v-model="welfareFlag">享受福利</el-checkbox>
+      <div>
+        <br/>
+      </div>
+      <el-date-picker v-model="deathDate"
+                      type="date"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      format="yyyy-MM-dd"
+                      placeholder="请选择死亡日期"
+                      style="width:200px"
+                      :clearable="false">
+      </el-date-picker>
       <span slot="footer" class="dialog-footer">
         <el-button @click="blacklistVisible = false">取 消</el-button>
         <el-button type="primary" @click="confirmJoinDeathlist">确 定</el-button>
@@ -348,6 +359,7 @@ export default {
       blacklistReason: '', // 加入黑名单原因
       welfareFlag: false,
       rowData: {}, // 加入黑名单的人员信息
+        deathDate: ''
     }
   },
   props: {
@@ -427,7 +439,8 @@ export default {
         type: '1',
         userId: this.rowData.icResiUserId,
         joinReason: this.blacklistReason,
-        welfareFlag: this.welfareFlag
+        welfareFlag: this.welfareFlag,
+          deathDate: this.deathDate
       }
       this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => {
         if (res.code !== 0) {
diff --git a/src/views/modules/plugins/rent/renthouse-add-or-update.vue b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
new file mode 100644
index 000000000..417c5a0ed
--- /dev/null
+++ b/src/views/modules/plugins/rent/renthouse-add-or-update.vue
@@ -0,0 +1,306 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
+          <el-form-item label="客户id" prop="customerId">
+          <el-input v-model="dataForm.customerId" placeholder="客户id"></el-input>
+      </el-form-item>
+          <el-form-item label="小区id" prop="neighborHoodId">
+          <el-input v-model="dataForm.neighborHoodId" placeholder="小区id"></el-input>
+      </el-form-item>
+          <el-form-item label="片区id，neighbor_hood_part.id,可为空。" prop="partId">
+          <el-input v-model="dataForm.partId" placeholder="片区id，neighbor_hood_part.id,可为空。"></el-input>
+      </el-form-item>
+          <el-form-item label="所属楼栋id" prop="buildingId">
+          <el-input v-model="dataForm.buildingId" placeholder="所属楼栋id"></el-input>
+      </el-form-item>
+          <el-form-item label="所属单元id" prop="buildingUnitId">
+          <el-input v-model="dataForm.buildingUnitId" placeholder="所属单元id"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋名字后台插入时生成" prop="houseName">
+          <el-input v-model="dataForm.houseName" placeholder="房屋名字后台插入时生成"></el-input>
+      </el-form-item>
+          <el-form-item label="门牌号" prop="doorName">
+          <el-input v-model="dataForm.doorName" placeholder="门牌号"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋类型，1楼房，2平房，3别墅" prop="houseType">
+          <el-input v-model="dataForm.houseType" placeholder="房屋类型，1楼房，2平房，3别墅"></el-input>
+      </el-form-item>
+          <el-form-item label="存储字典value" prop="purpose">
+          <el-input v-model="dataForm.purpose" placeholder="存储字典value"></el-input>
+      </el-form-item>
+          <el-form-item label="1：出租 0：自住  2：闲置" prop="rentFlag">
+          <el-input v-model="dataForm.rentFlag" placeholder="1：出租 0：自住  2：闲置"></el-input>
+      </el-form-item>
+          <el-form-item label="房主姓名" prop="ownerName">
+          <el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input>
+      </el-form-item>
+          <el-form-item label="房主电话" prop="ownerPhone">
+          <el-input v-model="dataForm.ownerPhone" placeholder="房主电话"></el-input>
+      </el-form-item>
+          <el-form-item label="房主身份证号" prop="ownerIdCard">
+          <el-input v-model="dataForm.ownerIdCard" placeholder="房主身份证号"></el-input>
+      </el-form-item>
+          <el-form-item label="排序" prop="sort">
+          <el-input v-model="dataForm.sort" placeholder="排序"></el-input>
+      </el-form-item>
+          <el-form-item label="删除标识 0未删除、1已删除" prop="delFlag">
+          <el-input v-model="dataForm.delFlag" placeholder="删除标识 0未删除、1已删除"></el-input>
+      </el-form-item>
+          <el-form-item label="乐观锁" prop="revision">
+          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
+      </el-form-item>
+          <el-form-item label="创建人" prop="createdBy">
+          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
+      </el-form-item>
+          <el-form-item label="创建时间" prop="createdTime">
+          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
+      </el-form-item>
+          <el-form-item label="更新人" prop="updatedBy">
+          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
+      </el-form-item>
+          <el-form-item label="更新时间" prop="updatedTime">
+          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
+      </el-form-item>
+          <el-form-item label="社区ID" prop="communityId">
+          <el-input v-model="dataForm.communityId" placeholder="社区ID"></el-input>
+      </el-form-item>
+          <el-form-item label="社区" prop="communityName">
+          <el-input v-model="dataForm.communityName" placeholder="社区"></el-input>
+      </el-form-item>
+          <el-form-item label="网格ID" prop="gridId">
+          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+      </el-form-item>
+          <el-form-item label="网格" prop="gridName">
+          <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋小区ID" prop="villageId">
+          <el-input v-model="dataForm.villageId" placeholder="房屋小区ID"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋小区" prop="villageName">
+          <el-input v-model="dataForm.villageName" placeholder="房屋小区"></el-input>
+      </el-form-item>
+          <el-form-item label="楼号ID" prop="buildId">
+          <el-input v-model="dataForm.buildId" placeholder="楼号ID"></el-input>
+      </el-form-item>
+          <el-form-item label="楼号" prop="buildName">
+          <el-input v-model="dataForm.buildName" placeholder="楼号"></el-input>
+      </el-form-item>
+          <el-form-item label="单元ID" prop="unitId">
+          <el-input v-model="dataForm.unitId" placeholder="单元ID"></el-input>
+      </el-form-item>
+          <el-form-item label="单元" prop="unitName">
+          <el-input v-model="dataForm.unitName" placeholder="单元"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋ID" prop="homeId">
+          <el-input v-model="dataForm.homeId" placeholder="房屋ID"></el-input>
+      </el-form-item>
+          <el-form-item label="房屋" prop="homeName">
+          <el-input v-model="dataForm.homeName" placeholder="房屋"></el-input>
+      </el-form-item>
+          <el-form-item label="购房日期" prop="purchaseDate">
+          <el-input v-model="dataForm.purchaseDate" placeholder="购房日期"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        customerId: '',
+        neighborHoodId: '',
+        partId: '',
+        buildingId: '',
+        buildingUnitId: '',
+        houseName: '',
+        doorName: '',
+        houseType: '',
+        purpose: '',
+        rentFlag: '',
+        ownerName: '',
+        ownerPhone: '',
+        ownerIdCard: '',
+        sort: '',
+        delFlag: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: '',
+        communityId: '',
+        communityName: '',
+        gridId: '',
+        gridName: '',
+        villageId: '',
+        villageName: '',
+        buildId: '',
+        buildName: '',
+        unitId: '',
+        unitName: '',
+        homeId: '',
+        homeName: '',
+        purchaseDate: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        customerId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        neighborHoodId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        partId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildingUnitId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        doorName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        houseType: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        purpose: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        rentFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        ownerName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        ownerPhone: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        ownerIdCard: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        sort: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        delFlag: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        revision: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        createdTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedBy: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        updatedTime: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        communityName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        gridName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        villageId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        villageName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        buildName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unitId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        unitName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        homeId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        homeName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        purchaseDate: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/rent/rentHouse/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/rent/rentHouse/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false })
+  }
+}
+</script>
diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue
new file mode 100644
index 000000000..bd9ea3697
--- /dev/null
+++ b/src/views/modules/plugins/rent/renthouse.vue
@@ -0,0 +1,98 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-rent__rentHouse}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="房屋主键" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="customerId" label="客户id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="neighborHoodId" label="小区id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="partId" label="片区id，neighbor_hood_part.id,可为空。" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingId" label="所属楼栋id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildingUnitId" label="所属单元id" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseName" label="房屋名字后台插入时生成" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="doorName" label="门牌号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="houseType" label="房屋类型，1楼房，2平房，3别墅" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="purpose" label="存储字典value" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="rentFlag" label="1：出租 0：自住  2：闲置" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ownerName" label="房主姓名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ownerPhone" label="房主电话" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ownerIdCard" label="房主身份证号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="delFlag" label="删除标识 0未删除、1已删除" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityId" label="社区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityName" label="社区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridId" label="网格ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="gridName" label="网格" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageId" label="房屋小区ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="villageName" label="房屋小区" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildId" label="楼号ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="buildName" label="楼号" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitId" label="单元ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="unitName" label="单元" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="homeId" label="房屋ID" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="homeName" label="房屋" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="purchaseDate" label="购房日期" header-align="center" align="center"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './renthouse-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/rent/rentHouse/page',
+        getDataListIsPage: true,
+        deleteURL: '/rent/rentHouse',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>