diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 019842e53..b164dcd4d 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -455,14 +455,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
-    maxTableHeight () {
-      console.log('computed-searchH---', this.searchH)
-      const h = this.clientHeight - this.searchH + this.iframeHeight
-      const _h = this.clientHeight - this.searchH
-      console.log('computed-searchH---_h', _h)
-      return this.$store.state.inIframe ? h : _h
 
-    },
 
     changeVDisabled () {
       return !this.fmData.villageId
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 75c56ac16..72ed4a89e 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -1,109 +1,90 @@
 <template>
-    <div class="mod-change__changeRelocation} resi-container">
-      <el-card ref="searchCard" class="search-card">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
+  <div class="div_main">
+    <div ref="searchForm"
+         class="div_search">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()"
+               label-width="100px">
         <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-select v-model.trim="dataForm.gridId"
+                     placeholder="请选择"
+                     clearable
+                     class="item_width_normal"
+                     @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 label="迁往何地">
+
+          <el-select v-model.trim="dataForm.villageId"
+                     placeholder="请选择小区"
+                     clearable
+                     class="item_width_communitycascader"
+                     @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-select v-model.trim="dataForm.buildId"
+                     placeholder="楼号"
+                     clearable
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     :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-select v-model.trim="dataForm.unitId"
+                     :disabled="changeBDisabled"
+                     placeholder="单元"
+                     clearable
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     @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-select v-model.trim="dataForm.homeId"
+                     :disabled="changeDDisabled"
+                     placeholder="房号"
+                     clearable
+                     class="item_width_buildcascader"
+                     style="margin-left:5px">
+            <el-option v-for="item in optionsH"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
         </el-form-item>
 
-        <br/>
         <el-form-item label="姓名"
                       prop="name">
           <el-input v-model="dataForm.name"
                     size="small"
-                    class="list_item_width_1"
+                    class="item_width_normal"
                     clearable
                     placeholder="请输入姓名">
           </el-input>
@@ -112,7 +93,7 @@
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
-                    class="list_item_width_1"
+                    class="item_width_normal"
                     clearable
                     placeholder="请输入证件号">
           </el-input>
@@ -121,49 +102,72 @@
                       prop="mobile">
           <el-input v-model="dataForm.mobile"
                     size="small"
-                    class="list_item_width_1"
+                    class="item_width_normal"
                     clearable
                     placeholder="请输入手机">
           </el-input>
         </el-form-item>
-        <br/>
+
         <el-form-item label="迁出时间"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
                           type="daterange"
                           clearable
                           size="small"
+                          class="item_width_daterange2"
                           range-separator="至"
                           start-placeholder="选择日期"
                           end-placeholder="选择日期"
                           value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="享受福利" prop="isWelfare">
-          <el-select v-model="dataForm.isWelfare" placeholder="请选择" clearable>
-            <el-option v-for="item in isWelfareArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+        <el-form-item label="享受福利"
+                      prop="isWelfare">
+          <el-select v-model="dataForm.isWelfare"
+                     placeholder="请选择"
+                     class="item_width_normal"
+                     clearable>
+            <el-option v-for="item in isWelfareArr"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+
+        <div class="div_search_btn">
+          <el-button class="diy-button--white"
+                     size="small"
+                     @click="resetForm">重置</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--blue"
+                     @click="getDataList">查询</el-button>
+
+        </div>
+        <!-- <el-form-item>
           <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button class="diy-button--reset" size="small" @click="resetForm">重置</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-item> -->
+
       </el-form>
-      </el-card>
-      <el-card class="resi-card-table">
-        <div class="resi-row-btn">
-          <el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <div class="div_btn_left">
+          <el-button size="small"
+                     class="diy-button--white"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
         </div>
-      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+      </div>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                :height="tableHeight"
+                @selection-change="dataListSelectionChangeHandle"
+                class="div_table_item">
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
         <el-table-column label="序号"
                          type="index"
@@ -171,17 +175,55 @@
                          align="center"
                          width="50">
         </el-table-column>
-        <el-table-column prop="name" label="姓名" header-align="center" align="center" min-width="120" show-overflow-tooltip>
+        <el-table-column prop="name"
+                         label="姓名"
+                         header-align="center"
+                         align="center"
+                         min-width="120"
+                         show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
+            <el-button @click="handleLook(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-look">{{scope.row.name}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="agencyName" label="所属网格" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="oldAddress" label="所属房屋" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="ownerName" label="户主姓名" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="idCard" label="证件号" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center" min-width="70" show-overflow-tooltip>
+        <el-table-column prop="agencyName"
+                         label="所属网格"
+                         header-align="center"
+                         align="center"
+                         min-width="120"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="oldAddress"
+                         label="所属房屋"
+                         header-align="center"
+                         align="center"
+                         min-width="120"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="ownerName"
+                         label="户主姓名"
+                         header-align="center"
+                         align="center"
+                         min-width="100"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="mobile"
+                         label="手机号"
+                         header-align="center"
+                         align="center"
+                         min-width="120"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="idCard"
+                         label="证件号"
+                         header-align="center"
+                         align="center"
+                         min-width="120"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="gender"
+                         label="性别"
+                         header-align="center"
+                         align="center"
+                         min-width="70"
+                         show-overflow-tooltip>
           <template slot-scope="scope">
             {{
             scope.row.gender == '2'
@@ -190,19 +232,39 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column prop="age" label="年龄" header-align="center" align="center" min-width="90" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="outOfTime" label="迁出时间" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="reason" label="迁出原因" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="address" label="迁往何地" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="age"
+                         label="年龄"
+                         header-align="center"
+                         align="center"
+                         min-width="90"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="outOfTime"
+                         label="迁出时间"
+                         header-align="center"
+                         align="center"
+                         min-width="120"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="reason"
+                         label="迁出原因"
+                         header-align="center"
+                         align="center"
+                         min-width="100"
+                         show-overflow-tooltip></el-table-column>
+        <el-table-column prop="address"
+                         label="迁往何地"
+                         header-align="center"
+                         align="center"
+                         min-width="120"
+                         show-overflow-tooltip></el-table-column>
         <el-table-column fixed="right"
                          label="操作"
                          align="center"
-                         width="120">
+                         width="140">
           <template slot-scope="scope">
             <el-button @click="handleChangeRecord(scope.row)"
                        type="text"
                        size="small"
-                       class="div-table-button--detail">变更记录</el-button>
+                       class="div-table-button--blue">变更记录</el-button>
             <el-popconfirm v-if="scope.row.status !== '0'"
                            title="确认恢复？"
                            @onConfirm="handleRecovery(scope.row)"
@@ -210,39 +272,39 @@
               <el-button slot="reference"
                          type="text"
                          size="small"
-                         class="div-table-button--delete"
-                         style="margin-left: 10px">恢复</el-button>
+                         class="div-table-button--blue">恢复</el-button>
             </el-popconfirm>
           </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 :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>
-      </el-card>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
-                   :userId="lookInfo.userId"
-                   :gridName="lookInfo.gridName"
-                   @close="handleCancleLook" />
-      <!-- 变更记录 -->
-      <el-dialog :visible.sync="changeRecordShow"
-                 :close-on-click-modal="false"
-                 :close-on-press-escape="false"
-                 :title="'变更记录'"
-                 width="1150px"
-                 top="5vh"
-                 @closed="diaClose">
-        <resi-change-record ref="ref_changerecord"></resi-change-record>
-      </el-dialog>
     </div>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible"
+                   ref="addOrUpdate"
+                   @refreshDataList="getDataList"></add-or-update>
+    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
+                 :userId="lookInfo.userId"
+                 :gridName="lookInfo.gridName"
+                 @close="handleCancleLook" />
+    <!-- 变更记录 -->
+    <el-dialog :visible.sync="changeRecordShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'变更记录'"
+               width="1150px"
+               top="5vh"
+               @closed="diaClose">
+      <resi-change-record ref="ref_changerecord"></resi-change-record>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -252,6 +314,7 @@ import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import nextTick from 'dai-js/tools/nextTick'
 import resiChangeRecord from '../../../components/resiChangeRecord.vue'
 import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -263,12 +326,12 @@ export default {
         deleteIsBatch: true,
         exportURL: '/epmetuser/changeRelocation/export'
       },
-        timeRange: '',
-        optionsV: [],
-        optionsB: [],
-        optionsH: [],
-        optionsD: [],
-        optionsG: [],
+      timeRange: '',
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
       dataForm: {
         id: '',
         name: '',
@@ -281,333 +344,282 @@ export default {
         homeId: '',
         isWelfare: ''
       },
-        // 显示人员详情
-        showedPeopleMoreInfo: false,
-        lookInfo: {
-            userId: '',
-            gridName: ''
-        },
-        isWelfareArr: [
-            { dictValue: '0', dictName: '否' },
-            { dictValue: '1', dictName: '是' }
-        ],
-        changeRecordShow: false
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+      lookInfo: {
+        userId: '',
+        gridName: ''
+      },
+      isWelfareArr: [
+        { dictValue: '0', dictName: '否' },
+        { dictValue: '1', dictName: '是' }
+      ],
+      changeRecordShow: false,
+
+      searchH: 0,
+      tableHeight: 0,
     }
   },
   components: {
     AddOrUpdate,
-      peopleMore,
-      resiChangeRecord
+    peopleMore,
+    resiChangeRecord
   },
-    computed: {
-        changeVDisabled() {
-            return !this.dataForm.villageId
-        },
-        changeBDisabled() {
-            return !this.dataForm.buildId
-        },
-        changeDDisabled() {
-            return !this.dataForm.unitId
-        }
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    changeVDisabled () {
+      return !this.dataForm.villageId
     },
-    created () {
-        this.getGridList()
-        this.getValiheList()
+    changeBDisabled () {
+      return !this.dataForm.buildId
     },
-    watch: {
-        timeRange (val) {
-            if (Array.isArray(val) && val.length == 2) {
-                this.dataForm.startTime = val[0];
-                this.dataForm.endTime = val[1];
-            } else {
-                this.dataForm.startTime = '';
-                this.dataForm.endTime = '';
-            }
-        }
+    changeDDisabled () {
+      return !this.dataForm.unitId
     },
-    methods: {
-        async handleRecovery (rowData) {
-            console.log('11111')
-            const url = "/epmetuser/changeRelocation/recovery";
 
-            let params = {
-                id: rowData.id
-            }
-            const { data, code, msg } = await requestPost(url,params);
-            if (code === 0) {
-                this.$message.success("恢复成功！");
-                this.getDataList();
-            } else {
-                this.$message.success("操作失败！");
-            }
-        },
-        diaClose () {
-            this.changeRecordShow = false
-        },
-        //变更记录
-        async handleChangeRecord (row) {
-            this.changeRecordShow = true
+  },
+  created () {
+    this.getGridList()
+    this.getValiheList()
 
-            await nextTick(200)
 
-            this.$refs.ref_changerecord.initForm(row)
-        },
-        exportHandle () {
-            const url = this.mixinViewModuleOptions.exportURL
-            this.$http({
-                method: 'GET',
-                url,
-                responseType: 'blob',
-                params: this.dataForm
-            }).then(res => {
-                // this.download(res.data, title + '.xls')
-                if (res.headers["content-disposition"]) {
-                    let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-                    console.log('filename', fileName)
-                    let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-                    var url = window.URL.createObjectURL(blob)
-                    var aLink = document.createElement('a')
-                    aLink.style.display = 'none'
-                    aLink.href = url
-                    aLink.setAttribute('download', fileName)
-                    document.body.appendChild(aLink)
-                    aLink.click()
-                    document.body.removeChild(aLink) //下载完成移除元素
-                    window.URL.revokeObjectURL(url) //释放掉blob对象
-                } else this.$message.error('下载失败')
-            }).catch(err => {
-                console.log('err', err)
-                return this.$message.error('网络错误')
-            })
-        },
-        async handleLook (row) {
-            if(row.agencyId !== ''){
-                const url = '/gov/org/grid/griddetail'
-                let params = {
-                    gridId : row.agencyId,
-                }
-                const { data, code, msg } = await requestPost(url, params)
-                if(code === 0){
-                    this.lookInfo.gridName = data.gridName
-                } else {
-                    this.$message.error(msg)
-                }
-            }else{
-                this.lookInfo.gridName = ''
-            }
-            this.lookInfo.userId = row.icUserId
-            this.showedPeopleMoreInfo = true
-        },
-        handleCancleLook() {
-            this.lookInfo.userId = ''
-            this.lookInfo.gridName = ''
-            this.showedPeopleMoreInfo = false
-        },
-        resetForm(formName) {
-            for(const n in this.dataForm) {
-                this.dataForm[n] = ''
-            }
-            this.timeRange = ''
-            this.getDataList()
-        },
-        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>
-  @import "@/assets/scss/buttonstyle.scss";
-  /deep/.el-form-item__label {
-    width: 80px !important;
-  }
-  .resi-container .resi-card-table {
-    ::v-deep .el-table th {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-      // border-right: 1px solid rgba(33, 149, 254, 1);
-    }
-  }
-  .resi-table {
-    ::v-deep .el-button--text {
-      text-decoration: underline;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
-  }
-  .form-wr {
-    .input-width {
-      width: 260px;
+  },
+  mounted () {
+    this.searchH = this.$refs.searchForm.offsetHeight + 290
+    console.log('searchH----', this.$refs.searchForm.offsetHeight)
+  },
+  watch: {
+    timeRange (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.dataForm.startTime = val[0];
+        this.dataForm.endTime = val[1];
+      } else {
+        this.dataForm.startTime = '';
+        this.dataForm.endTime = '';
+      }
+    },
+    searchH () {
+      const h = this.clientHeight - this.searchH + this.iframeHeight
+      const _h = this.clientHeight - this.searchH
+      console.log('computed-searchH---_h', _h)
 
+      this.$nextTick(() => {
+        this.tableHeight = this.$store.state.inIframe ? h : _h
+      })
     }
-    .input-width-textarea {
-      width: 500px;
-    }
-    .imsg-list {
-      display: flex;
-      align-items: center;
-      .imgs-item {
-        position: relative;
-        margin-right: 10px;
-        .el-icon-delete {
-          position: absolute;
-          top: 0;
-          right: 0;
-          font-size: 18px;
-          color: red;
-          z-index: 3;
-          cursor: pointer;
+  },
+  methods: {
+    async handleRecovery (rowData) {
+      console.log('11111')
+      const url = "/epmetuser/changeRelocation/recovery";
+
+      let params = {
+        id: rowData.id
+      }
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message.success("恢复成功！");
+        this.getDataList();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
+    diaClose () {
+      this.changeRecordShow = false
+    },
+    //变更记录
+    async handleChangeRecord (row) {
+      this.changeRecordShow = true
+
+      await nextTick(200)
+
+      this.$refs.ref_changerecord.initForm(row)
+    },
+    exportHandle () {
+      const url = this.mixinViewModuleOptions.exportURL
+      this.$http({
+        method: 'GET',
+        url,
+        responseType: 'blob',
+        params: this.dataForm
+      }).then(res => {
+        // this.download(res.data, title + '.xls')
+        if (res.headers["content-disposition"]) {
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        } else this.$message.error('下载失败')
+      }).catch(err => {
+        console.log('err', err)
+        return this.$message.error('网络错误')
+      })
+    },
+    async handleLook (row) {
+      if (row.agencyId !== '') {
+        const url = '/gov/org/grid/griddetail'
+        let params = {
+          gridId: row.agencyId,
         }
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          this.lookInfo.gridName = data.gridName
+        } else {
+          this.$message.error(msg)
+        }
+      } else {
+        this.lookInfo.gridName = ''
       }
-    }
-  }
-  .div-content {
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-  .resi-row-btn {
-    display: flex;
-    margin-bottom: 13px;
-    .el-button {
-      margin-left: 10px;
-      border: 0;
-    }
-    // .el-button--success {
-    //   background: rgba(34, 193, 195, 1);
-    // }
-    // .el-button--warning {
-    //   background: rgba(254, 179, 73, 1);
-    // }
-    // .el-button--danger {
-    //   background: rgba(254, 98, 82, 1);
-    // }
+      this.lookInfo.userId = row.icUserId
+      this.showedPeopleMoreInfo = true
+    },
+    handleCancleLook () {
+      this.lookInfo.userId = ''
+      this.lookInfo.gridName = ''
+      this.showedPeopleMoreInfo = false
+    },
+    resetForm (formName) {
+      for (const n in this.dataForm) {
+        this.dataForm[n] = ''
+      }
+      this.timeRange = ''
+      this.getDataList()
+    },
+    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>
+@import "@/assets/scss/modules/management/list-main.scss";
 </style>