diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js
index ca4f99438..be61dc0bb 100644
--- a/src/js/columns/constants/index.js
+++ b/src/js/columns/constants/index.js
@@ -59,6 +59,8 @@ export const dormitoryTypeList = [
     value: '0'
   }
 ]
+
+//证件类型
 export const idTypeList = [
   {
     label: '其他',
@@ -85,3 +87,15 @@ export const idTypeList = [
     value: 5
   }
 ]
+
+//是否list
+export const yesOrNoList = [
+  {
+    label: '是',
+    value: 1
+  },
+  {
+    label: '否',
+    value: 0
+  }
+]
diff --git a/src/views/business/resi-category-map.js b/src/views/business/resi-category-map.js
index 123f69b42..e2b844a8e 100644
--- a/src/views/business/resi-category-map.js
+++ b/src/views/business/resi-category-map.js
@@ -1,23 +1,23 @@
 export default {
-  PARTY_FLAG: "党员",
-  SUBSISTENCE_ALLOWANCE_FLAG: "低保人员",
-  ENSURE_HOUSE_FLAG: "保障房人员",
-  UNEMPLOYED_FLAG: "失业人员",
-  FERTILE_WOMAN_FLAG: "育龄妇女",
-  VETERAN_FLAG: "退役军人",
-  UNITED_FRONT_FLAG: "统战人员",
-  PETITION_OFFICER_FLAG: "信访人员",
-  VOLUNTEER_FLAG: "志愿者",
-  OLD_PEOPLE_FLAG: "老年人",
-  EMPTY_NESTER_FLAG: "空巢老人",
-  BEREAVED_PERSON_FLAG: "特扶人员",
-  DISABLED_FLAG: "失能老人",
-  DEMENTED_FLAG: "失智老人",
-  DISABILITY_FLAG: "残疾",
-  SERIOUS_ILLNESS_FLAG: "大病",
-  CHRONIC_DISEASE_FLAG: "慢病",
-  SPECIAL_CROWD_FLAG: "特殊人群",
-  TENANT_FLAG: "租户",
-  FLOATING_FLAG: "流动人口",
-  LIVE_ALONE_FLAG: "独居老人",
-};
+  PARTY_FLAG: '党员',
+  SUBSISTENCE_ALLOWANCE_FLAG: '低保人员',
+  ENSURE_HOUSE_FLAG: '保障房人员',
+  UNEMPLOYED_FLAG: '失业人员',
+  FERTILE_WOMAN_FLAG: '育龄妇女',
+  VETERAN_FLAG: '退役军人',
+  UNITED_FRONT_FLAG: '统战人员',
+  PETITION_OFFICER_FLAG: '信访人员',
+  VOLUNTEER_FLAG: '志愿者',
+  OLD_PEOPLE_FLAG: '老年人',
+  EMPTY_NESTER_FLAG: '空巢老人',
+  SPECIAL_SUPPORT_FLAG: '特扶人员',
+  DISABLED_FLAG: '失能老人',
+  DEMENTED_FLAG: '失智老人',
+  DISABILITY_FLAG: '残疾',
+  SERIOUS_ILLNESS_FLAG: '大病',
+  CHRONIC_DISEASE_FLAG: '慢病',
+  SPECIAL_CROWD_FLAG: '特殊人群',
+  TENANT_FLAG: '租户',
+  FLOATING_FLAG: '流动人口',
+  LIVE_ALONE_FLAG: '独居老人'
+}
diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
index 958e41413..0eacf00e3 100644
--- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue
+++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
@@ -1,641 +1,627 @@
 <template>
