diff --git a/src/views/components/deathSearch.vue b/src/views/components/deathSearch.vue
new file mode 100644
index 00000000..1c46b7e9
--- /dev/null
+++ b/src/views/components/deathSearch.vue
@@ -0,0 +1,649 @@
+<template>
+  <div class="resi-container">
+    <el-card class="resi-card">
+      <el-row class="resi-row-box" :class="openSearch && 'resi-row-more'">
+        <el-row class="resi-row">
+          <el-col :span="6">
+            <div class="resi-cell">
+              <div class="resi-cell-label">所属网格</div>
+              <div class="resi-cell-value">
+                <el-select
+                  v-model.trim="form.GRID_ID"
+                  placeholder="请选择"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @change="handleChangeGrid"
+                >
+                  <el-option
+                    v-for="item in optionsG"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </div>
+          </el-col>
+          <el-col :span="18">
+            <div class="resi-cell">
+              <div class="resi-cell-label">所属房屋</div>
+              <div class="resi-cell-value">
+                <el-select
+                  v-model.trim="form.VILLAGE_ID"
+                  placeholder="请选择小区"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                  @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="form.BUILD_ID"
+                  placeholder="楼号"
+                  size="small"
+                  clearable
+                  style="width: 120px;"
+                  class="resi-cell-select"
+                  :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="form.UNIT_ID"
+                  :disabled="changeBDisabled"
+                  placeholder="单元"
+                  size="small"
+                  clearable
+                  style="width: 120px;"
+                  class="resi-cell-select"
+                  @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="form.HOME_ID"
+                  :disabled="changeDDisabled"
+                  placeholder="房号"
+                  size="small"
+                  clearable
+                  style="width: 120px;"
+                  class="resi-cell-select"
+                >
+                  <el-option
+                    v-for="item in optionsH"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row
+          v-for="(item, index) in sliceList(formList, 4)"
+          :key="index"
+          class="resi-row"
+        >
+          <el-col v-for="n in item" :key="n.id" :span="6">
+            <div class="resi-cell">
+              <div class="resi-cell-label">{{ n.label }}</div>
+              <div
+                class="resi-cell-value"
+                :class="n.itemType === 'radio' && 'resi-cell-value-radio'"
+              >
+                <el-input
+                  v-if="n.itemType === 'input' || n.itemType === 'textarea'"
+                  v-model.trim="form[n.columnName]"
+                  class="resi-cell-input"
+                  size="small"
+                  clearable
+                  placeholder="请输入内容"
+                >
+                </el-input>
+                <template v-else-if="n.itemType === 'datepicker'">
+                  <el-date-picker
+                    v-if="n.queryType === 'daterange'"
+                    v-model.trim="form[n.columnName]"
+                    type="daterange"
+                    align="right"
+                    unlink-panels
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    class="resi-cell--daterange"
+                    size="small"
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                  >
+                  </el-date-picker>
+                  <el-date-picker
+                    v-else
+                    v-model.trim="form[n.columnName]"
+                    class="resi-cell-input"
+                    type="date"
+                    size="small"
+                    clearable
+                    format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期"
+                  >
+                  </el-date-picker>
+                </template>
+                <el-select
+                  v-else-if="n.itemType === 'select' || n.itemType === 'radio'"
+                  v-model.trim="form[n.columnName]"
+                  placeholder="请选择"
+                  size="small"
+                  clearable
+                  class="resi-cell-select"
+                >
+                  <el-option
+                    v-for="item in n.options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+                <el-cascader
+                  v-else-if="n.itemType === 'cascader'"
+                  v-model.trim="form[n.columnName]"
+                  :options="n.options"
+                  :props="{ checkStrictly: true }"
+                  clearable
+                  size="small"
+                  class="resi-cell-select"
+                >
+                </el-cascader>
+              </div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-row>
+      <el-row class="resi-search">
+        <!-- <el-col :span="20">
+          <el-button type="primary" size="mini">查询</el-button>
+        </el-col> -->
+        <el-col :span="24">
+          <el-button type="primary" size="small" @click="handleSearch">查询</el-button>
+          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
+        </el-col>
+      </el-row>
+      <div class="resi-down" @click="handleOpenSearch">
+        <img v-if="openSearch" src="../../assets/img/arrow-up.png" />
+        <img v-else src="../../assets/img/arrow-down.png" />
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DeathSearch',
+  props: {
+    formList: {
+      type: Array,
+      default: () => []
+    },
+    columnName: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    let initForm = (arr, columnName) => {
+      let _form = {}
+      // console.log('formInfo', obj)
+      // if (Object.keys(obj).length > 0) {
+      //   _form = { ...obj }
+      //   return _form
+      // }
+      arr.forEach((item) => {
+        if (columnName && columnName === item.columnName) _form[item.columnName] = '1'
+        else _form[item.columnName] = ''
+      })
+      return _form
+    }
+    let form = initForm(this.formList, this.columnName)
+    let tempFormList = this.formList.map(item => {
+
+      return {
+        ...item,
+        isChange: this.columnName && this.columnName === item.columnName ? true : false
+      }
+    })
+    let constForm = {
+      ...form,
+      GRID_ID: '',
+      VILLAGE_ID: '',
+      BUILD_ID: '',
+      UNIT_ID: '',
+      HOME_ID: ''
+    }
+    return {
+      pageLoading: false,
+      openSearch: false,
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      value: '',
+      fixedList: [],
+      fixedForm: {
+        GRID_ID: '',
+        VILLAGE_ID: '',
+        BUILD_ID: '',
+        UNIT_ID: '',
+        HOME_ID: ''
+      },
+      constForm,
+      form: {
+        ...form,
+        GRID_ID: '',
+        VILLAGE_ID: '',
+        BUILD_ID: '',
+        UNIT_ID: '',
+        HOME_ID: ''
+      },
+      tempFormList,
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近三个月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+              picker.$emit('pick', [start, end])
+            }
+          }
+        ]
+      }
+    }
+  },
+  computed: {
+    sliceList() {
+      return function (data, count) {
+        if (data !== undefined) {
+          let index = 0
+          let arrTemp = []
+          for (let i = 0; i < data.length; i++) {
+            index = parseInt(i / count)
+            if (arrTemp.length <= index) {
+              arrTemp.push([])
+            }
+            arrTemp[index].push(data[i])
+          }
+          return arrTemp
+        }
+      }
+    },
+    changeVDisabled() {
+      return !this.form.VILLAGE_ID
+    },
+    changeBDisabled() {
+      return !this.form.BUILD_ID
+    },
+    changeDDisabled() {
+      return !this.form.UNIT_ID
+    }
+  },
+  watch: {
+    form: {
+      handler(val, val2) {
+        // console.log('valpppp----', val, val2)
+        for (let n in val) {
+          if (this.constForm[n] !== val[n]) {
+            this.handleChangeForm(n)
+            console.log('nnnnnn', n)
+          }
+        }
+        this.constForm = { ...val }
+      },
+      deep: true
+    }
+  },
+  created() {
+    // this.initForm()
+    // console.log('formcccc---', this.form)
+    this.getGridList()
+    this.getValiheList()
+    if (this.columnName) this.handleChangeForm(this.columnName)
+  },
+  methods: {
+    initForm() {
+      this.formList.forEach((item) => {
+        this.$set(this.form, item.columnName, '')
+      })
+      console.log('formcccc---', this.form)
+    },
+    handleClearVillage() {
+      this.form.BUILD_ID = ''
+      this.form.HOME_ID = ''
+    },
+    handleClearBuild() {
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+    },
+    handleClearDan() {
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+    },
+    resetForm(formName) {
+      for(const n in this.form) {
+        this.form[n] = ''
+      }
+      this.handleSearch()
+    },
+    handleSearch() {
+      // console.log('formmmmm---', this.form)
+      const itemTypes = ['daterange', 'timerange']
+      let arr = this.tempFormList
+        .filter((n) => n.isChange)
+        .map((item) => {
+          return {
+            queryType: item.queryType,
+            tableName: item.tableName,
+            columnName: item.columnName,
+            // columnValue: []
+            columnValue:
+              itemTypes.includes(item.queryType) ||
+              itemTypes.includes(item.itemType)
+                ? this.form[item.columnName]
+                : [this.form[item.columnName].toString()]
+          }
+        })
+      let arr1 = this.fixedList
+        .filter((n) => n.columnValue.length > 0)
+        .map((item) => {
+          return {
+            ...item
+          }
+        })
+      let arr3 = [...arr1, ...arr]
+      this.$emit('search', arr3)
+    },
+    handleOpenSearch() {
+      this.openSearch = !this.openSearch
+    },
+    handleChangeGrid(val) {
+      console.log('val', val)
+      this.form.VILLAGE_ID = ''
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getValiheList()
+    },
+    handleChangeV(val) {
+      console.log('val', val)
+      this.form.BUILD_ID = ''
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getBuildList()
+    },
+    handleChangeB(val) {
+      console.log('val', val)
+      this.form.UNIT_ID = ''
+      this.form.HOME_ID = ''
+      this.getUniList()
+    },
+    handleChangeD(val) {
+      console.log('val', val)
+      this.form.HOME_ID = ''
+      this.getHouseList()
+    },
+    // 监听基础form
+    handleChangeForm(val) {
+      for (let n in this.fixedForm) {
+        if (n === val) {
+          if (this.fixedList.length > 0) {
+            let _item = {}
+            let hasVal = false
+            this.fixedList.forEach((item, index) => {
+              if (item.columnName == val) {
+                hasVal = true
+                item.columnValue[0] = this.form[val]
+                if (!this.form[val]) this.fixedList.splice(index, 1)
+                console.log('fixedList----val', this.fixedList)
+              } else {
+                _item = {
+                  queryType: 'equal',
+                  tableName: 'ic_resi_user',
+                  columnName: val,
+                  columnValue: [this.form[val]]
+                }
+                console.log('fixedList----else', _item)
+                // this.$set(this.fixedList, index, _item)
+              }
+            })
+            if (Object.keys(_item).length > 0 && !hasVal) this.fixedList.push(_item)
+          } else {
+            this.$set(this.fixedList, 0, {
+              queryType: 'equal',
+              tableName: 'ic_resi_user',
+              columnName: val,
+              columnValue: [this.form[val]]
+            })
+          }
+        }
+      }
+      console.log('fixedList----999', this.fixedList)
+      this.tempFormList.forEach((item) => {
+        if (item.columnName === val) item.isChange = true
+      })
+    },
+    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.form.GRID_ID,
+          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.form.VILLAGE_ID
+        })
+        .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.form.BUILD_ID
+        })
+        .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.form.UNIT_ID })
+        .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('网络错误')
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scope>
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+.resi-down {
+  position: absolute;
+  left: 50%;
+  bottom: -10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 46px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-left: -23rpx;
+  cursor: pointer;
+  background: #ffffff;
+  border-radius: 0 0 10px 10px;
+  img {
+    display: block;
+  }
+}
+.resi-row-box {
+  height: 104px;
+  overflow: hidden;
+  transition: height 0.5s;
+}
+.resi-row-more {
+  height: max-content;
+  transition: height 0.5s;
+}
+.resi-row {
+  margin-bottom: 20px;
+}
+.resi-search {
+  // padding-right: 20px;
+  .el-col {
+    text-align: right;
+  }
+}
+.resi-container .resi-cell {
+  display: flex;
+  align-items: center;
+  .resi-cell-label {
+    flex-shrink: 0;
+    width: 70px;
+    box-sizing: border-box;
+    margin-right: 15px;
+    text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 200px;
+  }
+  .resi-cell--daterange {
+    width: 200px;
+  }
+  .resi-cell-select {
+    width: 200px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 130px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+}
+</style>
diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue
index 3516274b..5aa2927c 100644
--- a/src/views/modules/plugins/rent/rentblacklist.vue
+++ b/src/views/modules/plugins/rent/rentblacklist.vue
@@ -59,6 +59,7 @@
         <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="removeBlacklist(scope.row.id)">解除黑名单</el-button>
+            <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">查看</el-button>
             <!-- <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>
@@ -85,6 +86,10 @@
           <el-button type="primary" @click="confirmRemoveBlacklist">确 定</el-button>
         </span>
       </el-dialog>
+      <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
+                   :userId="lookInfo.userId"
+                   :gridName="lookInfo.gridName"
+                   @close="handleCancleLook" />
     </div>
   </el-card>
 </template>
@@ -92,6 +97,8 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './rentblacklist-add-or-update'
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import { requestPost } from "@/js/dai/request";
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -109,6 +116,12 @@ export default {
       blacklistVisible: false, // 解除黑名单
       blacklistReason: '', // 解除黑名单原因
       removeId: '', // 解除黑名单的人员信息id
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+      lookInfo: {
+          userId: '',
+          gridName: ''
+      }
     }
   },
   watch: {
@@ -123,9 +136,33 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+      peopleMore
   },
   methods: {
+      async handleLook (row) {
+          if(row.gridId !== ''){
+              const url = '/gov/org/grid/griddetail'
+              let params = {
+                  gridId : row.gridId,
+              }
+              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.userId
+          this.showedPeopleMoreInfo = true
+      },
+      handleCancleLook() {
+          this.lookInfo.userId = ''
+          this.lookInfo.gridName = ''
+          this.showedPeopleMoreInfo = false
+      },
     removeBlacklist (id) {
       this.blacklistVisible = true
       this.blacklistReason = ''
diff --git a/src/views/modules/plugins/rent/rentdeath.vue b/src/views/modules/plugins/rent/rentdeath.vue
index aaf922e8..e1b9ab77 100644
--- a/src/views/modules/plugins/rent/rentdeath.vue
+++ b/src/views/modules/plugins/rent/rentdeath.vue
@@ -2,43 +2,75 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentDeath}">
       <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>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <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>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        <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 type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <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="userId" label="epmet用户主键" header-align="center" align="center"></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="性别 0女 1男" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="type" label="类型 0 租客 1 房东" 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="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>
-        <el-table-column prop="removeReason" 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="removeDate" label="移除时间" header-align="center" align="center"></el-table-column>-->
+        <!--<el-table-column prop="removeReason" 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 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>
+            <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">查看</el-button>
+            <!--<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>
@@ -53,6 +85,10 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <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" />
     </div>
   </el-card>
 </template>
@@ -60,23 +96,69 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './rentdeath-add-or-update'
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+import { requestPost } from "@/js/dai/request";
 export default {
   mixins: [mixinViewModule],
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/rent/rentDeath/page',
+        getDataListURL: '/pli/power/rentDeath/page',
         getDataListIsPage: true,
-        deleteURL: '/rent/rentDeath',
+        deleteURL: '/pli/power/rentDeath',
         deleteIsBatch: true
       },
+        timeRange: '',
       dataForm: {
         id: ''
-      }
+      },
+        // 显示人员详情
+        showedPeopleMoreInfo: false,
+        lookInfo: {
+            userId: '',
+            gridName: ''
+        }
     }
   },
