diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 3a0b19e03..df4b53bf4 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -1,133 +1,147 @@
 <template>
-  <div class="g-main">
-    <div ref="searchForm"
-         class="m-search">
-
-      <el-form :inline="true"
-               :model="fmData"
-               :label-width="'100px'">
-
-        <el-form-item prop="gridId"
-                      label="所属网格">
-
-          <el-select v-model.trim="fmData.gridId"
-                     placeholder="请选择网格"
-                     size="small"
-                     clearable
-                     class="u-item-width-normal"
-                     @change="handleChangeGrid">
-            <el-option v-for="item in optionsG"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-        <el-form-item label="所属房屋">
-
-          <el-select v-model.trim="fmData.villageId"
-                     placeholder="请选择小区"
-                     size="small"
-                     clearable
-                     class="u-item-width-communitycascader"
-                     @change="handleChangeV">
-            <el-option v-for="item in optionsV"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-          <el-select v-model.trim="fmData.buildId"
-                     placeholder="楼号"
-                     size="small"
-                     clearable
-                     :disabled="changeVDisabled"
-                     class="u-item-width-buildcascader"
-                     style="margin-left:5px"
-                     @change="handleChangeB">
-            <el-option v-for="item in optionsB"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-          <el-select v-model.trim="fmData.unitId"
-                     placeholder="单元"
-                     size="small"
-                     clearable
-                     :disabled="changeBDisabled"
-                     class="u-item-width-buildcascader"
-                     style="margin-left:5px"
-                     @change="handleChangeD">
-            <el-option v-for="item in optionsD"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-          <el-select v-model.trim="fmData.homeId"
-                     placeholder="房号"
-                     size="small"
-                     clearable
-                     :disabled="changeDDisabled"
-                     class="u-item-width-buildcascader"
-                     style="margin-left:5px">
-            <el-option v-for="item in optionsH"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-
-        </el-form-item>
-
-        <el-form-item label="姓名"
-                      prop="name">
-          <el-input v-model="fmData.name"
-                    class="u-item-width-normal"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="手机号"
-                      prop="mobile">
-          <el-input v-model="fmData.mobile"
-                    class="u-item-width-normal"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="证件号"
-                      prop="idCard">
-          <el-input v-model="fmData.idCard"
-                    class="u-item-width-normal"
-                    size="small"
-                    clearable
-                    placeholder="请输入">
-          </el-input>
-        </el-form-item>
-
-        <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"
-                          class="u-item-width-daterange2">
-          </el-date-picker>
-        </el-form-item>
-
-        <!-- <el-form-item label="享受福利"
+	<div class="g-main">
+		<div ref="searchForm" class="m-search">
+			<el-form :inline="true" :model="fmData" :label-width="'100px'">
+				<el-form-item prop="gridId" label="所属网格">
+					<el-select
+						v-model.trim="fmData.gridId"
+						placeholder="请选择网格"
+						size="small"
+						clearable
+						class="u-item-width-normal"
+						@change="handleChangeGrid"
+					>
+						<el-option
+							v-for="item in optionsG"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="所属房屋">
+					<el-select
+						v-model.trim="fmData.villageId"
+						placeholder="请选择小区"
+						size="small"
+						clearable
+						class="u-item-width-communitycascader"
+						@change="handleChangeV"
+					>
+						<el-option
+							v-for="item in optionsV"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+
+					<el-select
+						v-model.trim="fmData.buildId"
+						placeholder="楼号"
+						size="small"
+						clearable
+						:disabled="changeVDisabled"
+						class="u-item-width-buildcascader"
+						style="margin-left: 5px"
+						@change="handleChangeB"
+					>
+						<el-option
+							v-for="item in optionsB"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+
+					<el-select
+						v-model.trim="fmData.unitId"
+						placeholder="单元"
+						size="small"
+						clearable
+						:disabled="changeBDisabled"
+						class="u-item-width-buildcascader"
+						style="margin-left: 5px"
+						@change="handleChangeD"
+					>
+						<el-option
+							v-for="item in optionsD"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+
+					<el-select
+						v-model.trim="fmData.homeId"
+						placeholder="房号"
+						size="small"
+						clearable
+						:disabled="changeDDisabled"
+						class="u-item-width-buildcascader"
+						style="margin-left: 5px"
+					>
+						<el-option
+							v-for="item in optionsH"
+							:key="item.value"
+							:label="item.label"
+							:value="item.value"
+						>
+						</el-option>
+					</el-select>
+				</el-form-item>
+
+				<el-form-item label="姓名" prop="name">
+					<el-input
+						v-model="fmData.name"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item label="手机号" prop="mobile">
+					<el-input
+						v-model="fmData.mobile"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<el-form-item label="证件号" prop="idCard">
+					<el-input
+						v-model="fmData.idCard"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<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"
+						class="u-item-width-daterange2"
+					>
+					</el-date-picker>
+				</el-form-item>
+
+				<!-- <el-form-item label="享受福利"
                       prop="remark">
           <el-select v-model.trim="fmData.isWeifare"
                      placeholder="享受福利"
@@ -142,830 +156,924 @@
           </el-select>
         </el-form-item> -->
 
