diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js
index be61dc0bb..941d4fa36 100644
--- a/src/js/columns/constants/index.js
+++ b/src/js/columns/constants/index.js
@@ -87,15 +87,3 @@ export const idTypeList = [
     value: 5
   }
 ]
-
-//是否list
-export const yesOrNoList = [
-  {
-    label: '是',
-    value: 1
-  },
-  {
-    label: '否',
-    value: 0
-  }
-]
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 4fce6bbb0..f5e20a45e 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -177,15 +177,7 @@
                      class="f-flex"
                      style="flex-wrap: wrap;">
               <template v-if="itemj.id==='specialSupportDto'">
-                <el-form-item label-width="105px"
-                              label="银行卡号">
-                  <el-input :placeholder="`请输入银行卡号`"
-                            class="u-item-width-normal"
-                            size="small"
-                            v-model.trim="form[itemj.id].bankAccount"
-                            clearable>
-                  </el-input>
-                </el-form-item>
+
                 <el-form-item label-width="105px"
                               label="特扶类别">
 
@@ -194,7 +186,7 @@
                              size="small"
                              clearable
                              class="u-item-width-normal">
-                    <el-option v-for="items in itemj.children[1].opction"
+                    <el-option v-for="items in itemj.children[0].opction"
                                :key="items.value"
                                :label="items.label"
                                :value="items.value">
@@ -219,7 +211,7 @@
                              size="small"
                              clearable
                              class="u-item-width-normal">
-                    <el-option v-for="items in itemj.children[3].opction"
+                    <el-option v-for="items in itemj.children[2].opction"
                                :key="items.value"
                                :label="items.label"
                                :value="items.value">
@@ -247,7 +239,7 @@
                              size="small"
                              clearable
                              class="u-item-width-normal">
-                    <el-option v-for="items in itemj.children[5].opction"
+                    <el-option v-for="items in itemj.children[4].opction"
                                :key="items.value"
                                :label="items.label"
                                :value="items.value">
@@ -262,7 +254,7 @@
                              size="small"
                              clearable
                              class="u-item-width-normal">
-                    <el-option v-for="items in itemj.children[6].opction"
+                    <el-option v-for="items in itemj.children[5].opction"
                                :key="items.value"
                                :label="items.label"
                                :value="items.value">
