diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
new file mode 100644
index 00000000..09d8e8fb
--- /dev/null
+++ b/src/views/components/resiChangeTransfer.vue
@@ -0,0 +1,583 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form"
+               :inline="false"
+               :model="dataForm"
+               :rules="dataRule"
+               class="form">
+
+        <el-form-item label="当前组织"
+                      label-width="150px"
+                      style="display: block">
+          <span>{{ gridName }}</span>
+        </el-form-item>
+
+        <el-form-item label="迁出类型"
+                      prop="type"
+                      label-width="150px"
+                      style="display: block">
+          <el-radio-group v-model="dataForm.type">
+
+            <el-radio :label="'in'">{{'迁往'+rootAgency.organizationName+'内其他区域'}}</el-radio>
+            <el-radio :label="'out'">其他</el-radio>
+
+          </el-radio-group>
+        </el-form-item>
+
+        <div v-if="dataForm.type==='in'">
+          <el-form-item label="迁出至"
+                        prop='agencyId'
+                        label-width="150px">
+            <el-cascader ref="myCascader"
+                         v-model="agencyIdArray"
+                         style="width:480px"
+                         :key="iscascaderShow"
+                         :options="casOptions"
+                         :props="optionProps"
+                         @change="handleChangeAgency"
+                         clearable></el-cascader>
+          </el-form-item>
+
+          <el-form-item label="所属家庭"
+                        label-width="150px"
+                        prop="villageId">
+
+            <div class="resi-cell-col">
+
+              <el-select v-model.trim="dataForm.villageId"
+                         placeholder="请选择小区"
+                         clearable
+                         class="item_width_1"
+                         @change="handleChangeCommunity($event)">
+                <el-option v-for="item in communityList"
+                           :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_1 margin_left10"
+                         @change="handleChangeBuilding($event)">
+                <el-option v-for="item in buildingList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+
+              <el-select v-model.trim="dataForm.unitId"
+                         placeholder="请选择单元"
+                         clearable
+                         class="item_width_1 margin_left10"
+                         @change="handleChangeUnit($event)">
+                <el-option v-for="item in unitList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+
+              <el-select v-model.trim="dataForm.homeId"
+                         placeholder="请选择房号"
+                         clearable
+                         class="item_width_1 margin_left10"
+                         @change="handleChangeHome($event)">
+                <el-option v-for="item in roomList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+
+            </div>
+
+          </el-form-item>
+
+        </div>
+        <div v-if="dataForm.type==='out'">
+          <el-form-item label="外迁详细地址"
+                        prop="address"
+                        label-width="150px">
+            <el-input type="textarea"
+                      :autosize="{ minRows: 2, maxRows: 7}"
+                      :rows="5"
+                      resize="none"
+                      style="width:600px"
+                      placeholder='请输入外迁详细地址'
+                      v-model="dataForm.address">
+            </el-input>
+          </el-form-item>
+        </div>
+        <el-form-item label="迁出原因"
+                      prop="reason"
+                      label-width="150px">
+          <el-input type="textarea"
+                    :autosize="{ minRows: 4, maxRows: 7}"
+                    :rows="5"
+                    resize="none"
+                    style="width:600px"
+                    placeholder='请输入迁出原因'
+                    v-model="dataForm.reason">
+          </el-input>
+        </el-form-item>
+      </el-form>
+
+    </div>
+    <!-- <div class="div_btn">
+      <el-button @click="handleCancle">取 消</el-button>
+      <el-button type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div> -->
+    <div class="resi-btns">
+      <el-button size="small"
+                 @click="handleCancle">取消</el-button>
+      <el-button type="primary"
+                 size="small"
+                 :loading="btnDisable"
+                 @click="handleComfirm">提交</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import util from '@js/util.js';
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+
+      btnDisable: false,
+      communityList: [],
+      buildingList: [],
+      unitList: [],
+      roomList: [],
+
+      dataForm: {
+        icUserId: '', // 被调动人ID
+        type: 'in',//操作类型【客户外out,客户内in】
+        agencyId: '',//调动到的组织Id
+        gridId: '',//调动到的网格Id
+        gridName: '',
+        villageId: '',//调动到的小区ID
+        villageName: '',
+        buildId: '',//调动到的楼宇Id
+        buildName: '',
+        unitId: '',//调动到的单元Id
+        unitName: '',
+        homeId: '', //调动到的房屋Id
+        homeName: '',
+        transferTime: '', //调动时间【日期类型】
+        reason: '', //备注
+        customerId: '',
+        oldHome: '',
+        oldDept: '',
+        oldAddress: '',
+        ownerName: '',
+        name: '',
+        gender: '',
+        age: '',
+        address: ''
+      },
+
+      customerId: '',//客户id
+      userId: '',//操作人员id
+      gridName: '',
+      rootAgency: {},
+
+      casOptions: [],
+      agencyIdArray: [],
+      customerList: [],
+      iscascaderShow: 0,
+
+      optionProps: {
+        multiple: false,
+        value: 'agencyId',
+        label: 'agencyName',
+        children: 'subAgencyList',
+        // checkStrictly: true
+      },
+
+      selGrid: {},
+
+
+    }
+  },
+  components: {},
+  mounted () {
+
+  },
+    computed: {
+        dataRule () {
+            return {
+                type: [
+                    { required: true, message: '操作类型不能为空', trigger: 'blur' },
+                ],
+                agencyId: [
+                    { required: true, message: '所选组织不能为空', trigger: 'blur' }
+                ],
+                villageId: [
+                    { required: true, message: '所属家庭不能为空', trigger: 'blur' }
+                ],
+                address: [
+                    { required: true, message: '外迁详细地址不能为空', trigger: 'blur' }
+                ],
+
+            }
+        },
+
+    },
+  methods: {
+    async initForm (row) {
+
+      this.customerId = localStorage.getItem("customerId");
+
+      this.$refs.ref_form.resetFields();
+
+      // this.icUserId = row.icResiUserId
+      this.gridName = row.GRID_ID
+      this.dataForm.icUserId = row.icResiUserId
+
+      // 添加参数
+        if(row.DOOR_NAME !== null && row.DOOR_NAME !== '' && row.DOOR_NAME !== undefined){
+            this.dataForm.oldHome = row.DOOR_NAME
+        }
+        this.dataForm.customerId = this.customerId
+        this.dataForm.idCard = row.ID_CARD
+        this.dataForm.mobile = row.MOBILE
+
+        this.dataForm.oldDept = row.GRID_ID
+        this.dataForm.oldAddress = row.HOME_ID
+        this.dataForm.ownerName = row.NAME
+
+        this.dataForm.name = row.NAME
+        this.dataForm.gender = row.GENDER
+        this.dataForm.age = ''
+
+
+      await this.loadRootAgency()
+      await this.getAgencylist()
+
+    },
+
+    //根据人员id获取根组织信息
+    async loadRootAgency () {
+
+      await this.$http.post('/gov/org/agency/customerrootagency/' + this.customerId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+
+        if (res.data) {
+          this.rootAgency = res.data
+        }
+      }).catch(() => { })
+
+    },
+
+    async getAgencylist () {
+
+      const url = '/gov/org/customeragency/rootagencygridtree'
+
+
+      const params = {
+        agencyId: this.rootAgency.id
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        ++this.iscascaderShow
+        this.casOptions = []
+        this.agencyIdArray.length = []
+
+        if (data) {
+          let treeData = [data]
+          this.resolveAgencyTree(treeData)
+          this.casOptions.push(data)
+        }
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    resolveAgencyTree (treeData) {
+      treeData.forEach(element => {
+        if (!element.subAgencyList || element.subAgencyList.length === 0) {//不存在下级，且level=grid的是true
+
+          if (element.level === 'grid') {
+            element.disabled = false
+          } else {
+            element.disabled = true
+          }
+
+        } else {
+          this.resolveAgencyTree(element.subAgencyList)
+        }
+      });
+    },
+
+    handleChangeAgency () {
+      console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
+      this.selGrid = this.$refs["myCascader"].getCheckedNodes()[0].data
+      this.dataForm.agencyId = this.selGrid.pid
+      this.dataForm.gridId = this.selGrid.agencyId
+      this.dataForm.gridName = this.selGrid.agencyName
+      this.loadCommunityList()
+      this.dataForm.villageId = ''//调动到的小区ID
+      this.dataForm.villageName = ''
+      this.dataForm.buildId = ''//调动到的楼宇Id
+      this.dataForm.buildName = ''
+      this.dataForm.unitId = ''//调动到的单元Id
+      this.dataForm.unitName = ''
+      this.dataForm.homeId = '' //调动到的房屋Id
+      this.dataForm.homeName = ''
+
+    },
+
+    async loadCommunityList () {
+      const url = '/gov/org/icneighborhood/neighborhoodoption'
+
+      let params = {
+        gridId: this.dataForm.gridId,
+        agencyId: this.dataForm.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.communityList = []
+        this.communityList = [...data]
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeCommunity (id) {
+        // 小区
+        this.communityList.find((item) => {
+            if (item.value === id) {
+                this.dataForm.villageName = item.label
+            }
+        })
+
+      const url = '/gov/org/icbuilding/buildingoption'
+
+      let params = {
+        neighborHoodId: this.dataForm.villageId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.buildingList = []
+        this.buildingList = [...data]
+        this.dataForm.buildId = ''//调动到的楼宇Id
+        this.dataForm.unitId = ''//调动到的单元Id
+        this.dataForm.homeId = '' //调动到的房屋Id
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeBuilding (id) {
+
+        // 楼号
+        this.buildingList.find((item) => {
+            if (item.value === id) {
+                this.dataForm.buildName = item.label
+            }
+        })
+
+      const url = '/gov/org/icbuildingunit/unitoption'
+
+      let params = {
+        buildingId: this.dataForm.buildId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = []
+        this.unitList = [...data]
+        this.dataForm.unitId = ''//调动到的单元Id
+        this.dataForm.homeId = '' //调动到的房屋Id
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleChangeUnit (id) {
+        // 单元号
+        this.unitList.find((item) => {
+            if (item.value === id) {
+                this.dataForm.unitName = item.label
+            }
+        })
+
+      const url = '/gov/org/ichouse/houseoption'
+
+      let params = {
+        unitId: this.dataForm.unitId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.roomList = []
+        this.roomList = [...data]
+        this.dataForm.homeId = '' //调动到的房屋Id
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+      async handleChangeHome (id) {
+          // 房屋号
+          this.roomList.find((item) => {
+              if (item.value === id) {
+                  this.dataForm.homeName = item.label
+              }
+          })
+      },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 2000)
+
+
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+
+        } else {
+          if (this.dataForm.type === 'in') {
+
+
+            if (!this.dataForm.buildId) {
+              this.$message.warning('楼栋')
+              return false
+            }
+            if (!this.dataForm.unitId) {
+              this.$message.warning('请选择单元')
+              return false
+            }
+            if (!this.dataForm.homeId) {
+              this.$message.warning('请选择房间')
+              return false
+            }
+          }
+          this.saveForm()
+        }
+
+      })
+    },
+
+    async saveForm () {
+      const url = '/pli/power/changeRelocation/saveOutOfInfo'
+      let noData = new Date()
+      noData = util.dateFormatter(noData, 'time')
+      this.dataForm.transferTime = noData
+
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+        console.log('----------------')
+        console.log(this.dataForm)
+
+      if (code === 0) {
+        this.$message.success('调动成功')
+        this.handleCancle()
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.dataForm = {
+        icUserId: '', // 被调动人ID
+        type: 'in',//操作类型【客户外out,客户内in】
+        agencyId: '',//调动到的组织Id
+        gridId: '',//调动到的网格Id
+        villageId: '',//调动到的小区ID
+        buildId: '',//调动到的楼宇Id
+        unitId: '',//调动到的单元Id
+        homeId: '', //调动到的房屋Id
+        transferTime: '', //调动时间【日期类型】
+        reason: '' //备注
+      }
+
+      this.customerId = ''//客户id
+      this.userId = ''//操作人员id
+      this.gridName = ''
+      this.rootAgency = {}
+
+      this.selGrid = {}
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  props: {}
+}
+</script>
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 150px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+
+.div_btn {
+  display: flex;
+  justify-content: flex-end;
+}
+.resi-cell-col {
+  width: 750px;
+  display: flex;
+  justify-content: flex-start;
+}
+
+.margin_left10 {
+  margin-left: 10px;
+}
+</style>
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 40e10d54..3ff91ba7 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -45,6 +45,9 @@
         <el-form-item>
           <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <el-form-item>
+          <el-button type="warning"  size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
+        </el-form-item>
         <!--<el-form-item>-->
           <!--<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
         <!--</el-form-item>-->
@@ -55,14 +58,30 @@
       </el-card>
       <el-card class="resi-card-table">
       <el-table class="resi-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 type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+        <el-table-column label="序号"
+                         type="index"
+                         fixed="left"
+                         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="userId" label="epmet用户主键" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="name" label="姓名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="idCard" label="身份证" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
         <el-table-column prop="gender" label="性别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="type" label="类型" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="type" label="类型" header-align="center" align="center">
+          <template slot-scope="scope">
+            {{
+            scope.row.type == '0'
+            ? "租客"
+            : scope.row.type == '1'
+            ? "房东"
+            : ""
+            }}
+          </template>
+        </el-table-column>
         <el-table-column prop="joinDate" 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>-->
@@ -110,7 +129,8 @@ export default {
         getDataListURL: '/pli/power/rentDeath/page',
         getDataListIsPage: true,
         deleteURL: '/pli/power/rentDeath',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/pli/power/rentDeath/export'
       },
         timeRange: '',
       dataForm: {
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 563e1d57..d2d7ce31 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -1,57 +1,118 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
-    <div class="mod-change__changeRelocation}">
+    <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-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        <el-form-item label="姓名"
+                      prop="name">
+          <el-input v-model="dataForm.name"
+                    size="small"
+                    class="list_item_width_1"
+                    clearable
+                    placeholder="请输入姓名">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="身份证"
+                      prop="idCard">
+          <el-input v-model="dataForm.idCard"
+                    size="small"
+                    class="list_item_width_1"
+                    clearable
+                    placeholder="请输入身份证">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="手机"
+                      prop="mobile">
+          <el-input v-model="dataForm.mobile"
+                    size="small"
+                    class="list_item_width_1"
+                    clearable
+                    placeholder="请输入手机">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="迁出时间"
+                      prop="startTime">
+          <el-date-picker v-model="timeRange"
+                          type="daterange"
+                          clearable
+                          size="small"
+                          range-separator="至"
+                          start-placeholder="选择日期"
+                          end-placeholder="选择日期"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</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="name" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="age" label="年龄" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="pid" label="组织PID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="agencyId" label="组织ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="agencyName" 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="address" label="外迁详细地址" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="type" label="操作类型【客户外out,客户内in】" 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="oldDept" label="原网格信息" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="oldAddress" label="原房屋信息" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="oldHome" label="原房间号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="reason" 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="customerId" label="客户ID" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      </el-card>
+      <el-card class="resi-card-table">
+      <el-table class="resi-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 label="序号"
+                         type="index"
+                         fixed="left"
+                         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="name" 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>
+        <el-table-column prop="age" label="年龄" header-align="center" align="center" min-width="90" 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="pid" label="组织PID" header-align="center" align="center"></el-table-column>-->
+        <!--<el-table-column prop="agencyId" label="组织ID" header-align="center" align="center"></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="villageId" label="房屋小区ID" header-align="center" align="center"></el-table-column>-->
+        <el-table-column prop="villageName" label="房屋小区" header-align="center" align="center" min-width="120" show-overflow-tooltip></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" min-width="100" show-overflow-tooltip></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" min-width="100" show-overflow-tooltip></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" 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="type" label="操作类型" header-align="center" align="center" min-width="90" show-overflow-tooltip>
           <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>
+            {{
+            scope.row.type == 'out'
+            ? "客户外"
+            : scope.row.type == 'in'
+            ? "客户内"
+            : ""
+            }}
           </template>
         </el-table-column>
+        <el-table-column prop="ownerName" label="原房主姓名" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="oldDept" 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="oldHome" label="原房间号" header-align="center" align="center" min-width="90" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="reason" label="迁出原因" header-align="center" align="center" min-width="120" show-overflow-tooltip></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="outOfTime" label="迁出时间" header-align="center" align="center" min-width="160"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" min-width="160"></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="customerId" label="客户ID" 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"
@@ -62,6 +123,7 @@
         @size-change="pageSizeChangeHandle"
         @current-change="pageCurrentChangeHandle">
       </el-pagination>
+      </el-card>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     </div>
@@ -79,15 +141,86 @@ export default {
         getDataListURL: '/pli/power/changeRelocation/page',
         getDataListIsPage: true,
         deleteURL: '/pli/power/changeRelocation',
-        deleteIsBatch: true
+        deleteIsBatch: true,
+        exportURL: '/pli/power/changeRelocation/export'
       },
+        timeRange: '',
       dataForm: {
-        id: ''
+        id: '',
+          name: '',
+          mobile: '',
+          idCard: ''
       }
     }
   },
   components: {
     AddOrUpdate
-  }
+  },
+    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 = '';
+            }
+        }
+    },
 }
 </script>