-    <div class="g-main">
-      <div>
-        <div class="m-search">
-          <el-form
-            :inline="true"
-            :model="formData"
-            ref="ref_searchform"
-            :label-width="'100px'"
-          >
-            <el-form-item label="姓名">
-              <el-input
-                v-model="formData.name"
-                placeholder="请输入"
-                size="small"
-                class="u-item-width-normal"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="联系电话">
-              <el-input
-                v-model="formData.mobile"
-                placeholder="请输入"
-                size="small"
-                class="u-item-width-normal"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="证件号">
-              <el-input
-                v-model="formData.idNum"
-                placeholder="请输入"
-                size="small"
-                class="u-item-width-normal"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item label="性别">
-              <el-select
-                v-model="formData.gender"
-                placeholder="请输入"
-                size="small"
-                class="u-item-width-normal"
-                clearable
-              >
-                <el-option
-                  v-for="item in genderList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="本地户籍">
-              <el-select
-                v-model="formData.localResidenceFlag"
-                placeholder="请输入"
-                size="small"
-                class="u-item-width-normal"
-                clearable
-              >
-                <el-option
-                  v-for="item in binaryOptionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="居住地址">
-              <el-input
-                v-model="formData.currentResidence"
-                placeholder="请输入"
-                size="small"
-                class="u-item-width-normal"
-                clearable
-              ></el-input>
-            </el-form-item>
-       
-            <el-form-item label="低保">
-              <el-select
-                v-model="formData.subsistenceAllowanceFlag"
-                placeholder="请选择"
-                size="small"
-                class="u-item-width-normal"
-                clearable
-              >
-                <el-option
-                  v-for="item in binaryOptionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-           
-            <el-form-item label="备注">
-              <el-input
-                v-model="formData.remark"
-                placeholder="请输入"
-                size="small"
-                class="u-item-width-normal"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-row type="flex">
-              <el-col :span="24" align="right">
-                <el-button
-                  style="margin-left: 30px"
-                  size="small"
-                  type="primary "
-                  @click="handleSearch"
-                  >查询</el-button
-                >
-                <el-button
-                  style="margin-left: 10px"
-                  is-plain
-                  class="diy-button--white el-button--default"
-                  size="small"
-                  @click="resetSearch"
-                  >重置</el-button
-                >
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-  
-        <div class="m-table">
-          <div class="div_btn">
-            <div class="div_btn_left">
-              <el-button
-                size="small"
-                @click="handleAdd"
-                type="primary"
-                icon="el-icon-plus"
-                >新增</el-button
-              >
-            </div>
-            <el-button
-              @click="handleExport"
-              type="primary"
-              size="small"
-              class="diy-button--white el-button--default"
-              >导出</el-button
-            >
-            <el-button
-              @click="onDeleteBatch"
-              style="margin: 0 10px"
-              size="small"
-              type="primary"
-            >
-              批量删除
-            </el-button>
-            <el-upload
-              :headers="$getElUploadHeaders()"
-              ref="upload"
-              class="upload-btn"
-              action="uploadUlr"
-              :limit="1"
-              :accept="'.xls,.xlsx'"
-              :with-credentials="true"
-              :show-file-list="false"
-              :auto-upload="true"
-              :before-upload="beforeExcelUpload"
-              :http-request="uploadHttpRequest"
-            >
-              <el-button
-                type="primary"
-                size="small"
-                class="diy-button--white el-button--default"
-                :loading="importLoading"
-                >导入</el-button
-              >
-            </el-upload>
-            <el-button
-              style="margin-left: 10px"
-              class="diy-button--blue"
-              size="small"
-              @click="handleExportModule('room')"
-              >下载模板</el-button
-            >
+  <div class="g-main">
+    <div>
+      <div class="m-search">
+        <el-form :inline="true"
+                 :model="formData"
+                 ref="ref_searchform"
+                 :label-width="'100px'">
+
+          <el-form-item label="住房性质">
+            <el-select v-model="formData.gender"
+                       placeholder="请输入"
+                       size="small"
+                       class="u-item-width-normal"
+                       clearable>
+              <el-option v-for="item in housingNatureList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="姓名">
+            <el-input v-model="formData.name"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话">
+            <el-input v-model="formData.mobile"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="证件号">
+            <el-input v-model="formData.idNum"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
+          </el-form-item>
+          <el-form-item label="户籍地址">
+            <el-input v-model="formData.currentResidence"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="现居地址">
+            <el-input v-model="formData.currentResidence"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="保障类型">
+            <el-select v-model="formData.localResidenceFlag"
+                       placeholder="请输入"
+                       size="small"
+                       class="u-item-width-normal"
+                       clearable>
+              <el-option v-for="item in binaryOptionList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="补贴编号">
+            <el-input v-model="formData.currentResidence"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="补贴金额">
+            <el-input v-model="formData.currentResidence"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
+          </el-form-item>
+
+          <el-form-item label="发证日期">
+            <el-date-picker v-model="formData.birthdayStart"
+                            type="date"
+                            size="small"
+                            class="u-item-width-daterange"
+                            value-format="yyyy-MM-dd"
+                            placeholder="开始日期">
+            </el-date-picker>
+            <span class="u-data-tag">至</span>
+            <el-date-picker v-model="formData.birthdayEnd"
+                            type="date"
+                            size="small"
+                            value-format="yyyy-MM-dd"
+                            class="u-item-width-daterange u-data-tag"
+                            placeholder="结束日期"
+                            :picker-options="pickerOptionsEnd">
+            </el-date-picker>
+          </el-form-item>
+
+          <el-form-item label="备注">
+            <el-input v-model="formData.remark"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
+          </el-form-item>
+          <el-row type="flex">
+            <el-col :span="24"
+                    align="right">
+              <el-button style="margin-left: 30px"
+                         size="small"
+                         type="primary "
+                         @click="handleSearch">查询</el-button>
+              <el-button style="margin-left: 10px"
+                         is-plain
+                         class="diy-button--white el-button--default"
+                         size="small"
+                         @click="resetSearch">重置</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+
+      <div class="m-table">
+        <div class="div_btn">
+          <div class="div_btn_left">
+            <el-button size="small"
+                       @click="handleAdd"
+                       type="primary"
+                       icon="el-icon-plus">新增</el-button>
           </div>
