diff --git a/src/assets/scss/modules/management/detail-main.scss b/src/assets/scss/modules/management/detail-main.scss
index 0b491394f..426ffdf66 100644
--- a/src/assets/scss/modules/management/detail-main.scss
+++ b/src/assets/scss/modules/management/detail-main.scss
@@ -134,7 +134,10 @@
       .info-title-2 {
         
           flex: 0 0 100px;
-          font-size: 15px;
+
+      }
+      .info-title-3{
+        flex: 0 0 150px;
       }
 
       > span,
diff --git a/src/views/modules/base/community/buildDetail.vue b/src/views/modules/base/community/buildDetail.vue
index 236e3c9ab..31039d156 100644
--- a/src/views/modules/base/community/buildDetail.vue
+++ b/src/views/modules/base/community/buildDetail.vue
@@ -22,7 +22,7 @@
 
           <div class="info-prop">
             <span class="info-title-2">楼栋类型：</span>
-            <span>{{ dataForm.buildType?dataForm.buildType:'--'}}</span>
+            <span>{{ dataForm.typeName?dataForm.typeName:'--'}}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">单元数：</span>
diff --git a/src/views/modules/base/community/communityDetail.vue b/src/views/modules/base/community/communityDetail.vue
index fbb8ae91e..b04e4f30f 100644
--- a/src/views/modules/base/community/communityDetail.vue
+++ b/src/views/modules/base/community/communityDetail.vue
@@ -36,7 +36,7 @@
 
           <div class="info-prop">
             <span class="info-title-2">关联物业：</span>
-            <span>{{ dataForm.propertyName?dataForm.propertyName:'--'}}</span>
+            <span>{{ dataForm.propertyShow?dataForm.propertyShow:'--'}}</span>
           </div>
           <div class="info-prop">
             <span class="info-title-2">实有楼栋：</span>