@@ -1257,14 +1249,8 @@ export default {
         {
           id: 'specialSupportDto',
           children: [
+
             {//0
-              label: "银行卡号",
-              itemType: "input1",
-              formName: "bankAccount",
-              opction: [
-              ]
-            },
-            {//1
               label: "特扶类别",
               itemType: "select2",
               formName: "specialSupportType",
@@ -1279,14 +1265,14 @@ export default {
                 }
               ]
             },
-            {//2
+            {//1
               label: "子女姓名",
               itemType: "input1",
               formName: "childName",
               opction: [
               ]
             },
-            {//3
+            {//2
               label: "子女性别",
               itemType: "input1",
               formName: "childGender",
@@ -1301,14 +1287,14 @@ export default {
                 }
               ]
             },
-            {//4
+            {//3
               label: "子女死亡日期",
               itemType: "datepicker1",
               formName: "certificateDate",
               opction: [],
               showFlag: '0'//不显示
             },
-            {//5
+            {//4
               label: "伤残类别",
               itemType: "select1",
               formName: "childDisabilityCategoryCode",
@@ -1316,7 +1302,7 @@ export default {
               ],
               showFlag: '0'//不显示
             },
-            {//6
+            {//5
               label: "伤残等级",
               itemType: "select1",
               formName: "childDisabilityLevel",
@@ -1522,7 +1508,6 @@ export default {
         },
         //特扶人员
         specialSupportDto: {
-          bankAccount: '',//银行卡号
           specialSupportType: '',//特扶类别
           childName: '',//子女姓名
           childGender: '',//子女性别
@@ -2617,7 +2602,6 @@ export default {
           return this.$message.error(res.msg);
         } else {
           this.form.specialSupportDto = res.data ? res.data : {//特扶人员信息
-            bankAccount: '',//银行卡号
             specialSupportType: '',//特扶类别
             childName: '',//子女姓名
             childGender: '',//子女性别
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 173e60b13..774f1d65b 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -700,6 +700,7 @@ export default {
       }
     },
     handleChangeAgency (val) {
+
       this.sarr = []
       const map = new Map();
       this.getLastItem(
diff --git a/src/views/modules/base/residentManagement/housingNature/addForm.vue b/src/views/modules/base/residentManagement/housingNature/addForm.vue
index 51e9912cd..45f4072fb 100644
--- a/src/views/modules/base/residentManagement/housingNature/addForm.vue
+++ b/src/views/modules/base/residentManagement/housingNature/addForm.vue
@@ -1,108 +1,132 @@
 <template>
-    <div>
-      <div
-        class="dialog-h-content scroll-h"
-        :class="{ 'visiual-form': source === 'visiual' }"
-      >
-        <el-form
-          ref="ref_add_form"
-          :inline="true"
-          :model="formData"
-          :rules="dataRule"
-          class="div_form"
-        >
+  <div>
+    <div class="dialog-h-content scroll-h"
+         :class="{ 'visiual-form': source === 'visiual' }">
+      <el-form ref="ref_add_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               class="div_form">
+
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">所属组织: </span>
+
+            </div>
+            <el-form-item v-else
+                          label="所属组织"
+                          :label-width="labelWidth"
+                          prop="agencyId">
+              <el-cascader v-if="formType == 'add'"
+                           ref="ref_cascader_agency"
+                           class="width-two"
+                           v-model="formData.agencyId"
+                           :options="optionsA"
+                           @change="handleChangeAngency"
+                           :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
+                           clearable />
+
+              <span v-else>{{ formData.agencyName || "--" }}</span>
+
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
         <el-row>
           <el-col :span="12">
-            <div class="info-prop" v-if="formType == 'detail'">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
               <span class="info-title-2">姓名: </span>
               <span>{{ formData.name || "--" }}</span>
             </div>
-            <el-form-item label-width="100px" label="姓名" prop="name" v-else>
-              <el-input
-                v-model="formData.name"
-                placeholder="请输入"
-                clearable
-              ></el-input>
+            <el-form-item :label-width="labelWidth"
+                          label="姓名"
+                          prop="name"
+                          v-else>
+              <el-input v-model="formData.name"
+                        placeholder="请输入"
+                        clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="info-prop" v-if="formType == 'detail'">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
               <span class="info-title-2">联系电话: </span>
               <span>{{ formData.mobile || "--" }}</span>
             </div>
-            <el-form-item label-width="100px" label="联系电话" v-else>
-              <el-input
-                v-model="formData.mobile"
-                placeholder="请输入"
-                clearable
-              ></el-input>
+            <el-form-item :label-width="labelWidth"
+                          label="联系电话"
+                          v-else>
+              <el-input v-model="formData.mobile"
+                        placeholder="请输入"
+                        clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-  
+
         <el-row>
           <el-col :span="12">
-            <div class="info-prop" v-if="formType == 'detail'">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
               <span class="info-title-2">证件类型: </span>
               <span>{{ formData.idTypeName || "--" }}</span>
             </div>
-            <el-form-item
-              label-width="100px"
-              label="证件类型"
-              prop="idType"
-              v-else
-            >
-              <el-select v-model="formData.idType" clearable>
-                <el-option
-                  v-for="item in dicts.idCard_type"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+            <el-form-item :label-width="labelWidth"
+                          label="证件类型"
+                          prop="idType"
+                          v-else>
+              <el-select v-model="formData.idType"
+                         clearable>
+                <el-option v-for="item in idTypeList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="info-prop" v-if="formType == 'detail'">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
               <span class="info-title-2">证件号: </span>
               <span>{{ formData.idNum || "--" }}</span>
             </div>
-            <el-form-item
-              label-width="100px"
-              label="证件号"
-              prop="idNum"
-              v-else
-            >
-              <el-input
-                v-model="formData.idNum"
-                placeholder="请输入"
-                clearable
-              ></el-input>
+            <el-form-item :label-width="labelWidth"
+                          label="证件号"
+                          prop="idNum"
+                          v-else>
+              <el-input v-model="formData.idNum"
+                        placeholder="请输入"
+                        clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-  
+
         <el-row>
           <el-col :span="12">
-            <div class="info-prop" v-if="formType == 'detail'">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
               <span class="info-title-2">出生日期: </span>
               <span>{{formData.birthday||'--'}}</span>
             </div>
-            <el-form-item label-width="100px" label="出生日期" v-else>
-              <el-date-picker
-                v-model="formData.birthday"
-                type="date"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="选择日期"
-                style="width: 202px"
-                clearable
-              >
+            <el-form-item :label-width="labelWidth"
+                          label="出生日期"
+                          v-else>
+              <el-date-picker v-model="formData.birthday"
+                              type="date"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="选择日期"
+                              style="width: 202px"
+                              clearable>
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="info-prop" v-if="formType == 'detail'">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
               <span class="info-title-2">性别: </span>
               <span>{{
                 formData.gender
@@ -114,14 +138,15 @@
                   : "--"
               }}</span>
             </div>
-            <el-form-item label-width="100px" label="性别" v-else>
-              <el-select v-model="formData.gender" clearable>
-                <el-option
-                  v-for="item in genderList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+            <el-form-item :label-width="labelWidth"
+                          label="性别"
+                          v-else>
+              <el-select v-model="formData.gender"
+                         clearable>
+                <el-option v-for="item in genderList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -129,24 +154,27 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <div class="info-prop" v-if="formType == 'detail'">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
               <span class="info-title-2">民族: </span>
               <span>{{ nationName || "--" }}</span>
             </div>
-            <el-form-item label-width="100px" label="民族" v-else>
-              <el-select v-model="formData.nation" clearable>
-                <el-option
-                  v-for="item in dicts.nationList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+            <el-form-item :label-width="labelWidth"
+                          label="民族"
+                          v-else>
+              <el-select v-model="formData.nation"
+                         clearable>
+                <el-option v-for="item in dicts.nationList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
                 </el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="info-prop" v-if="formType == 'detail'">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
               <span class="info-title-2">本地户籍: </span>
               <span>{{
                 formData.localResidenceFlag != null
@@ -158,422 +186,548 @@
                   : "--"
               }}</span>
             </div>
-            <el-form-item label-width="100px" label="本地户籍" v-else>
-              <el-select v-model="formData.localResidenceFlag" clearable>
-                <el-option
-                  v-for="item in binaryOptionList"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
+            <el-form-item :label-width="labelWidth"
+                          label="本地户籍"
+                          v-else>
+              <el-select v-model="formData.localResidenceFlag"
+                         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-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">户籍地址: </span>
+              <span>{{ formData.placeOfDomicile || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="户籍地址"
+                          class="wd-wr"
+                          v-else>
+              <el-input v-model="formData.placeOfDomicile"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">现居地址: </span>
+              <span>{{ formData.currentResidence || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="现居地址"
+                          class="wd-wr"
+                          v-else>
+              <el-input v-model="formData.currentResidence"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">所在社区: </span>
+              <span>{{ formData.liveCommunityName || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="所在社区"
+                          v-else>
+              <el-input v-model="formData.liveCommunity"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">是否为低保: </span>
+              <span>{{  formData.subsistenceAllowanceFlag?formData.subsistenceAllowanceFlag=='1'?'是':formData.subsistenceAllowanceFlag=='0'?'否':'--':'--' }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="是否为低保"
+                          v-else>
+              <el-select v-model="formData.subsistenceAllowanceFlag"
+                         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-col>
         </el-row>
-  
-          <el-row>
-            <el-col :span="24">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">户籍地址: </span>
-                <span>{{ formData.placeOfDomicile || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="户籍地址" class="wd-wr" v-else>
-                <el-input
-                  v-model="formData.placeOfDomicile"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="24">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">现居地址: </span>
-                <span>{{ formData.currentResidence || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
-                <el-input
-                  v-model="formData.currentResidence"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">残疾类别: </span>
-                <span>{{ formData.disabilityCategoryName || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="残疾类别" v-else>
-                <el-select v-model="formData.disabilityCategoryCode" clearable>
-                  <el-option
-                    v-for="item in dicts.disability_category_code"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">残疾级别: </span>
-                <span>{{ formData.disabilityLevelName || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="残疾级别" v-else>
-                <el-select v-model="formData.disabilityLevel" clearable>
-                  <el-option
-                    v-for="item in dicts.disability_level"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">残疾证号: </span>
-                <span>{{ formData.disabilityNum || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="残疾证号" v-else>
-                <el-input
-                  v-model="formData.disabilityNum"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">低保: </span>
-                <span>{{  formData.subsistenceAllowanceFlag?formData.subsistenceAllowanceFlag=='1'?'是':formData.subsistenceAllowanceFlag=='0'?'否':'--':'--' }}</span
-                >
-              </div>
-              <el-form-item label-width="100px" label="低保" v-else>
-                <el-select v-model="formData.subsistenceAllowanceFlag" 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-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">退休金额: </span>
-                <span>{{ formData.retirementAmount || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="退休金额" v-else>
-                <el-input
-                  v-model="formData.retirementAmount"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">月收入: </span>
-                <span>{{ formData.monthIncome || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="月收入" v-else>
-                <el-input
-                  v-model="formData.monthIncome"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">联系人: </span>
-                <span>{{ formData.contactName || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="联系人" v-else>
-                <el-input
-                  v-model="formData.contactName"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">联系电话: </span>
-                <span>{{ formData.contactMobile || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="联系电话" v-else>
-                <el-input
-                  v-model="formData.contactMobile"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="24">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">备注: </span>
-                <span>{{ formData.remark || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
-                <el-input
-                  v-model="formData.remark"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <div class="div_btn">
-        <el-button size="small" @click="handleCancle">取 消</el-button>
-        <el-button
-          size="small"
-          type="primary"
-          :disabled="btnDisable"
-          @click="handleComfirm"
-          >确 定</el-button
-        >
-      </div>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">房东姓名: </span>
+              <span>{{ formData.landlordName || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="房东姓名"
+                          v-else>
+              <el-input v-model="formData.landlordName"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">房东身份证号: </span>
+              <span>{{  formData.landlordIdNum|| "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="房东身份证号"
+                          v-else>
+              <el-input v-model="formData.landlordIdNum"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">住房性质: </span>
+              <span>{{ formData.housingNatureName || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="住房性质"
+                          v-else>
+              <el-select v-model="formData.housingNature"
+                         clearable>
+                <el-option v-for="item in dicts.housingNatureList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">领取通知书日期: </span>
+              <span>{{  formData.notificationRcvDate||'' }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="领取通知书日期"
+                          v-else>
+              <el-date-picker v-model="formData.notificationRcvDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择日期"
+                              style="width: 202px"
+                              clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">保障类型: </span>
+              <span>{{ formData.securityType || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="保障类型"
+                          v-else>
+              <el-input v-model="formData.securityType"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">发证日期: </span>
+              <span>{{ formData.certificateDate || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="发证日期"
+                          v-else>
+              <el-date-picker v-model="formData.certificateDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="发证日期"
+                              style="width: 202px"
+                              clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">补贴编号: </span>
+              <span>{{ formData.subsidyNum || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="补贴编号"
+                          v-else>
+              <el-input v-model="formData.subsidyNum"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">补贴金额: </span>
+              <span>{{ formData.subsidyAmount || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="补贴金额"
+                          v-else>
+              <el-input v-model="formData.subsidyAmount"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">备注: </span>
+              <span>{{ formData.remark || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="备注"
+                          class="wd-wr"
+                          v-else>
+              <el-input v-model="formData.remark"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
     </div>
-  </template>
+  </div>
+</template>
       
         <script>
-  import { Loading } from "element-ui"; // 引入Loading服务
-  import { requestPost, requestGet } from "@/js/dai/request";
-  import nextTick from "dai-js/tools/nextTick";
-  import { genderList, binaryOptionList } from "@/js/columns/constants";
-  
-  let loading; // 加载动画
-  
-  export default {
-    props: {
-      formType:{
-          type:String,
-          default:'add'
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { genderList, binaryOptionList, idTypeList } from "@/js/columns/constants";
+
+let loading; // 加载动画
+
+export default {
+  props: {
+    formType: {
+      type: String,
+      default: 'add'
+    },
+    source: {
+      //展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: "manage",
+    },
+  },
+
+  data () {
+    return {
+      btnDisable: false,
+      optionsA: [],
+      labelWidth: '120px',
+
+      formData: {
+        // agencyId: '',
+        // name: "",
+        // mobile: "",
+        // idType: "",
+        // idNum: "",
+        // birthday: "",
+        // gender: null,
+        // nation: "",
+        // localResidenceFlag: null,
+        // placeOfDomicile: "",//户籍地址
+        // currentResidence: "",//现居地址
+        // liveCommunity: '',//所在社区
+        // subsistenceAllowanceFlag: null,//是否为低保
+        // landlordName: '',//房东姓名
+        // landlordIdNum: '',//房东身份证号
+        // housingNature: '',//住房性质
+        // notificationRcvDate: '',//领取通知书日期
+        // securityType: '',//保障类型
+        // certificateDate: '',//发证日期
+        // subsidyNum: '',//补贴编号
+        // subsidyAmount: '',//补贴金额
+        // remark: '',     //备注   
+        agencyId: "1582261714844827649",
+        birthday: "2023-08-01 00:00:00",
+        certificateDate: "2023-08-26",
+        currentResidence: "现居地址",
+        gender: "1",
+        housingNature: "1",
+        idNum: "370213198810101010",
+        idType: 1,
+        landlordIdNum: "370213187802232323",
+        landlordName: "房东姓名",
+        liveCommunity: "所在社区",
+        localResidenceFlag: 1,
+        mobile: "15111111111",
+        name: "王保障",
+        nation: "0",
+        notificationRcvDate: "2023-08-22",
+        placeOfDomicile: "户籍地址",
+        remark: "备注",
+        securityType: "保障类型",
+        subsidyAmount: "300",
+        subsidyNum: "23333",
+        subsistenceAllowanceFlag: 1,
       },
-      source: {
-        //展示来源：manage  管理平台    visiual  可视化平台
-        type: String,
-        default: "manage",
+
+      genderList,
+      binaryOptionList,
+      idTypeList,
+
+      dataRule: {
+        agencyId: [{ required: true, message: "所属组织不能为空", trigger: "bulr" }],
+        name: [{ required: true, message: "姓名不能为空", trigger: "bulr" }],
+        idNum: [{ required: true, message: "证件号不能为空", trigger: "bulr" }],
+        idType: [
+          { required: true, message: "证件类型不能为空", trigger: "bulr" },
+        ],
       },
+      scopeId: "",
+
+      dicts: {
+        nationList: [],
+        housingNatureList: [],
+
+      },
+    };
+  },
+
+  watch: {},
+
+  components: {},
+  async created () {
+    await this.getDicts();
+    await this.getGridList();
+  },
+  async mounted () {
+    this.startLoading();
+    await this.endLoading();
+  },
+
+  methods: {
+    async initForm (type, row) {
+      this.formType = type;
+      this.scopeId = row.categorizedResiId;
+      await this.getDetail(this.scopeId);
     },
-  
-    data() {
-      return {
-        btnDisable: false,
-  
-        formData: {
-          name: "",
-          mobile: "",
-          idType: "",
-          idNum: "",
-          gender: "",
-          localResidenceFlag: null,
-          placeOfDomicile: "",
-          currentResidence: "",
-          disabilityCategoryCode: "",
-          disabilityLevel: "",
-          disabilityNum: "",
-          subsistenceAllowanceFlag: null,
-          retirementAmount: null,
-          monthIncome: null,
-          contactName: "",
-          contactMobile: "",
-          remark: "",
-        },
-        genderList,
-        binaryOptionList,
-        dataRule: {
-          name: [{ required: true, message: "姓名不能为空", trigger: "bulr" }],
-          idNum: [{ required: true, message: "证件号不能为空", trigger: "bulr" }],
-  
-          idType: [
-            { required: true, message: "证件类型不能为空", trigger: "bulr" },
-          ],
-        },
-        scopeId: "",
-  
-        dicts: {
-          nationList: [],
-          educationList: [],
-          idCard_type: [],
-          disability_category_code: [],
-          disability_level: [],
-        },
-      };
-    },
-  
-    watch: {},
-  
-    components: {},
-    async created() {
-      await this.getDicts();
+    async getDetail (categorizedResiId) {
+      const url = `/actual/base/resiCategorized/ensureHouse/detail/${categorizedResiId}`;
+      const { data, code, msg } = await requestGet(url);
+      if (code === 0) {
+        this.formData = { ...data };
+      } else {
+        this.$message.error(msg);
+      }
     },
-    async mounted() {
-      this.startLoading();
-      await this.endLoading();
+    handleChangeAngency (val) {
+
+      let obj = this.$refs["ref_cascader_agency"].getCheckedNodes()[0].data;
+      console.log('改变组织', obj)
+      if (obj) {
+        if (obj.level !== 'community') {
+          this.$message.info('请选择社区')
+          this.formData.agencyId = ''
+          return false
+        } else {
+          this.formData.agencyId = val
+        }
+      }
     },
-  
-    methods: {
-      async initForm(type, row) {
-        this.formType = type;
-        this.scopeId = row.categorizedResiId;
-        await this.getDetail(this.scopeId);
-      },
-      async getDetail(categorizedResiId) {
-        const url = `/governance/commonDemand/detail/${categorizedResiId}`;
-        const { data, code, msg } = await requestGet(url);
+    async handleComfirm () {
+      this.$refs["ref_add_form"].validate(async (valid) => {
+        if (!valid) {
+          return false;
+        }
+        const url =
+          this.formType === "edit"
+            ? "/actual/base/resiCategorized/ensureHouse/update"
+            : "/actual/base/resiCategorized/ensureHouse/create";
+        // console.log(this.formData)
+        // return false
+        const { data, code, msg } = await requestPost(url, this.formData);
         if (code === 0) {
-          console.log(data);
-          this.formData = { ...data };
-        } else {
+          this.$message.success(this.formType == 'add' ? "添加成功" : '修改成功');
+          this.resetData();
+          this.$emit("handleComfirm");
+        } else if (code >= 8000) {
           this.$message.error(msg);
         }
-      },
-      async handleComfirm() {
-        this.$refs["ref_add_form"].validate(async (valid) => {
-          if (!valid) {
-            return false;
-          }
-          const url =
-            this.formType === "edit"
-              ? ""
-              : "";
-  
-          const { data, code, msg } = await requestPost(url, this.formData);
-          if (code === 0) {
-            this.$message.success(this.formType == 'add'?"添加成功":'修改成功');
-            this.resetData();
-            this.$emit("handleComfirm");
-          } else if (code >= 8000) {
-            this.$message.error(msg);
+      });
+    },
+    async getDicts () {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/nation", {
+            formCode: "resi_base_info",
+          }),
+
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "house",
+          }),
+
+        ];
+        const dictKeys = [
+          "nationList",
+          "housingNatureList",
+
+        ]; // 对应的键名
+
+        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}`);
           }
         });
-      },
-      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",
-            }),
-            this.$http.post("sys/dict/data/dictlist", {
-              dictType: "idCard_type",
-            }),
-            this.$http.post("sys/dict/data/dictlist", {
-              dictType: "disability_category_code",
-            }),
-            this.$http.post("sys/dict/data/dictlist", {
-              dictType: "disability_level",
-            }),
-          ];
-          const dictKeys = [
-            "nationList",
-            "educationList",
-            "idCard_type",
-            "disability_category_code",
-            "disability_level",
-          ]; // 对应的键名
-  
-          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);
-        }
-      },
-      handleCancle() {
-        this.resetData();
-        this.$emit("handleClose");
-      },
-  
-      resetData() {
-        this.formData = {};
-      },
-      // 开启加载动画
-      startLoading() {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: "正在加载……", // 加载中需要显示的文字
-          background: "rgba(0,0,0,.7)", // 背景颜色
-        });
-      },
-      // 结束加载动画
-      endLoading() {
-        if (loading) {
-          loading.close();
-        }
-      },
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
     },
-  };
+    getGridList () {
+      const { user } = this.$store.state
+      this.dataListLoading = true
+      const params = {
+        agencyId: user.agencyId,
+        client: 'gov'
+      }
+      this.$http
+        // .post('/gov/org/userhouse/service/serviceScopeTree')
+        // .post('/data/aggregator/org/agencytree', params)
+        .post('/gov/org/customeragency/staffinagencylist')
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+
+            let { agencyList, subAgencyList } = res.data
+
+            const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
+            this.optionsA = this.deepTree(_arr)
+          }
+        })
+        .catch(() => {
+          this.dataListLoading = false
+          return this.$message.error('网络错误')
+        })
+      this.dataListLoading = false
+    },
+    deepTree (arr) {
+      if (Array.isArray(arr)) {
+        return arr.map(item => {
+          return {
+            ...item,
+            subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
+          }
+        })
+      }
+    },
+    handleCancle () {
+      this.resetData();
+      this.$emit("handleClose");
+    },
+
+    resetData () {
+      this.formData = {};
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading () {
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+};
   </script>
       
         <style lang="scss" scoped>
-  @import "@/assets/scss/modules/management/form-main.scss";
-  @import "@/assets/scss/modules/visual/a_customize.scss";
-  @import "@/assets/scss/modules/management/detail-main.scss";
-  
-  .form-item::v-deep .el-form-item__label {
+@import "@/assets/scss/modules/management/form-main.scss";
+@import "@/assets/scss/modules/visual/a_customize.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+.form-item::v-deep .el-form-item__label {
+  color: #fff;
+}
+.form-item {
+  .el-radio {
     color: #fff;
   }
-  .form-item {
-    .el-radio {
-      color: #fff;
-    }
-    .el-checkbox {
-      color: #fff;
-    }
+  .el-checkbox {
+    color: #fff;
   }
-  
-  .wd-wr {
-    width: 100%;
-    /deep/ .el-form-item__content {
-      width: calc(100% - 148px);
-    }
+}
+
+.wd-wr {
+  width: 100%;
+  /deep/ .el-form-item__content {
+    width: calc(100% - 148px);
   }
-  .info-prop {
-    margin-top: 29px;
-    .info-title-2 {
-      width: 100px;
-      text-align: right;
-      display: inline-block;
-      padding-right: 10px;
-    }
+}
+.info-prop {
+  margin-top: 29px;
+  .info-title-2 {
+    width: 100px;
+    text-align: right;
+    display: inline-block;
+    padding-right: 10px;
   }
-  </style>
+}
+.width-two {
+  width: 553px;
+}
+</style>
       
     
     
\ No newline at end of file
diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
index 0eacf00e3..abf873e00 100644
--- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue
+++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
@@ -8,7 +8,7 @@
                  :label-width="'100px'">
 
           <el-form-item label="住房性质">
-            <el-select v-model="formData.gender"
+            <el-select v-model="formData.housingNature"
                        placeholder="请输入"
                        size="small"
                        class="u-item-width-normal"
@@ -42,7 +42,7 @@
                       clearable></el-input>
           </el-form-item>
           <el-form-item label="户籍地址">
-            <el-input v-model="formData.currentResidence"
+            <el-input v-model="formData.placeOfDomicile"
                       placeholder="请输入"
                       size="small"
                       class="u-item-width-normal"
@@ -58,20 +58,15 @@
           </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-input v-model="formData.securityType"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
           </el-form-item>
+
           <el-form-item label="补贴编号">
-            <el-input v-model="formData.currentResidence"
+            <el-input v-model="formData.subsidyNum"
                       placeholder="请输入"
                       size="small"
                       class="u-item-width-normal"
@@ -79,7 +74,7 @@
           </el-form-item>
 
           <el-form-item label="补贴金额">
-            <el-input v-model="formData.currentResidence"
+            <el-input v-model="formData.subsidyAmount"
                       placeholder="请输入"
                       size="small"
                       class="u-item-width-normal"
@@ -87,7 +82,7 @@
           </el-form-item>
 
           <el-form-item label="发证日期">
-            <el-date-picker v-model="formData.birthdayStart"
+            <el-date-picker v-model="formData.certificateDateStart"
                             type="date"
                             size="small"
                             class="u-item-width-daterange"
@@ -95,7 +90,7 @@
                             placeholder="开始日期">
             </el-date-picker>
             <span class="u-data-tag">至</span>
-            <el-date-picker v-model="formData.birthdayEnd"
+            <el-date-picker v-model="formData.certificateDateEnd"
                             type="date"
                             size="small"
                             value-format="yyyy-MM-dd"
@@ -225,37 +220,37 @@
                            label="居住地址"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="disabilityCategoryName"
+          <el-table-column prop="housingNatureName"
                            align="center"
                            width="100"
                            label="住房性质"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="disabilityCategoryName"
+          <el-table-column prop="securityType"
                            align="center"
                            width="100"
                            label="保障类型"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="disabilityCategoryName"
+          <el-table-column prop="subsidyNum"
                            align="center"
                            width="100"
                            label="补贴编号"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="disabilityCategoryName"
+          <el-table-column prop="subsidyAmount"
                            align="center"
                            width="100"
                            label="补贴金额"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="disabilityCategoryName"
+          <el-table-column prop="certificateDate"
                            align="center"
                            width="100"
                            label="发证日期"
                            :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column prop="disabilityCategoryName"
+          <el-table-column prop="remark"
                            align="center"
                            width="100"
                            label="备注"
@@ -298,7 +293,7 @@
                :close-on-press-escape="false"
                :title="addDiaTitle"
                :modal-append-to-body="false"
-               width="720px"
+               width="820px"
                top="5vh"
                class="dialog-h"
                @closed="showAdd = false">
@@ -312,7 +307,6 @@
     
       <script>
 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";
@@ -320,6 +314,24 @@ import addForm from "./addForm";
 // import detailForm from "./detailForm";
 //   import editForm from "./editForm";
 
+
+function iniFmData () {
+  return {
+    housingNature: '',//住房性质
+    name: '',
+    mobile: '',
+    idNum: '',
+    placeOfDomicile: '',//户籍地址
+    currentResidence: '',//现居地址
+    securityType: '',//保障类型
+    subsidyNum: '',//补贴编号
+    subsidyAmount: '',//补贴金额
+    certificateDateStart: '',//发证开始日期
+    certificateDateEnd: '',//发证截止日期
+    remark: '',     //备注   
+  };
+}
+
 export default {
   components: { addForm, },
 
@@ -333,24 +345,9 @@ export default {
       searchH: 170,
       tableData: [],
 
-      genderList,
-      binaryOptionList,
-      yesOrNoList,
-
-      formData: {
-        certificateDateEnd: '',
-        certificateDateStart: '',
-        currentResidence: null,
-        housingNature: '',
-        idNum: '',
-        mobile: '',
-        name: '',
-        placeOfDomicile: '',
-        remark: '',
-        securityType: '',
-        subsidyAmount: '',
-        subsidyNum: '',
-      },
+      housingNatureList: [],
+
+      formData: iniFmData(),
       pageNo: 1,
       pageSize: window.localStorage.getItem("pageSize") || 20,
       total: 1,
@@ -364,11 +361,21 @@ export default {
 
       multiSelection: [], // 多选结果
       importLoading: false,
+      pickerOptionsEnd: {
+        disabledDate: time => {
+          let nowData = Date.now();
+          if (this.formData.certificateDateStart) {
+            let certificateDateStart = new Date(this.formData.certificateDateStart);
+            return (
+              time.getTime() < certificateDateStart - 24 * 60 * 60 * 1000 ||
+              time.getTime() > nowData
+            );
+          } else {
+            return (time.getTime() > nowData || time.getTime() === nowData);
+          }
+        }
+      },
 
-      dicts: {
-        educationList: [],
-        nationList: [],
-      }, //字典对象
     };
   },
   computed: {
@@ -381,7 +388,7 @@ export default {
   },
   watch: {},
   async created () {
-    await this.getDicts();
+    await this.getHousingNatureList();
   },
   mounted () {
     console.log(this.$store.state);
@@ -391,36 +398,22 @@ export default {
   },
   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);
+    async getHousingNatureList () {
+      const url = "/sys/dict/data/dictlist";
+
+      const { data, code, msg } = await requestPost(url, {
+        dictType: "house",
+      });
+
+      if (code === 0) {
+        this.housingNatureList = data || [];
+      } else {
+        this.$message.error(msg);
       }
     },
 
-    binaryText (value) {
-      let text = ''
-      text = this.binaryOptionList.filter(item => item.value == value)[0].label
-      return text || "--"
-    },
+
+
     // ------------------------------------事件------------------------------------------
     checkNumberInput () {
       if (isNaN(this.formData.retirementAmount)) {
@@ -464,7 +457,7 @@ export default {
       const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append("file", file.file); //添加文件对象
       await this.$http
-        .post("/actual/base/resiCategorized/disability/import", formData)
+        .post("/actual/base/resiHousingNature/import", formData)
         .then((res) => {
           console.log("res-up", res);
           if (res.data.code == 0 && res.data.msg == "success") {
@@ -503,7 +496,11 @@ export default {
     },
 
     //   编辑触发事件
-    async handleEdit (row) { },
+    async handleEdit (row) {
+      this.$nextTick(() => {
+        this.$refs.ref_add_form.initForm("edit", row);
+      });
+    },
     //  新增弹出框组件取消事件
     handleClose () {
       this.formType = "";
@@ -536,11 +533,15 @@ export default {
         });
     },
     //   删除处理
-    async cancelFuwu (id) {
-      const url = "";
-      const { data, code, msg } = await requestPost(url, id);
+    async cancelFuwu (ids) {
+      const url = "/actual/base/resiHousingNature/delete";
+
+      let params = {
+        ids: ids
+      }
+      const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
-        this.$message.success("取消成功！");
+        this.$message.success("删除成功！");
         this.getTableData();
       } else {
         this.$message.error("操作失败！");
@@ -549,7 +550,7 @@ export default {
     //   获取列表
     async getTableData () {
       this.tableLoading = true;
-      const url = "";
+      const url = "/actual/base/resiCategorized/ensureHouse/page";
 
       const { pageSize, pageNo, formData } = this;
       const { data, code, msg } = await requestPost(url, {
@@ -567,7 +568,7 @@ export default {
     },
     //   导出
     async handleExport () {
-      const url = "";
+      const url = "/actual/base/resiHousingNature/export";
       const { pageSize, pageNo, formData } = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
@@ -653,7 +654,7 @@ export default {
     },
     //   重置
     resetSearch () {
-      this.formData = {};
+      this.formData = iniFmData();
 
       this.pageNo = 1;
       this.getTableData();
diff --git a/src/views/modules/base/residentManagement/louzhang/addForm.vue b/src/views/modules/base/residentManagement/louzhang/addForm.vue
index ecbddff2b..633cbeb5b 100644
--- a/src/views/modules/base/residentManagement/louzhang/addForm.vue
+++ b/src/views/modules/base/residentManagement/louzhang/addForm.vue
@@ -170,7 +170,6 @@ export default {
     return {
       btnDisable: false,
       optionsA: [],
-      selManageList: [],
       optionsRange: [],
       props: {
         multiple: true,
@@ -188,7 +187,13 @@ export default {
         idNum: "",
         dormitoryTypeArray: [],
         dormitoryTypeCode: '',
-        rangeList: []
+        rangeList: [
+
+          // ["1497127889652744194", "1497127889728241666"],
+
+          // ["1497127889652744194", "1497127889728241666", "1497127889786961922"],
+
+        ]
 
       },
       dormitoryTypeList,
@@ -202,6 +207,8 @@ export default {
         rangeList: [{ required: true, message: "管理范围不能为空", trigger: "change" }],
       },
 
+      categorizedResiId: ''
+
     };
   },
 
@@ -217,17 +224,19 @@ export default {
   methods: {
     async initForm (type, row) {
       this.formType = type;
+
       if (this.formType === 'add') {
-        await this.getGridList()
+
       } else {
-        await this.getDetail(row.categorizedResiId);
+        this.categorizedResiId = row.categorizedResiId
       }
+      await this.getGridList()
 
 
 
     },
-    async getDetail (categorizedResiId) {
-      const url = `/actual/base/resiCategorized/buildingUnitChief/detail/${categorizedResiId}`;
+    async getDetail () {
+      const url = `/actual/base/resiCategorized/buildingUnitChief/detail/${this.categorizedResiId}`;
 
       const { data, code, msg } = await requestGet(url);
       if (code === 0) {
@@ -243,6 +252,7 @@ export default {
 
 
         this.formData = { ...data };
+        this.$set(this.formData, 'rangeList', data.rangeList)
         console.log(this.formData)
       } else {
         this.$message.error(msg);
@@ -255,7 +265,7 @@ export default {
       if (obj) {
         if (obj.level !== 'community') {
           this.$message.info('请选择社区')
-          this.formData.agencyId = []
+          this.formData.agencyId = ''
           return false
         } else {
           this.formData.agencyId = val
@@ -267,7 +277,7 @@ export default {
 
 
     },
-    getGridList () {
+    async getGridList () {
       const { user } = this.$store.state
       this.dataListLoading = true
       const params = {
@@ -288,7 +298,7 @@ export default {
             const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
             this.optionsA = this.deepTree(_arr)
             this.optionsRange = this.deepTree(_arr)
-
+            this.getDetail();
           }
         })
         .catch(() => {
diff --git a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
index 74cfba2ae..8ce9a27a4 100644
--- a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
+++ b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
@@ -120,17 +120,17 @@
                        type="primary"
                        icon="el-icon-plus">新增</el-button>
           </div>
-          <el-button @click="handleExport"
+          <!-- <el-button @click="handleExport"
                      type="primary"
                      size="small"
-                     class="diy-button--white el-button--default">导出</el-button>
+                     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()"
+          <!-- <el-upload :headers="$getElUploadHeaders()"
                      ref="upload"
                      class="upload-btn"
                      action="uploadUlr"
@@ -149,7 +149,7 @@
           <el-button style="margin-left: 10px"
                      class="diy-button--blue"
                      size="small"
-                     @click="handleExportModule">下载模板</el-button>
+                     @click="handleExportModule">下载模板</el-button> -->
         </div>
 
         <el-table :data="tableData"
@@ -513,9 +513,12 @@ export default {
         });
     },
     //   删除处理
-    async deleteBatch (id) {
+    async deleteBatch (ids) {
       const url = "/actual/base/resiCategorized/buildingUnitChief/deleteBatch";
-      const { data, code, msg } = await requestPost(url, id);
+      let params = {
+        ids: ids
+      }
+      const { data, code, msg } = await requestPost(url, ids);
       if (code === 0) {
         this.$message.success("删除成功！");
         this.getTableData();
@@ -531,7 +534,7 @@ export default {
       const { data, code, msg } = await requestPost(url, {
         pageSize,
         pageNo,
-        agencyId: this.agencyId,
+        // agencyId: this.agencyId,
         ...formData,
       });
       this.tableLoading = false;
diff --git a/src/views/modules/base/residentManagement/tefu/addForm.vue b/src/views/modules/base/residentManagement/tefu/addForm.vue
new file mode 100644
index 000000000..45f4072fb
--- /dev/null
+++ b/src/views/modules/base/residentManagement/tefu/addForm.vue
@@ -0,0 +1,733 @@
+<template>
+  <div>
+    <div class="dialog-h-content scroll-h"
+         :class="{ 'visiual-form': source === 'visiual' }">
+      <el-form ref="ref_add_form"
+               :inline="true"
+               :model="formData"
+               :rules="dataRule"
+               class="div_form">
+
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">所属组织: </span>
+
+            </div>
+            <el-form-item v-else
+                          label="所属组织"
+                          :label-width="labelWidth"
+                          prop="agencyId">
+              <el-cascader v-if="formType == 'add'"
+                           ref="ref_cascader_agency"
+                           class="width-two"
+                           v-model="formData.agencyId"
+                           :options="optionsA"
+                           @change="handleChangeAngency"
+                           :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
+                           clearable />
+
+              <span v-else>{{ formData.agencyName || "--" }}</span>
+
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">姓名: </span>
+              <span>{{ formData.name || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="姓名"
+                          prop="name"
+                          v-else>
+              <el-input v-model="formData.name"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">联系电话: </span>
+              <span>{{ formData.mobile || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="联系电话"
+                          v-else>
+              <el-input v-model="formData.mobile"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">证件类型: </span>
+              <span>{{ formData.idTypeName || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="证件类型"
+                          prop="idType"
+                          v-else>
+              <el-select v-model="formData.idType"
+                         clearable>
+                <el-option v-for="item in idTypeList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">证件号: </span>
+              <span>{{ formData.idNum || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="证件号"
+                          prop="idNum"
+                          v-else>
+              <el-input v-model="formData.idNum"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">出生日期: </span>
+              <span>{{formData.birthday||'--'}}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="出生日期"
+                          v-else>
+              <el-date-picker v-model="formData.birthday"
+                              type="date"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="选择日期"
+                              style="width: 202px"
+                              clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">性别: </span>
+              <span>{{
+                formData.gender
+                  ? formData.gender == "1"
+                    ? "男"
+                    : formData.gender == "2"
+                    ? "女"
+                    : "--"
+                  : "--"
+              }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="性别"
+                          v-else>
+              <el-select v-model="formData.gender"
+                         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-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">民族: </span>
+              <span>{{ nationName || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="民族"
+                          v-else>
+              <el-select v-model="formData.nation"
+                         clearable>
+                <el-option v-for="item in dicts.nationList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">本地户籍: </span>
+              <span>{{
+                formData.localResidenceFlag != null
+                  ? formData.localResidenceFlag == 1
+                    ? "是"
+                    : formData.gender == 2
+                    ? "否"
+                    : "--"
+                  : "--"
+              }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="本地户籍"
+                          v-else>
+              <el-select v-model="formData.localResidenceFlag"
+                         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-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">户籍地址: </span>
+              <span>{{ formData.placeOfDomicile || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="户籍地址"
+                          class="wd-wr"
+                          v-else>
+              <el-input v-model="formData.placeOfDomicile"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">现居地址: </span>
+              <span>{{ formData.currentResidence || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="现居地址"
+                          class="wd-wr"
+                          v-else>
+              <el-input v-model="formData.currentResidence"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">所在社区: </span>
+              <span>{{ formData.liveCommunityName || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="所在社区"
+                          v-else>
+              <el-input v-model="formData.liveCommunity"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">是否为低保: </span>
+              <span>{{  formData.subsistenceAllowanceFlag?formData.subsistenceAllowanceFlag=='1'?'是':formData.subsistenceAllowanceFlag=='0'?'否':'--':'--' }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="是否为低保"
+                          v-else>
+              <el-select v-model="formData.subsistenceAllowanceFlag"
+                         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-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">房东姓名: </span>
+              <span>{{ formData.landlordName || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="房东姓名"
+                          v-else>
+              <el-input v-model="formData.landlordName"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">房东身份证号: </span>
+              <span>{{  formData.landlordIdNum|| "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="房东身份证号"
+                          v-else>
+              <el-input v-model="formData.landlordIdNum"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">住房性质: </span>
+              <span>{{ formData.housingNatureName || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="住房性质"
+                          v-else>
+              <el-select v-model="formData.housingNature"
+                         clearable>
+                <el-option v-for="item in dicts.housingNatureList"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">领取通知书日期: </span>
+              <span>{{  formData.notificationRcvDate||'' }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="领取通知书日期"
+                          v-else>
+              <el-date-picker v-model="formData.notificationRcvDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="选择日期"
+                              style="width: 202px"
+                              clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">保障类型: </span>
+              <span>{{ formData.securityType || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="保障类型"
+                          v-else>
+              <el-input v-model="formData.securityType"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">发证日期: </span>
+              <span>{{ formData.certificateDate || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="发证日期"
+                          v-else>
+              <el-date-picker v-model="formData.certificateDate"
+                              type="date"
+                              value-format="yyyy-MM-dd"
+                              placeholder="发证日期"
+                              style="width: 202px"
+                              clearable>
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">补贴编号: </span>
+              <span>{{ formData.subsidyNum || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="补贴编号"
+                          v-else>
+              <el-input v-model="formData.subsidyNum"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">补贴金额: </span>
+              <span>{{ formData.subsidyAmount || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="补贴金额"
+                          v-else>
+              <el-input v-model="formData.subsidyAmount"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop"
+                 v-if="formType == 'detail'">
+              <span class="info-title-2">备注: </span>
+              <span>{{ formData.remark || "--" }}</span>
+            </div>
+            <el-form-item :label-width="labelWidth"
+                          label="备注"
+                          class="wd-wr"
+                          v-else>
+              <el-input v-model="formData.remark"
+                        placeholder="请输入"
+                        clearable></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="div_btn">
+      <el-button size="small"
+                 @click="handleCancle">取 消</el-button>
+      <el-button size="small"
+                 type="primary"
+                 :disabled="btnDisable"
+                 @click="handleComfirm">确 定</el-button>
+    </div>
+  </div>
+</template>
+      
+        <script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { genderList, binaryOptionList, idTypeList } from "@/js/columns/constants";
+
+let loading; // 加载动画
+
+export default {
+  props: {
+    formType: {
+      type: String,
+      default: 'add'
+    },
+    source: {
+      //展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: "manage",
+    },
+  },
+
+  data () {
+    return {
+      btnDisable: false,
+      optionsA: [],
+      labelWidth: '120px',
+
+      formData: {
+        // agencyId: '',
+        // name: "",
+        // mobile: "",
+        // idType: "",
+        // idNum: "",
+        // birthday: "",
+        // gender: null,
+        // nation: "",
+        // localResidenceFlag: null,
+        // placeOfDomicile: "",//户籍地址
+        // currentResidence: "",//现居地址
+        // liveCommunity: '',//所在社区
+        // subsistenceAllowanceFlag: null,//是否为低保
+        // landlordName: '',//房东姓名
+        // landlordIdNum: '',//房东身份证号
+        // housingNature: '',//住房性质
+        // notificationRcvDate: '',//领取通知书日期
+        // securityType: '',//保障类型
+        // certificateDate: '',//发证日期
+        // subsidyNum: '',//补贴编号
+        // subsidyAmount: '',//补贴金额
+        // remark: '',     //备注   
+        agencyId: "1582261714844827649",
+        birthday: "2023-08-01 00:00:00",
+        certificateDate: "2023-08-26",
+        currentResidence: "现居地址",
+        gender: "1",
+        housingNature: "1",
+        idNum: "370213198810101010",
+        idType: 1,
+        landlordIdNum: "370213187802232323",
+        landlordName: "房东姓名",
+        liveCommunity: "所在社区",
+        localResidenceFlag: 1,
+        mobile: "15111111111",
+        name: "王保障",
+        nation: "0",
+        notificationRcvDate: "2023-08-22",
+        placeOfDomicile: "户籍地址",
+        remark: "备注",
+        securityType: "保障类型",
+        subsidyAmount: "300",
+        subsidyNum: "23333",
+        subsistenceAllowanceFlag: 1,
+      },
+
+      genderList,
+      binaryOptionList,
+      idTypeList,
+
+      dataRule: {
+        agencyId: [{ required: true, message: "所属组织不能为空", trigger: "bulr" }],
+        name: [{ required: true, message: "姓名不能为空", trigger: "bulr" }],
+        idNum: [{ required: true, message: "证件号不能为空", trigger: "bulr" }],
+        idType: [
+          { required: true, message: "证件类型不能为空", trigger: "bulr" },
+        ],
+      },
+      scopeId: "",
+
+      dicts: {
+        nationList: [],
+        housingNatureList: [],
+
+      },
+    };
+  },
+
+  watch: {},
+
+  components: {},
+  async created () {
+    await this.getDicts();
+    await this.getGridList();
+  },
+  async mounted () {
+    this.startLoading();
+    await this.endLoading();
+  },
+
+  methods: {
+    async initForm (type, row) {
+      this.formType = type;
+      this.scopeId = row.categorizedResiId;
+      await this.getDetail(this.scopeId);
+    },
+    async getDetail (categorizedResiId) {
+      const url = `/actual/base/resiCategorized/ensureHouse/detail/${categorizedResiId}`;
+      const { data, code, msg } = await requestGet(url);
+      if (code === 0) {
+        this.formData = { ...data };
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    handleChangeAngency (val) {
+
+      let obj = this.$refs["ref_cascader_agency"].getCheckedNodes()[0].data;
+      console.log('改变组织', obj)
+      if (obj) {
+        if (obj.level !== 'community') {
+          this.$message.info('请选择社区')
+          this.formData.agencyId = ''
+          return false
+        } else {
+          this.formData.agencyId = val
+        }
+      }
+    },
+    async handleComfirm () {
+      this.$refs["ref_add_form"].validate(async (valid) => {
+        if (!valid) {
+          return false;
+        }
+        const url =
+          this.formType === "edit"
+            ? "/actual/base/resiCategorized/ensureHouse/update"
+            : "/actual/base/resiCategorized/ensureHouse/create";
+        // console.log(this.formData)
+        // return false
+        const { data, code, msg } = await requestPost(url, this.formData);
+        if (code === 0) {
+          this.$message.success(this.formType == 'add' ? "添加成功" : '修改成功');
+          this.resetData();
+          this.$emit("handleComfirm");
+        } else if (code >= 8000) {
+          this.$message.error(msg);
+        }
+      });
+    },
+    async getDicts () {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/nation", {
+            formCode: "resi_base_info",
+          }),
+
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "house",
+          }),
+
+        ];
+        const dictKeys = [
+          "nationList",
+          "housingNatureList",
+
+        ]; // 对应的键名
+
+        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);
+      }
+    },
+    getGridList () {
+      const { user } = this.$store.state
+      this.dataListLoading = true
+      const params = {
+        agencyId: user.agencyId,
+        client: 'gov'
+      }
+      this.$http
+        // .post('/gov/org/userhouse/service/serviceScopeTree')
+        // .post('/data/aggregator/org/agencytree', params)
+        .post('/gov/org/customeragency/staffinagencylist')
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+
+            let { agencyList, subAgencyList } = res.data
+
+            const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
+            this.optionsA = this.deepTree(_arr)
+          }
+        })
+        .catch(() => {
+          this.dataListLoading = false
+          return this.$message.error('网络错误')
+        })
+      this.dataListLoading = false
+    },
+    deepTree (arr) {
+      if (Array.isArray(arr)) {
+        return arr.map(item => {
+          return {
+            ...item,
+            subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
+          }
+        })
+      }
+    },
+    handleCancle () {
+      this.resetData();
+      this.$emit("handleClose");
+    },
+
+    resetData () {
+      this.formData = {};
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading () {
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+};
+  </script>
+      
+        <style lang="scss" scoped>
+@import "@/assets/scss/modules/management/form-main.scss";
+@import "@/assets/scss/modules/visual/a_customize.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+.form-item::v-deep .el-form-item__label {
+  color: #fff;
+}
+.form-item {
+  .el-radio {
+    color: #fff;
+  }
+  .el-checkbox {
+    color: #fff;
+  }
+}
+
+.wd-wr {
+  width: 100%;
+  /deep/ .el-form-item__content {
+    width: calc(100% - 148px);
+  }
+}
+.info-prop {
+  margin-top: 29px;
+  .info-title-2 {
+    width: 100px;
+    text-align: right;
+    display: inline-block;
+    padding-right: 10px;
+  }
+}
+.width-two {
+  width: 553px;
+}
+</style>
+      
+    
+    
\ No newline at end of file
diff --git a/src/views/modules/base/residentManagement/tefu/tefuList.vue b/src/views/modules/base/residentManagement/tefu/tefuList.vue
new file mode 100644
index 000000000..0976721a4
--- /dev/null
+++ b/src/views/modules/base/residentManagement/tefu/tefuList.vue
@@ -0,0 +1,924 @@
+<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.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.marriage"
+                       placeholder="请输入"
+                       size="small"
+                       class="u-item-width-normal"
+                       clearable>
+              <el-option v-for="item in dicts.marriageList"
+                         :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.bankAccount"
+                      placeholder="请输入"
+                      size="small"
+                      class="u-item-width-normal"
+                      clearable></el-input>
+          </el-form-item>
+
+          <el-form-item>
+            <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; ">所属组织:</span>
+            <el-cascader class="u-item-width-normal"
+                         size="small"
+                         ref="ref_cascader_agency"
+                         v-model="formData.agencyId"
+                         :options="optionsA"
+                         @change="handleChangeAgency"
+                         :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}"
+                         :show-all-levels="false"
+                         clearable></el-cascader>
+          </el-form-item>
+          <el-form-item prop="villageId">
+            <div class="resi-cell">
+              <div class="resi-cell-value">
+                <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; ">所属房屋:</span>
+                <el-select v-model.trim="formData.villageId"
+                           placeholder="请选择小区"
+                           size="small"
+                           filterable
+                           clearable
+                           class="u-item-width-communitycascader"
+                           @clear="handleClearVillage"
+                           @change="handleChangeV">
+                  <el-option v-for="item in optionsV"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+                <el-select v-model.trim="formData.buildId"
+                           placeholder="楼号"
+                           size="small"
+                           filterable
+                           clearable
+                           style="margin-left: 5px"
+                           class="u-item-width-buildcascader"
+                           :disabled="changeVDisabled"
+                           @clear="handleClearBuild"
+                           @change="handleChangeB">
+                  <el-option v-for="item in optionsB"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+                <el-select v-model.trim="formData.unitId"
+                           :disabled="changeBDisabled"
+                           placeholder="单元"
+                           size="small"
+                           filterable
+                           clearable
+                           style="margin-left: 5px"
+                           class="u-item-width-buildcascader"
+                           @click="handleClearDan"
+                           @change="handleChangeD">
+                  <el-option v-for="item in optionsD"
+                             :key="item.value"
+                             :label="item.label"
+                             :value="item.value">
+                  </el-option>
+                </el-select>
+                <el-select v-model.trim="formData.homeId"
+                           :disabled="changeDDisabled"
+                           placeholder="房号"
+                           size="small"
+                           filterable
+                           clearable
+                           style="margin-left: 5px"
+                           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>
+              </div>
+            </div>
+          </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>
+
+        <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">
+            <template slot-scope="scope">
+              <span>{{scope.row.localResidenceFlag != null
+                  ?scope.row.localResidenceFlag == 1
+                    ? "是"
+                    :scope.row. formData.gender == 2
+                    ? "否"
+                    : "--"
+                  : "--" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="currentResidence"
+                           align="center"
+                           width="150"
+                           label="居住地址"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="genderName"
+                           align="center"
+                           width="80"
+                           label="性别"
+                           :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{
+                scope.row.gender != null
+                  ? scope.row.gender == 1
+                    ? "男"
+                    : scope.row.gender == 2
+                    ? "女"
+                    : "--"
+                  : "--"
+              }}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column prop="marriageName"
+                           align="center"
+                           width="100"
+                           label="婚姻状况"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="bankAccount"
+                           align="center"
+                           width="100"
+                           label="银行卡号"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="homeName"
+                           align="center"
+                           width="100"
+                           label="所属房屋"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+
+          <el-table-column prop="remark"
+                           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>
+      </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="820px"
+               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 nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import axios from "axios";
+import addForm from "./addForm";
+import { binaryOptionList } from "@/js/columns/constants";
+
+
+function iniFmData () {
+  return {
+    name: '',
+    mobile: '',
+    idNum: '',
+    localResidenceFlag: null,//本地户籍
+    // placeOfDomicile: '',//户籍地址
+    currentResidence: '',//现居地址
+    marriage: '',//婚姻状况
+    bankAccount: '',//银行卡号
+    agencyId: '',
+    buildId: '',
+    homeId: '',
+    unitId: '',
+    villageId: '',
+  };
+}
+
+export default {
+  components: { addForm, },
+
+  data () {
+
+    return {
+      tableLoading: false,
+      user: {},
+      agencyId: "",
+      searchH: 170,
+      tableData: [],
+      binaryOptionList,
+
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+
+      optionsA: [],
+
+      formData: iniFmData(),
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      showAdd: false,
+      showEdit: false,
+      showDetail: false,
+      formType: "add",
+      addDiaTitle: "新增",
+      detailDiaTitle: "详情",
+
+      multiSelection: [], // 多选结果
+      importLoading: false,
+
+      dicts: {
+
+        marriageList: [],
+
+      }, //字典对象
+
+    };
+  },
+  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;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    changeVDisabled () {
+      return !this.formData.villageId
+    },
+    changeBDisabled () {
+      return !this.formData.buildId
+    },
+    changeDDisabled () {
+      return !this.formData.unitId
+    },
+  },
+  watch: {},
+  async created () {
+    await this.getDicts();
+    await this.getAgencyList();
+    this.getValiheList()
+  },
+  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/dictlist", { dictType: "marriage" }),
+
+        ];
+        const dictKeys = [
+          "marriageList",
+        ];
+        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);
+      }
+    },
+
+
+    // 搜索事件
+    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) {
+      this.$nextTick(() => {
+        this.$refs.ref_add_form.initForm("edit", 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 cancelFuwu (ids) {
+
+      const url = "/actual/base/resiCategorized/specialSupport/delete";
+      let params = {
+        ids: ids
+      }
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.error("操作失败！");
+      }
+    },
+    //   获取列表
+    async getTableData () {
+      this.tableLoading = true;
+      const url = "/actual/base/resiCategorized/specialSupport/page";
+
+      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);
+      }
+    },
+
+    handleChangeAgency (val) {
+
+      let obj = this.$refs["ref_cascader_agency"].getCheckedNodes()[0].data;
+      console.log('改变组织', obj)
+      this.formData.agencyId = val
+
+
+      this.getValiheList()
+    },
+
+    handleChangeV (val) {
+      console.log('小区val', val)
+      this.formData.buildId = ''
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+      this.getBuildList()
+    },
+    handleChangeB (val) {
+      console.log('楼号val', val)
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+      this.getUniList()
+    },
+    handleChangeD (val) {
+      console.log('单元val', val)
+      this.formData.homeId = ''
+      this.getHouseList()
+    },
+    getAgencyList () {
+      const { user } = this.$store.state
+      this.dataListLoading = true
+      const params = {
+        agencyId: user.agencyId,
+        client: 'gov'
+      }
+      this.$http
+        // .post('/gov/org/userhouse/service/serviceScopeTree')
+        // .post('/data/aggregator/org/agencytree', params)
+        .post('/gov/org/customeragency/staffinagencylist')
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+
+            let { agencyList, subAgencyList } = res.data
+
+            const _arr = [{ ...agencyList, subAgencyList: [...subAgencyList] }]
+            this.optionsA = this.deepTree(_arr)
+          }
+        })
+        .catch(() => {
+          this.dataListLoading = false
+          return this.$message.error('网络错误')
+        })
+      this.dataListLoading = false
+    },
+    deepTree (arr) {
+      if (Array.isArray(arr)) {
+        return arr.map(item => {
+          return {
+            ...item,
+            subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
+          }
+        })
+      }
+    },
+    getValiheList () {
+      const { user } = this.$store.state
+      var agencyIdTemp = ''
+      if (this.formData.agencyId.length == 0) {
+        agencyIdTemp = ''
+      } else {
+        agencyIdTemp = this.formData.agencyId[this.formData.agencyId.length - 1]
+      }
+      this.$http
+        .post('/actual/base/communityQuarters/listQuartersOptions', {
+          gridId: '',
+          agencyId: this.formData.agencyId,
+          // agencyId: user.agencyId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsV = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getBuildList () {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', {
+          neighborHoodId: this.formData.villageId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList () {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', {
+          buildingId: this.formData.buildId
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList () {
+      this.$http
+        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.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('网络错误')
+        })
+    },
+    handleClearVillage () {
+      this.formData.buildId = ''
+      this.formData.homeId = ''
+    },
+    handleClearBuild () {
+      this.formData.buildId = ''
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+    },
+    handleClearDan () {
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+    },
+    // 导入
+    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/resiHousingNature/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('导入失败')
+        });
+    },
+    //   导出
+    async handleExport () {
+      const url = "/actual/base/resiHousingNature/export";
+      const { pageSize, pageNo, formData } = this;
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
+          pageSize,
+          pageNo,
+          ...formData,
+        },
+        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对象
+        })
+        .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.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 = iniFmData();
+
+      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));
+        })
+        .catch((err) => {
+          console.error(err);
+          this.$message.error("删除失败");
+        });
+    },
+  },
+
+  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>
+    
+    
\ No newline at end of file