-  
-          <el-table
-            :data="tableData"
-            border
-            v-loading="tableLoading"
-            class="m-table-item"
-            style="width: 100%"
-            :height="maxTableHeight"
-            @selection-change="onMultiSelection"
-          >
-            <el-table-column
-              type="selection"
-              fixed="left"
-              align="center"
-              width="50"
-            />
-            <el-table-column
-              label="序号"
-              fixed="left"
-              type="index"
-              align="center"
-              width="50"
-            />
-  
-            <el-table-column
-              prop="name"
-              align="center"
-              width="100"
-              label="姓名"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-  
-            <el-table-column
-              prop="mobile"
-              align="center"
-              width="150"
-              label="联系电话"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="idNum"
-              align="center"
-              width="200"
-              label="证件号"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="genderName"
-              align="center"
-              width="80"
-              label="性别"
-              :show-overflow-tooltip="true"
-            >
+          <el-button @click="handleExport"
+                     type="primary"
+                     size="small"
+                     class="diy-button--white el-button--default">导出</el-button>
+          <el-button @click="onDeleteBatch"
+                     style="margin: 0 10px"
+                     size="small"
+                     type="primary">
+            批量删除
+          </el-button>
+          <el-upload :headers="$getElUploadHeaders()"
+                     ref="upload"
+                     class="upload-btn"
+                     action="uploadUlr"
+                     :limit="1"
+                     :accept="'.xls,.xlsx'"
+                     :with-credentials="true"
+                     :show-file-list="false"
+                     :auto-upload="true"
+                     :before-upload="beforeExcelUpload"
+                     :http-request="uploadHttpRequest">
+            <el-button type="primary"
+                       size="small"
+                       class="diy-button--white el-button--default"
+                       :loading="importLoading">导入</el-button>
+          </el-upload>
+          <el-button style="margin-left: 10px"
+                     class="diy-button--blue"
+                     size="small"
+                     @click="handleExportModule('room')">下载模板</el-button>
+        </div>
+
+        <el-table :data="tableData"
+                  border
+                  v-loading="tableLoading"
+                  class="m-table-item"
+                  style="width: 100%"
+                  :height="maxTableHeight"
+                  @selection-change="onMultiSelection">
+          <el-table-column type="selection"
+                           fixed="left"
+                           align="center"
+                           width="50" />
+
+          <el-table-column label="序号"
+                           fixed="left"
+                           type="index"
+                           align="center"
+                           width="50" />
+
+          <el-table-column prop="agencyName"
+                           align="center"
+                           width="150"
+                           label="所属组织"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="name"
+                           align="center"
+                           width="100"
+                           label="姓名"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="mobile"
+                           align="center"
+                           width="150"
+                           label="联系电话"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="idNum"
+                           align="center"
+                           width="200"
+                           label="证件号"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="placeOfDomicile"
+                           align="center"
+                           width="150"
+                           label="户籍地址"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="currentResidence"
+                           align="center"
+                           width="150"
+                           label="居住地址"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="disabilityCategoryName"
+                           align="center"
+                           width="100"
+                           label="住房性质"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="disabilityCategoryName"
+                           align="center"
+                           width="100"
+                           label="保障类型"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="disabilityCategoryName"
+                           align="center"
+                           width="100"
+                           label="补贴编号"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="disabilityCategoryName"
+                           align="center"
+                           width="100"
+                           label="补贴金额"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="disabilityCategoryName"
+                           align="center"
+                           width="100"
+                           label="发证日期"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="disabilityCategoryName"
+                           align="center"
+                           width="100"
+                           label="备注"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column fixed="right"
+                           label="操作"
+                           align="center"
+                           width="220">
             <template slot-scope="scope">
