diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
new file mode 100644
index 000000000..437ac47ed
--- /dev/null
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -0,0 +1,854 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+      <el-form
+        ref="ref_form"
+        :inline="true"
+        :model="fmData"
+        :rules="dataRule"
+        :disabled="formType === 'detail'"
+        class="form"
+      >
+        <el-form-item
+          label="所属网格	"
+          prop="gridId"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.gridId"
+            placeholder="请选择"
+            size="small"
+            clearable
+            class="item_width_1"
+            @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="所属房屋	"
+          prop="homeId"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.villageId"
+            placeholder="请选择小区"
+            size="small"
+            clearable
+            class="resi-cell-select"
+            @clear="handleClearVillage"
+            @change="handleChangeV"
+            style="margin-right: 8px; width: 120px"
+          >
+            <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
+            style="margin-right: 8px; 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="fmData.unitId"
+            :disabled="changeBDisabled"
+            placeholder="单元"
+            size="small"
+            clearable
+            style="margin-right: 8px; 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="fmData.homeId"
+            :disabled="changeDDisabled"
+            placeholder="房号"
+            size="small"
+            clearable
+            @change="handleChangeH"
+            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>
+        </el-form-item>
+
+        <el-form-item
+          label="姓名"
+          prop="name"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            maxlength="50"
+            show-word-limit
+            style="margin-right: 20px"
+            placeholder="请输入姓名	"
+            v-model="fmData.name"
+          >
+          </el-input>
+
+          <el-checkbox v-model="fmData.isWelfare" true-label="1" false-label="0"
+            >享受福利</el-checkbox
+          >
+          <el-checkbox
+            v-model="fmData.isCHeck"
+            true-label="1"
+            false-label="0"
+            @change="checkResiAvailable"
+            >补充居民信息</el-checkbox
+          >
+        </el-form-item>
+
+        <el-form-item
+          label="手机号"
+          prop="mobile"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="number"
+            maxlength="11"
+            show-word-limit
+            placeholder="请输入手机号	"
+            v-model="fmData.mobile"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="身份证号"
+          prop="idCard"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入身份证号"
+            v-model="fmData.idCard"
+            @blur="handleBlurId"
+          ></el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="性别"
+          prop="principalName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.gender"
+            placeholder="性别"
+            size="small"
+            clearable
+            class="item_width_1"
+          >
+            <el-option
+              v-for="item in optionsGender"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="年龄"
+          prop="age"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            type="number"
+            show-word-limit
+            placeholder="请输入手机号	"
+            v-model="fmData.age"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="迁入时间"
+          prop="inTime"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-date-picker
+            v-model="fmData.inTime"
+            type="date"
+            placeholder="迁入时间"
+            value-format="yyyy-MM-dd"
+            class="item_width_1"
+          >
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item
+          label="迁入原因"
+          prop="inReason"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            type="textarea"
+            class="item_width_2"
+            placeholder="请输入迁入原因"
+            v-model="fmData.inReason"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="来源地"
+          prop="sourceAddress"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-cascader ref="nowArea" class="item_width_1" :props="areaProps" 
+            v-model="nowAllCode" clearable @change="handleNowArea"></el-cascader>
+          <!-- <el-input
+            class="item_width_1"
+            placeholder="请输入来源地"
+            v-model="fmData.sourceAddress"
+          > -->
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="详细地址"
+          prop="address"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入详细地址"
+            v-model="fmData.address"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item
+          label="迁移证号码"
+          prop="moveNumber"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入迁移证号码"
+            v-model="fmData.moveNumber"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="户主姓名"
+          prop="houseHolderName"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-input
+            class="item_width_1"
+            placeholder="请输入户主姓名"
+            :disabled="fmData.alreadyHaveMaster"
+            v-model="fmData.houseName"
+          >
+          </el-input>
+        </el-form-item>
+
+        <el-form-item
+          label="与户主关系"
+          prop="houseHolderRelation"
+          label-width="150px"
+          style="display: block"
+        >
+          <el-select
+            v-model.trim="fmData.houseRelation"
+            placeholder="与户主关系"
+            size="small"
+            clearable
+            class="item_width_1"
+          >
+            <el-option
+              v-for="item in optionsRelation"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="div_btn resi-btns">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        v-if="formType != 'detail'"
+        type="primary"
+        size="small"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import formVltHelper from 'dai-js/tools/formVltHelper'
+import { computedCard } from '@/utils/index'
+import { isCard, isMobile } from '@/utils/validate'
+
+function iniFmData() {
+  return {
+    gridId: '',
+    villageId: '',
+    buildId: '',
+    unitId: '',
+    homeId: '',
+    name: '',
+    mobile: '',
+    idCard: '',
+    isWelfare: '0', //福利0否，1是
+    isCHeck: '0',
+    gender: '',
+    age: '',
+    inTime: '',
+    inReason: '',
+    sourceAddress: '',
+    address: '',
+    sourceAddressPathCode: '',
+    sourceAddressCode: '',
+    houseName: '',
+    houseRelation: '',
+    alreadyHaveMaster: false
+  }
+}
+
+export default {
+  data() {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      nowAllCode: [],
+      optionsGender: [
+        {
+          value: '1',
+          label: '男'
+        },
+        {
+          value: '2',
+          label: '女'
+        }
+      ],
+      optionsRelation: [],
+
+      fmData: iniFmData(),
+      areaProps: {
+        // checkStrictly: true,
+        lazy: true,
+        lazyLoad: this.lzayLoadArea
+      }
+    }
+  },
+  components: {},
+  computed: {
+    dataRule() {
+      let checkIdCard = (rule, value, callback) => {
+        if (value === '') {
+          callback(new Error('请输入身份证'))
+        } else {
+          if (!isCard(value)) {
+            callback(new Error('身份证号格式不正确'))
+          }
+          callback()
+        }
+      }
+
+      return {
+        gridId: [
+          { required: true, message: '所属网格不能为空', trigger: 'blur' }
+        ],
+        homeId: [
+          { required: true, message: '所属房屋不能为空', trigger: 'blur' }
+        ],
+        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+        idCard: [
+          { required: true, message: '身份证号不能为空', trigger: 'blur' },
+          { required: true, validator: checkIdCard, trigger: 'blur' }
+        ],
+        inTime: [
+          { required: true, message: '迁入时间不能为空', trigger: 'blur' }
+        ],
+        inReason: [
+          { required: true, message: '迁入原因不能为空', trigger: 'blur' }
+        ],
+        sourceAddress: [
+          { required: true, message: '来源地不能为空', trigger: 'blur' }
+        ],
+        address: [
+          { required: true, message: '详细地址不能为空', trigger: 'blur' }
+        ]
+      }
+    },
+
+    changeVDisabled() {
+      return !this.fmData.villageId
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId
+    }
+  },
+  props: {},
+  watch: {},
+
+  async mounted() {
+    this.getGridList()
+    this.getValiheList()
+    this.getRelationList()
+  },
+
+  methods: {
+    lzayLoadArea(node, resolve) {
+      // this.getArea(node, resolve)
+      setTimeout(() => {
+        this.getArea(node, resolve)
+      }, 200)
+    },
+    async checkResiAvailable() {
+      const {
+        fmData: { idCard, isResiUser }
+      } = this
+      if (isCard(idCard)) {
+        const { data, code, msg } = await requestPost(
+          '/epmetuser/icresiuser/checkuser',
+          {
+            idCard,
+            agencyId: this.$store.state.user.agencyId
+          }
+        )
+        if (code === 0) {
+          if (!data.moveInstatus) {
+            this.$message({
+              type: 'error',
+              message: `请联系${data.resiAgencyName}迁出该居民后操作`
+            })
+          }
+        } else {
+          this.$message.error(msg)
+        }
+      }
+    },
+    handleNowArea(val) {
+      console.log('val-----', val)
+      console.log('label-----', this.$refs.nowArea.getCheckedNodes())
+      if (val.length > 0) {
+        const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
+        this.fmData.presentAddressCode = val[val.length - 1]
+        this.fmData.presentAddress = labels.join('-')
+        this.fmData.presentAddressPathCode = val.join(',')
+        console.log('presentAddress', this.formData.presentAddress)
+        this.$refs.ref_form.clearValidate('presentAddress')
+      } else {
+        this.fmData.presentAddressCode = ''
+        this.fmData.presentAddress = ''
+        this.fmData.presentAddressPathCode = ''
+      }
+    },
+    handleBlurId(val) {
+      const { sex, age } = computedCard(this.fmData.idCard)
+      if (val) {
+        this.fmData.age = age
+        this.fmData.gender = sex == 1 ? '1' : '2'
+        this.checkResiAvailable()
+      }
+    },
+
+    handleClearVillage() {
+      this.fmData.buildId = ''
+      this.fmData.homeId = ''
+    },
+    handleClearBuild() {
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+    },
+    handleClearDan() {
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+    },
+    handleChangeGrid(val) {
+      console.log('val', val)
+      this.fmData.villageId = ''
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getValiheList()
+    },
+    handleChangeV(val) {
+      console.log('val', val)
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getBuildList()
+    },
+    handleChangeB(val) {
+      console.log('val', val)
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getUniList()
+    },
+    handleChangeD(val) {
+      console.log('val', val)
+      this.fmData.homeId = ''
+      this.getHouseList()
+    },
+    handleChangeH(val) {
+      console.log('val', val)
+      this.getHouseMaster()
+    },
+    async getArea (node, resolve) {
+
+      const url = "/commonservice/areacode/nextarea"
+      let params = {
+        parentLevel: node.data ? node.data.level : '',
+        parentAreaCode: node.data ? node.data.code : ''
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        const nodes = data.map(item => ({
+          value: item.areaCode, // 
+          label: item.areaName,
+          code: item.areaCode,
+          level: item.level,
+          leaf: node.level >= 4 // 5层级
+        }))
+        resolve(nodes)
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+    getRelationList() {
+      const { user } = this.$store.state
+      this.$http
+        .post('/sys/dict/data/relationship', {
+          formCode: 'resi_base_info'
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsRelation = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    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.fmData.gridId,
+          agencyId: ''
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getBuildList() {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', {
+          neighborHoodId: this.fmData.villageId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList() {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', {
+          buildingId: this.fmData.buildId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList() {
+      this.$http
+        .post('/gov/org/ichouse/houseoption', { unitId: this.fmData.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsH = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    getHouseMaster() {
+      const { homeId } = this.fmData
+      if (!homeId) return (this.alreadyHaveMaster = false)
+
+      this.$http
+        .post('/epmetuser/icresiuser/queryhousehold/' + homeId, {})
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取户主信息成功', res.data)
+            const { name } = res.data
+            if (name) {
+              this.fmData.houseHolderName = name
+              this.alreadyHaveMaster = true
+            } else {
+              this.alreadyHaveMaster = false
+            }
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    async initForm(type, id) {
+      this.$refs.ref_form.resetFields()
+
+      this.formType = type
+      if (id) {
+        this.getDatail(id)
+      }
+    },
+    async getDatail(moveInId) {
+      let url = '/epmetuser/icMoveIn/detail'
+      
+      const params = {
+        moveInId: moveInId || ''
+      }
+      const { data, code, msg } = await requestPost(url, this.fmData)
+      if (code === 0) {
+        this.fmData = { ...data }
+      } else this.$message.error(msg)
+    },
+
+    async handleComfirm() {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          app.util.validateRule(messageObj)
+          this.btnDisable = false
+        } else {
+          if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
+            return this.$message({
+              type: 'error',
+              message: '手机号格式有误'
+            })
+          }
+          this.submit()
+        }
+      })
+    },
+
+    async submit() {
+      let url = ''
+      if (this.formType === 'add') {
+        url = '/epmetuser/icMoveIn/save'
+      } else {
+        url = '/epmetuser/icMoveIn/edit'
+
+        this.fmData.orgId = this.orgId
+      }
+
+      const { data, code, msg } = await requestPost(url, this.fmData)
+
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+        this.btnDisable = false
+      } else {
+        this.btnDisable = false
+        this.$message.error(msg)
+      }
+    },
+
+    handleCancle() {
+      this.resetData()
+      this.$emit('dialogCancle')
+    },
+    resetData() {
+      this.orgId = ''
+      this.nowAllCode = []
+      this.fmData = iniFmData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.item_width_1 {
+  width: 220px;
+}
+.item_width_2 {
+  width: 400px;
+}
+.item_width_3 {
+  margin-left: 10px;
+  width: 200px;
+}
+.item_width_4 {
+  width: 200px;
+}
+
+.div_map {
+  margin-top: 10px;
+}
+
+.div_btn {
+  // display: flex;
+  // justify-content: flex-end;
+}
+.el-tabs {
+  margin: 0 20px;
+}
+.el-upload__tip {
+  color: rgb(155, 155, 155);
+  margin: 0;
+}
+.form {
+  margin-top: 30px;
+}
+
+.m-staffs {
+  width: 468px;
+  .item {
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: 7px;
+  }
+  .item-add {
+  }
+}
+</style>
+
+<style>
+.el-dialog__body {
+  padding: 0 10px 20px !important;
+}
+</style>
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
new file mode 100644
index 000000000..f49e38cdc
--- /dev/null
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -0,0 +1,971 @@
+<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="请选择小区"
+                    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="请选择楼号"
+                    size="small"
+                    clearable
+                    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="请选择单元"
+                    size="small"
+                    clearable
+                    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
+                    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>
+
+        <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="rangeTime">
+            <el-date-picker
+              v-model="fmData.rangeTime"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="享受福利" prop="remark">
+            <el-select
+              v-model.trim="fmData.isWeifare"
+              placeholder="享受福利"
+              size="small"
+              clearable
+              style="width: 120px"
+              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>
+        </div>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button class="diy-button--add" size="small" @click="handleAdd"
+          >迁入登记</el-button
+        >
+        <el-button
+          v-if="false"
+          class="diy-button--export"
+          size="small"
+          @click="handleExportModule('room')"
+          >下载模板</el-button
+        >
+        <el-upload
+          v-if="false"
+          ref="upload"
+          class="upload-btn"
+          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 @click="handleChu" class="diy-button--reset" size="small"
+          >导出</el-button
+        >
+      </div>
+      <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="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>
+
+        <el-table-column
+          prop="mobile"
+          width="140"
+          align="center"
+          label="手机号"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="idCard"
+          align="center"
+          min-width="160"
+          label="身份证号"
+        >
+        </el-table-column>
+
+        <el-table-column prop="gender" align="center" width="60" label="性别">
+        </el-table-column>
+
+        <el-table-column prop="age" align="center" width="60" label="年龄">
+        </el-table-column>
+
+        <el-table-column
+          prop="inTime"
+          align="center"
+          min-width="140"
+          label="迁入时间"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="inReason"
+          align="center"
+          label="迁入原因"
+          min-width="160"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="source"
+          min-width="160"
+          align="center"
+          label="由何地迁入"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="moveNumber"
+          min-width="160"
+          align="center"
+          label="迁移证号码"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="houseName"
+          min-width="100"
+          align="center"
+          label="户主姓名"
+        >
+        </el-table-column>
+
+        <el-table-column
+          prop="houseRelationName"
+          align="center"
+          min-width="100"
+          label="与户主关系"
+        >
+        </el-table-column>
+
+        <el-table-column fixed="right" label="操作" align="center" width="160">
+          <template slot-scope="scope">
+            <el-button
+              @click="handleWatch(scope.$index)"
+              type="text"
+              size="small"
+              >查看</el-button
+            >
+
+            <el-button
+              @click="handleEdit(scope.$index)"
+              type="text"
+              size="small"
+              class="div-table-button--edit"
+              >修改</el-button
+            >
+
+            <el-popconfirm
+              v-if="false"
+              title="删除之后无法回复，确认删除？"
+              @onConfirm="handleDel(scope.row, scope.$index)"
+              @confirm="handleDel(scope.row, scope.$index)"
+            >
+              <el-button
+                slot="reference"
+                type="text"
+                size="small"
+                class="div-table-button--delete"
+                style="margin-left: 10px"
+                >删除</el-button
+              >
+            </el-popconfirm>
+          </template>
+        </el-table-column>
+      </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>
+      </div>
+    </el-card>
+
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      width="850px"
+      top="5vh"
+      class="dialog-h"
+      @closed="handleClose"
+    >
+      <edit-form
+        ref="eleEditForm"
+        @dialogCancle="handleClose"
+        @dialogOk="handleEditSuccess"
+      ></edit-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { requestPost } from '@/js/dai/request'
+import nextTick from 'dai-js/tools/nextTick'
+import { mapGetters } from 'vuex'
+import editForm from './edit'
+import axios from 'axios'
+
+export default {
+  components: { editForm },
+  data() {
+    return {
+      openSearch: false,
+
+      formShow: false,
+      formTitle: '出生登记',
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem('pageSize') || 20,
+      total: 1,
+
+      tableData: [],
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+
+      optionsWelfare: [
+        {
+          value: '1',
+          label: '是'
+        },
+        {
+          value: '0',
+          label: '否'
+        }
+      ],
+
+      fmData: {
+        gridId: '',
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        name: '',
+        mobile: '',
+        idCard: '',
+        isWeifare: '', //福利0否，1是
+        startTime: '',
+        endTime: ''
+      },
+      rangeTime: [],
+
+      importBtnTitle: '导入',
+      importLoading: false,
+
+      //积分记录
+      scoreDiaTitle: '积分记录',
+      scoreDiaShow: false
+    }
+  },
+  computed: {
+    maxTableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight - 360
+    },
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    changeVDisabled() {
+      return !this.fmData.villageId
+    },
+    changeBDisabled() {
+      return !this.fmData.buildId
+    },
+    changeDDisabled() {
+      return !this.fmData.unitId
+    }
+  },
+  watch: {
+    rangeTime: function (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.startTime = val[0]
+        this.fmData.endTime = val[1]
+      } else {
+        this.fmData.startTime = ''
+        this.fmData.endTime = ''
+      }
+    }
+  },
+  mounted() {
+    this.getGridList()
+    this.getValiheList()
+    this.getTableData()
+  },
+  methods: {
+    handleClearVillage() {
+      this.fmData.buildId = ''
+      this.fmData.homeId = ''
+    },
+    handleClearBuild() {
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+    },
+    handleClearDan() {
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+    },
+    handleChangeGrid(val) {
+      console.log('val', val)
+      this.fmData.villageId = ''
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getValiheList()
+    },
+    handleChangeV(val) {
+      console.log('val', val)
+      this.fmData.buildId = ''
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getBuildList()
+    },
+    handleChangeB(val) {
+      console.log('val', val)
+      this.fmData.unitId = ''
+      this.fmData.homeId = ''
+      this.getUniList()
+    },
+    handleChangeD(val) {
+      console.log('val', val)
+      this.fmData.homeId = ''
+      this.getHouseList()
+    },
+
+    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.fmData.gridId,
+          agencyId: ''
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getBuildList() {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', {
+          neighborHoodId: this.fmData.villageId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList() {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', {
+          buildingId: this.fmData.buildId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList() {
+      this.$http
+        .post('/gov/org/ichouse/houseoption', { unitId: this.fmData.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsH = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    async handleExportModule() {
+      let url = '/heart/iccommunityselforganization/import-template-download'
+
+      let params = {}
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then((res) => {
+          // this.download(res.data, title + '.xls')
+          if (res.headers['content-disposition']) {
+            let fileName = window.decodeURI(
+              res.headers['content-disposition'].split(';')[1].split('=')[1]
+            )
+            console.log('filename', fileName)
+            let blob = new Blob([res.data], {
+              type: 'application/vnd.ms-excel'
+            })
+            var url = window.URL.createObjectURL(blob)
+            var aLink = document.createElement('a')
+            aLink.style.display = 'none'
+            aLink.href = url
+            aLink.setAttribute('download', fileName)
+            document.body.appendChild(aLink)
+            aLink.click()
+            document.body.removeChild(aLink) //下载完成移除元素
+            window.URL.revokeObjectURL(url) //释放掉blob对象
+          } else this.$message.error('下载失败')
+        })
+        .catch((err) => {
+          console.log('err', err)
+          return this.$message.error('网络错误')
+        })
+    },
+    // 上传大图标成功
+    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 < 10
+      if (!fileType) {
+        this.$message.error('上传文件只能是xls/xlsx格式！')
+      }
+
+      if (!isLt1M) {
+        this.$message.error('上传文件大小不能超过 10MB!')
+      }
+      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(
+          '/heart/iccommunityselforganization/importcommunityselforganization',
+          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('导入失败')
+        })
+      // axios({
+      //   url:
+      //     window.SITE_CONFIG["apiURL"] +
+      //     "/heart/iccommunityselforganization/importcommunityselforganization",
+      //   method: "post",
+      //   data: formData,
+      //   // responseType: "blob",
+      // })
+      //   .then((res) => {
+      //     this.importLoading = false;
+      //     this.importBtnTitle = "导入";
+      //     console.log("resresresresresresres", res);
+
+      //     this.getTableData();
+      //     if (res.data.code == 0) {
+      //       return this.$message.success(res.data.data || "导入成功");
+      //     } else {
+      //       return this.$message.error(res.data.msg);
+      //     }
+      //   })
+      //   .catch((err) => {
+      //     console.log("失败", err);
+      //   });
+      this.importLoading = false
+      this.importBtnTitle = '导入'
+      this.$refs.upload.clearFiles()
+    },
+
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`)
+      this.pageSize = val
+      window.localStorage.setItem('pageSize', val)
+      this.getTableData()
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`)
+      this.pageNo = val
+      this.getTableData()
+    },
+
+    handleClose() {
+      this.formShow = false
+    },
+    handleSearch(val) {
+      console.log(this.fmData)
+      this.pageNo = 1
+      this.getTableData()
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+      this.handleSearch()
+    },
+    async handleAdd() {
+      this.formShow = true
+      await nextTick()
+      console.log(this.$refs)
+      this.$refs.eleEditForm.initForm('add')
+    },
+
+    async handleChu() {
+      const url =
+        '/heart/iccommunityselforganization/exportcommunityselforganization'
+      const { pageSize, pageNo, fmData } = this
+      axios({
+        url: window.SITE_CONFIG['apiURL'] + url,
+        method: 'post',
+        data: {
+          pageSize,
+          pageNo,
+          ...fmData
+        },
+        responseType: 'blob'
+      })
+        .then((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)
+          return this.$message.error('网络错误')
+        })
+    },
+
+    async handleWatch(rowIndex) {
+      this.formShow = true
+      await nextTick()
+      this.$refs.eleEditForm.initForm('detail', this.tableData[rowIndex].moveInId)
+    },
+
+    async handleEdit(rowIndex) {
+      this.formShow = true
+      await nextTick()
+      this.$refs.eleEditForm.initForm('edit', this.tableData[rowIndex].moveInId)
+    },
+    handleEditSuccess() {
+      this.handleClose()
+      this.getTableData()
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex)
+      const url =
+        '/heart/iccommunityselforganization/delcommunityselforganization'
+      const { tableData } = this
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: tableData[rowIndex].orgId
+      })
+
+      if (code === 0) {
+        this.$message.success('删除成功！')
+        this.getTableData()
+      } else {
+        this.$message.success('操作失败！')
+      }
+    },
+
+    async getTableData() {
+      const url = '/epmetuser/icMoveIn/list'
+      const { pageSize, pageNo, fmData } = this
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...fmData
+      })
+      if (code === 0) {
+        console.log('列表请求成功！！！！！！！！！！！！！！')
+        this.total = data.total || 0
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return item
+            })
+          : []
+      } else {
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import '@/assets/scss/buttonstyle.scss';
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+
+.demo-form-inline .resi-cell {
+  display: flex;
+  align-items: center;
+  // margin-bottom: 20px;
+
+  .resi-cell-label {
+    flex-shrink: 0;
+    min-width: 0;
+    box-sizing: border-box;
+    margin-right: 15px;
+    // text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-label1 {
+    width: max-content;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 200px;
+  }
+  .resi-cell--daterange {
+    max-width: 260px;
+  }
+  .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;
+  }
+}
+.mt10 {
+  margin-top: 10px;
+}
+</style>