@@ -115,6 +115,13 @@ export default {
     async initForm (row) {
       this.dataForm = JSON.parse(JSON.stringify(row))
 
+      let propertyShowList = []
+      this.dataForm.propertyList.forEach(element => {
+        propertyShowList.push(element.name)
+      });
+
+      this.dataForm.propertyShow = propertyShowList.join(',')
+
       this.initLoading = true
 
       this.$nextTick(() => {
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index cf0d1b125..5c92033ec 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -453,7 +453,7 @@ export default {
     },
 
     detailFormCancle () {
-      this.$refs.ref_form_detail.diaDestroy()
+      // this.$refs.ref_form_detail.diaDestroy()
       this.detailShow = false
     },
 
diff --git a/src/views/modules/base/huji/chusheng/cpts/detail.vue b/src/views/modules/base/huji/chusheng/cpts/detail.vue
new file mode 100644
index 000000000..603592f0e
--- /dev/null
+++ b/src/views/modules/base/huji/chusheng/cpts/detail.vue
@@ -0,0 +1,185 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <div v-if="initLoading"
+           class="m-row">
+        <div class="m-info">
+          <div class="info-prop">
+            <span class="info-title-3">所属网格：</span>
+            <span>{{ fmData.gridName  }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">所属房屋：</span>
+            <span>{{ fmData.homeAllName ?fmData.homeAllName :'--' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">姓名：</span>
+            <span>{{ fmData.name}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">手机号：</span>
+            <span>{{ fmData.mobile?fmData.mobile:'--'}}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">证件号：</span>
+            <span>{{ fmData.idCard?fmData.idCard:'--'}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">性别：</span>
+            <span>{{fmData.gender==='1' ?'男' :fmData.gender==='2'?'女':'未知' }}</span>
+          </div>
+
+          <div class="info-prop">
+            <span class="info-title-3">出生日期：</span>
+            <span>{{ fmData.birthday?fmData.birthday:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">出生地：</span>
+            <span>{{ fmData.birthplace?fmData.birthplace:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">出生父亲姓名：</span>
+            <span>{{ fmData.father?fmData.father:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">出生母亲姓名：</span>
+            <span>{{ fmData.mother?fmData.mother:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">胎次：</span>
+            <span>{{ fmData.count? fmData.count:0}}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">申报户口日期：</span>
+            <span>{{ fmData.reportDate?fmData.reportDate:'--' }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">户主姓名：</span>
+            <span>{{ fmData.householderName? fmData.householderName:'--'  }}</span>
+          </div>
+          <div class="info-prop">
+            <span class="info-title-3">与户主关系：</span>
+            <span>{{ fmData.householderRelationName ? fmData.householderRelationName :'--' }}</span>
+          </div>
+
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost } from "@/js/dai/request";
+
+
+let loading; // 加载动画
+
+function iniFmData () {
+  return {
+    id: "",
+    gridId: "",
+    villageId: "",
+    buildId: "",
+    unitId: "",
+    homeId: "",
+    name: "",
+    mobile: "",
+    idCard: "",
+    isWelfare: "0", //福利0否，1是
+    isCheck: "0",
+    isReplace: "0",
+    gender: "",
+    birthplace: "",
+    father: "",
+    mother: "",
+    count: "",
+    reportDate: "",
+    householderName: "",
+    householderRelation: "",
+    alreadyHaveMaster: false,
+  };
+}
+
+export default {
+  data () {
+    return {
+
+      btnDisable: false,
+      initLoading: false,
+
+      fmData: iniFmData(),
+
+    };
+  },
+  components: {},
+  computed: {
+
+  },
+  props: {},
+  watch: {},
+
+  async mounted () {
+
+  },
+
+  methods: {
+
+
+    async initForm (row) {
+
+      await this.getInfo(row.id);
+      this.initLoading = true
+
+    },
+
+    async getInfo (id) {
+      const { data, code, msg } = await requestPost(
+        "/epmetuser/icBirthRecord/" + id,
+        {
+          // id,
+        }
+      );
+      if (code === 0) {
+        this.fmData = { ...this.fmData, ...data };
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+
+
+
+    resetData () {
+
+      this.fmData = iniFmData();
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index fca0d3e4a..ec866fedf 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -1,30 +1,26 @@
 <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"
-      >
+    <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="所属网格">
+          <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-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>
@@ -32,76 +28,60 @@
 
           <el-form-item label="所属房屋">
             <div class="resi-cell-value">
-              <el-select
-                v-model.trim="fmData.villageId"
-                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-select v-model.trim="fmData.villageId"
+                         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="fmData.buildId"
-                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-select v-model.trim="fmData.buildId"
+                         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="fmData.unitId"
-                :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-select v-model.trim="fmData.unitId"
+                         :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="fmData.homeId"
-                :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-select v-model.trim="fmData.homeId"
+                         :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>
@@ -109,239 +89,205 @@
         </div>
 
         <div>
-          <el-form-item label="姓名" prop="name">
-            <el-input
-              v-model="fmData.name"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
+          <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-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-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="birthdayTime">
-            <el-date-picker
-              v-model="fmData.birthdayTime"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-            >
+          <el-form-item label="出生日期"
+                        prop="birthdayTime">
+            <el-date-picker v-model="fmData.birthdayTime"
+                            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.isWelfare"
-              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-form-item label="享受福利"
+                        prop="remark">
+            <el-select v-model.trim="fmData.isWelfare"
+                       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-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-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
-        >
+        <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" fixed="left" label="姓名" align="center">
+      <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"
+                         fixed="left"
+                         label="姓名"
+                         align="center">
           <template slot-scope="scope">
-            <a class="name-a" @click="handleWatch(scope.$index)">
+            <a class="name-a"
+               @click="handleWatch(scope.$index)">
               {{ scope.row.name }}
             </a>
           </template>
         </el-table-column>
 
-        <el-table-column
-          prop="gridName"
-          align="center"
-          label="所属网格"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="gridName"
+                         align="center"
+                         label="所属网格"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column
-          prop="home"
-          label="所属房屋"
-          align="center"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="home"
+                         label="所属房屋"
+                         align="center"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column
-          prop="mobile"
-          width="100"
-          align="center"
-          label="手机号"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="mobile"
+                         width="100"
+                         align="center"
+                         label="手机号"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column
-          prop="idCard"
-          align="center"
-          label="证件号"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="idCard"
+                         align="center"
+                         label="证件号"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column prop="gender" align="center" label="性别">
+        <el-table-column prop="gender"
+                         align="center"
+                         label="性别">
         </el-table-column>
 
-        <el-table-column
-          prop="birthday"
-          align="center"
-          label="出生日期"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="birthday"
+                         align="center"
+                         label="出生日期"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column
-          prop="birthplace"
-          align="center"
-          label="出生地"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="birthplace"
+                         align="center"
+                         label="出生地"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column
-          prop="parentName"
-          align="center"
-          label="出生人父/母姓名"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="parentName"
+                         align="center"
+                         label="出生人父/母姓名"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column prop="count" align="center" label="胎次">
+        <el-table-column prop="count"
+                         align="center"
+                         label="胎次">
         </el-table-column>
 
-        <el-table-column
-          prop="reportDate"
-          align="center"
-          label="申报户口日期"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="reportDate"
+                         align="center"
+                         label="申报户口日期"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column
-          prop="householderName"
-          align="center"
-          label="户主姓名"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="householderName"
+                         align="center"
+                         label="户主姓名"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column
-          prop="householderRelation"
-          align="center"
-          label="与户主关系"
-          :show-overflow-tooltip="true"
-        >
+        <el-table-column prop="householderRelation"
+                         align="center"
+                         label="与户主关系"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column fixed="right" label="操作" align="center" width="160">
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="160">
           <template slot-scope="scope">
             <!-- <el-button
               @click="handleWatch(scope.$index)"
@@ -350,63 +296,61 @@
               >查看</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-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 @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 :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>
+
+    <!-- 详情弹出框 -->
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'出生详情'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="detailFormCancle">
+      <detail-form ref="ref_form_detail"></detail-form>
     </el-dialog>
   </div>
 </template>
@@ -416,16 +360,18 @@ import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import editForm from "./cpts/edit";
+import detailForm from "./cpts/detail";
 import axios from "axios";
 
 export default {
-  components: { editForm },
-  data() {
+  components: { editForm, detailForm },
+  data () {
     return {
       openSearch: false,
 
       formShow: false,
       formTitle: "出生登记",
+      detailShow: false,
 
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
@@ -478,19 +424,19 @@ export default {
     };
   },
   computed: {
-    maxTableHeight() {
+    maxTableHeight () {
       return this.$store.state.inIframe
         ? this.clientHeight - 360 + this.iframeHeigh
         : this.clientHeight - 360;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
-    changeVDisabled() {
+    changeVDisabled () {
       return !this.fmData.villageId;
     },
-    changeBDisabled() {
+    changeBDisabled () {
       return !this.fmData.buildId;
     },
-    changeDDisabled() {
+    changeDDisabled () {
       return !this.fmData.unitId;
     },
   },
@@ -505,26 +451,26 @@ export default {
       }
     },
   },
-  mounted() {
+  mounted () {
     this.getGridList();
     this.getValiheList();
     this.getTableData();
   },
   methods: {
-    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 = "";
@@ -532,26 +478,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", {
@@ -570,7 +516,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state;
       this.$http
         .post("/gov/org/icneighborhood/neighborhoodoption", {
@@ -590,7 +536,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post("/gov/org/icbuilding/buildingoption", {
           neighborHoodId: this.fmData.villageId,
@@ -607,7 +553,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post("/gov/org/icbuildingunit/unitoption", {
           buildingId: this.fmData.buildId,
@@ -624,7 +570,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId })
         .then(({ data: res }) => {
@@ -640,7 +586,7 @@ export default {
         });
     },
 
-    async handleExportModule() {
+    async handleExportModule () {
       let url = "/heart/iccommunityselforganization/import-template-download";
 
       let params = {};
@@ -677,18 +623,18 @@ export default {
         });
     },
     // 上传大图标成功
-    handleExcelSuccess(res, file) {
+    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) {
+    handleProgress (event, file, fileList) {
       console.log("percentage", file.percentage);
     },
 
-    beforeExcelUpload(file) {
+    beforeExcelUpload (file) {
       console.log("file", file);
       const isType = file.type === "application/vnd.ms-excel";
       const isTypeComputer =
@@ -705,7 +651,7 @@ export default {
       }
       return fileType && isLt1M;
     },
-    async uploadHttpRequest(file) {
+    async uploadHttpRequest (file) {
       this.importLoading = true;
       this.importBtnTitle = "正在上传中...";
       this.$message({
@@ -760,38 +706,38 @@ export default {
       this.$refs.upload.clearFiles();
     },
 
-    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() {
+    handleClose () {
       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);
       this.$refs.eleEditForm.initForm("add");
     },
 
-    async handleChu() {
+    async handleChu () {
       const url = "/epmetuser/icBirthRecord/export";
       const { pageSize, pageNo, fmData } = this;
       axios({
@@ -826,23 +772,33 @@ export default {
         });
     },
 
-    async handleWatch(rowIndex) {
-      this.formShow = true;
-      await nextTick();
-      this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+    async handleWatch (rowIndex) {
+      // this.formShow = true;
+      // await nextTick();
+      // this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
+      this.detailShow = true
+
+      this.$nextTick(() => {
+        this.$refs.ref_form_detail.initForm(this.tableData[rowIndex])
+      })
+    },
+
+    detailFormCancle () {
+
+      this.detailShow = false
     },
 
-    async handleEdit(rowIndex) {
+    async handleEdit (rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess() {
+    handleEditSuccess () {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel(rowData, rowIndex) {
+    async handleDel (rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url =
         "/heart/iccommunityselforganization/delcommunityselforganization";
@@ -860,7 +816,7 @@ export default {
       }
     },
 
-    async getTableData() {
+    async getTableData () {
       const url = "/epmetuser/icBirthRecord/page";
       const { pageSize, pageNo, fmData } = this;
       const { data, code, msg } = await requestPost(url, {
@@ -873,8 +829,8 @@ export default {
         this.total = data.total || 0;
         this.tableData = data.list
           ? data.list.map((item) => {
-              return item;
-            })
+            return item;
+          })
           : [];
       } else {
       }
diff --git a/src/views/modules/base/huji/immigration/detail.vue b/src/views/modules/base/huji/immigration/detail.vue
new file mode 100644
index 000000000..703f18a93
--- /dev/null
+++ b/src/views/modules/base/huji/immigration/detail.vue
@@ -0,0 +1,176 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h">
+
+      <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>
+      </div>
+
+    </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: '',
+    householderName: '',
+    moveNumber: '',
+    householderRelation: '',
+    alreadyHaveMaster: false,
+    isReplace: '0'
+  }
+}
+
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+      btnDisable: false,
+      initLoading: false,
+
+
+      fmData: iniFmData(),
+
+      userInfo: {},
+
+    }
+  },
+  components: {},
+  computed: {
+
+  },
+  props: {},
+  watch: {},
+
+  async mounted () {
+    console.log('mounted-----我执行了')
+
+  },
+
+  methods: {
+
+    async initForm (id) {
+
+      await this.getDatail(id)
+
+      this.initLoading = true
+
+    },
+    async getDatail (moveInId) {
+      let url = '/epmetuser/icMoveIn/detail'
+
+      const params = {
+        moveInId: moveInId || ''
+      }
+      const { data, code, msg } = await requestPost(url, params)
+      if (code === 0) {
+        this.fmData = { ...data }
+
+
+      } else this.$message.error(msg)
+    },
+
+    resetData () {
+      this.orgId = ''
+
+      this.btnDisable = false
+      this.userInfo = {}
+      this.fmData = iniFmData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/detail-main.scss";
+</style>
+
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 8f4673564..95ee697f1 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -1,30 +1,26 @@
 <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"
-      >
+    <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="所属网格">
+          <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-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>
@@ -33,76 +29,60 @@
             <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-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
-                    :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-select v-model.trim="fmData.buildId"
+                             placeholder="楼号"
+                             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="单元"
-                    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-select v-model.trim="fmData.unitId"
+                             placeholder="单元"
+                             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-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>
@@ -112,312 +92,271 @@
         </div>
 
         <div>
-          <el-form-item label="姓名" prop="name">
-            <el-input
-              v-model="fmData.name"
-              class="resi-cell-input"
-              size="small"
-              clearable
-              placeholder="请输入"
-            >
+          <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-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-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-date-picker
-              v-model="rangeTime"
-              type="daterange"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              value-format="yyyy-MM-dd"
-            >
+          <el-form-item label="迁入时间"
+                        prop="startTime">
+            <el-date-picker v-model="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-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-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-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
-        >
+        <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="tableHeight"
-      >
-        <el-table-column
-          label="序号"
-          fixed="left"
-          type="index"
-          align="center"
-          width="50"
-        />
-
-        <el-table-column
-          prop="name"
-          width="100"
-          fixed="left"
-          label="姓名"
-          align="center"
-        >
+      <el-table :data="tableData"
+                border
+                style="width: 100%"
+                class="resi-table"
+                :height="tableHeight">
+        <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)">
+            <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 prop="gridName"
+                         align="center"
+                         label="所属网格"
+                         min-width="160"
+                         :show-overflow-tooltip="true">
         </el-table-column>
 
-        <el-table-column
-          prop="allName"
-          label="所属房屋"
-          align="center"
-          min-width="160"
-          :show-overflow-tooltip="true"
-        />
-
-        <el-table-column
-          prop="mobile"
-          width="140"
-          align="center"
-          label="手机号"
-        >
+        <el-table-column prop="allName"
+                         label="所属房屋"
+                         align="center"
+                         min-width="160"
+                         :show-overflow-tooltip="true" />
+
+        <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 prop="idCard"
+                         align="center"
+                         min-width="160"
+                         label="证件号">
         </el-table-column>
 
-        <el-table-column prop="genderName" align="center" width="60" label="性别">
+        <el-table-column prop="genderName"
+                         align="center"
+                         width="60"
+                         label="性别">
         </el-table-column>
 
-        <el-table-column prop="age" align="center" width="60" label="年龄">
+        <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 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 prop="inReason"
+                         align="center"
+                         label="迁入原因"
+                         min-width="160"
+                         show-overflow-tooltip>
         </el-table-column>
 
-        <el-table-column
-          prop="sourceAddress"
-          min-width="160"
-          align="center"
-          label="由何地迁入"
-        >
+        <el-table-column prop="sourceAddress"
+                         min-width="160"
+                         align="center"
+                         label="由何地迁入">
         </el-table-column>
 
-        <el-table-column
-          prop="moveNumber"
-          min-width="160"
-          align="center"
-          label="迁移证号码"
-        >
+        <el-table-column prop="moveNumber"
+                         min-width="160"
+                         align="center"
+                         label="迁移证号码">
         </el-table-column>
 
-        <el-table-column
-          prop="householderName"
-          min-width="100"
-          align="center"
-          label="户主姓名"
-        >
+        <el-table-column prop="householderName"
+                         min-width="100"
+                         align="center"
+                         label="户主姓名">
         </el-table-column>
 
-        <el-table-column
-          prop="householderRelationName"
-          align="center"
-          min-width="100"
-          label="与户主关系"
-        >
+        <el-table-column prop="householderRelationName"
+                         align="center"
+                         min-width="100"
+                         label="与户主关系">
         </el-table-column>
 
-        <el-table-column fixed="right" label="操作" align="center" width="120">
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="120">
           <template slot-scope="scope">
-            <el-button
-              v-if="false"
-              @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-button v-if="false"
+                       @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 @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
-        v-if="formShow"
-        ref="eleEditForm"
-        @dialogCancle="handleClose"
-        @dialogOk="handleEditSuccess"
-      ></edit-form>
+    <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 v-if="formShow"
+                 ref="eleEditForm"
+                 @dialogCancle="handleClose"
+                 @dialogOk="handleEditSuccess"></edit-form>
+    </el-dialog>
+
+    <!-- 详情弹出框 -->
+    <el-dialog :visible.sync="detailShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'迁入详情'"
+               width="850px"
+               top="5vh"
+               class="dialog-h"
+               @closed="detailFormCancle">
+      <detail-form v-if="detailShow"
+                   ref="ref_form_detail"></detail-form>
     </el-dialog>
   </div>
 </template>
@@ -427,16 +366,19 @@ import { requestPost } from '@/js/dai/request'
 import nextTick from 'dai-js/tools/nextTick'
 import { mapGetters } from 'vuex'
 import editForm from './edit'
+import detailForm from './detail'
 import axios from 'axios'
 
 export default {
-  components: { editForm },
-  data() {
+  components: { editForm, detailForm },
+  data () {
     return {
       openSearch: false,
 
       formShow: false,
+      detailShow: false,
       formTitle: '迁入登记',
+      detailShow: false,
 
       pageNo: 1,
       pageSize: window.localStorage.getItem('pageSize') || 20,
@@ -485,7 +427,7 @@ export default {
   },
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
-    maxTableHeight() {
+    maxTableHeight () {
       console.log('computed-searchH---', this.searchH)
       const h = this.clientHeight - this.searchH + this.iframeHeight
       const _h = this.clientHeight - this.searchH
@@ -494,13 +436,13 @@ export default {
 
     },
 
-    changeVDisabled() {
+    changeVDisabled () {
       return !this.fmData.villageId
     },
-    changeBDisabled() {
+    changeBDisabled () {
       return !this.fmData.buildId
     },
-    changeDDisabled() {
+    changeDDisabled () {
       return !this.fmData.unitId
     }
   },
@@ -515,7 +457,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)
@@ -525,7 +467,7 @@ export default {
       })
     }
   },
-  mounted() {
+  mounted () {
     this.getGridList()
     this.getValiheList()
     this.getTableData()
@@ -533,20 +475,20 @@ export default {
     console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
   },
   methods: {
-    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 = ''
@@ -554,26 +496,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', {
@@ -592,7 +534,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state
       this.$http
         .post('/gov/org/icneighborhood/neighborhoodoption', {
@@ -612,7 +554,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post('/gov/org/icbuilding/buildingoption', {
           neighborHoodId: this.fmData.villageId
@@ -629,7 +571,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post('/gov/org/icbuildingunit/unitoption', {
           buildingId: this.fmData.buildId
@@ -646,7 +588,7 @@ export default {
           return this.$message.error('网络错误')
         })
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post('/gov/org/ichouse/houseoption', { unitId: this.fmData.unitId })
         .then(({ data: res }) => {
@@ -662,7 +604,7 @@ export default {
         })
     },
 
-    async handleExportModule() {
+    async handleExportModule () {
       let url = '/heart/iccommunityselforganization/import-template-download'
 
       let params = {}
@@ -699,18 +641,18 @@ export default {
         })
     },
     // 上传大图标成功
-    handleExcelSuccess(res, file) {
+    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) {
+    handleProgress (event, file, fileList) {
       console.log('percentage', file.percentage)
     },
 
-    beforeExcelUpload(file) {
+    beforeExcelUpload (file) {
       console.log('file', file)
       const isType = file.type === 'application/vnd.ms-excel'
       const isTypeComputer =
@@ -727,7 +669,7 @@ export default {
       }
       return fileType && isLt1M
     },
-    async uploadHttpRequest(file) {
+    async uploadHttpRequest (file) {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       this.$message({
@@ -782,38 +724,38 @@ export default {
       this.$refs.upload.clearFiles()
     },
 
-    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() {
+    handleClose () {
       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)
       this.$refs.eleEditForm.initForm('add')
     },
 
-    async handleChu() {
+    async handleChu () {
       const url =
         '/epmetuser/icMoveIn/export'
       const { pageSize, pageNo, fmData } = this
@@ -875,7 +817,7 @@ export default {
       //     return this.$message.error('网络错误')
       //   })
     },
-    formatData(res) {
+    formatData (res) {
       const fileReader = new FileReader()
       fileReader.onloadend = () => {
         try {
@@ -891,7 +833,7 @@ export default {
       }
       fileReader.readAsText(res.data)
     },
-    downloadFile(res) {
+    downloadFile (res) {
       if (res.headers["content-disposition"]) {
         let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
         console.log('filename', fileName)
@@ -910,23 +852,35 @@ export default {
       } else this.$message.error('下载失败')
     },
 
-    async handleWatch(rowIndex) {
-      this.formShow = true
-      await nextTick()
-      this.$refs.eleEditForm.initForm('detail', this.tableData[rowIndex].moveInId)
+    async handleWatch (rowIndex) {
+      // this.formShow = true
+      // await nextTick()
+      // this.$refs.eleEditForm.initForm('detail', this.tableData[rowIndex].moveInId)
+
+      this.detailShow = true
+
+      this.$nextTick(() => {
+        this.$refs.ref_form_detail.initForm(this.tableData[rowIndex].moveInId)
+      })
+
     },
 
-    async handleEdit(rowIndex) {
+    detailFormCancle () {
+
+      this.detailShow = false
+    },
+
+    async handleEdit (rowIndex) {
       this.formShow = true
       await nextTick()
       this.$refs.eleEditForm.initForm('edit', this.tableData[rowIndex].moveInId)
     },
-    handleEditSuccess() {
+    handleEditSuccess () {
       this.handleClose()
       this.getTableData()
     },
 
-    async handleDel(rowData, rowIndex) {
+    async handleDel (rowData, rowIndex) {
       console.log(rowData, rowIndex)
       const url =
         '/heart/iccommunityselforganization/delcommunityselforganization'
@@ -944,7 +898,7 @@ export default {
       }
     },
 
-    async getTableData() {
+    async getTableData () {
       const url = '/epmetuser/icMoveIn/list'
       const { pageSize, pageNo, fmData } = this
       const { data, code, msg } = await requestPost(url, {
@@ -957,8 +911,8 @@ export default {
         this.total = data.total || 0
         this.tableData = data.list
           ? data.list.map((item) => {
-              return item
-            })
+            return item
+          })
           : []
       } else {
       }
@@ -968,7 +922,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '@/assets/scss/buttonstyle.scss';
+@import "@/assets/scss/buttonstyle.scss";
 
 .resi-container .resi-card-table {
   ::v-deep .el-table th {