diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index 309bfe353..1d4a6b5f7 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -125,11 +125,14 @@
   }
 }
 
+
+
+//-----旧版
+
 .cell-width-area{
   width: 450px
 }
 
-
 .div_searchmap {
   z-index: 1000;
   position: absolute;
@@ -137,7 +140,6 @@
   left: 5px;
 }
 
-
 .cell-width-1{
   width: 250px
 }
@@ -178,16 +180,11 @@
     overflow-x: auto;
 }
 
-
 .m-btns {
     display: flex;
     justify-content: center;
 }
 
-
-
-//-----旧版
-
 .m-info {
 
   .info-title {
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 944ca823f..131277511 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -22,6 +22,7 @@
     }
 
     .div_search_btn{
+      margin-right:10px;
       margin-top:5px;
       float:right;
     }                                                                                                                                                                                                                                                                                                                          
@@ -95,6 +96,9 @@
     }
   }
 
+
+  //---------旧版
+
    .item_width_2{
     width: 138px;
   }
diff --git a/src/views/components/deathSearch copy.vue b/src/views/components/deathSearch copy.vue
new file mode 100644
index 000000000..f82185e81
--- /dev/null
+++ b/src/views/components/deathSearch copy.vue	
@@ -0,0 +1,623 @@
+<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/components/deathSearch.vue b/src/views/components/deathSearch.vue
index 1c46b7e93..25bc772ea 100644
--- a/src/views/components/deathSearch.vue
+++ b/src/views/components/deathSearch.vue
@@ -1,206 +1,160 @@
 <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
+  <div>
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="form"
+               :label-width="'100px'">
+
+        <el-form-item prop="gridId"
+                      label="所属网格">
+
+          <el-select v-model.trim="form.GRID_ID"
+                     placeholder="请选择"
+                     size="small"
+                     clearable
+                     class="item_width_normal"
+                     @change="handleChangeGrid">
+            <el-option v-for="item in optionsG"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属房屋">
+
+          <el-select v-model.trim="form.VILLAGE_ID"
+                     placeholder="请选择小区"
+                     size="small"
+                     clearable
+                     class="item_width_communitycascader"
+                     @clear="handleClearVillage"
+                     @change="handleChangeV">
+            <el-option v-for="item in optionsV"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+          <el-select v-model.trim="form.BUILD_ID"
+                     placeholder="楼号"
+                     size="small"
+                     clearable
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     :disabled="changeVDisabled"
+                     @clear="handleClearBuild"
+                     @change="handleChangeB">
+            <el-option v-for="item in optionsB"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+          <el-select v-model.trim="form.UNIT_ID"
+                     :disabled="changeBDisabled"
+                     placeholder="单元"
+                     size="small"
+                     clearable
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     @click="handleClearDan"
+                     @change="handleChangeD">
+            <el-option v-for="item in optionsD"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+          <el-select v-model.trim="form.HOME_ID"
+                     :disabled="changeDDisabled"
+                     placeholder="房号"
+                     size="small"
+                     clearable
+                     class="item_width_buildcascader"
+                     style="margin-left:5px">
+            <el-option v-for="item in optionsH"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item v-for="(n, index) in formList"
+                      :key="index"
+                      :prop="n.id"
+                      :label="n.label">
+
+          <el-input v-if="n.itemType === 'input' || n.itemType === 'textarea'"
                     v-model.trim="form[n.columnName]"
-                    class="resi-cell-input"
-                    type="date"
+                    class="item_width_normal"
                     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>
+                    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="item_width_daterange2"
+                            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="item_width_normal"
+                            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="item_width_normal">
+            <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="item_width_normal">
+          </el-cascader>
+        </el-form-item>
+
+        <div class="div_search_btn">
+          <el-button class="diy-button--white"
+                     size="small"
+                     @click="resetForm">重置</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--blue"
+                     @click="handleSearch">查询</el-button>
+
+        </div>
+
+      </el-form>
+
+    </div>
   </div>
 </template>
 
@@ -217,7 +171,7 @@ export default {
       default: ''
     }
   },