-            <span>{{ scope.row.gender?scope.row.gender == "1" ? "男":scope.row.gender == "2"?"女" :'--':"--"  }}</span>
+              <el-button @click="handleDetail(scope.row)"
+                         type="text"
+                         size="small">查看</el-button>
+              <el-button @click="handleEdit(scope.row)"
+                         type="text"
+                         size="small">编辑</el-button>
+
+              <el-button @click="handleDel(scope.row)"
+                         type="text"
+                         size="small">删除</el-button>
             </template>
-            </el-table-column>
-            <el-table-column
-              prop="localResidenceFlagName"
-              align="center"
-              width="100"
-              label="本地户籍"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="currentResidence"
-              align="center"
-              width="100"
-              label="居住地址"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="disabilityCategoryName"
-              align="center"
-              width="100"
-              label="残疾类别"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column
-              prop="disabilityCategoryName"
-              align="center"
-              width="100"
-              label="残疾级别"
-              :show-overflow-tooltip="true"
-            >
-            </el-table-column>
-            <el-table-column
-              fixed="right"
-              label="操作"
-              align="center"
-              width="220"
-            >
-              <template slot-scope="scope">
-                <el-button
-                  @click="handleDetail(scope.row)"
-                  type="text"
-                  size="small"
-                  >查看</el-button
-                >
-                <el-button
-                  @click="handleEdit(scope.row)"
-                  type="text"
-                  size="small"
-                  >编辑</el-button
-                >
-  
-                <el-button @click="handleDel(scope.row)" 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-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>
-      <el-dialog
-        v-if="showAdd"
-        :visible.sync="showAdd"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        :title="addDiaTitle"
-        :modal-append-to-body="false"
-        width="720px"
-        top="5vh"
-        class="dialog-h"
-        @closed="showAdd = false"
-      >
-        <add-form
-          ref="ref_add_form"
-          :formType="formType"
-          @handleComfirm="handleComfirm"
-          @handleClose="handleClose"
-        ></add-form>
-      </el-dialog>
     </div>
-  </template>
+    <el-dialog v-if="showAdd"
+               :visible.sync="showAdd"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="addDiaTitle"
+               :modal-append-to-body="false"
+               width="720px"
+               top="5vh"
+               class="dialog-h"
+               @closed="showAdd = false">
+      <add-form ref="ref_add_form"
+                :formType="formType"
+                @handleComfirm="handleComfirm"
+                @handleClose="handleClose"></add-form>
+    </el-dialog>
+  </div>
+</template>
     
       <script>