+<style lang="scss" scoped>
+  @import "@/assets/scss/buttonstyle.scss";
+
+  .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;
+
+    }
+    .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;
+        }
+      }
+    }
+  }
+  .div-content {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+</style>
diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue
index 1b818045..312a53c7 100644
--- a/src/views/modules/plugins/change/resichange.vue
+++ b/src/views/modules/plugins/change/resichange.vue
@@ -83,6 +83,10 @@
                          align="center"
                          width="150">
           <template slot-scope="scope">
+            <el-button @click="handleTransfer(scope.row)"
+                       type="text"
+                       size="small"
+                       class="div-table-button--detail">迁出</el-button>
               <el-button @click="joinBlacklist(scope.row)"
                        type="text"
                        size="small"
@@ -243,8 +247,8 @@
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
-      <resi-transfer ref="ref_transfer"
-                     @dialogCancle="transferClose"></resi-transfer>
+      <resi-change-transfer ref="ref_change_transfer"
+                     @dialogCancle="transferClose"></resi-change-transfer>
     </el-dialog>
 
     <!-- 变更记录 -->
@@ -281,7 +285,7 @@ import resiForm from '../../../components/resiForm.vue'
 import editResi from '../../../components/editResi.vue'
 import axios from 'axios'
 import { mapGetters } from 'vuex'
-import resiTransfer from '../../../components/resiTransfer.vue'
+import resiChangeTransfer from '../../../components/resiChangeTransfer.vue'
 import resiChangeRecord from '../../../components/resiChangeRecord.vue'
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
 
@@ -290,7 +294,7 @@ export default {
       deathSearch,
     resiForm,
     editResi,
-    resiTransfer,
+      resiChangeTransfer,
     resiChangeRecord,
     peopleMore
   },
@@ -453,7 +457,7 @@ export default {
 
       await nextTick(200)
 
-      this.$refs.ref_transfer.initForm(row)
+      this.$refs.ref_change_transfer.initForm(row)
     },
     //变更记录
     async handleChangeRecord (row) {
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index 3ca6eb70..f825fd3a 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -233,7 +233,8 @@ export default {
                 lessorMobile: '',
                 startTime: '',
                 endTime: '',
-                endDate: ''
+                endDate: '',
+                state: '1'
             },
             pickerBeginDateBefore: {
                 disabledDate: (time) => {
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index 795e44ef..7e58728f 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -230,7 +230,23 @@ export default {
             {dictValue: '0', dictName: '未审核'},
             {dictValue: '1', dictName: '审核通过'},
             {dictValue: '2', dictName: '审核不通过'}
-        ]
+        ],
+        pickerBeginDateBefore: {
+            disabledDate: (time) => {
+                let beginDateVal = this.dataForm.endTime
+                if (beginDateVal) {
+                    return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+                }
+            }
+        },
+        pickerBeginDateAfter: {
+            disabledDate: (time) => {
+                let EndDateVal = this.dataForm.startTime
+                if (EndDateVal) {
+                    return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+                }
+            }
+        }
     }
   },
   components: {