+    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 = "";
+            }
+        }
+    },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+      peopleMore
+  },
+    methods: {
+        async handleLook (row) {
+            if(row.gridId !== ''){
+                const url = '/gov/org/grid/griddetail'
+                let params = {
+                    gridId : row.gridId,
+                }
+                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.userId
+            this.showedPeopleMoreInfo = true
+        },
+        handleCancleLook() {
+            this.lookInfo.userId = ''
+            this.lookInfo.gridName = ''
+            this.showedPeopleMoreInfo = false
+        }
   }
 }
 </script>
diff --git a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
index 870b11eb..bfe53ce2 100644
--- a/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo-add-or-update.vue
@@ -1,47 +1,37 @@
 <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="contractId">
-          <el-input v-model="dataForm.contractId" placeholder="合同ID"></el-input>
-      </el-form-item>
-          <el-form-item label="姓名" prop="name">
-          <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
-      </el-form-item>
-          <el-form-item label="身份证" prop="idCard">
-          <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
-      </el-form-item>
-          <el-form-item label="手机号" prop="mobile">
-          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
-      </el-form-item>
-          <el-form-item label="与房主关系" prop="yfzgx">
-          <el-input v-model="dataForm.yfzgx" placeholder="与房主关系"></el-input>
-      </el-form-item>
-          <el-form-item label="照片" prop="img">
-          <el-input v-model="dataForm.img" 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-dialog :visible.sync="visible" :title="dataForm.flag === '1' ? '查看' : '审核'" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="120px">
+        <el-form-item label="姓名" prop="name">
+            <el-input v-model="dataForm.name" placeholder="姓名"></el-input>
+        </el-form-item>
+        <el-form-item label="身份证" prop="idCard">
+            <el-input v-model="dataForm.idCard" placeholder="身份证"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号" prop="mobile">
+            <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+        </el-form-item>
+        <el-form-item label="与房主关系" prop="yfzgx">
+            <el-input v-model="dataForm.yfzgx" placeholder="与房主关系"></el-input>
+        </el-form-item>
+        <el-form-item label="照片" prop="imgList">
+            <template slot-scope="scope">
+                <label v-for="(item,index) in dataForm.imgList" :key="index">
+                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
+                </label>
+            </template>
+        </el-form-item>
+        <el-form-item label="审核原因" prop="reason">
+            <textarea v-model="dataForm.reason" placeholder="请输入审核原因" class="blacklist-reason"></textarea>
+        </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>
+      <el-button type="danger" @click="dataFormSubmitHandle('2')">{{ $t('checkBTGBtn') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle('1')">{{ $t('checkTGBtn') }}</el-button>
     </template>
+      <el-dialog :visible.sync="dialogVisible" :modal="false">
+          <img width="100%" :src="dialogImageUrl" alt="">
+      </el-dialog>
   </el-dialog>
 </template>
 
@@ -53,19 +43,17 @@ export default {
       visible: false,
       dataForm: {
         id: '',
+          flag: '',
         contractId: '',
         name: '',
         idCard: '',
         mobile: '',
         yfzgx: '',
-        img: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
+        imgList: [],
+          reason: ''
+      },
+        dialogVisible: false,
+        dialogImageUrl: ''
     }
   },
   computed: {
@@ -86,25 +74,7 @@ export default {
         yfzgx: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        img: [
-          { 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: [
+          imgList: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
@@ -120,6 +90,11 @@ export default {
         }
       })
     },
+      // 查看大图
+      imgShow(url){
+          this.dialogImageUrl = url
+          this.dialogVisible = true
+      },
     // 获取信息
     getInfo () {
       this.$http.get(`/pli/power/rentTenantInfo/${this.dataForm.id}`).then(({ data: res }) => {
@@ -133,12 +108,13 @@ export default {
       }).catch(() => {})
     },
     // 表单提交
-    dataFormSubmitHandle: debounce(function () {
+    dataFormSubmitHandle: debounce(function (type) {
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
           return false
         }
-        this.$http[!this.dataForm.id ? 'post' : 'put']('/pli/power/rentTenantInfo/', this.dataForm).then(({ data: res }) => {
+          this.dataForm.state = type
+        this.$http.post('/pli/power/rentTenantInfo/landlord/review', this.dataForm).then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
@@ -157,3 +133,14 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+    .blacklist-reason {
+        width: 100%;
+        height: 80px;
+        border: 1px solid #e4e4e4;
+        border-radius: 4px;
+        resize: none;
+        padding: 8px;
+        box-sizing: border-box;
+    }
+</style>
diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue
index e6b11241..b016004b 100644
--- a/src/views/modules/plugins/rent/renttenantinfo.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo.vue
@@ -2,35 +2,49 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-rent__rentTenantInfo}">
       <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="姓名" label-width="60px">
+          <el-input v-model="dataForm.name" placeholder='姓名' clearable @keyup.native="btKeyUpName"></el-input>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        <el-form-item label="身份证" label-width="60px">
+          <el-input v-model="dataForm.idCard" placeholder='身份证' clearable @keyup.native="btKeyUpIdCard"></el-input>
+        </el-form-item>
+        <el-form-item label="手机号" label-width="60px">
+          <el-input v-model="dataForm.mobile" placeholder='手机号' clearable @keyup.native="btKeyUpMobile"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <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>
       <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="contractId" label="合同ID" header-align="center" align="center"></el-table-column>
+        <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+        <el-table-column label="序号" header-align="center" align="center" width="50px">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
+        <!--<el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
+        <!--<el-table-column prop="contractId" label="合同ID" 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="yfzgx" label="与房主关系" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="img" 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="yfzgx" label="与房主关系" header-align="center" align="center"></el-table-column>-->
+        <el-table-column prop="state" label="审核状态" header-align="center" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.state === '1'" size="small" type="success">审核通过</el-tag>
+            <el-tag v-else-if="scope.row.state === '2'" size="small" type="danger">审核不通过</el-tag>
+            <el-tag v-else size="small">未审核</el-tag>
+          </template>
+        </el-table-column>
+        <!--<el-table-column prop="img" 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 :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>
+            <!--<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>-->
+            <el-button :disabled="scope.row.state !== '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id,'2')">{{ $t('checkBtn') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -45,6 +59,14 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <el-dialog title="审核" :visible.sync="checkVisible" width="40%">
+        <textarea v-model="checkForm.reason" placeholder="请输入审核原因" class="blacklist-reason"></textarea>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="checkVisible = false">{{ $t('cancel') }}</el-button>
+          <el-button type="danger" @click="checkSubmitHandle('2')">{{ $t('checkBTGBtn') }}</el-button>
+          <el-button type="primary" @click="checkSubmitHandle('1')">{{ $t('checkTGBtn') }}</el-button>
+      </span>
+      </el-dialog>
     </div>
   </el-card>
 </template>
@@ -57,18 +79,85 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/pli/power/rentTenantInfo/page',
+        getDataListURL: '/pli/power/rentTenantInfo/landlord/page',
         getDataListIsPage: true,
         deleteURL: '/pli/power/rentTenantInfo',
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+          name: '',
+          idCard: '',
+          mobile: ''
+      },
+        checkVisible: false,
+        checkForm:{
+          id: '',
+          state: '',
+            reason: ''
+        }
     }
   },
   components: {
     AddOrUpdate
-  }
+  },
+    methods: {
+        // 新增 / 修改
+        addOrUpdateHandle (id,flag) {
+            this.addOrUpdateVisible = true
+            this.$nextTick(() => {
+                this.$refs.addOrUpdate.dataForm.id = id
+                this.$refs.addOrUpdate.dataForm.flag = flag
+                this.$refs.addOrUpdate.init()
+            })
+        },
+        btKeyUpIdCard (e) {
+            e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+            this.dataForm.idCard = e.target.value
+        },
+        btKeyUpMobile (e) {
+            e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+            this.dataForm.mobile = e.target.value
+        },
+        btKeyUpName (e) {
+            e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
+            this.dataForm.name = e.target.value
+        },
+        checkHandle(id){
+            this.checkForm.id = id
+            this.checkVisible = true
+            this.reason = ''
+
+        },
+        // 审核提交方法
+        checkSubmitHandle: function (type) {
+            this.checkForm.state = type
+            this.$http.post('/pli/power/rentTenantInfo/landlord/review', this.checkForm).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.checkVisible = false
+                        this.$emit('refreshDataList')
+                    }
+                })
+            }).catch(() => {})
+        }
+    }
 }
 </script>