-  import { requestPost } from "@/js/dai/request";
-  import { genderList, binaryOptionList } from "@/js/columns/constants";
-  import nextTick from "dai-js/tools/nextTick";
-  import { mapGetters } from "vuex";
-  import axios from "axios";
-  import addForm from "./addForm";
-  // import detailForm from "./detailForm";
-  //   import editForm from "./editForm";
-  
-  export default {
-    components: { addForm,  },
-  
-    data() {
-      let endDisabledDate = (time) => {
-        //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-        let nowData = Date.now();
-        if (this.formData.serviceTimeStart) {
-          let serviceTimeStart = new Date(this.formData.serviceTimeStart);
-          return (
-            time.getTime() < serviceTimeStart - 24 * 60 * 60 * 1000 ||
-            time.getTime() === serviceTimeStart - 24 * 60 * 60 * 1000
-          );
-        } else {
-          return time.getTime() > nowData || time.getTime() === nowData;
-        }
-      };
-      // let startDisabledDate = (time) => {
-      //   //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      //   let nowData = Date.now() - 24 * 60 * 60 * 1000;
-      //   return time.getTime() < nowData;
-      // };
-  
-      return {
-        tableLoading: false,
-        user: {},
-        agencyId: "",
-        searchH: 170,
-        tableData: [],
-        genderList,
-        binaryOptionList,
-        formData: {
-          name: "刘备",
-          mobile: "174744645454",
-          gender: "1",
-          idNum: "37024545454544545",
-          localResidenceFlag: "1",
-          currentResidence: "青岛市市北区时代国际广场",
-          disabilityCategoryCode: "",
-          disabilityLevel: "",
-          disabilityNum: "12345678",
-          subsistenceAllowanceFlag: "1",
-          monthIncome: 2000,
-          contactName: "关羽",
-          contactMobile: "12345678",
-          remark: "ipsum nostrud adipisicing",
-        },
-        pageNo: 1,
-        pageSize: window.localStorage.getItem("pageSize") || 20,
-        total: 1,
-        endPickerOptions: {
-          disabledDate: endDisabledDate,
-        },
-        startPickerOptions: {
-          // disabledDate: startDisabledDate
-        },
-  
-        showAdd: false,
-        showEdit: false,
-        showDetail: false,
-        formType: "add",
-        addDiaTitle: "新增",
-        detailDiaTitle: "详情",
-  
-        multiSelection: [], // 多选结果
-        importLoading: false,
-  
-        dicts: {
-          educationList: [],
-          nationList: [],
-        }, //字典对象
-      };
-    },
-    computed: {
-      maxTableHeight() {
-        const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
-        const _h = this.clientHeight - 330 - this.searchH;
-        return this.$store.state.inIframe ? h : _h;
+import { requestPost } from "@/js/dai/request";
+import { genderList, binaryOptionList, yesOrNoList } from "@/js/columns/constants";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+import addForm from "./addForm";
+// import detailForm from "./detailForm";
+//   import editForm from "./editForm";
+
+export default {
+  components: { addForm, },
+
+  data () {
+
+
+    return {
+      tableLoading: false,
+      user: {},
+      agencyId: "",
+      searchH: 170,
+      tableData: [],
+
+      genderList,
+      binaryOptionList,
+      yesOrNoList,
+
+      formData: {
+        certificateDateEnd: '',
+        certificateDateStart: '',
+        currentResidence: null,
+        housingNature: '',
+        idNum: '',
+        mobile: '',
+        name: '',
+        placeOfDomicile: '',
+        remark: '',
+        securityType: '',
+        subsidyAmount: '',
+        subsidyNum: '',
       },
-      ...mapGetters(["clientHeight", "iframeHeight"]),
-    },
-    watch: {},
-    async created() {
-      await this.getDicts();
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      showAdd: false,
+      showEdit: false,
+      showDetail: false,
+      formType: "add",
+      addDiaTitle: "新增",
+      detailDiaTitle: "详情",
+
+      multiSelection: [], // 多选结果
+      importLoading: false,
+
+      dicts: {
+        educationList: [],
+        nationList: [],
+      }, //字典对象
+    };
+  },
+  computed: {
+    maxTableHeight () {
+      const h = this.clientHeight - this.searchH - 330 + this.iframeHeight;
+      const _h = this.clientHeight - 330 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
     },
-    mounted() {
-      console.log(this.$store.state);
-      this.user = this.$store.state.user;
-      this.agencyId = this.user.agencyId;
-      this.getTableData();
-    },
-    methods: {
-      // --------------------------------------字典------------------------------------------
-      async getDicts() {
-        try {
-          const requests = [
-            this.$http.post("sys/dict/data/nation", {
-              formCode: "resi_base_info",
-            }),
-            this.$http.post("sys/dict/data/education", {
-              formCode: "resi_base_info",
-            }),
-          ];
-          const dictKeys = ["nationList", "educationList"]; // 对应的键名
-  
-          const results = await Promise.all(requests);
-          results.forEach((result, index) => {
-            if (result.data.code === 0) {
-              this.dicts[dictKeys[index]].push(...result.data.data);
-            } else {
-              console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
-            }
-          });
-        } catch (error) {
-          console.log("获取字典失败: ", error);
-        }
-      },
-  
-      binaryText(value){
-         let text = ''
-         text = this.binaryOptionList.filter(item=>item.value == value)[0].label
-         return text || "--"
-      },
-      // ------------------------------------事件------------------------------------------
-      checkNumberInput(){
-          if (isNaN(this.formData.retirementAmount)) {
-          this.$message.error('请输入数字');
-          this.formData.retirementAmount = '';
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {},
+  async created () {
+    await this.getDicts();
+  },
+  mounted () {
+    console.log(this.$store.state);
+    this.user = this.$store.state.user;
+    this.agencyId = this.user.agencyId;
+    this.getTableData();
+  },
+  methods: {
+    // --------------------------------------字典------------------------------------------
+    async getDicts () {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/nation", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/education", {
+            formCode: "resi_base_info",
+          }),
+        ];
+        const dictKeys = ["nationList", "educationList"]; // 对应的键名
+
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictKeys[index]].push(...result.data.data);
           } else {
-          this.formData.retirementAmount = parseFloat(this.formData.retirementAmount);
+            console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
           }
-      },
-      // 导入
-      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.$message({
-          showClose: true,
-          dangerouslyUseHTMLString: true,
-          message:
-            "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-          duration: 3000,
         });
-        let than = this;
-        document.getElementById("clickA").addEventListener("click", function () {
-          than.$router.replace("/main/importRecord-index");
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
+    },
+
+    binaryText (value) {
+      let text = ''
+      text = this.binaryOptionList.filter(item => item.value == value)[0].label
+      return text || "--"
+    },
+    // ------------------------------------事件------------------------------------------
+    checkNumberInput () {
+      if (isNaN(this.formData.retirementAmount)) {
+        this.$message.error('请输入数字');
+        this.formData.retirementAmount = '';
+      } else {
+        this.formData.retirementAmount = parseFloat(this.formData.retirementAmount);
+      }
+    },
+    // 导入
+    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.$message({
+        showClose: true,
+        dangerouslyUseHTMLString: true,
+        message:
+          "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+        duration: 3000,
+      });
+      let than = this;
+      document.getElementById("clickA").addEventListener("click", function () {
+        than.$router.replace("/main/importRecord-index");
+      });
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post("/actual/base/resiCategorized/disability/import", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            this.$message.success("导入成功");
+            this.getTableData();
+            this.$refs.upload.clearFiles();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
         });
-        const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-        formData.append("file", file.file); //添加文件对象
-        await this.$http
-          .post("/actual/base/resiCategorized/disability/import", formData)
-          .then((res) => {
-            console.log("res-up", res);
-            if (res.data.code == 0 && res.data.msg == "success") {
-              this.$message.success("导入成功");
-              this.getTableData();
-              this.$refs.upload.clearFiles();
-            } else this.$message.error(res.data.msg);
-          })
-          .catch((err) => {
-            console.log("失败", err);
-            file.onError(); //上传失败的文件会从文件列表中删除
-            // this.$message.error('导入失败')
-          });
-      },
-      // 搜索事件
-      handleSearch(val) {
-        console.log(this.formData);
-        this.pageNo = 1;
-        this.getTableData();
-      },
-  
-      //   调出新增组件
-      async handleAdd() {
-        this.addDiaTitle = "新增";
-        this.formType = "add";
-        this.showAdd = true;
-      },
-      //   查看详情触发事件
-      async handleDetail(row) {
-        this.addDiaTitle = "详情";
-        this.formType = "detail";
-        this.showAdd = true;
-        this.$nextTick(() => {
-          this.$refs.ref_add_form.initForm("detail", row);
+    },
+    // 搜索事件
+    handleSearch (val) {
+      console.log(this.formData);
+      this.pageNo = 1;
+      this.getTableData();
+    },
+
+    //   调出新增组件
+    async handleAdd () {
+      this.addDiaTitle = "新增";
+      this.formType = "add";
+      this.showAdd = true;
+    },
+    //   查看详情触发事件
+    async handleDetail (row) {
+      this.addDiaTitle = "详情";
+      this.formType = "detail";
+      this.showAdd = true;
+      this.$nextTick(() => {
+        this.$refs.ref_add_form.initForm("detail", row);
+      });
+    },
+
+    //   编辑触发事件
+    async handleEdit (row) { },
+    //  新增弹出框组件取消事件
+    handleClose () {
+      this.formType = "";
+      this.showAdd = false;
+      this.showEdit = false;
+    },
+    //  新增弹出框组件确定事件
+    handleComfirm () {
+      this.handleClose();
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    //   删除触发事件
+    async handleDel (row) {
+      this.$confirm("确认删除?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.cancelFuwu([row.categorizedResiId]);
+        })
+        .catch((err) => {
+          if (err == "cancel") {
+            // this.$message({
+            //   type: "info",
+            //   message: "已取消删除"
+            // });
+          }
         });
-      },
-  
-      //   编辑触发事件
-      async handleEdit(row) {},
-      //  新增弹出框组件取消事件
-      handleClose() {
-        this.formType = "";
-        this.showAdd = false;
-        this.showEdit = false;
-      },
-      //  新增弹出框组件确定事件
-      handleComfirm() {
-        this.handleClose();
-        this.pageNo = 1;
+    },
+    //   删除处理
+    async cancelFuwu (id) {
+      const url = "";
+      const { data, code, msg } = await requestPost(url, id);
+      if (code === 0) {
+        this.$message.success("取消成功！");
         this.getTableData();
-      },
-      //   删除触发事件
-      async handleDel(row) {
-        this.$confirm("确认删除?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-            this.cancelFuwu([row.categorizedResiId]);
-          })
-          .catch((err) => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
-          });
-      },
-      //   删除处理
-      async cancelFuwu(id) {
-        const url = "";
-        const { data, code, msg } = await requestPost(url, id);
-        if (code === 0) {
-          this.$message.success("取消成功！");
-          this.getTableData();
-        } else {
-          this.$message.error("操作失败！");
-        }
-      },
-      //   获取列表
-      async getTableData() {
-        this.tableLoading = true;
-        const url = "";
-  
-        const { pageSize, pageNo, formData } = this;
-        const { data, code, msg } = await requestPost(url, {
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+    //   获取列表
+    async getTableData () {
+      this.tableLoading = true;
+      const url = "";
+
+      const { pageSize, pageNo, formData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...formData,
+      });
+      this.tableLoading = false;
+      if (code === 0) {
+        this.total = data.total || 0;
+        this.tableData = data.list;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    //   导出
+    async handleExport () {
+      const url = "";
+      const { pageSize, pageNo, formData } = this;
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
           pageSize,
           pageNo,
           ...formData,
-        });
-        this.tableLoading = false;
-        if (code === 0) {
-          this.total = data.total || 0;
-          this.tableData = data.list;
-        } else {
-          this.$message.error(msg);
-        }
-      },
-      //   导出
-      async handleExport() {
-        const url = "";
-        const { pageSize, pageNo, formData } = this;
-        axios({
-          url: window.SITE_CONFIG["apiURL"] + url,
-          method: "post",
-          data: {
-            pageSize,
-            pageNo,
-            ...formData,
-          },
-          responseType: "blob",
+        },
+        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.openxmlformats-officedocument.spreadsheetml.sheet",
+          });
+          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对象
         })
-          .then((res) => {
+        .catch((err) => {
+          console.log("获取导出情失败", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    // 下载模板
+    async handleExportModule () {
+      let url = "";
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          console.log("res----dddd", res);
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
             let fileName = window.decodeURI(
               res.headers["content-disposition"].split(";")[1].split("=")[1]
             );
             console.log("filename", fileName);
             let blob = new Blob([res.data], {
-              type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+              type: "application/vnd.ms-excel",
             });
             var url = window.URL.createObjectURL(blob);
             var aLink = document.createElement("a");
@@ -646,105 +632,69 @@
             aLink.click();
             document.body.removeChild(aLink); //下载完成移除元素
             window.URL.revokeObjectURL(url); //释放掉blob对象
-          })
-          .catch((err) => {
-            console.log("获取导出情失败", err);
-            return this.$message.error("网络错误");
-          });
-      },
-      // 下载模板
-      async handleExportModule() {
-        let url = "";
-        let params = {};
-        await this.$http({
-          method: "POST",
-          url,
-          responseType: "blob",
-          data: params,
+          } else this.$message.error("下载失败");
         })
-          .then((res) => {
-            console.log("res----dddd", res);
-            // this.download(res.data, title + '.xls')
-            if (res.headers["content-disposition"]) {
-              let fileName = window.decodeURI(
-                res.headers["content-disposition"].split(";")[1].split("=")[1]
-              );
-              console.log("filename", fileName);
-              let blob = new Blob([res.data], {
-                type: "application/vnd.ms-excel",
-              });
-              var url = window.URL.createObjectURL(blob);
-              var aLink = document.createElement("a");
-              aLink.style.display = "none";
-              aLink.href = url;
-              aLink.setAttribute("download", fileName);
-              document.body.appendChild(aLink);
-              aLink.click();
-              document.body.removeChild(aLink); //下载完成移除元素
-              window.URL.revokeObjectURL(url); //释放掉blob对象
-            } else this.$message.error("下载失败");
-          })
-          .catch((err) => {
-            console.log("err", err);
-            return this.$message.error("网络错误");
-          });
-      },
-      //   分页
-      handleSizeChange(val) {
-        this.pageSize = val;
-        window.localStorage.setItem("pageSize", val);
-        this.getTableData();
-      },
-  
-      //   分页
-      handleCurrentChange(val) {
-        this.pageNo = val;
-        this.getTableData();
-      },
-      //   重置
-      resetSearch() {
-        this.formData = {};
-  
-        this.pageNo = 1;
-        this.getTableData();
-      },
-      // 多选事件
-      onMultiSelection(rows) {
-        this.multiSelection = rows;
-      },
-  
-      // 批量删除
-      onDeleteBatch() {
-        if (this.multiSelection.length == 0) {
-          this.$message.warning("请先选中至少一项");
-          return;
-        }
-  
-        this.$confirm("删除之后无法恢复，确认删除？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    //   分页
+    handleSizeChange (val) {
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+
+    //   分页
+    handleCurrentChange (val) {
+      this.pageNo = val;
+      this.getTableData();
+    },
+    //   重置
+    resetSearch () {
+      this.formData = {};
+
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    // 多选事件
+    onMultiSelection (rows) {
+      this.multiSelection = rows;
+    },
+
+    // 批量删除
+    onDeleteBatch () {
+      if (this.multiSelection.length == 0) {
+        this.$message.warning("请先选中至少一项");
+        return;
+      }
+
+      this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.cancelFuwu(this.multiSelection.map((e) => e.categorizedResiId));
         })
-          .then(() => {
-            this.cancelFuwu(this.multiSelection.map((e) => e.categorizedResiId));
-          })
-          .catch((err) => {
-            console.error(err);
-            this.$message.error("删除失败");
-          });
-      },
+        .catch((err) => {
+          console.error(err);
+          this.$message.error("删除失败");
+        });
     },
-  
-    props: {},
-  };
+  },
+
+  props: {},
+};
   </script>
   <style lang="scss" scoped>
-  @import "@/assets/scss/buttonstyle.scss";
-  @import "@/assets/scss/modules/management/list-main.scss";
-  @import "@/assets/scss/modules/shequzhili/event-info.scss";
-  .div_btn_left > * {
-    margin-right: 10px;
-  }
-  </style>
+@import "@/assets/scss/buttonstyle.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/shequzhili/event-info.scss";
+.div_btn_left > * {
+  margin-right: 10px;
+}
+</style>
     
     
\ No newline at end of file