-        <div class="u-search-btn">
-          <el-button class="diy-button--white"
-                     size="small"
-                     @click="resetForm('searchForm')">重置</el-button>
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--blue"
-                     @click="handleSearch">查询</el-button>
-
-        </div>
-
-      </el-form>
-    </div>
-    <div class="m-table">
-      <div class="u-table-btn1">
-
-        <el-button class="diy-button--blue"
-                   icon="el-icon-plus"
-                   size="small"
-                   @click="handleAdd">迁入登记</el-button>
-        <el-button v-if="false"
-                   class="diy-button--white"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
-                   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--white"
-                     :loading="importLoading">{{ importBtnTitle }}</el-button>
-        </el-upload>
-
-        <el-button @click="handleChu"
-                   class="diy-button--white"
-                   size="small">导出</el-button>
-      </div>
-
-      <div class="m-table-item">
-        <el-table :data="tableData"
-                  border
-                  style="width: 100%"
-                  :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)">
-                {{ 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="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>
-
-          <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>
-
-          <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="sourceAddress"
-                           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="householderName"
-                           min-width="100"
-                           align="center"
-                           label="户主姓名">
-          </el-table-column>
-
-          <el-table-column prop="householderRelationName"
-                           align="center"
-                           min-width="100"
-                           label="与户主关系">
-          </el-table-column>
-
-          <el-table-column fixed="right"
-                           label="操作"
-                           align="center"
-                           width="190">
-            <template slot-scope="scope">
-              <el-button v-if="false"
-                         @click="handleWatch(scope.$index)"
-                         type="text"
-                         class="div-table-button--blue"
-                         size="small">查看</el-button>
-
-              <el-button @click="handleEdit(scope.$index)"
-                         type="text"
-                         size="small"
-                         class="div-table-button--blue">修改</el-button>
-
-              <el-button @click="handleChangeRecord(scope.row)"
-                         type="text"
-                         size="small"
-                         class="div-table-button--blue">变更记录</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>
-              <el-popconfirm v-if="true"
-                             title="删除之后无法回复，确认删除？"
-                             @onConfirm="handleDelNew(scope.row)"
-                             @confirm="handleDelNew(scope.row)">
-                <el-button slot="reference"
-                           type="text"
-                           size="small"
-                           class="div-table-button--blue"
-                           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>
-      </div>
-    </div>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="670px"
-               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="670px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailFormCancle">
-      <detail-form v-if="detailShow"
-                   ref="ref_form_detail"
-                   @diaDetailClose="detailFormCancle"></detail-form>
-    </el-dialog>
-
-    <!-- 变更记录 -->
-    <el-dialog :visible.sync="changeRecordShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'变更记录'"
-               width="1150px"
-               top="5vh"
-               @closed="diaClose">
-      <resi-change-record ref="ref_changerecord"></resi-change-record>
-    </el-dialog>
-  </div>
+				<div class="u-search-btn">
+					<el-button
+						class="diy-button--white"
+						size="small"
+						@click="resetForm('searchForm')"
+						>重置</el-button
+					>
+					<el-button
+						style="margin-left: 10px"
+						size="small"
+						class="diy-button--blue"
+						@click="handleSearch"
+						>查询</el-button
+					>
+				</div>
+			</el-form>
+		</div>
+
+		<div class="m-table">
+			<div class="u-table-btn1">
+				<el-button
+					class="diy-button--blue"
+					icon="el-icon-plus"
+					size="small"
+					@click="handleAdd"
+					>迁入登记</el-button
+				>
+				<el-button
+					v-if="false"
+					class="diy-button--white"
+					size="small"
+					@click="handleExportModule('room')"
+					>下载模板</el-button
+				>
+				<el-upload
+					:headers="$getElUploadHeaders()"
+					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--white"
+						:loading="importLoading"
+						>{{ importBtnTitle }}</el-button
+					>
+				</el-upload>
+
+				<el-button
+					@click="handleChu"
+					class="diy-button--white"
+					size="small"
+					>导出</el-button
+				>
+			</div>
+
+			<div class="m-table-item">
+				<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)"
+							>
+								{{ 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="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>
+
+					<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>
+
+					<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="sourceAddress"
+						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="householderName"
+						min-width="100"
+						align="center"
+						label="户主姓名"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="householderRelationName"
+						align="center"
+						min-width="100"
+						label="与户主关系"
+					>
+					</el-table-column>
+
+					<el-table-column
+						fixed="right"
+						label="操作"
+						align="center"
+						width="190"
+					>
+						<template slot-scope="scope">
+							<el-button
+								v-if="false"
+								@click="handleWatch(scope.$index)"
+								type="text"
+								class="div-table-button--blue"
+								size="small"
+								>查看</el-button
+							>
+
+							<el-button
+								@click="handleEdit(scope.$index)"
+								type="text"
+								size="small"
+								class="div-table-button--blue"
+								>修改</el-button
+							>
+
+							<el-button
+								@click="handleChangeRecord(scope.row)"
+								type="text"
+								size="small"
+								class="div-table-button--blue"
+								>变更记录</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>
+							<el-popconfirm
+								v-if="true"
+								title="删除之后无法回复，确认删除？"
+								@onConfirm="handleDelNew(scope.row)"
+								@confirm="handleDelNew(scope.row)"
+							>
+								<el-button
+									slot="reference"
+									type="text"
+									size="small"
+									class="div-table-button--blue"
+									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>
+			</div>
+		</div>
+
+		<!-- 修改弹出框 -->
+		<el-dialog
+			:visible.sync="formShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="formTitle"
+			width="670px"
+			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="670px"
+			top="5vh"
+			class="dialog-h"
+			@closed="detailFormCancle"
+		>
+			<detail-form
+				v-if="detailShow"
+				ref="ref_form_detail"
+				@diaDetailClose="detailFormCancle"
+			></detail-form>
+		</el-dialog>
+
+		<!-- 变更记录 -->
+		<el-dialog
+			:visible.sync="changeRecordShow"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			:title="'变更记录'"
+			width="1150px"
+			top="5vh"
+			@closed="diaClose"
+		>
+			<resi-change-record ref="ref_changerecord"></resi-change-record>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
-import { requestPost } from '@/js/dai/request'
-import nextTick from 'dai-js/tools/nextTick'
-import resiChangeRecord from '../../../../components/resiChangeRecord.vue'
-import { mapGetters } from 'vuex'
-import editForm from './edit'
-import detailForm from './detail'
-import axios from 'axios'
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import resiChangeRecord from "../../../../components/resiChangeRecord.vue";
+import { mapGetters } from "vuex";
+import editForm from "./edit";
+import detailForm from "./detail";
+import axios from "axios";
 
 export default {
-  components: { editForm, detailForm, resiChangeRecord },
-  data () {
-    return {
-      openSearch: false,
-
-      formShow: false,
-      detailShow: false,
-      formTitle: '迁入登记',
-      detailShow: false,
-      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,
-
-      searchH: 0,
-      tableHeight: 0,
-      changeRecordShow: false,
-    }
-  },
-  computed: {
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-
-
-    changeVDisabled () {
-      return !this.fmData.villageId
-    },
-    changeBDisabled () {
-      return !this.fmData.buildId
-    },
-    changeDDisabled () {
-      return !this.fmData.unitId
-    }
-  },
-  watch: {
-    rangeTime: function (val) {
-      console.log('val----', 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 = ''
-      }
-    },
-    searchH () {
-      const h = this.clientHeight - this.searchH + this.iframeHeight
-      const _h = this.clientHeight - this.searchH
-      console.log('computed-searchH---_h', _h)
-
-      this.$nextTick(() => {
-        this.tableHeight = this.$store.state.inIframe ? h : _h
-      })
-    }
-  },
-  mounted () {
-    this.getGridList()
-    this.getValiheList()
-    this.getTableData()
-
-    this.searchH = this.$refs.searchForm.offsetHeight + 290
-    console.log('searchH----', this.$refs.searchForm.offsetHeight)
-  },
-  methods: {
-    diaClose () {
-      this.changeRecordShow = false
-    },
-    //变更记录
-    async handleChangeRecord (row) {
-      this.changeRecordShow = true
-
-      await nextTick(200)
-
-      this.$refs.ref_changerecord.initForm(row)
-    },
-    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('/actual/base/communityQuarters/listQuartersOptions', {
-          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('/actual/base/communityBuilding/buildingoption', {
-          quartersId: 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('/actual/base/communityBuildingUnit/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('/actual/base/communityHouse/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 = '/actual/base/residentMoveInRecord/export'
-
-      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 =
-        '/actual/base/residentMoveInRecord/export'
-      const { pageSize, pageNo, fmData } = this
-      await this.$http({
-        method: 'POST',
-        url,
-        responseType: 'blob',
-        data: {
-          pageSize,
-          pageNo,
-          ...fmData
-        }
-      })
-        .then(res => {
-          console.log('res----dddd', res)
-          // this.download(res.data, title + '.xls')
-          // this.getTemplateList()
-
-          // this.exportLoading = false
-          // if (res.data.code && res.data.code == 9999) {
-          //   return this.$message.error(res.data.msg)
-          // }
-          this.formatData(res)
-
-        })
-        .catch(err => {
-          console.log('err', err)
-          this.exportLoading = false
-          return this.$message.error('网络错误')
-        })
-      // 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('网络错误')
-      //   })
-    },
-    formatData (res) {
-      const fileReader = new FileReader()
-      fileReader.onloadend = () => {
-        try {
-          const jsonData = JSON.parse(fileReader.result) // 说明是普通对象数据，后台转换失败
-          // 后台信息
-          console.log('jsonData---1', jsonData)
-          return this.$message.error(jsonData.msg)
-        } catch (err) { // 解析成对象失败，说明是正常的文件流
-          // 下载文件
-          console.log('errr-----', err, this)
-          this.downloadFile(res)
-        }
-      }
-      fileReader.readAsText(res.data)
-    },
-    downloadFile (res) {
-      if (res.headers["content-disposition"]) {
-        let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-        console.log('filename', fileName)
-        let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-        var url = window.URL.createObjectURL(blob)
-        var aLink = document.createElement('a')
-        aLink.style.display = 'none'
-        aLink.href = url
-        aLink.setAttribute('download', fileName)
-        document.body.appendChild(aLink)
-        aLink.click()
-        document.body.removeChild(aLink) //下载完成移除元素
-        window.URL.revokeObjectURL(url) //释放掉blob对象
-        this.$message.success('导出成功')
-        this.$emit('close')
-      } else this.$message.error('下载失败')
-    },
-
-    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)
-      })
-
-    },
-
-    detailFormCancle () {
-
-      this.detailShow = false
-    },
-
-    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 =
-        '/actual/base/residentMoveInRecord/deleteById'
-      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 handleDelNew (rowData) {
-      const url = "/actual/base/residentMoveInRecord/deleteById";
-      let params = {
-        id: rowData.moveInId
-      }
-      const { data, code, msg } = await requestPost(url, params);
-      if (code === 0) {
-        this.$message.success("删除成功！");
-        this.getTableData();
-      } else {
-        this.$message.success("操作失败！");
-      }
-    },
-
-    async getTableData () {
-      const url = '/actual/base/residentMoveInRecord/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 {
-      }
-    }
-  }
-}
+	components: { editForm, detailForm, resiChangeRecord },
+	data() {
+		return {
+			openSearch: false,
+
+			formShow: false,
+			detailShow: false,
+			formTitle: "迁入登记",
+			detailShow: false,
+			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,
+
+			searchH: 0,
+			tableHeight: 0,
+			changeRecordShow: false,
+		};
+	},
+	computed: {
+		...mapGetters(["clientHeight", "iframeHeight"]),
+
+		changeVDisabled() {
+			return !this.fmData.villageId;
+		},
+		changeBDisabled() {
+			return !this.fmData.buildId;
+		},
+		changeDDisabled() {
+			return !this.fmData.unitId;
+		},
+	},
+	watch: {
+		rangeTime: function (val) {
+			console.log("val----", 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 = "";
+			}
+		},
+		searchH() {
+			const h = this.clientHeight - this.searchH + this.iframeHeight;
+			const _h = this.clientHeight - this.searchH;
+			console.log("computed-searchH---_h", _h);
+
+			this.$nextTick(() => {
+				this.tableHeight = this.$store.state.inIframe ? h : _h;
+			});
+		},
+	},
+	mounted() {
+		this.getGridList();
+		this.getValiheList();
+		this.getTableData();
+
+		this.searchH = this.$refs.searchForm.offsetHeight + 290;
+		console.log("searchH----", this.$refs.searchForm.offsetHeight);
+	},
+	methods: {
+		diaClose() {
+			this.changeRecordShow = false;
+		},
+		//变更记录
+		async handleChangeRecord(row) {
+			this.changeRecordShow = true;
+
+			await nextTick(200);
+
+			this.$refs.ref_changerecord.initForm(row);
+		},
+		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("/actual/base/communityQuarters/listQuartersOptions", {
+					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("/actual/base/communityBuilding/buildingoption", {
+					quartersId: 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("/actual/base/communityBuildingUnit/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("/actual/base/communityHouse/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 = "/actual/base/residentMoveInRecord/export";
+
+			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 = "/actual/base/residentMoveInRecord/export";
+			const { pageSize, pageNo, fmData } = this;
+			await this.$http({
+				method: "POST",
+				url,
+				responseType: "blob",
+				data: {
+					pageSize,
+					pageNo,
+					...fmData,
+				},
+			})
+				.then((res) => {
+					console.log("res----dddd", res);
+					// this.download(res.data, title + '.xls')
+					// this.getTemplateList()
+
+					// this.exportLoading = false
+					// if (res.data.code && res.data.code == 9999) {
+					//   return this.$message.error(res.data.msg)
+					// }
+					this.formatData(res);
+				})
+				.catch((err) => {
+					console.log("err", err);
+					this.exportLoading = false;
+					return this.$message.error("网络错误");
+				});
+			// 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('网络错误')
+			//   })
+		},
+		formatData(res) {
+			const fileReader = new FileReader();
+			fileReader.onloadend = () => {
+				try {
+					const jsonData = JSON.parse(fileReader.result); // 说明是普通对象数据，后台转换失败
+					// 后台信息
+					console.log("jsonData---1", jsonData);
+					return this.$message.error(jsonData.msg);
+				} catch (err) {
+					// 解析成对象失败，说明是正常的文件流
+					// 下载文件
+					console.log("errr-----", err, this);
+					this.downloadFile(res);
+				}
+			};
+			fileReader.readAsText(res.data);
+		},
+		downloadFile(res) {
+			if (res.headers["content-disposition"]) {
+				let fileName = window.decodeURI(
+					res.headers["content-disposition"]
+						.split(";")[1]
+						.split("=")[1]
+				);
+				console.log("filename", fileName);
+				let blob = new Blob([res.data], {
+					type: "application/vnd.ms-excel",
+				});
+				var url = window.URL.createObjectURL(blob);
+				var aLink = document.createElement("a");
+				aLink.style.display = "none";
+				aLink.href = url;
+				aLink.setAttribute("download", fileName);
+				document.body.appendChild(aLink);
+				aLink.click();
+				document.body.removeChild(aLink); //下载完成移除元素
+				window.URL.revokeObjectURL(url); //释放掉blob对象
+				this.$message.success("导出成功");
+				this.$emit("close");
+			} else this.$message.error("下载失败");
+		},
+
+		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
+				);
+			});
+		},
+
+		detailFormCancle() {
+			this.detailShow = false;
+		},
+
+		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 = "/actual/base/residentMoveInRecord/deleteById";
+			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 handleDelNew(rowData) {
+			const url = "/actual/base/residentMoveInRecord/deleteById";
+			let params = {
+				id: rowData.moveInId,
+			};
+			const { data, code, msg } = await requestPost(url, params);
+			if (code === 0) {
+				this.$message.success("删除成功！");
+				this.getTableData();
+			} else {
+				this.$message.success("操作失败！");
+			}
+		},
+
+		async getTableData() {
+			const url = "/actual/base/residentMoveInRecord/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>
diff --git a/src/views/modules/home/notice.vue b/src/views/modules/home/notice.vue
index 4d7d56a41..3bfaeeb8b 100644
--- a/src/views/modules/home/notice.vue
+++ b/src/views/modules/home/notice.vue
@@ -97,11 +97,12 @@ export default {
 		async read(item, index) {
 			if (item && item.readFlag == 1) return;
 
-			const url = "/message/intelligentMessage/msg/clear?id=" + item.id;
+			const url = "/message/intelligentMessage/msg/clear";
 			let params = {};
 
 			if (item.id) {
 				params.id = item.id;
+				url += "?id=" + item.id;
 			}
 
 			const { data, code, msg } = await requestPost(url, params);
diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
index 7c86822b3..547cb63d7 100644
--- a/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
+++ b/src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue
@@ -1,46 +1,50 @@
 <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="category"
-                        label="居民类别">
-            <div class="resi-cell-value">
-              <el-form-item prop="category">
-                <el-select v-model="fmData.category"
-                           placeholder="请选择居民类别"
-                           size="small"
-                           clearable
-                           class="resi-cell-select">
-                  <el-option v-for="(item,index) in jmlbOptions"
-                             @click.native="handleChangeJmlb(index)"
-                             :key="item.value"
-                             :label="item.label"
-                             :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </div>
-          </el-form-item>
-          <el-form-item prop="gridId"
-                        label="所属组织">
-            <div class="resi-cell-value">
-              <el-cascader class="customer_cascader"
-                           ref="myCascader"
-                           clearable
-                           v-model="agencyIdArray"
-                           :options="orgOptions"
-                           :props="orgOptionProps"
-                           :show-all-levels="false"
-                           @change="handleChangeAgency"></el-cascader>
-            </div>
-          </el-form-item>
-          <!-- <el-form-item prop="gridId" label="所属网格">
+	<div class="g-main">
+		<div ref="searchCard" class="m-search">
+			<el-form
+				ref="searchForm"
+				:inline="true"
+				:model="fmData"
+				:label-width="'100px'"
+				class="demo-form-inline"
+			>
+				<el-form-item prop="categoryKey" label="居民类别">
+					<div class="resi-cell-value">
+						<el-form-item prop="categoryKey">
+							<el-select
+								v-model="fmData.categoryKey"
+								placeholder="请选择居民类别"
+								size="small"
+								clearable
+								class="u-item-width-normal"
+							>
+								<el-option
+									v-for="item in jmlbOptions"
+									:key="item.value"
+									:label="item.label"
+									:value="item.value"
+								>
+								</el-option>
+							</el-select>
+						</el-form-item>
+					</div>
+				</el-form-item>
+
+				<el-form-item prop="gridId" label="所属组织">
+					<div class="resi-cell-value">
+						<el-cascader
+							class="u-item-width-normal"
+							ref="myCascader"
+							clearable
+							v-model="agencyIdArray"
+							:options="orgOptions"
+							:props="orgOptionProps"
+							:show-all-levels="false"
+							@change="handleChangeAgency"
+						></el-cascader>
+					</div>
+				</el-form-item>
+				<!-- <el-form-item prop="gridId" label="所属网格">
             <div class="resi-cell-value">
               <el-select
                 v-model.trim="fmData.gridId"
@@ -61,872 +65,728 @@
             </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
-                             :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-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item prop="homeId">
-                  <el-select v-model.trim="fmData.homeId"
-                             placeholder="房号"
-                             size="small"
-                             clearable
-                             :disabled="changeDDisabled"
-                             class="resi-cell-select resi-cell-select-middle">
-                    <el-option v-for="item in optionsH"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </div>
-            </div>
-          </el-form-item>
-        </div>
-
-        <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>
-
-          <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 @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="GRID_ID"
-                         align="center"
-                         label="所属网格"
-                         min-width="160"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="HOME_ID"
-                         label="所属房屋"
-                         align="center"
-                         min-width="160"
-                         :show-overflow-tooltip="true" />
-
-        <el-table-column prop="NAME"
-                         align="center"
-                         label="姓名"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="MOBILE"
-                         width="140"
-                         align="center"
-                         label="手机"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="GENDER"
-                         align="center"
-                         width="60"
-                         label="性别">
-        </el-table-column>
-
-        <el-table-column prop="ID_CARD"
-                         align="center"
-                         min-width="160"
-                         label="证件号"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="BIRTHDAY"
-                         align="center"
-                         label="出生日期"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column prop="zhzlCategoryName"
-                         align="center"
-                         label="类别"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-        <el-table-column prop="REMARKS"
-                         align="center"
-                         label="备注"
-                         :show-overflow-tooltip="true">
-        </el-table-column>
-
-        <el-table-column fixed="right"
-                         label="操作"
-                         align="center"
-                         width="120">
-          <template slot-scope="scope">
-            <el-button @click="handleWatch(scope.$index)"
-                       type="text"
-                       size="small">查看</el-button>
-          </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>
-
-    <people-more v-if="showedPeopleMoreInfo && currentPepeleId"
-                 :userId="currentPepeleId"
-                 :gridName="currentPepeleGridName"
-                 @close="showedPeopleMoreInfo = false" />
-
-    <el-dialog :visible.sync="diyDialog"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               width="1150px"
-               top="5vh"
-               class="dialog-h">
-      <diy-info v-if="diyDialog"
-                ref="ref_diy"
-                :list="exportList"
-                :search="computeQueryParams()"
-                @close="diyDialog = false"></diy-info>
-    </el-dialog>
-  </div>
+				<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="u-item-width-communitycascader"
+									@change="handleChangeV"
+								>
+									<el-option
+										v-for="item in optionsV"
+										:key="item.value"
+										:label="item.label"
+										:value="item.value"
+									>
+									</el-option>
+								</el-select>
+							</el-form-item>
+							<el-form-item prop="buildId">
+								<el-select
+									v-model.trim="fmData.buildId"
+									placeholder="楼号"
+									size="small"
+									clearable
+									:disabled="changeVDisabled"
+									class="u-item-width-buildcascader"
+									@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="u-item-width-buildcascader"
+									@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="u-item-width-buildcascader"
+								>
+									<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>
+
+				<el-form-item label="姓名" prop="name">
+					<el-input
+						v-model="fmData.name"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<!-- <el-form-item label="手机号" prop="mobile">
+						<el-input
+							v-model="fmData.mobile"
+							class="u-item-width-normal"
+							size="small"
+							clearable
+							placeholder="请输入"
+						>
+						</el-input>
+					</el-form-item> -->
+
+				<el-form-item label="证件号" prop="idNum">
+					<el-input
+						v-model="fmData.idNum"
+						class="u-item-width-normal"
+						size="small"
+						clearable
+						placeholder="请输入"
+					>
+					</el-input>
+				</el-form-item>
+
+				<div class="u-search-btn">
+					<el-button
+						class="diy-button--white"
+						size="small"
+						@click="resetForm('searchForm')"
+						>重置</el-button
+					>
+					<el-button
+						class="diy-button--blue"
+						size="small"
+						@click="handleSearch"
+						>查询</el-button
+					>
+				</div>
+			</el-form>
+		</div>
+
+		<div class="m-table">
+			<div class="u-table-btn1">
+				<el-button
+					@click="handleChu"
+					class="diy-button--white"
+					size="small"
+					>导出</el-button
+				>
+			</div>
+
+			<div class="m-table-item">
+				<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="gridName"
+						align="center"
+						label="所属网格"
+						min-width="160"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="homeName"
+						label="所属房屋"
+						align="center"
+						min-width="160"
+						:show-overflow-tooltip="true"
+					/>
+
+					<el-table-column
+						prop="name"
+						align="center"
+						label="姓名"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="mobile"
+						width="140"
+						align="center"
+						label="手机"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="gender"
+						align="center"
+						width="60"
+						label="性别"
+					>
+						<template slot-scope="scope">
+							<span v-if="scope.row.gender == 1">男</span>
+							<span v-if="scope.row.gender == 2">女</span>
+						</template>
+					</el-table-column>
+
+					<el-table-column
+						prop="idNum"
+						align="center"
+						min-width="160"
+						label="证件号"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="birthday"
+						align="center"
+						label="出生日期"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						prop="categoryName"
+						align="center"
+						label="类别"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+					<el-table-column
+						prop="remark"
+						align="center"
+						label="备注"
+						:show-overflow-tooltip="true"
+					>
+					</el-table-column>
+
+					<el-table-column
+						fixed="right"
+						label="操作"
+						align="center"
+						width="120"
+					>
+						<template slot-scope="scope">
+							<el-button
+								@click="handleWatch(scope.$index)"
+								type="text"
+								size="small"
+								>查看</el-button
+							>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+
+			<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>
+		</div>
+
+		<resi-info
+			v-if="showedResiInfo && currentResiId"
+			:resi-id="currentResiId"
+			@close="showedResiInfo = false"
+		/>
+
+		<el-dialog
+			:visible.sync="diyDialog"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
+			width="1150px"
+			top="5vh"
+			class="dialog-h"
+		>
+			<diy-info
+				v-if="diyDialog"
+				ref="ref_diy"
+				:list="exportList"
+				:search="computeQueryParams()"
+				@close="diyDialog = false"
+			></diy-info>
+		</el-dialog>
+	</div>
 </template>
 
 <script>
 import { requestPost } from "@/js/dai/request";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
-import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import diyInfo from "@/views/modules/base/diyInfo.vue";
+import resiInfo from "@/views/modules/cpts/resi/info";
 
 export default {
-  props: {
-
-  },
-
-  components: { peopleMore, diyInfo },
-  data () {
-    return {
-      openSearch: false,
-
-      formShow: false,
-      formTitle: "",
-
-      pageNo: 1,
-      pageSize: window.localStorage.getItem("pageSize") || 20,
-      total: 1,
-
-      tableData: [],
-
-      optionsV: [],
-      optionsB: [],
-      optionsH: [],
-      optionsD: [],
-      optionsG: [],
-      orgOptions: [],
-      jmlbOptions: [],
-      orgOptionProps: {
-        multiple: false,
-        value: 'agencyId',
-        label: 'agencyName',
-        children: 'subAgencyList',
-        checkStrictly: true
-      },
-      agencyIdArray: [],
-
-      optionsWelfare: [
-        {
-          value: "1",
-          label: "是",
-        },
-        {
-          value: "0",
-          label: "否",
-        },
-      ],
-
-      fmData: {
-        agencyId: "",
-        gridId: "",
-        villageId: "",
-        buildId: "",
-        unitId: "",
-        homeId: "",
-        name: "",
-        mobile: "",
-        idCard: "",
-        category: "",
-      },
-      rangeTime: [],
-
-      searchH: 0,
-      tableHeight: 0,
-
-      // 显示人员详情
-      showedPeopleMoreInfo: false,
-
-      currentPepeleId: "",
-      currentPepeleGridName: "",
-
-      diyDialog: false,
-      exportList: [],
-
-      elseParams: [],
-    };
-  },
-  computed: {
-    ...mapGetters(["clientHeight", "iframeHeight"]),
-    maxTableHeight () {
-      console.log("computed-searchH---", this.searchH);
-      const h = this.clientHeight - this.searchH + this.iframeHeight;
-      const _h = this.clientHeight - this.searchH;
-      console.log("computed-searchH---_h", _h);
-      return this.$store.state.inIframe ? h : _h;
-    },
-
-    changeVDisabled () {
-      return !this.fmData.villageId;
-    },
-    changeBDisabled () {
-      return !this.fmData.buildId;
-    },
-    changeDDisabled () {
-      return !this.fmData.unitId;
-    },
-  },
-  watch: {
-    rangeTime: function (val) {
-      console.log("val----", 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 = "";
-      }
-    },
-    searchH () {
-      const h = this.clientHeight - this.searchH + this.iframeHeight;
-      const _h = this.clientHeight - this.searchH;
-      console.log("computed-searchH---_h", _h);
-
-      this.$nextTick(() => {
-        this.tableHeight = this.$store.state.inIframe ? h : _h;
-      });
-    },
-  },
-  async mounted () {
-    await this.getJmlb();
-    this.getOrgTreeList();
-    this.getGridList();
-    this.getValiheList();
-    this.getTableData();
-    this.searchH = this.$refs.searchCard.$el.offsetHeight + 270;
-    console.log("searchH----", this.$refs.searchCard.$el.offsetHeight);
-  },
-  methods: {
-    async handleWatch (rowIndex) {
-      let item = this.tableData[rowIndex];
-      this.currentPepeleId = item.icResiUserId;
-      this.currentPepeleGridName = item.GRID_ID;
-      await nextTick();
-      this.showedPeopleMoreInfo = true;
-    },
-
-    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();
-    },
-    handleChangeJmlb (index) {
-      // debugger
-      let selItem = this.jmlbOptions[index]
-      this.elseParams = []
-      let temp = {
-        queryType: selItem.queryType,
-        tableName: selItem.tableName,
-        columnName: selItem.columnName,
-        columnValue: [selItem.columnValue],
-      }
-
-      this.elseParams.push(temp)
-    },
-
-    async getJmlb () {
-      const url = '/data/aggregator/coverage/zhzl-category-option'
-      let params = {}
-      const { data, code, msg } = await requestPost(url, params);
-
-
-      if (code === 0) {
-        this.jmlbOptions = []
-        this.jmlbOptions = data
-        if (this.jmlbOptions.length > 0) {
-          this.fmData.category = 'anzhibangjiao'
-          // let temp = {
-          //   queryType: this.jmlbOptions[0].queryType,
-          //   tableName: this.jmlbOptions[0].tableName,
-          //   columnName: this.jmlbOptions[0].columnName,
-          //   columnValue: [this.jmlbOptions[0].columnValue],
-          // }
-          let temp = {
-            queryType: 'list_equal',
-            tableName: 'ic_special',
-            columnName: 'SPECIAL_RQLB',
-            columnValue: ["anzhibangjiao"],
-          }
-
-          this.elseParams.push(temp)
-        }
-
-      } else {
-        this.$message.error(msg)
-      }
-
-
-    },
-    getOrgTreeList () {
-
-      const { user } = this.$store.state
-      this.$http
-        .post('/gov/org/customeragency/agencygridtree', {})
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取组织树成功', res.data)
-            this.orgOptions = []
-            this.orgOptions.push(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("/actual/base/communityQuarters/listQuartersOptions", {
-          gridId: this.fmData.gridId,
-          agencyId: this.fmData.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("/actual/base/communityBuilding/buildingoption", {
-          quartersId: 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("/actual/base/communityBuildingUnit/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("/actual/base/communityHouse/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("网络错误");
-        });
-    },
-
-    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.agencyIdArray = []
-      this.fmData = {
-        agencyId: "",
-        gridId: "",
-        villageId: "",
-        buildId: "",
-        unitId: "",
-        homeId: "",
-        name: "",
-        mobile: "",
-        idCard: "",
-
-      }
-      this.elseParams = []
-      if (this.jmlbOptions.length > 0) {
-        this.fmData.category = this.jmlbOptions[0].value
-        let temp = {
-          queryType: this.jmlbOptions[0].queryType,
-          tableName: this.jmlbOptions[0].tableName,
-          columnName: this.jmlbOptions[0].columnName,
-          columnValue: [this.jmlbOptions[0].columnValue],
-        }
-
-        this.elseParams.push(temp)
-      }
-      this.handleSearch();
-    },
-
-    handleChangeAgency (val) {
-      let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
-
-      if (obj) {
-        if (obj.level === 'grid') {
-          this.fmData.gridId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.fmData.agencyId = ''
-        } else {
-          this.fmData.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '';
-          this.fmData.gridId = ''
-        }
-
-      } else {
-        this.fmData.agencyId = ''
-        this.fmData.gridId = ''
-      }
-
-
-      this.fmData.villageId = ''
-      this.fmData.buildId = ''
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-      this.getValiheList()
-    },
-
-    computeQueryParams () {
-      const { pageSize, pageNo, elseParams, fmData } = this;
-      let conditions = []
-      if (fmData.agencyId) {
-        conditions.push({
-          queryType: "like",
-          tableName: "ic_resi_user",
-          columnName: "AGENCY_ID",
-          columnValue: [fmData.agencyId],
-        })
-      }
-
-      if (fmData.gridId) {
-        conditions.push(
-          {
-            queryType: "equal",
-            tableName: "ic_resi_user",
-            columnName: "GRID_ID",
-            columnValue: [fmData.gridId],
-          }
-        )
-      }
-
-      if (fmData.villageId) {
-        conditions.push(
-          {
-            queryType: "equal",
-            tableName: "ic_resi_user",
-            columnName: "VILLAGE_ID",
-            columnValue: [fmData.villageId],
-          }
-        )
-      }
-
-      if (fmData.buildId) {
-        conditions.push({
-          queryType: "equal",
-          tableName: "ic_resi_user",
-          columnName: "BUILD_ID",
-          columnValue: [fmData.buildId],
-        })
-      }
-
-      if (fmData.unitId) {
-        conditions.push({
-          queryType: "equal",
-          tableName: "ic_resi_user",
-          columnName: "UNIT_ID",
-          columnValue: [fmData.unitId],
-        })
-      }
-
-      if (fmData.homeId) {
-        conditions.push({
-          queryType: "equal",
-          tableName: "ic_resi_user",
-          columnName: "HOME_ID",
-          columnValue: [fmData.homeId],
-        })
-      }
-
-      if (fmData.name) {
-        conditions.push({
-          queryType: "like",
-          tableName: "ic_resi_user",
-          columnName: "NAME",
-          columnValue: [fmData.name],
-        })
-      }
-      if (fmData.mobile) {
-        conditions.push({
-          queryType: "like",
-          tableName: "ic_resi_user",
-          columnName: "MOBILE",
-          columnValue: [fmData.mobile],
-        })
-      }
-      if (fmData.idCard) {
-        conditions.push({
-          queryType: "like",
-          tableName: "ic_resi_user",
-          columnName: "ID_CARD",
-          columnValue: [fmData.idCard],
-        })
-      }
-
-      return {
-        formCode: "resi_base_info",
-        pageSize,
-        pageNo,
-        conditions: [
-
-          ...conditions,
-
-          ...elseParams,
-        ],
-      };
-    },
-
-    async handleChu () {
-      this.getExportList();
-    },
-
-    async getExportList () {
-      const url = "/oper/customize//icformitemgroup/list";
-      let params = {
-        formCode: "resi_base_info",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        data.forEach((item) => {
-          (async (id) => {
-            // item.queryItemList = await this.getExportChildList(id)
-            item.queryItemList = [];
-          })(item.id);
-        });
-        this.exportList = [...data];
-        this.$nextTick(() => {
-          this.diyDialog = true;
-        });
-        console.log("获取详情成功getExportList----", this.exportList);
-      } else {
-        this.$message.error(msg);
-      }
-    },
-
-    async getTableData () {
-      const url = "/epmetuser/icresiuser/listresi-zhzl";
-      const { data, code, msg } = await requestPost(url, {
-        ...this.computeQueryParams(),
-      });
-      if (code === 0) {
-        console.log("列表请求成功！！！！！！！！！！！！！！");
-        this.total = data.total || 0;
-        this.tableData = data.list
-          ? data.list.map((item) => {
-            return item;
-          })
-          : [];
-      } else {
-      }
-    },
-  },
+	props: {},
+
+	components: { resiInfo, diyInfo },
+
+	data() {
+		return {
+			openSearch: false,
+
+			formShow: false,
+			formTitle: "",
+
+			pageNo: 1,
+			pageSize: window.localStorage.getItem("pageSize") || 20,
+			total: 1,
+
+			tableData: [],
+
+			optionsV: [],
+			optionsB: [],
+			optionsH: [],
+			optionsD: [],
+			optionsG: [],
+			orgOptions: [],
+			jmlbOptions: [],
+			orgOptionProps: {
+				multiple: false,
+				value: "agencyId",
+				label: "agencyName",
+				children: "subAgencyList",
+				checkStrictly: true,
+			},
+			agencyIdArray: [],
+
+			optionsWelfare: [
+				{
+					value: "1",
+					label: "是",
+				},
+				{
+					value: "0",
+					label: "否",
+				},
+			],
+
+			fmData: {
+				agencyId: "",
+				gridId: "",
+				villageId: "",
+				buildId: "",
+				unitId: "",
+				homeId: "",
+				name: "",
+				mobile: "",
+				idNum: "",
+				categoryKey: "",
+			},
+			rangeTime: [],
+
+			searchH: 0,
+			tableHeight: 0,
+
+			// 显示人员详情
+			showedResiInfo: false,
+
+			currentResiId: "",
+			currentPepeleGridName: "",
+
+			diyDialog: false,
+			exportList: [],
+		};
+	},
+	computed: {
+		...mapGetters(["clientHeight", "iframeHeight"]),
+		maxTableHeight() {
+			console.log("computed-searchH---", this.searchH);
+			const h = this.clientHeight - this.searchH + this.iframeHeight;
+			const _h = this.clientHeight - this.searchH;
+			console.log("computed-searchH---_h", _h);
+			return this.$store.state.inIframe ? h : _h;
+		},
+
+		changeVDisabled() {
+			return !this.fmData.villageId;
+		},
+		changeBDisabled() {
+			return !this.fmData.buildId;
+		},
+		changeDDisabled() {
+			return !this.fmData.unitId;
+		},
+	},
+	watch: {
+		rangeTime: function (val) {
+			console.log("val----", 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 = "";
+			}
+		},
+		searchH() {
+			const h = this.clientHeight - this.searchH + this.iframeHeight;
+			const _h = this.clientHeight - this.searchH;
+			console.log("computed-searchH---_h", _h);
+
+			this.$nextTick(() => {
+				this.tableHeight = this.$store.state.inIframe ? h : _h;
+			});
+		},
+	},
+	async mounted() {
+		await this.getJmlb();
+		this.getOrgTreeList();
+		this.getGridList();
+		this.getValiheList();
+		this.getTableData();
+		this.searchH = this.$refs.searchCard.offsetHeight + 270;
+		console.log("searchH----", this.$refs.searchCard.offsetHeight);
+	},
+	methods: {
+		async handleWatch(rowIndex) {
+			let item = this.tableData[rowIndex];
+			this.currentResiId = item.resiId;
+			await nextTick();
+			this.showedResiInfo = true;
+		},
+
+		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();
+		},
+
+		async getJmlb() {
+			const url = "/actual/base/residentSpecial/zhzl-category-option";
+			let params = {};
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				this.jmlbOptions = [];
+				this.jmlbOptions = data;
+				if (this.jmlbOptions.length > 0) {
+					this.fmData.categoryKey = data[0].value;
+				}
+			} else {
+				this.$message.error(msg);
+			}
+		},
+		getOrgTreeList() {
+			const { user } = this.$store.state;
+			this.$http
+				.post("/gov/org/customeragency/agencygridtree", {})
+				.then(({ data: res }) => {
+					if (res.code !== 0) {
+						return this.$message.error(res.msg);
+					} else {
+						console.log("获取组织树成功", res.data);
+						this.orgOptions = [];
+						this.orgOptions.push(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("/actual/base/communityQuarters/listQuartersOptions", {
+					gridId: this.fmData.gridId,
+					agencyId: this.fmData.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("/actual/base/communityBuilding/buildingoption", {
+					quartersId: 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("/actual/base/communityBuildingUnit/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("/actual/base/communityHouse/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("网络错误");
+				});
+		},
+
+		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.agencyIdArray = [];
+			this.fmData = {
+				agencyId: "",
+				gridId: "",
+				villageId: "",
+				buildId: "",
+				unitId: "",
+				homeId: "",
+				name: "",
+				mobile: "",
+				idNum: "",
+			};
+			if (this.jmlbOptions.length > 0) {
+				this.fmData.categoryKey = this.jmlbOptions[0].value;
+			}
+			this.handleSearch();
+		},
+
+		handleChangeAgency(val) {
+			let obj = this.$refs["myCascader"].getCheckedNodes()[0].data;
+
+			if (obj) {
+				if (obj.level === "grid") {
+					this.fmData.gridId =
+						this.agencyIdArray.length > 0
+							? this.agencyIdArray[this.agencyIdArray.length - 1]
+							: "";
+					this.fmData.agencyId = "";
+				} else {
+					this.fmData.agencyId =
+						this.agencyIdArray.length > 0
+							? this.agencyIdArray[this.agencyIdArray.length - 1]
+							: "";
+					this.fmData.gridId = "";
+				}
+			} else {
+				this.fmData.agencyId = "";
+				this.fmData.gridId = "";
+			}
+
+			this.fmData.villageId = "";
+			this.fmData.buildId = "";
+			this.fmData.unitId = "";
+			this.fmData.homeId = "";
+			this.getValiheList();
+		},
+
+		computeQueryParams() {
+			const { pageSize, pageNo, fmData } = this;
+
+			return {
+				formCode: "resi_base_info",
+				pageSize,
+				pageNo,
+				...fmData,
+			};
+		},
+
+		async handleChu() {
+			this.getExportList();
+		},
+
+		async getExportList() {
+			const url = "/oper/customize//icformitemgroup/list";
+			let params = {
+				formCode: "resi_base_info",
+			};
+
+			const { data, code, msg } = await requestPost(url, params);
+
+			if (code === 0) {
+				data.forEach((item) => {
+					(async (id) => {
+						// item.queryItemList = await this.getExportChildList(id)
+						item.queryItemList = [];
+					})(item.id);
+				});
+				this.exportList = [...data];
+				this.$nextTick(() => {
+					this.diyDialog = true;
+				});
+				console.log("获取详情成功getExportList----", this.exportList);
+			} else {
+				this.$message.error(msg);
+			}
+		},
+
+		async getTableData() {
+			const url = "/actual/base/residentSpecial/page-zongzhirenqun";
+			const { data, code, msg } = await requestPost(url, {
+				...this.computeQueryParams(),
+			});
+			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 {
-  // 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: 120px;
-    }
-    &-small {
-      width: 88px;
-    }
-  }
-  .resi-cell-select:last-child {
-    margin-right: 0;
-  }
-}
-
-.mt10 {
-  margin-top: 10px;
-}
+@import "@/assets/scss/modules/management/list-main.scss";
 </style>