+<style lang="scss" scoped>
+  .blacklist-reason {
+    width: 100%;
+    height: 80px;
+    border: 1px solid #e4e4e4;
+    border-radius: 4px;
+    resize: none;
+    padding: 8px;
+    box-sizing: border-box;
+  }
+</style>
diff --git a/src/views/modules/plugins/rent/resideath.vue b/src/views/modules/plugins/rent/resideath.vue
new file mode 100644
index 00000000..1b818045
--- /dev/null
+++ b/src/views/modules/plugins/rent/resideath.vue
@@ -0,0 +1,1350 @@
+<template>
+  <div class="resi-container">
+    <death-search v-if="searchList.length > 0"
+                 ref="deathSearch"
+                 :form-list="searchList"
+                 :column-name="defaultCategotyKey"
+                 @search="handleSearch" />
+    <el-card class="resi-card-table">
+      <!-- <div class="resi-row-btn">
+        <el-button size="small"
+                   class="diy-button--add"
+                   @click="handleAdd">新增</el-button>
+        <el-button class="diy-button--export"
+                   size="small"
+                   @click="handleExportModule('room')">下载模板</el-button>
+        <el-upload ref="upload"
+                   class="upload-demo"
+                   action="uploadUlr"
+                   :limit="1"
+                   :accept="'.xls,.xlsx'"
+                   :with-credentials="true"
+                   :show-file-list="false"
+                   :auto-upload="true"
+                   :on-progress="handleProgress"
+                   :on-success="handleExcelSuccess"
+                   :before-upload="beforeExcelUpload"
+                   :http-request="uploadHttpRequest">
+          <el-button size="small"
+                     class="diy-button--delete"
+                     :loading="importLoading">{{importBtnTitle}}</el-button>
+        </el-upload>
+
+        <el-button size="small"
+                   class="diy-button--reset"
+                   :loading="exportBtn"
+                   @click="handleExport">{{exportBtnTitle}}</el-button>
+        <el-button
+                     class="diy-button--add"
+                     size="small"
+                     @click="deleteBatch">批量删除</el-button>
+
+      </div> -->
+      <el-table ref="ref_table"
+                :data="tableData"
+                v-loading="tableLoading"
+                border
+                style="width: 100%"
+                class="resi-table"
+                :height="tableHeight"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <el-table-column type="selection"
+                         fixed="left"
+                         align="center"
+                         :selectable="checkSelect"
+                         width="55" />
+        <el-table-column label="序号"
+                         type="index"
+                         fixed="left"
+                         align="center"
+                         width="50">
+        </el-table-column>
+        <el-table-column v-for="item in tableHeader"
+                         :key="item.columnName"
+                         :prop="item.columnName"
+                         :label="item.label"
+                         align="center"
+                         :fixed="item.columnName == 'NAME' ? 'left' : false"
+                         :show-overflow-tooltip="true"
+                         >
+                         <!-- :width="item.width || computedWidth(item.label, item.itemType)" -->
+                         <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
+          <template slot-scope="scope">
+            <a v-if="item.columnName == 'NAME'"
+               class="name-a"
+               @click="handleLook(scope.row)">
+              {{ handleFilterSpan(scope.row, item) }}
+            </a>
+            <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作"
+                         align="center"
+                         width="150">
+          <template slot-scope="scope">
+              <el-button @click="joinBlacklist(scope.row)"
+                       type="text"
+                       size="small"
+                       class="div-table-button--detail">迁入死亡人口</el-button>
+            <!-- <el-button @click="handleLook(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-look">查看</el-button> -->
+            <!-- <el-button @click="handleTransfer(scope.row)"
+                       type="text"
+                       size="small"
+                       class="div-table-button--detail">变动</el-button>
+            <el-button @click="handleChangeRecord(scope.row)"
+                       type="text"
+                       size="small"
+                       class="div-table-button--detail">变更记录</el-button>
+            <template v-if="filterEdit(scope.row.ORG_ID)">
+              <el-button @click="handleEdit(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">修改</el-button>
+              <el-popconfirm title="删除之后无法回复，确认删除？"
+                             @onConfirm="handleDel(scope.row)">
+              </el-popconfirm>
+            </template> -->
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="div-flex">
+        <div class="div_del">
+          <!-- <el-checkbox :indeterminate="isIndeterminate"
+                       v-model="selAllFlag"
+                       :disabled="selAllFlagDisabled"
+                       @change="handleSelectAll">全选</el-checkbox>
+          <el-button v-if="selection.length > 0"
+                     style="margin-left:15px"
+                     type="danger"
+                     size="small"
+                     @click="deleteBatch">删除</el-button> -->
+        </div>
+        <div>
+          <el-pagination @size-change="handleSizeChange"
+                         @current-change="handleCurrentChange"
+                         :current-page.sync="currentPage"
+                         :page-sizes="[20, 50, 100, 200]"
+                         :page-size="pageSize"
+                         layout="sizes, prev, pager, next, total"
+                         :total="total">
+          </el-pagination>
+        </div>
+
+      </div>
+    </el-card>
+
+    <el-dialog :title="formName"
+               :visible.sync="dialogVisible"
+               width="80%"
+               top="5vh"
+               append-to-body
+               class="dialog-h"
+               :close-on-click-modal="false"
+               :before-close="handlerCancle">
+      <div class="dialog-h-content scroll-h">
+        <resi-form v-if="dialogVisible"
+                   ref="baseForm"
+                   :fixed="true"
+                   :form-list="formList"
+                   @changegroup="handleChangeGroup" />
+        <div v-if="dialogVisible"
+             class="resi-other">
+          <div class="resi-other-title">其他</div>
+          <div class="tabs-other-info">
+            <el-tabs v-model="activeName"
+                     @tab-click="handleClick">
+              <el-tab-pane v-for="item in tabsList"
+                           :key="item.columnName"
+                           :label="item.label"
+                           :name="'group' + item.groupId">
+                <resi-form :ref="'group' + item.groupId"
+                           :columns="3"
+                           :support-add="item.supportAdd"
+                           :form-id="item.columnName"
+                           :form-list="item.itemList" />
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+        </div>
+      </div>
+
+      <div class="resi-btns">
+        <el-button size="small"
+                   @click="handlerCancle">取消</el-button>
+        <el-button type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleSUbmit">提交</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="formName"
+               :visible.sync="dialogEditVisible"
+               width="80%"
+               append-to-body
+               class="dialog-h"
+               top="5vh"
+               :close-on-click-modal="false"
+               :before-close="handlerEditCancle">
+      <div class="dialog-h-content scroll-h">
+        <edit-resi v-if="dialogEditVisible"
+                   ref="baseForm"
+                   :disabled="disabled"
+                   :form-info="editForm"
+                   :fixed="true"
+                   :form-list="formList"
+                   :agency-id="editAgencyId"
+                   @changegroup="handleChangeGroup" />
+        <div v-if="dialogEditVisible"
+             class="resi-other">
+          <div class="resi-other-title">其他</div>
+          <div class="tabs-other-info">
+            <el-tabs v-model="activeName"
+                     @tab-click="handleClick">
+              <el-tab-pane v-for="item in tabsList"
+                           :key="item.columnName"
+                           :label="item.label"
+                           :name="'group' + item.groupId">
+                <edit-resi :ref="'group' + item.groupId"
+                           :columns="3"
+                           :support-add="item.supportAdd"
+                           :form-id="item.columnName"
+                           :muti-list="item.mutiList"
+                           :form-list="item.itemList"
+                           :disabled="disabled"
+                           :label-width="'140px'"
+                           :agency-id="editAgencyId" />
+              </el-tab-pane>
+            </el-tabs>
+          </div>
+        </div>
+      </div>
+      <div class="resi-btns">
+        <el-button size="small"
+                   @click="handlerEditCancle">取消</el-button>
+        <el-button v-if="!disabled"
+                   type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleEditSUbmit">提交</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 调动 -->
+    <el-dialog :visible.sync="tranferShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'人员变动'"
+               width="950px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <resi-transfer ref="ref_transfer"
+                     @dialogCancle="transferClose"></resi-transfer>
+    </el-dialog>
+
+    <!-- 变更记录 -->
+    <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>
+    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
+                 :userId="lookInfo.userId"
+                 :gridName="lookInfo.gridName"
+                 @close="handleCancleLook" />
+    <el-dialog
+      title="迁入死亡人口的原因"
+      :visible.sync="blacklistVisible"
+      width="40%">
+      <textarea v-model="blacklistReason" placeholder="请输入迁入死亡人口的原因" class="blacklist-reason"></textarea>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="blacklistVisible = false">取 消</el-button>
+        <el-button type="primary" @click="confirmJoinDeathlist">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import nextTick from 'dai-js/tools/nextTick'
+import deathSearch from '../../../components/deathSearch.vue'
+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 resiChangeRecord from '../../../components/resiChangeRecord.vue'
+import peopleMore from "@/views/modules/shequ/cpts/people-more";
+
+export default {
+  components: {
+      deathSearch,
+    resiForm,
+    editResi,
+    resiTransfer,
+    resiChangeRecord,
+    peopleMore
+  },
+  data () {
+    return {
+      exportBtn: false,
+      exportBtnTitle: '导出',
+      importBtnTitle: '导入',
+      importLoading: false,
+      rowVisible: false,
+      tableLoading: false,
+      btnLoading: false,
+      disabled: false,
+      pageLoading: false,
+      selAllFlag: false,
+      selAllFlagDisabled: false,
+      isIndeterminate: false,
+      dialogEditVisible: false,
+      dialogVisible: false,
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+      uploadUlr: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
+      currentPage: 1,
+      pageSize: 20,
+      total: null,
+      searchH: 0,
+      conditions: [],
+      activeName: '',
+      tableData: [],
+      searchList: [],
+      editAgencyId: '',
+      editForm: {
+        GRID_ID: '',
+        VILLAGE_ID: '',
+        BUILD_ID: '',
+        HOME_ID: ''
+      },
+      editTableName: {},
+      formName: '',
+      formList: [],
+      tableHeader: [],
+      tabsList: [],
+      selection: [],
+
+      defaultCategotyKey: '',
+
+      tranferShow: false,
+      changeRecordShow: false,
+      lookInfo: {
+        userId: '',
+        gridName: ''
+      },
+      blacklistVisible: false, // 加入黑名单
+      blacklistReason: '', // 加入黑名单原因
+      rowData: {}, // 加入黑名单的人员信息
+    }
+  },
+  props: {
+
+  },
+  async activated () {
+    if (this.$route.query) {
+      this.searchList = []
+      let query = this.$route.query
+      this.defaultCategotyKey = query.columnName
+      console.log(this.defaultCategotyKey)
+      await this.getSearchList()
+      this.$refs.deathSearch.handleSearch()
+    }
+
+  },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
+  async created () {
+    if (this.$route.query) {
+      let query = this.$route.query
+      this.defaultCategotyKey = query.columnName
+    }
+
+
+    await this.getSearchList()
+    // await this.getFormList()
+    await this.getTableHeader()
+    // console.log('this.$refs.deathSearch', this)
+    this.$refs.deathSearch.handleSearch()
+
+    // this.handleSearch()
+    // this.getTableData()
+    this.pageLoading = true
+    this.searchH = this.$refs.deathSearch.$el.offsetHeight
+    console.log('storeoooo----0000', this.$store)
+    // console.log('deathSearch', this.$refs.deathSearch.$el.offsetHeight)
+
+  },
+  mounted () {
+
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.documentElement.clientHeight - this.$refs.deathSearch.$el.offsetHeight - 280 + 'px'
+    // })
+    console.log('document.documentElement.clientWidth', document.documentElement.clientHeight)
+  },
+  methods: {
+    searchFilter (columnName) {
+      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD' ]
+      return filterName.some(item => {
+        return item == columnName
+      })
+    },
+    tableHeaderFilter (columnName) {
+      const filterName = [ 'NAME', 'GRID_ID', 'HOME_ID', 'MOBILE', 'ID_CARD', 'GENDER' ]
+      return filterName.some(item => {
+        return item == columnName
+      })
+    },
+    joinBlacklist (row) {
+      this.blacklistVisible = true
+      this.blacklistReason = ''
+      this.rowData = { ...row }
+    },
+    confirmJoinDeathlist () {
+      const params = {
+        idCard: this.rowData.ID_CARD,
+        name: this.rowData.NAME,
+        mobile: this.rowData.MOBILE,
+        gender: this.rowData.GENDER == '女' ? '0' : this.rowData.GENDER == '男' ? '1' : '',
+        type: '1',
+        userId: this.rowData.icResiUserId,
+        joinReason: this.blacklistReason
+      }
+      this.$http.post('/pli/power/rentDeath/save', params).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.blacklistVisible = false
+            this.getTableData()
+          }
+        })
+      }).catch(err => {
+        this.$message.error(err.message)
+      })
+    },
+    checkSelect (row, index) {
+
+      return row.isChecked
+    },
+    //调动
+    async handleTransfer (row) {
+      this.tranferShow = true
+
+      await nextTick(200)
+
+      this.$refs.ref_transfer.initForm(row)
+    },
+    //变更记录
+    async handleChangeRecord (row) {
+      this.changeRecordShow = true
+
+      await nextTick(200)
+
+      this.$refs.ref_changerecord.initForm(row)
+    },
+
+    diaClose () {
+      this.tranferShow = false
+      this.changeRecordShow = false
+    },
+
+    transferClose () {
+      this.tranferShow = false
+      this.getTableData()
+    },
+    computedWidth (label, type) {
+
+      let wd = ''
+      if (type == 'input' || type == 'select') wd = 40 * label.length
+      else if(type == 'radio') wd = 20 * label.length
+      console.log('type-----wd', wd)
+      return wd > 80 ? wd : 80
+    },
+    filterEdit (id) {
+      const { user } = this.$store.state
+      return id === user.agencyId
+    },
+    selectionChange (selection) {
+      this.selection = selection
+
+      if (selection.length === this.tableData.length) {
+        this.selAllFlag = true
+        this.isIndeterminate = false
+      } else if (selection.length > 0) {
+        this.selAllFlag = false
+        this.isIndeterminate = true
+      } else {
+        this.selAllFlag = false
+        this.isIndeterminate = false
+      }
+    },
+    handleSelectAll (selectAllFlag) {
+      // if (this.tableData.length == 0) {
+      //   this.selAllFlag = false
+      //   return
+      // }
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach(row => {
+          // this.$refs.ref_table.toggleRowSelection(row);
+          if (row.isChecked) {
+            this.$refs.ref_table.toggleRowSelection(row);
+          }
+        });
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection
+
+      if (selection.length > 0) {
+        this.selAllFlag = true
+      } else {
+        this.selAllFlag = false
+      }
+
+    },
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteresiBatch()
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+
+          });
+      } else {
+        this.$message.warning('请先选择要删除的居民')
+      }
+    },
+    handleSizeChange (val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      this.getTableData()
+    },
+    handleCurrentChange (val) {
+      console.log(`当前页: ${val}`)
+      this.currentPage = val
+      this.getTableData()
+    },
+    handleFilterSpan (row, item) {
+      let _val = ''
+      if (item.itemType === 'radio' && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label
+        })
+        if (row[item.columnName] == '0') return _val = ''
+      }
+
+      return _val || row[item.columnName]
+    },
+    handleSearch (val) {
+      this.currentPage = 1
+      this.conditions = val
+      this.getTableData()
+    },
+    async handleExportModule () {
+      let url = "/epmetuser/icresiuser/import/download-template"
+
+
+      let params = {}
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('res----dddd', 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('网络错误')
+        })
+    },
+    // 下载文件
+    download (data, fileName) {
+      console.log('data', data)
+      if (!data) {
+        return
+      }
+
+      var csvData = new Blob([data])
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName)
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement('a')
+        document.body.appendChild(a)
+        a.style = 'display: none'
+        var url = window.URL.createObjectURL(csvData)
+        a.href = url
+        a.download = fileName
+        a.click()
+        a.remove()
+        window.URL.revokeObjectURL(url)
+      }
+    },
+    async handleExport () {
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
+      let params = {
+        formCode: 'resi_base_info',
+        conditions: this.conditions
+      }
+
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      await axios({
+        url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/exportExcel',
+        // url: 'epmetuser/icresiuser/exportExcel',
+        method: 'post',
+        data: params,
+        responseType: 'blob'
+      })
+        .then(res => {
+
+          console.log('resllll', res)
+          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对象
+        })
+        .catch((err) => {
+          console.log('获取导出情失败', err)
+          this.$message.error('获取导出失败')
+        })
+      this.exportBtnTitle = '导出'
+      this.exportBtn = false
+    },
+    // 上传大图标成功
+    handleExcelSuccess (res, file) {
+      if (res.code === 0 && res.msg === 'success') {
+
+        console.log('resss---ppp', res)
+
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    handleProgress (event, file, fileList) {
+      console.log('percentage', file.percentage)
+    },
+
+    beforeExcelUpload (file) {
+      console.log('file', file)
+      const isType = file.type === 'application/vnd.ms-excel'
+      const isTypeComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      const fileType = isType || isTypeComputer
+      const isLt1M = (file.size / 1024 / 1024) < 100
+      if (!fileType) {
+        this.$message.error('上传文件只能是xls/xlsx格式！')
+      }
+
+      if (!isLt1M) {
+        this.$message.error('上传文件大小不能超过 100MB!')
+      }
+      return fileType && isLt1M
+    },
+    async uploadHttpRequest (file) {
+      this.importLoading = true
+      this.importBtnTitle = '正在上传中...'
+      this.$message({
+        showClose: true,
+        message: '导入中，请到系统管理-导入记录中查看进度',
+        duration: 0
+      })
+      const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append('file', file.file) //添加文件对象
+      await this.$http
+        .post('/epmetuser/icresiuser/importExcel', formData).then(res => {
+          console.log('res-up', res)
+          if (res.data.code == 0 && res.data.msg == 'success') {
+            // this.$message.success('导入成功')
+            this.getTableData()
+          } else this.$message.error(res.data.msg)
+        }).catch(err => {
+          console.log('失败', err)
+          file.onError() //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        })
+      // await axios({
+      //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
+      //   method: 'post',
+      //   data: formData,
+      //   timeout: '300000',
+      //   responseType: 'blob'
+      // })
+      //   .then((res) => {
+      //     console.log('res-up', res)
+      //     // 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对象
+      //     // }
+
+      //     this.getTableData()
+      //   })
+      //   .catch(err => {
+      //     console.log('失败', err)
+      //     file.onError() //上传失败的文件会从文件列表中删除
+      //     this.$message.error('导入失败')
+      //   })
+      this.importLoading = false
+      this.importBtnTitle = '导入'
+      this.$refs.upload.clearFiles()
+    },
+    handleClick (tab, event) {
+      console.log(tab, event)
+    },
+    async handleLook (row) {
+      this.lookInfo.userId = row.icResiUserId
+      this.lookInfo.gridName = row.GRID_ID
+      this.showedPeopleMoreInfo = true;
+      // this.disabled = true
+      // this.editAgencyId = row.ORG_ID
+      // await this.getFormList('edit')
+      // this.getrowInfo(row.icResiUserId)
+    },
+    handleCancleLook() {
+      this.lookInfo.userId = ''
+      this.lookInfo.gridName = ''
+      this.showedPeopleMoreInfo = false;
+    },
+    async handleEdit (row) {
+      this.disabled = false
+      this.editAgencyId = row.ORG_ID
+      await this.getFormList('edit')
+      await this.getrowInfo(row.icResiUserId)
+    },
+    async handleAdd () {
+      await this.getFormList()
+      this.dialogVisible = true
+    },
+    async handleChangeGroup (val) {
+      console.log('changeguoprrrrr----', val)
+      let { childGroup, value } = val
+      let hasT = false
+      let i = 0
+      // const list = { ...this.tabsList }
+      this.tabsList.forEach((item, index) => {
+        if (item.tableName === childGroup.tableName) {
+          hasT = true
+          i = index
+        }
+      })
+      if (value === 1 || value === '1') {
+        // console.log('changegroup----999', value)
+        if (!hasT) {
+          childGroup.itemList.forEach(async (item) => {
+            if (item.optionSourceType === 'remote') {
+              await this.getOptionsList(item.optionSourceValue).then((res) => {
+                item.options = res
+              })
+              // console.log('')
+            }
+          })
+          this.tabsList.push(childGroup)
+        }
+      } else {
+        // console.log('changegroup----000', value)
+        if (hasT) this.tabsList.splice(i, 1)
+      }
+    },
+    formetForm () {
+      const _baseForm = this.$refs.baseForm.handleForm()
+      let arr = []
+      if (_baseForm.length === 0) return false
+      arr.push([..._baseForm])
+      this.tabsList.forEach((item) => {
+        arr.push([...this.$refs['group' + item.groupId][0].handleForm()])
+      })
+      let arr2 = arr.reduce(function (a, b) {
+        return a.concat(b)
+      })
+      let noChange = true
+      arr2.forEach((item) => {
+        if (item.list.length !== 0) noChange = false
+      })
+      console.log('arr2', arr2)
+      if (noChange) {
+        this.$message.warning('您还没有做任何修改')
+        return false
+      }
+      // 合并相同tableName的多个数组
+      let hash = {}
+      let i = 0
+      let res = []
+      let finalArr = []
+      arr2.forEach(function (item) {
+        let name = item.tableName
+        if (hash[name]) {
+          res[hash[name] - 1].list.push(...item.list)
+        } else {
+          hash[name] = ++i
+          res.push({
+            list: [...item.list],
+            supportAdd: item.supportAdd,
+            tableName: name
+          })
+        }
+      })
+      console.log('res', res)
+      // 多个list合并成一个list子集
+      res.forEach((item) => {
+        let _form = {}
+        item.list.length > 0 &&
+          item.list.forEach((n) => {
+            _form = { ..._form, ...n }
+          })
+        if (item.list.length > 0) {
+          finalArr.push({
+            tableName: item.tableName,
+            list: item.supportAdd ? [...item.list] : [{ ..._form }]
+          })
+        }
+      })
+      console.log('finalArr', finalArr)
+      return finalArr
+    },
+    async handleEditSUbmit () {
+      const arr = await this.formetForm()
+      if (arr) this.submitEdit(arr)
+    },
+    async handleSUbmit () {
+      const arr = await this.formetForm()
+      if (arr) this.submitAdd(arr)
+    },
+    handleDel (row) {
+      let params = {
+        formCode: 'resi_base_info',
+        userIds: [row.icResiUserId]
+      }
+      console.log('row1', row)
+      this.$http
+        .post('/epmetuser/icresiuser/delete', params)
+        .then(({ data: res }) => {
+          console.log('row2', row)
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('row3', row)
+            this.$message.success('删除成功')
+            this.getTableData()
+          }
+        })
+        .catch((err) => {
+          console.log('row4', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    handleFormatUrl (url) {
+      return url.includes('?')
+    },
+    handlerEditCancle () {
+      this.$refs.baseForm.resetForm()
+      this.tabsList.forEach((item) => {
+        this.$refs['group' + item.groupId][0].resetForm()
+      })
+      this.dialogEditVisible = false
+    },
+    handlerCancle () {
+      this.$refs.baseForm.resetForm()
+      this.tabsList.forEach((item) => {
+        this.$refs['group' + item.groupId][0].resetForm()
+      })
+      this.dialogVisible = false
+    },
+    async submitAdd (arr) {
+      this.btnLoading = true
+      await this.$http
+        .post('/epmetuser/icresiuser/add', arr)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('提交成功')
+            // this.$refs[formName].resetFields();
+            this.$refs.baseForm.resetForm()
+            this.tabsList.forEach((item) => {
+              this.$refs['group' + item.groupId][0].resetForm()
+            })
+            this.getTableData()
+            this.dialogVisible = false
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.btnLoading = false
+    },
+    async submitEdit (arr) {
+      this.btnLoading = true
+      await this.$http
+        .post('/epmetuser/icresiuser/edit', arr)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('提交成功')
+            // this.$refs[formName].resetFields();
+            this.$refs.baseForm.resetForm()
+            this.tabsList.forEach((item) => {
+              this.$refs['group' + item.groupId][0].resetForm()
+            })
+            this.getTableData()
+            this.dialogEditVisible = false
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.btnLoading = false
+    },
+    async getTableHeader () {
+      await this.$http
+        .post('/oper/customize/icform/tableheaders', {
+          formCode: 'resi_base_info'
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.tableHeader = []
+            res.data.forEach(item => {
+              if (this.tableHeaderFilter(item.columnName)) {
+                this.tableHeader.push(item)
+              }
+            })
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getTableData () {
+      this.tableLoading = true
+      let params = {
+        formCode: 'resi_base_info',
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        conditions: this.conditions
+      }
+      await this.$http
+        .post('/epmetuser/icresiuser/listresi', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.tableData = res.data.list.map(item => {
+              return {
+                ...item,
+                isChecked: this.filterEdit(item.ORG_ID)
+              }
+            })
+            let _selAllFlagDisabled = true
+            this.tableData.forEach(item => {
+              if (item.isChecked) _selAllFlagDisabled = false
+            })
+            this.selAllFlagDisabled = _selAllFlagDisabled
+            this.total = res.data.total
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      this.tableLoading = false
+    },
+    getrowInfo (id) {
+      let params = {
+        formCode: 'resi_base_info',
+        icResiUserId: id
+      }
+      this.$http
+        .post('/epmetuser/icresiuser/detail', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            // console.log('getrowInfo----', res.data)
+            let info = res.data
+            this.editTableName = { ...info }
+            let list = info[this.formList[0].tableName][0]
+            for (let n in list) {
+              this.editForm[n] = list[n]
+            }
+            this.formList.forEach((item) => {
+              item.columnValue = list[item.columnName]
+              item.ID = list.ID
+
+              if (
+                item.columnValue == '1' &&
+                item.itemType === 'radio' &&
+                item.childGroup
+              ) {
+                this.tabsList.push(item.childGroup)
+              }
+
+              // if (item.childGroup && info[item.childGroup.tableName]) {
+
+              // }
+            })
+            this.tabsList.forEach((item) => {
+              let _info = info[item.tableName]
+              if (item.supportAdd) {
+                // console.log('tabsList---333', item.label)
+                const _list = [...item.itemList]
+                let mutiList = []
+                if (_info) {
+                  _info.forEach((fo, index) => {
+                    // console.log('mutiList----555' + index, mutiList, _list)
+                    mutiList.splice(index, 0, {
+                      row: index,
+                      itemList: _list.map((m) => {
+                        // console.log('itemList---item' + index, m)
+                        return {
+                          ...m,
+                          ID: fo.ID,
+                          columnValue: fo[m.columnName]
+                        }
+                      })
+                    })
+                    // console.log('mutiList----666' + index, mutiList)
+                  })
+                }
+                item.mutiList = mutiList
+              } else {
+                if (_info) {
+                  item.itemList.forEach((n) => {
+                    n.ID = _info[0].ID
+                    n.columnValue = _info[0][n.columnName]
+                  })
+                }
+              }
+            })
+            // console.log('getrowInfo---formname', this.tabsList)
+            this.dialogEditVisible = true
+          }
+        })
+        .catch((err) => {
+          console.log('getrowInfo---formnameerr', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    async getOptionsList (url) {
+      let options = []
+      // console.log('getOptionsList----', url)
+      await this.$http
+        .post(url, { formCode: 'resi_base_info' })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            options = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+      return options
+    },
+    async getSearchList () {
+      await this.$http
+        .post('/oper/customize/icform/conditionlist', {
+          formCode: 'resi_base_info',
+          dynamic: true
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功--sss', res)
+            this.searchList = []
+            res.data.forEach(item => {
+              if (this.searchFilter(item.columnName)) {
+                this.searchList.push(item)
+              }
+            })
+            res.data.forEach((item) => {
+              if (item.optionSourceType === 'remote') {
+                this.getOptionsList(item.optionSourceValue).then((res) => {
+                  item.options = res
+                })
+                // console.log('')
+              }
+            })
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getTreeData (data) {
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.children) {
+          if (item.children.length === 0) _item = { ...item, children: undefined }
+          else _item = { ...item, children: this.getTreeData(item.children) }
+        } else {
+          _item = { ...item }
+        }
+        return _item
+      })
+      return arr
+    },
+    async getFormList (type) {
+      await this.$http
+        .post('/oper/customize/icform/getcustomerform', {
+          formCode: 'resi_base_info',
+          dynamic: true
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取详情成功getFormList')
+            let { itemList, groupList, formName } = res.data
+            this.formName = formName
+            this.activeName = 'group' + res.data.groupList[0].groupId
+            if (type !== 'edit') {
+              itemList.forEach(async (item) => {
+                if (item.optionSourceType === 'remote') {
+                  await this.getOptionsList(item.optionSourceValue).then(
+                    (res) => {
+                      item.options = this.getTreeData(res)
+                    }
+                  )
+                }
+              })
+            }
+            groupList.forEach((item) => {
+              item.itemList.forEach(async (n) => {
+                n.tableName = item.tableName
+                if (n.optionSourceType === 'remote' && type !== 'edit') {
+                  await this.getOptionsList(n.optionSourceValue).then((res) => {
+                    n.options = this.getTreeData(res)
+                  })
+                }
+              })
+            })
+            // }
+            this.formList = itemList
+            this.tabsList = groupList
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async deleteresiBatch () {
+      if (this.selection.length === 0) return this.$message.error('请选择之后进行操作')
+      let userIds = this.selection.map(item => item.icResiUserId)
+      let params = {
+        formCode: 'resi_base_info',
+        userIds
+      }
+      this.$http
+        .post('/epmetuser/icresiuser/delete', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message.success('删除成功')
+            this.getTableData()
+          }
+        })
+        .catch((err) => {
+          console.log('row4', err)
+          return this.$message.error('网络错误')
+        })
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.tabs-other-info {
+  ::v-deep .el-tabs__item {
+    // width: 50px;
+    height: 24px;
+    box-sizing: border-box;
+    margin-right: 7px;
+    padding: 0 10px !important;
+    font-size: 16px;
+    font-weight: 400;
+    color: #666666;
+    line-height: 24px;
+    background: #ebecf1;
+    border-radius: 2px;
+  }
+  ::v-deep .el-tabs__nav-wrap::after,
+  ::v-deep .el-tabs__active-bar {
+    display: none;
+  }
+  ::v-deep .el-tabs__nav-next,
+  ::v-deep .el-tabs__nav-prev {
+    // width: 12px;
+    // height: 12px;
+    color: rgba(30, 122, 254, 1);
+    line-height: 20px;
+    background: rgba(30, 122, 254, 0.2);
+    // border-radius: 50%;
+  }
+  ::v-deep .el-tabs__item.is-active {
+    color: #fff;
+    background: linear-gradient(90deg, #1a5afd, #26c4ff);
+  }
+}
+.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);
+  }
+}
+</style>
+
+<style lang="scss" scoped>
+.resi-card-table {
+  margin-top: 20px;
+}
+.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);
+  // }
+}
+.resi-other {
+  width: 100%;
+  display: flex;
+  .resi-other-title {
+    flex-shrink: 0;
+    // display: inline-block;
+    width: 100px;
+    box-sizing: border-box;
+    margin-bottom: 10px;
+    // padding: 6px 12px 0 0;
+    font-size: 16px;
+    font-weight: 500;
+    color: #333;
+    text-align: center;
+  }
+  .tabs-other-info {
+    // display: inline-block;
+    // flex: 1;
+    // padding-left: 60px;
+    width: calc(100% - 100px);
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+.div-flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  .div_del {
+    margin-top: 15px;
+  }
+}
+.blacklist-reason {
+  width: 100%;
+  height: 80px;
+  border: 1px solid #e4e4e4;
+  border-radius: 4px;
+  resize: none;
+  padding: 8px;
+  box-sizing: border-box;
+}
+</style>