diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 39ebbe05..003ab87f 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -2,7 +2,104 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-change__changeRelocation} resi-container">
       <el-card ref="searchCard" class="search-card">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
+        <el-form-item label="所属网格"
+                      prop="gridId">
+          <el-select
+                  v-model.trim="dataForm.gridId"
+                  placeholder="请选择"
+                  clearable
+                  @change="handleChangeGrid"
+          >
+            <el-option
+                    v-for="item in optionsG"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属房屋" >
+          <div class="resi-cell-value">
+            <div class="resi-cell-col">
+              <el-form-item prop="villageId">
+                <el-select
+                        v-model.trim="dataForm.villageId"
+                        placeholder="请选择小区"
+                        clearable
+                        @clear="handleClearVillage"
+                        @change="handleChangeV"
+                >
+                  <el-option
+                          v-for="item in optionsV"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item prop="buildId">
+                <el-select
+                        v-model.trim="dataForm.buildId"
+                        placeholder="楼号"
+                        clearable
+                        style="width: 120px;"
+                        :disabled="changeVDisabled"
+                        @clear="handleClearBuild"
+                        @change="handleChangeB"
+                >
+                  <el-option
+                          v-for="item in optionsB"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item prop="unitId">
+                <el-select
+                        v-model.trim="dataForm.unitId"
+                        :disabled="changeBDisabled"
+                        placeholder="单元"
+                        clearable
+                        style="width: 120px;"
+                        @click="handleClearDan"
+                        @change="handleChangeD"
+                >
+                  <el-option
+                          v-for="item in optionsD"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item prop="homeId">
+                <el-select
+                        v-model.trim="dataForm.homeId"
+                        :disabled="changeDDisabled"
+                        placeholder="房号"
+                        clearable
+                        style="width: 120px;"
+                >
+                  <el-option
+                          v-for="item in optionsH"
+                          :key="item.value"
+                          :label="item.label"
+                          :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </div>
+          </div>
+        </el-form-item>
+
+        <br/>
         <el-form-item label="姓名"
                       prop="name">
           <el-input v-model="dataForm.name"
@@ -30,6 +127,7 @@
                     placeholder="请输入手机">
           </el-input>
         </el-form-item>
+        <br/>
         <el-form-item label="迁出时间"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
@@ -108,17 +206,42 @@ export default {
         exportURL: '/pli/power/changeRelocation/export'
       },
         timeRange: '',
+        optionsV: [],
+        optionsB: [],
+        optionsH: [],
+        optionsD: [],
+        optionsG: [],
       dataForm: {
         id: '',
           name: '',
           mobile: '',
-          idCard: ''
+          idCard: '',
+          gridId: '',
+          villageId: '',
+          buildId: '',
+          unitId: '',
+          homeId: '',
       }
     }
   },
   components: {
     AddOrUpdate
   },
+    computed: {
+        changeVDisabled() {
+            return !this.dataForm.villageId
+        },
+        changeBDisabled() {
+            return !this.dataForm.buildId
+        },
+        changeDDisabled() {
+            return !this.dataForm.unitId
+        }
+    },
+    created () {
+        this.getGridList()
+        this.getValiheList()
+    },
     watch: {
         timeRange (val) {
             if (Array.isArray(val) && val.length == 2) {
@@ -130,6 +253,132 @@ export default {
             }
         }
     },
+    methods: {
+        handleClearVillage() {
+            this.dataForm.buildId = ''
+            this.dataForm.homeId = ''
+        },
+        handleClearBuild() {
+            this.dataForm.buildId = ''
+            this.dataForm.unitId = ''
+            this.dataForm.homeId = ''
+        },
+        handleClearDan() {
+            this.dataForm.unitId = ''
+            this.dataForm.homeId = ''
+        },
+        handleChangeGrid(val) {
+            console.log('val', val)
+            this.dataForm.villageId = ''
+            this.dataForm.buildId = ''
+            this.dataForm.unitId = ''
+            this.dataForm.homeId = ''
+            this.getValiheList()
+        },
+        getGridList() {
+            const { user } = this.$store.state
+            this.$http
+                .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取查询详情成功', res.data)
+                        this.optionsG = res.data
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
+        getValiheList() {
+            const { user } = this.$store.state
+            this.$http
+                .post('/gov/org/icneighborhood/neighborhoodoption', {
+                    gridId: this.dataForm.gridId,
+                    agencyId: ''
+                    // agencyId: user.agencyId
+                })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取查询详情成功', res.data)
+                        this.optionsV = res.data
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
+        getBuildList() {
+            this.$http
+                .post('/gov/org/icbuilding/buildingoption', {
+                    neighborHoodId: this.dataForm.villageId
+                })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取查询详情成功', res.data)
+                        this.optionsB = res.data
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
+        getUniList() {
+            this.$http
+                .post('/gov/org/icbuildingunit/unitoption', {
+                    buildingId: this.dataForm.buildId
+                })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取查询详情成功', res.data)
+                        this.optionsD = res.data
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
+        getHouseList() {
+            this.$http
+                .post('/gov/org/ichouse/houseoption', { unitId: this.dataForm.unitId })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取查询详情成功', res.data)
+                        this.optionsH = res.data
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
+        handleChangeV(val) {
+            console.log('val', val)
+            this.dataForm.buildId = ''
+            this.dataForm.unitId = ''
+            this.dataForm.homeId = ''
+            this.getBuildList()
+        },
+        handleChangeB(val) {
+            console.log('val', val)
+            this.dataForm.unitId = ''
+            this.dataForm.homeId = ''
+            this.getUniList()
+        },
+        handleChangeD(val) {
+            console.log('val', val)
+            this.dataForm.homeId = ''
+            this.getHouseList()
+        },
+    }
 }
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue
index 312a53c7..15a7074b 100644
--- a/src/views/modules/plugins/change/resichange.vue
+++ b/src/views/modules/plugins/change/resichange.vue
@@ -87,10 +87,10 @@
                        type="text"
                        size="small"
                        class="div-table-button--detail">迁出</el-button>
-              <el-button @click="joinBlacklist(scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--detail">迁入死亡人口</el-button>
+              <!--<el-button @click="joinBlacklist(scope.row)"-->
+                       <!--type="text"-->
+                       <!--size="small"-->
+                       <!--class="div-table-button&#45;&#45;detail">迁入死亡人口</el-button>-->
             <!-- <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index f825fd3a..229785c2 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -100,13 +100,13 @@
         </el-form-item>
           <br/>
           <el-form-item label="出租人" label-width="100px">
-              <el-input v-model="dataForm.lessorName" placeholder='承租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
+              <el-input v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
           </el-form-item>
-          <el-form-item label="出租身份证" label-width="100px">
-              <el-input v-model="dataForm.lessorIdCard" placeholder='承租人身份证' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
+          <el-form-item label="出租人身份证" label-width="100px">
+              <el-input v-model="dataForm.lessorIdCard" placeholder='出租人身份证' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
           </el-form-item>
-          <el-form-item label="出租手机号" label-width="100px">
-              <el-input v-model="dataForm.lessorMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
+          <el-form-item label="出租人手机号" label-width="100px">
+              <el-input v-model="dataForm.lessorMobile" placeholder='出租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
           </el-form-item>
           <br/>
           <el-form-item label="承租人" label-width="100px">