-  data() {
+  data () {
     let initForm = (arr, columnName) => {
       let _form = {}
       // console.log('formInfo', obj)
@@ -278,7 +232,7 @@ export default {
         shortcuts: [
           {
             text: '最近一周',
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
@@ -287,7 +241,7 @@ export default {
           },
           {
             text: '最近一个月',
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
@@ -296,7 +250,7 @@ export default {
           },
           {
             text: '最近三个月',
-            onClick(picker) {
+            onClick (picker) {
               const end = new Date()
               const start = new Date()
               start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
@@ -308,7 +262,7 @@ export default {
     }
   },
   computed: {
-    sliceList() {
+    sliceList () {
       return function (data, count) {
         if (data !== undefined) {
           let index = 0
@@ -324,19 +278,19 @@ export default {
         }
       }
     },
-    changeVDisabled() {
+    changeVDisabled () {
       return !this.form.VILLAGE_ID
     },
-    changeBDisabled() {
+    changeBDisabled () {
       return !this.form.BUILD_ID
     },
-    changeDDisabled() {
+    changeDDisabled () {
       return !this.form.UNIT_ID
     }
   },
   watch: {
     form: {
-      handler(val, val2) {
+      handler (val, val2) {
         // console.log('valpppp----', val, val2)
         for (let n in val) {
           if (this.constForm[n] !== val[n]) {
@@ -349,7 +303,7 @@ export default {
       deep: true
     }
   },
-  created() {
+  created () {
     // this.initForm()
     // console.log('formcccc---', this.form)
     this.getGridList()
@@ -357,32 +311,32 @@ export default {
     if (this.columnName) this.handleChangeForm(this.columnName)
   },
   methods: {
-    initForm() {
+    initForm () {
       this.formList.forEach((item) => {
         this.$set(this.form, item.columnName, '')
       })
       console.log('formcccc---', this.form)
     },
-    handleClearVillage() {
+    handleClearVillage () {
       this.form.BUILD_ID = ''
       this.form.HOME_ID = ''
     },
-    handleClearBuild() {
+    handleClearBuild () {
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
     },
-    handleClearDan() {
+    handleClearDan () {
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
     },
-    resetForm(formName) {
-      for(const n in this.form) {
+    resetForm (formName) {
+      for (const n in this.form) {
         this.form[n] = ''
       }
       this.handleSearch()
     },
-    handleSearch() {
+    handleSearch () {
       // console.log('formmmmm---', this.form)
       const itemTypes = ['daterange', 'timerange']
       let arr = this.tempFormList
@@ -395,7 +349,7 @@ export default {
             // columnValue: []
             columnValue:
               itemTypes.includes(item.queryType) ||
-              itemTypes.includes(item.itemType)
+                itemTypes.includes(item.itemType)
                 ? this.form[item.columnName]
                 : [this.form[item.columnName].toString()]
           }
@@ -410,10 +364,10 @@ export default {
       let arr3 = [...arr1, ...arr]
       this.$emit('search', arr3)
     },
-    handleOpenSearch() {
+    handleOpenSearch () {
       this.openSearch = !this.openSearch
     },
-    handleChangeGrid(val) {
+    handleChangeGrid (val) {
       console.log('val', val)
       this.form.VILLAGE_ID = ''
       this.form.BUILD_ID = ''
@@ -421,26 +375,26 @@ export default {
       this.form.HOME_ID = ''
       this.getValiheList()
     },
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log('val', val)
       this.form.BUILD_ID = ''
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
       this.getBuildList()
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log('val', val)
       this.form.UNIT_ID = ''
       this.form.HOME_ID = ''
       this.getUniList()
     },
-    handleChangeD(val) {
+    handleChangeD (val) {
       console.log('val', val)
       this.form.HOME_ID = ''
       this.getHouseList()
     },
     // 监听基础form
-    handleChangeForm(val) {
+    handleChangeForm (val) {
       for (let n in this.fixedForm) {
         if (n === val) {
           if (this.fixedList.length > 0) {
@@ -479,7 +433,7 @@ export default {
         if (item.columnName === val) item.isChange = true
       })
     },
-    getGridList() {
+    getGridList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
@@ -495,7 +449,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
@@ -515,7 +469,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post('/gov/org/icbuilding/buildingoption', {
           neighborHoodId: this.form.VILLAGE_ID
@@ -532,7 +486,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post('/gov/org/icbuildingunit/unitoption', {
           buildingId: this.form.BUILD_ID
@@ -549,7 +503,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post('/gov/org/ichouse/houseoption', { unitId: this.form.UNIT_ID })
         .then(({ data: res }) => {
@@ -569,81 +523,11 @@ export default {
 </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;
+@import "@/assets/scss/modules/management/list-main.scss";
+
+.div_search {
+  /deep/ .el-form-item {
+    margin-bottom: 14px;
   }
 }
 </style>
diff --git a/src/views/components/resiChangeRecord.vue b/src/views/components/resiChangeRecord.vue
index a13585a82..4788ca80c 100644
--- a/src/views/components/resiChangeRecord.vue
+++ b/src/views/components/resiChangeRecord.vue
@@ -1,12 +1,10 @@
 <template>
   <div class="div_main">
 
-    <el-table class="table"
-              :data="tableData"
+    <el-table :data="tableData"
               border
               :height="tableHeight"
               v-loading="tableLoading"
-              :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
               style="width: 100%">
 
       <el-table-column label="序号"
@@ -47,7 +45,7 @@
                        show-overflow-tooltip
                        min-width="230">
       </el-table-column>
-      
+
       <el-table-column prop="operatorName"
                        header-align="center"
                        align="center"
@@ -68,7 +66,7 @@
                        show-overflow-tooltip
                        min-width="120">
       </el-table-column>
-      
+
     </el-table>
     <div>
       <el-pagination @size-change="handleSizeChange"
@@ -85,8 +83,6 @@
 </template>
 
 <script>
-
-
 import util from '@js/util.js';
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
@@ -266,47 +262,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/buttonstyle.scss";
-
-.div_main {
-  background: #ffffff;
-  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-  border-radius: 4px;
-  margin-top: 15px;
-  padding: 23px 30px 10px;
-}
-
-.div_search {
-  background: #ffffff;
-  border-radius: 4px;
-  padding: 30px 20px 5px;
-  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-}
-
-.item_width_1 {
-  width: 260px;
-}
-.item_width_2 {
-  width: 495px;
-}
-
-.div_table {
-  background: #ffffff;
-  box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
-  border-radius: 4px;
-  margin-top: 15px;
-  padding: 23px 30px 10px;
-
-  .table {
-    margin-top: 20px;
-  }
-}
-
-.el-row {
-  /* margin-bottom: 20px; */
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 10px;
-  margin-right: 50px;
-}
+@import "@/assets/scss/modules/management/list-main.scss";
 </style>
diff --git a/src/views/modules/base/huji/immigration/detail.vue b/src/views/modules/base/huji/immigration/detail.vue
index fcdafa994..b7929f064 100644
--- a/src/views/modules/base/huji/immigration/detail.vue
+++ b/src/views/modules/base/huji/immigration/detail.vue
@@ -4,70 +4,69 @@
 
       <div v-if="initLoading"
            class="m-row">
-        <div class="m-info">
-          <div class="info-prop">
-            <span class="info-title-2">所属网格：</span>
-            <span>{{ fmData.gridName }}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">所属房屋：</span>
-            <span>{{ fmData.allName?fmData.allName:'--' }}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">姓名：</span>
-            <span>{{ fmData.name}}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">手机号：</span>
-            <span>{{ fmData.mobile?fmData.mobile:'--'}}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">证件号：</span>
-            <span>{{ fmData.idCard?fmData.idCard:'--'}}</span>
-          </div>
-          <div class="info-prop">
-            <span class="info-title-2">性别：</span>
-            <span>{{fmData.genderName?fmData.genderName:'--' }}</span>
-          </div>
-
-          <div class="info-prop">
-            <span class="info-title-2">年龄：</span>
-            <span>{{ fmData.age?fmData.age:'--' }}</span>
-          </div>
-          <div class="info-prop">
-            <span class="info-title-2">迁入日期：</span>
-            <span>{{ fmData.inTime?fmData.inTime:'--' }}</span>
-          </div>
-          <div class="info-prop">
-            <span class="info-title-2">迁入原因：</span>
-            <span>{{ fmData.inReason?fmData.inReason:'--' }}</span>
-          </div>
-          <div class="info-prop">
-            <span class="info-title-2">来源地：</span>
-            <span>{{ fmData.sourceAddress?fmData.sourceAddress:'--' }}</span>
-          </div>
-          <div class="info-prop">
-            <span class="info-title-2">详细地址：</span>
-            <span>{{ fmData.address? fmData.address:'--'}}</span>
-          </div>
-          <div class="info-prop">
-            <span class="info-title-2">迁移证号码：</span>
-            <span>{{ fmData.moveNumber?fmData.moveNumber:'--' }}</span>
-          </div>
-          <div class="info-prop">
-            <span class="info-title-2">户主姓名：</span>
-            <span>{{ fmData.householderName? fmData.householderName:'--'  }}</span>
-          </div>
-          <div class="info-prop">
-            <span class="info-title-2">与户主关系：</span>
-            <span>{{ fmData.householderRelationName? fmData.householderRelationName:'--' }}</span>
-          </div>
 
+        <div class="info-prop">
+          <span class="info-title info-title-100">所属网格：</span>
+          <span>{{ fmData.gridName }}</span>
         </div>
+
+        <div class="info-prop">
+          <span class="info-title info-title-100">所属房屋：</span>
+          <span>{{ fmData.allName?fmData.allName:'--' }}</span>
+        </div>
+
+        <div class="info-prop">
+          <span class="info-title info-title-100">姓名：</span>
+          <span>{{ fmData.name}}</span>
+        </div>
+
+        <div class="info-prop">
+          <span class="info-title info-title-100">手机号：</span>
+          <span>{{ fmData.mobile?fmData.mobile:'--'}}</span>
+        </div>
+
+        <div class="info-prop">
+          <span class="info-title info-title-100">证件号：</span>
+          <span>{{ fmData.idCard?fmData.idCard:'--'}}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">性别：</span>
+          <span>{{fmData.genderName?fmData.genderName:'--' }}</span>
+        </div>
+
+        <div class="info-prop">
+          <span class="info-title info-title-100">年龄：</span>
+          <span>{{ fmData.age?fmData.age:'--' }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">迁入日期：</span>
+          <span>{{ fmData.inTime?fmData.inTime:'--' }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">迁入原因：</span>
+          <span>{{ fmData.inReason?fmData.inReason:'--' }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">来源地：</span>
+          <span>{{ fmData.sourceAddress?fmData.sourceAddress:'--' }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">详细地址：</span>
+          <span>{{ fmData.address? fmData.address:'--'}}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">迁移证号码：</span>
+          <span>{{ fmData.moveNumber?fmData.moveNumber:'--' }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">户主姓名：</span>
+          <span>{{ fmData.householderName? fmData.householderName:'--'  }}</span>
+        </div>
+        <div class="info-prop">
+          <span class="info-title info-title-100">与户主关系：</span>
+          <span>{{ fmData.householderRelationName? fmData.householderRelationName:'--' }}</span>
+        </div>
+
       </div>
 
     </div>
diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue
index b65914e9a..abc9a0951 100644
--- a/src/views/modules/plugins/change/resichange.vue
+++ b/src/views/modules/plugins/change/resichange.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="resi-container">
+  <div class="div_main">
     <death-search v-if="searchList.length > 0"
-                 ref="deathSearch"
-                 :form-list="searchList"
-                 :column-name="defaultCategotyKey"
-                 @search="handleSearch" />
+                  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"
@@ -66,10 +66,9 @@
                          :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" -->
+                         :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"
@@ -87,10 +86,10 @@
                        type="text"
                        size="small"
                        class="div-table-button--detail">迁出</el-button>
-              <!--<el-button @click="joinBlacklist(scope.row)"-->
-                       <!--type="text"-->
-                       <!--size="small"-->
-                       <!--class="div-table-button&#45;&#45;detail">迁入死亡人口</el-button>-->
+            <!--<el-button @click="joinBlacklist(scope.row)"-->
+            <!--type="text"-->
+            <!--size="small"-->
+            <!--class="div-table-button&#45;&#45;detail">迁入死亡人口</el-button>-->
             <!-- <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
@@ -248,7 +247,7 @@
                class="dialog-h"
                @closed="diaClose">
       <resi-change-transfer ref="ref_change_transfer"
-                     @dialogCancle="transferClose"></resi-change-transfer>
+                            @dialogCancle="transferClose"></resi-change-transfer>
     </el-dialog>
 
     <!-- 变更记录 -->
@@ -265,14 +264,17 @@
                  :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-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>
+        <el-button type="primary"
+                   @click="confirmJoinDeathlist">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -291,10 +293,10 @@ import peopleMore from "@/views/modules/shequ/cpts/people-more";
 
 export default {
   components: {
-      deathSearch,
+    deathSearch,
     resiForm,
     editResi,
-      resiChangeTransfer,
+    resiChangeTransfer,
     resiChangeRecord,
     peopleMore
   },
@@ -368,7 +370,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
-    tableHeight() {
+    tableHeight () {
       const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
       const _h = this.clientHeight - 280 - this.searchH
       return this.$store.state.inIframe ? h : _h
@@ -404,13 +406,13 @@ export default {
   },
   methods: {
     searchFilter (columnName) {
-      const filterName = [ 'NAME', 'MOBILE', 'ID_CARD' ]
+      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' ]
+      const filterName = ['NAME', 'GRID_ID', 'HOME_ID', 'MOBILE', 'ID_CARD', 'GENDER']
       return filterName.some(item => {
         return item == columnName
       })
@@ -430,7 +432,7 @@ export default {
         userId: this.rowData.icResiUserId,
         joinReason: this.blacklistReason
       }
-        console.log('----------8----------')
+      console.log('----------8----------')
       console.log(params)
       this.$http.post('/epmetuser/rentDeath/save', params).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -483,7 +485,7 @@ export default {
 
       let wd = ''
       if (type == 'input' || type == 'select') wd = 40 * label.length
-      else if(type == 'radio') wd = 20 * label.length
+      else if (type == 'radio') wd = 20 * label.length
       console.log('type-----wd', wd)
       return wd > 80 ? wd : 80
     },
@@ -775,7 +777,7 @@ export default {
       // await this.getFormList('edit')
       // this.getrowInfo(row.icResiUserId)
     },
-    handleCancleLook() {
+    handleCancleLook () {
       this.lookInfo.userId = ''
       this.lookInfo.gridName = ''
       this.showedPeopleMoreInfo = false;
@@ -1234,6 +1236,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+
 .tabs-other-info {
   ::v-deep .el-tabs__item {
     // width: 50px;
diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue
index 23e4239f8..941ef9956 100644
--- a/src/views/modules/plugins/change/verify.vue
+++ b/src/views/modules/plugins/change/verify.vue
@@ -1,152 +1,121 @@
 <template>
-  <div class="resi-container">
-    <el-card ref="searchCard" class="search-card">
-      <el-form
-        ref="searchForm"
-        :inline="true"
-        :model="fmData"
-        :label-width="'100px'"
-        class="demo-form-inline"
-      >
-        <div>
-          <el-form-item prop="gridId" label="所属网格">
-            <div class="resi-cell-value">
-              <el-select
-                v-model.trim="fmData.gridId"
-                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>
-          </el-form-item>
-          <el-form-item label="所属房屋">
-            <div class="resi-cell-value">
-              <div class="resi-cell-col">
-                <el-form-item prop="villageId">
-                  <el-select
-                    v-model.trim="fmData.villageId"
-                    placeholder="请选择小区"
+  <div class="div_main">
+    <div ref="searchForm"
+         class="div_search">
+      <el-form ref="searchForm"
+               :inline="true"
+               :model="fmData"
+               :label-width="'100px'">
+
+        <el-form-item prop="gridId"
+                      label="所属网格">
+
+          <el-select v-model.trim="fmData.gridId"
+                     placeholder="请选择网格"
+                     size="small"
+                     clearable
+                     class="item_width_normal"
+                     @change="handleChangeGrid">
+            <el-option v-for="item in optionsG"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="所属房屋">
+
+          <el-select v-model.trim="fmData.villageId"
+                     placeholder="请选择小区"
+                     size="small"
+                     clearable
+                     class="item_width_communitycascader"
+                     @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="fmData.buildId"
+                     placeholder="楼号"
+                     size="small"
+                     clearable
+                     :disabled="changeVDisabled"
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     @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="fmData.unitId"
+                     placeholder="单元"
+                     size="small"
+                     clearable
+                     :disabled="changeBDisabled"
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     @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="fmData.homeId"
+                     placeholder="房号"
+                     size="small"
+                     clearable
+                     :disabled="changeDDisabled"
+                     class="item_width_buildcascader"
+                     style="margin-left:5px">
+            <el-option v-for="item in optionsH"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="姓名"
+                      prop="name">
+          <el-input v-model="fmData.name"
+                    class="item_width_normal"
                     size="small"
                     clearable
-                    class="resi-cell-select"
-                    @change="handleChangeV"
-                  >
-                    <el-option
-                      v-for="item in optionsV"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="buildId">
-                  <el-select
-                    v-model.trim="fmData.buildId"
-                    placeholder="楼号"
+                    placeholder="请输入">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="mobile">
+          <el-input v-model="fmData.mobile"
+                    class="item_width_normal"
                     size="small"
                     clearable
-                    :disabled="changeVDisabled"
-                    class="resi-cell-select resi-cell-select-middle"
-                    @change="handleChangeB"
-                  >
-                    <el-option
-                      v-for="item in optionsB"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="unitId">
-                  <el-select
-                    v-model.trim="fmData.unitId"
-                    placeholder="单元"
+                    placeholder="请输入">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="证件号"
+                      prop="idCard">
+          <el-input v-model="fmData.idCard"
+                    class="item_width_normal"
                     size="small"
                     clearable
-                    :disabled="changeBDisabled"
-                    class="resi-cell-select resi-cell-select-middle"
-                    @change="handleChangeD"
-                  >
-                    <el-option
-                      v-for="item in optionsD"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="homeId">
-                  <el-select
-                    v-model.trim="fmData.homeId"
-                    placeholder="房号"
-                    size="small"
-                    clearable
-                    :disabled="changeDDisabled"
-                    class="resi-cell-select resi-cell-select-middle"
-                  >
-                    <el-option
-                      v-for="item in optionsH"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </div>
-            </div>
-          </el-form-item>
-        </div>
+                    placeholder="请输入">
+          </el-input>
+        </el-form-item>
 
-        <div>
-          <el-form-item label="姓名" prop="name">
-            <el-input
-              v-model="fmData.name"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="手机号" prop="mobile">
-            <el-input
-              v-model="fmData.mobile"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="证件号" prop="idCard">
-            <el-input
-              v-model="fmData.idCard"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
-            </el-input>
-          </el-form-item>
-        </div>
-        <div>
-          <!-- <el-form-item label="迁入时间" prop="startTime">
+        <!-- <el-form-item label="迁入时间" prop="startTime">
             <el-date-picker
               v-model="rangeTime"
               type="daterange"
@@ -158,104 +127,87 @@
             </el-date-picker>
           </el-form-item> -->
 
-          <el-form-item label="审核状态" prop="confirmResult">
-            <el-select
-              v-model.trim="fmData.confirmResult"
-              placeholder="审核状态"
-              size="small"
-              clearable
-              class="resi-cell-select"
-            >
-              <el-option
-                v-for="item in optionsWelfare"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button
-              class="diy-button--search"
-              size="small"
-              @click="handleSearch"
-              >查询</el-button
-            >
-            <el-button
-              class="diy-button--reset"
-              size="small"
-              @click="resetForm('searchForm')"
-              >重置</el-button
-            >
-          </el-form-item>
+        <el-form-item label="审核状态"
+                      prop="confirmResult">
+          <el-select v-model.trim="fmData.confirmResult"
+                     placeholder="审核状态"
+                     size="small"
+                     clearable
+                     class="item_width_normal">
+            <el-option v-for="item in optionsWelfare"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <div class="div_search_btn">
+          <el-button class="diy-button--white"
+                     size="small"
+                     @click="resetForm('searchForm')">重置</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--blue"
+                     @click="handleSearch">查询</el-button>
+
         </div>
+
       </el-form>
-    </el-card>
+    </div>
+
     <el-card class="resi-card-table">
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        class="resi-table"
-        :height="maxTableHeight"
-      >
-        <el-table-column
-          label="序号"
-          fixed="left"
-          type="index"
-          align="center"
-          width="50"
-        />
-
-        <el-table-column
-          prop="name"
-          width="100"
-          fixed="left"
-          label="姓名"
-          align="center"
-        />
-          <!-- <template slot-scope="scope">
+      <el-table :data="tableData"
+                border
+                style="width: 100%"
+                class="resi-table"
+                :height="maxTableHeight">
+        <el-table-column label="序号"
+                         fixed="left"
+                         type="index"
+                         align="center"
+                         width="50" />
+
+        <el-table-column prop="name"
+                         width="100"
+                         fixed="left"
+                         label="姓名"
+                         align="center" />
+        <!-- <template slot-scope="scope">
             <a class="name-a" @click="handleWatch(scope.$index)">
               {{ scope.row.name }}
             </a>
           </template>
         </el-table-column> -->
-        <el-table-column prop="gender" align="center" width="60" label="性别">
+        <el-table-column prop="gender"
+                         align="center"
+                         width="60"
+                         label="性别">
         </el-table-column>
-        <el-table-column
-          prop="mobile"
-          width="140"
-          align="center"
-          label="手机号"
-        >
+        <el-table-column prop="mobile"
+                         width="140"
+                         align="center"
+                         label="手机号">
         </el-table-column>
 
-        <el-table-column
-          prop="idCard"
-          align="center"
-          width="180"
-          label="证件号"
-        >
+        <el-table-column prop="idCard"
+                         align="center"
+                         width="180"
+                         label="证件号">
         </el-table-column>
 
-        <el-table-column
-          prop="gridName"
-          align="center"
-          label="所属网格"
-          min-width="160"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="gridName"
+                         align="center"
+                         label="所属网格"
+                         min-width="160"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column
-          prop="homeName"
-          label="所属房屋"
-          align="center"
-          min-width="160"
-          :show-overflow-tooltip="true"
-        />
+        <el-table-column prop="homeName"
+                         label="所属房屋"
+                         align="center"
+                         min-width="160"
+                         :show-overflow-tooltip="true" />
         <!-- <el-table-column
           prop="allName"
           label="迁出类型"
@@ -263,40 +215,31 @@
           min-width="160"
           :show-overflow-tooltip="true"
         /> -->
-        <el-table-column
-          prop="newHomeName"
-          label="迁往房屋"
-          align="center"
-          min-width="160"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          prop="confirmResult"
-          label="审核状态"
-          align="center"
-          width="100"
-        />
-
-
-        <el-table-column fixed="right" label="操作" align="center" width="120">
+        <el-table-column prop="newHomeName"
+                         label="迁往房屋"
+                         align="center"
+                         min-width="160"
+                         :show-overflow-tooltip="true" />
+        <el-table-column prop="confirmResult"
+                         label="审核状态"
+                         align="center"
+                         width="100" />
+
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
-            <el-button
-              @click="handleWatch(scope.row)"
-              type="text"
-              size="small"
-              >查看</el-button
-            >
-
+            <el-button @click="handleWatch(scope.row)"
+                       type="text"
+                       size="small">查看</el-button>
 
             <template v-if="filterEdit(scope.row.agencyId)">
-              <el-button
-                v-if="scope.row.confirmResult == '未审核'"
-                @click="handleEdit(scope.row)"
-                type="text"
-                size="small"
-                class="div-table-button--edit"
-                >审核</el-button
-              >
+              <el-button v-if="scope.row.confirmResult == '未审核'"
+                         @click="handleEdit(scope.row)"
+                         type="text"
+                         size="small"
+                         class="div-table-button--edit">审核</el-button>
             </template>
 
           </template>
@@ -304,35 +247,29 @@
       </el-table>
 
       <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="pageNo"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="parseInt(pageSize)"
-          layout="sizes, prev, pager, next, total"
-          :total="total"
-        >
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="parseInt(pageSize)"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
         </el-pagination>
       </div>
     </el-card>
 
     <!-- 修改弹出框 -->
-    <el-dialog
-      :visible.sync="formShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="formTitle"
-      width="1000px"
-      top="5vh"
-      class="dialog-h"
-      @close="handleClose(false)"
-    >
-      <verify-form
-        v-if="formShow"
-        ref="eleEditForm"
-        @dialogCancle="handleClose"
-      ></verify-form>
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="1000px"
+               top="5vh"
+               class="dialog-h"
+               @close="handleClose(false)">
+      <verify-form v-if="formShow"
+                   ref="eleEditForm"
+                   @dialogCancle="handleClose"></verify-form>
     </el-dialog>
   </div>
 </template>
@@ -346,7 +283,7 @@ import axios from 'axios'
 
 export default {
   components: { verifyForm },
-  data() {
+  data () {
     return {
       openSearch: false,
 
@@ -402,7 +339,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
-    maxTableHeight() {
+    maxTableHeight () {
       console.log('computed-searchH---', this.searchH)
       const h = this.clientHeight - this.searchH - 440 + this.iframeHeight
       const _h = this.clientHeight - this.searchH - 440
@@ -411,13 +348,13 @@ export default {
 
     },
 
-    changeVDisabled() {
+    changeVDisabled () {
       return !this.fmData.villageId
     },
-    changeBDisabled() {
+    changeBDisabled () {
       return !this.fmData.buildId
     },
-    changeDDisabled() {
+    changeDDisabled () {
       return !this.fmData.unitId
     }
   },
@@ -432,7 +369,7 @@ export default {
         this.fmData.endTime = ''
       }
     },
-    searchH() {
+    searchH () {
       const h = this.clientHeight - this.searchH + this.iframeHeight
       const _h = this.clientHeight - this.searchH
       console.log('computed-searchH---_h', _h)
@@ -442,7 +379,7 @@ export default {
       })
     }
   },
-  mounted() {
+  mounted () {
     this.getGridList()
     this.getValiheList()
     this.getTableData()
@@ -454,20 +391,20 @@ export default {
       const { user } = this.$store.state
       return id === user.agencyId
     },
-    handleClearVillage() {
+    handleClearVillage () {
       this.fmData.buildId = ''
       this.fmData.homeId = ''
     },
-    handleClearBuild() {
+    handleClearBuild () {
       this.fmData.buildId = ''
       this.fmData.unitId = ''
       this.fmData.homeId = ''
     },
-    handleClearDan() {
+    handleClearDan () {
       this.fmData.unitId = ''
       this.fmData.homeId = ''
     },
-    handleChangeGrid(val) {
+    handleChangeGrid (val) {
       console.log('val', val)
       this.fmData.villageId = ''
       this.fmData.buildId = ''
@@ -475,26 +412,26 @@ export default {
       this.fmData.homeId = ''
       this.getValiheList()
     },
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log('val', val)
       this.fmData.buildId = ''
       this.fmData.unitId = ''
       this.fmData.homeId = ''
       this.getBuildList()
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log('val', val)
       this.fmData.unitId = ''
       this.fmData.homeId = ''
       this.getUniList()
     },
-    handleChangeD(val) {
+    handleChangeD (val) {
       console.log('val', val)
       this.fmData.homeId = ''
       this.getHouseList()
     },
 
-    getGridList() {
+    getGridList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/customergrid/gridoption', {
@@ -513,7 +450,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
@@ -533,7 +470,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post('/gov/org/icbuilding/buildingoption', {
           neighborHoodId: this.fmData.villageId
@@ -550,7 +487,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post('/gov/org/icbuildingunit/unitoption', {
           buildingId: this.fmData.buildId
@@ -567,7 +504,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post('/gov/org/ichouse/houseoption', { unitId: this.fmData.unitId })
         .then(({ data: res }) => {
@@ -583,35 +520,35 @@ export default {
         })
     },
 
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`)
       this.pageSize = val
       window.localStorage.setItem('pageSize', val)
       this.getTableData()
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log(`当前页: ${val}`)
       this.pageNo = val
       this.getTableData()
     },
 
-    handleClose(val) {
+    handleClose (val) {
       console.log('val-----', val)
       if (val) {
         this.handleEditSuccess()
       }
       this.formShow = false
     },
-    handleSearch(val) {
+    handleSearch (val) {
       console.log(this.fmData)
       this.pageNo = 1
       this.getTableData()
     },
-    resetForm(formName) {
+    resetForm (formName) {
       this.$refs[formName].resetFields()
       this.handleSearch()
     },
-    async handleAdd() {
+    async handleAdd () {
       this.formShow = true
       await nextTick()
       console.log(this.$refs)
@@ -619,23 +556,23 @@ export default {
     },
 
 
-    async handleWatch(row) {
+    async handleWatch (row) {
       this.formShow = true
       await nextTick()
       this.$refs.eleEditForm.getDatail('detail', row.id)
     },
 
-    async handleEdit(row) {
+    async handleEdit (row) {
       this.formShow = true
       await nextTick()
       this.$refs.eleEditForm.getDatail('edit', row.id)
     },
-    handleEditSuccess() {
+    handleEditSuccess () {
       // this.handleClose()
       this.getTableData()
     },
 
-    async handleDel(rowData, rowIndex) {
+    async handleDel (rowData, rowIndex) {
       console.log(rowData, rowIndex)
       const url =
         '/heart/iccommunityselforganization/delcommunityselforganization'
@@ -653,7 +590,7 @@ export default {
       }
     },
 
-    async getTableData() {
+    async getTableData () {
       const url = '/epmetuser/myHome/confirmList'
       const { pageSize, pageNo, fmData } = this
       const { data, code, msg } = await requestPost(url, {
@@ -666,8 +603,8 @@ export default {
         this.total = data.total || 0
         this.tableData = data.list
           ? data.list.map((item) => {
-              return item
-            })
+            return item
+          })
           : []
       } else {
       }
@@ -677,7 +614,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '@/assets/scss/buttonstyle.scss';
+@import "@/assets/scss/modules/management/list-main.scss";
 
 .resi-container .resi-card-table {
   ::v-deep .el-table th {