diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index f5e20a45e..10c7fc7da 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -2686,6 +2686,7 @@ export default {
         this.newForm.idNum = this.form.idNum,
         this.newForm.idType = this.form.idType,
         this.newForm.nationality = this.form.nationality,
+        this.newForm.nation = this.form.nation,
         this.newForm.gender = this.form.gender,
         this.newForm.mobile = this.form.mobile,
         this.newForm.partyFlag = this.form.partyFlag,
diff --git a/src/views/components/resiInfo.vue b/src/views/components/resiInfo.vue
index 031024b0c..965f67b1a 100644
--- a/src/views/components/resiInfo.vue
+++ b/src/views/components/resiInfo.vue
@@ -1,18 +1,24 @@
 <template>
   <div class="g-main">
     <div class="title-small title_postion">基础信息</div>
-    <el-row type="flex" class="f-m-top29">
-      <el-col :span="12" class="f-flex">
+    <el-row type="flex"
+            class="f-m-top29">
+      <el-col :span="12"
+              class="f-flex">
         <div class="f-label">所属网格:</div>
         <div class="f-left8 f-font-color">{{ gridName }}</div>
       </el-col>
-      <el-col :span="12" class="f-flex">
+      <el-col :span="12"
+              class="f-flex">
         <div class="f-label">所属房屋:</div>
         <div class="f-left8 f-font-color">{{ homeName }}</div>
       </el-col>
     </el-row>
-    <el-row type="flex" justify="" class="f-m-top29">
-      <el-col :span="24" class="f-flex">
+    <el-row type="flex"
+            justify=""
+            class="f-m-top29">
+      <el-col :span="24"
+              class="f-flex">
         <div class="f-label">本地户籍:</div>
         <div class="f-left8 f-font-color">
           {{
@@ -25,20 +31,27 @@
         </div>
       </el-col>
     </el-row>
-    <el-row type="flex" justify="" class="f-m-top29">
-      <el-col :span="12" class="f-flex">
+    <el-row type="flex"
+            justify=""
+            class="f-m-top29">
+      <el-col :span="12"
+              class="f-flex">
         <div class="f-label">居民姓名:</div>
         <div class="f-left8 f-font-color">
           {{ resiDetailObj.name ? resiDetailObj.name : "--" }}
         </div>
       </el-col>
-      <el-col :span="12" class="f-flex">
+      <el-col :span="12"
+              class="f-flex">
         <div class="f-label">出生日期:</div>
         <div class="f-left8 f-font-color">{{ resiDetailObj.birthday }}</div>
       </el-col>
     </el-row>
-    <el-row type="flex" justify="" class="f-m-top29">
-      <el-col :span="12" class="f-flex">
+    <el-row type="flex"
+            justify=""
+            class="f-m-top29">
+      <el-col :span="12"
+              class="f-flex">
         <div class="f-label">性别:</div>
         <div class="f-left8 f-font-color">
           {{
@@ -50,15 +63,28 @@
           }}
         </div>
       </el-col>
-      <el-col :span="12" class="f-flex">
+      <el-col :span="12"
+              class="f-flex">
         <div class="f-label">民族:</div>
         <div class="f-left8 f-font-color">
           {{ resiDetailObj.nationName ? resiDetailObj.nationName : "--" }}
         </div>
+
       </el-col>
     </el-row>
-    <el-row type="flex" justify="" class="f-m-top29">
-      <el-col :span="12" class="f-flex">
+    <el-row type="flex"
+            justify=""
+            class="f-m-top29">
+      <el-col :span="12"
+              class="f-flex">
+        <div class="f-label">国籍:</div>
+        <div class="f-left8 f-font-color">
+          {{ resiDetailObj.nationalityName ? resiDetailObj.nationalityName : "--" }}
+        </div>
+
+      </el-col>
+      <el-col :span="12"
+              class="f-flex">
         <div class="f-label">联系电话:</div>
         <div class="f-left8 f-font-color">
           {{
@@ -71,30 +97,37 @@
               : "--"
           }}
         </div>
-        <img
-          v-show="this.showFlagMobileBtn && resiDetailObj.mobile"
-          src="../../assets/img/yanjing1.png"
-          alt=""
-          width="14px"
-          style="margin-left: 10px"
-        />
-        <img
-          v-show="!this.showFlagMobileBtn"
-          src="../../assets/img/yanjing2.png"
-          alt=""
-          width="14px"
-          style="margin-left: 10px"
-        />
-        <el-button
-          v-if="resiDetailObj.mobile"
-          type="text"
-          class="div-table-button--blue"
-          size="small"
-          @click="handleTuomin('mobile')"
-          >{{ showFlagMobileBtn ? "显示" : "隐藏" }}</el-button
-        >
+        <img v-show="this.showFlagMobileBtn && resiDetailObj.mobile"
+             src="../../assets/img/yanjing1.png"
+             alt=""
+             width="14px"
+             style="margin-left: 10px" />
+        <img v-show="!this.showFlagMobileBtn"
+             src="../../assets/img/yanjing2.png"
+             alt=""
+             width="14px"
+             style="margin-left: 10px" />
+        <el-button v-if="resiDetailObj.mobile"
+                   type="text"
+                   class="div-table-button--blue"
+                   size="small"
+                   @click="handleTuomin('mobile')">{{ showFlagMobileBtn ? "显示" : "隐藏" }}</el-button>
       </el-col>
-      <el-col :span="12" class="f-flex">
+
+    </el-row>
+    <el-row type="flex"
+            justify=""
+            class="f-m-top29">
+      <el-col :span="12"
+              class="f-flex">
+        <div class="f-label">证件类型:</div>
+        <div class="f-left8 f-font-color">
+          {{ resiDetailObj.idTypeName ? resiDetailObj.idTypeName : "--" }}
+        </div>
+
+      </el-col>
+      <el-col :span="12"
+              class="f-flex">
         <div class="f-label">证件号:</div>
         <div class="f-left8 f-font-color">
           {{
@@ -107,32 +140,28 @@
               : "--"
           }}
         </div>
-        <img
-          v-show="this.showFlagIdCardBtn && resiDetailObj.idNum"
-          src="../../assets/img/yanjing1.png"
-          alt=""
-          width="14px"
-          style="margin-left: 10px"
-        />
-        <img
-          v-show="!this.showFlagIdCardBtn"
-          src="../../assets/img/yanjing2.png"
-          alt=""
-          width="14px"
-          style="margin-left: 10px"
-        />
-        <el-button
-          v-if="resiDetailObj.idNum"
-          type="text"
-          class="div-table-button--blue"
-          size="small"
-          @click="handleTuomin('idCard')"
-          >{{ showFlagIdCardBtn ? "显示" : "隐藏" }}</el-button
-        >
+        <img v-show="this.showFlagIdCardBtn && resiDetailObj.idNum"
+             src="../../assets/img/yanjing1.png"
+             alt=""
+             width="14px"
+             style="margin-left: 10px" />
+        <img v-show="!this.showFlagIdCardBtn"
+             src="../../assets/img/yanjing2.png"
+             alt=""
+             width="14px"
+             style="margin-left: 10px" />
+        <el-button v-if="resiDetailObj.idNum"
+                   type="text"
+                   class="div-table-button--blue"
+                   size="small"
+                   @click="handleTuomin('idCard')">{{ showFlagIdCardBtn ? "显示" : "隐藏" }}</el-button>
       </el-col>
     </el-row>
-    <el-row type="flex" justify="" class="f-m-top29">
-      <el-col :span="24" class="f-flex">
+    <el-row type="flex"
+            justify=""
+            class="f-m-top29">
+      <el-col :span="24"
+              class="f-flex">
         <div class="f-label">备注:</div>
         <div class="f-left8 f-font-color">
           {{ resiDetailObj.remark ? resiDetailObj.remark : "--" }}
@@ -141,132 +170,67 @@
     </el-row>
     <div class="title-small title_postion f-top40">分类信息</div>
     <el-row class="f-m-top29">
-      <el-col :span="24" class="f-flex">
+      <el-col :span="24"
+              class="f-flex">
         <div class="f-label">居民分类:</div>
-        <section
-          class="f-left15 f-flex f-flex1"
-          v-if="resiDetailObj.categoryInfo && resiClass"
-          style="flex: 1; flex-wrap: wrap"
-        >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.bereavedPersonFlag == 1"
-            >特扶人员
+        <section class="f-left15 f-flex f-flex1"
+                 v-if="resiDetailObj.categoryInfo && resiClass"
+                 style="flex: 1; flex-wrap: wrap">
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.bereavedPersonFlag == 1">特扶人员
           </span>
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.chronicDiseaseFlag == 1"
-            >慢病</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.dementedFlag == 1"
-            >失智老人</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.disabilityFlag == 1"
-          >
-            残疾</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.disabledFlag == 1"
-            >失能老人</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.emptyNesterFlag == 1"
-            >空巢老人</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.ensureHouseFlag == 1"
-            >保障房人员</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.fertileWomanFlag == 1"
-            >育龄妇女</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.floatingFlag == 1"
-            >流动人口</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.liveAloneFlag == 1"
-            >独居老人</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.oldPeopleFlag == 1"
-            >老年人</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.partyFlag == 1"
-          >
-            党员</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.petitionOfficerFlag == 1"
-            >信访人员</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.seriousIllnessFlag == 1"
-          >
-            大病</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.specialCrowdFlag == 1"
-            >特殊人群</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.subsistenceAllowanceFlag == 1"
-            >低保人员</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.unitedFrontFlag == 1"
-            >统战人员</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.tenantFlag == 1"
-            >租户</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.unemployedFlag == 1"
-            >失业人员</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.veteranFlag == 1"
-            >退役军人</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.volunteerFlag == 1"
-            >志愿者</span
-          >
-          <span
-            class="f-right30 f-w70 f-font-color f-bto16"
-            v-show="resiDetailObj.categoryInfo.publicWelfareFlag == 1"
-            >公益岗人员</span
-          >
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.chronicDiseaseFlag == 1">慢病</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.dementedFlag == 1">失智老人</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.disabilityFlag == 1">
+            残疾</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.disabledFlag == 1">失能老人</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.emptyNesterFlag == 1">空巢老人</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.ensureHouseFlag == 1">保障房人员</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.fertileWomanFlag == 1">育龄妇女</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.floatingFlag == 1">流动人口</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.liveAloneFlag == 1">独居老人</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.oldPeopleFlag == 1">老年人</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.partyFlag == 1">
+            党员</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.petitionOfficerFlag == 1">信访人员</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.seriousIllnessFlag == 1">
+            大病</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.specialCrowdFlag == 1">特殊人群</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.subsistenceAllowanceFlag == 1">低保人员</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.unitedFrontFlag == 1">统战人员</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.tenantFlag == 1">租户</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.unemployedFlag == 1">失业人员</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.veteranFlag == 1">退役军人</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.volunteerFlag == 1">志愿者</span>
+          <span class="f-right30 f-w70 f-font-color f-bto16"
+                v-show="resiDetailObj.categoryInfo.publicWelfareFlag == 1">公益岗人员</span>
         </section>
         <section v-else>--</section>
       </el-col>
     </el-row>
     <div class="title-small title_postion f-top40 f-bot24">其他信息</div>
-    <el-tabs v-model="activeName" @tab-click="handleClick">
+    <el-tabs v-model="activeName"
+             @tab-click="handleClick">
       <el-tab-pane label="教育">
         <div class="f-flex f-bto16 f-top24">
           <div class="f-labels">文化程度:</div>
@@ -280,23 +244,25 @@
         </div>
       </el-tab-pane>
       <el-tab-pane label="兴趣爱好">
-        <section class="f-flex f-flex1" style="flex: 1; flex-wrap: wrap">
+        <section class="f-flex f-flex1"
+                 style="flex: 1; flex-wrap: wrap">
           <div class="f-labels f-top24">兴趣分类 :</div>
-          <div
-            v-for="(item, index) in hobbyCodeArr"
-            :key="index"
-            class="f-top24"
-          >
+          <div v-for="(item, index) in hobbyCodeArr"
+               :key="index"
+               class="f-top24">
             <span class="f-right24 f-font-color">
               {{ item }}
             </span>
           </div>
-          <span v-show="hobbyCodeArr.length == 0" class="f-top24 f-left8">
+          <span v-show="hobbyCodeArr.length == 0"
+                class="f-top24 f-left8">
             --
           </span>
         </section>
-        <el-row type="flex" class="f-flex f-bto16 f-top24">
-          <el-col :span="24" class="f-flex">
+        <el-row type="flex"
+                class="f-flex f-bto16 f-top24">
+          <el-col :span="24"
+                  class="f-flex">
             <div class="f-labels">兴趣:</div>
             <div class="f-left8 f-font-color">
               {{ hobbyInfoObj.interestDesc ? hobbyInfoObj.interestDesc : "--" }}
@@ -304,7 +270,8 @@
           </el-col>
         </el-row>
         <el-row type="flex">
-          <el-col :span="24" class="f-flex">
+          <el-col :span="24"
+                  class="f-flex">
             <div class="f-labels">备注:</div>
             <div class="f-left8 f-font-color">
               {{ hobbyInfoObj.hobbyRemark ? hobbyInfoObj.hobbyRemark : "--" }}
@@ -826,29 +793,23 @@
       </el-tab-pane>
 
       <el-tab-pane label="更新记录">
-        <el-table
-          class="m-table-item"
-          :data="tableData"
-          border
-          style="width: 100%"
-        >
-          <el-table-column
-            label="序号"
-            type="index"
-            fixed="left"
-            align="left"
-            width="50"
-          >
+        <el-table class="m-table-item"
+                  :data="tableData"
+                  border
+                  style="width: 100%">
+          <el-table-column label="序号"
+                           type="index"
+                           fixed="left"
+                           align="left"
+                           width="50">
           </el-table-column>
-          <el-table-column
-            v-for="item in tableHeader"
-            :key="item.columnName"
-            :prop="item.columnName"
-            :label="item.label"
-            align="left"
-            :show-overflow-tooltip="true"
-            :width="item.width || ''"
-          >
+          <el-table-column v-for="item in tableHeader"
+                           :key="item.columnName"
+                           :prop="item.columnName"
+                           :label="item.label"
+                           align="left"
+                           :show-overflow-tooltip="true"
+                           :width="item.width || ''">
             <template slot-scope="scope">
               <span>{{ handleFilterSpan(scope.row, item) }}</span>
             </template>
@@ -856,7 +817,8 @@
         </el-table>
       </el-tab-pane>
 
-      <el-tab-pane label="党员" v-if="dyShowStatus">
+      <el-tab-pane label="党员"
+                   v-if="dyShowStatus">
         <el-row>
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
@@ -959,7 +921,8 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="保障房" v-if="bzfShowStatus">
+      <el-tab-pane label="保障房"
+                   v-if="bzfShowStatus">
         <el-row>
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
@@ -1019,7 +982,8 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="失业" v-if="syShowStatus">
+      <el-tab-pane label="失业"
+                   v-if="syShowStatus">
         <el-row>
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
@@ -1123,7 +1087,8 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="退役军人" v-if="tyjrShowStatus">
+      <el-tab-pane label="退役军人"
+                   v-if="tyjrShowStatus">
         <el-row>
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
@@ -1253,7 +1218,8 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="统战人员" v-if="tzryShowStatus">
+      <el-tab-pane label="统战人员"
+                   v-if="tzryShowStatus">
         <el-row>
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
@@ -1281,22 +1247,20 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="志愿者" v-if="zyzShowStatus">
-        <section class="f-flex f-flex1" style="flex: 1; flex-wrap: wrap">
+      <el-tab-pane label="志愿者"
+                   v-if="zyzShowStatus">
+        <section class="f-flex f-flex1"
+                 style="flex: 1; flex-wrap: wrap">
           <div class="f-labels f-top24">志愿者类别 :</div>
-          <div
-            v-for="(item, index) in volunteerCategoryArr"
-            :key="index"
-            class="f-top24"
-          >
+          <div v-for="(item, index) in volunteerCategoryArr"
+               :key="index"
+               class="f-top24">
             <span class="f-right24 f-font-color">
               {{ item }}
             </span>
           </div>
-          <span
-            v-show="volunteerCategoryArr.length == 0"
-            class="f-top24 f-left8"
-          >
+          <span v-show="volunteerCategoryArr.length == 0"
+                class="f-top24 f-left8">
             --
           </span>
         </section>
@@ -1315,7 +1279,8 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="老年人" v-if="lnrShowStatus">
+      <el-tab-pane label="老年人"
+                   v-if="lnrShowStatus">
         <el-row>
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
@@ -1329,24 +1294,26 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="特殊人群" v-if="tsrqShowStatus">
-        <section class="f-flex f-flex1" style="flex: 1; flex-wrap: wrap">
+      <el-tab-pane label="特殊人群"
+                   v-if="tsrqShowStatus">
+        <section class="f-flex f-flex1"
+                 style="flex: 1; flex-wrap: wrap">
           <div class="f-labels f-top24">特殊人群类别 :</div>
-          <div
-            v-for="(item, index) in specialDtoArrText"
-            :key="index"
-            class="f-top24"
-          >
+          <div v-for="(item, index) in specialDtoArrText"
+               :key="index"
+               class="f-top24">
             <span class="f-right24 f-font-color">
               {{ item }}
             </span>
           </div>
-          <span v-show="specialDtoArrText.length == 0" class="f-top24 f-left8">
+          <span v-show="specialDtoArrText.length == 0"
+                class="f-top24 f-left8">
             --
           </span>
         </section>
       </el-tab-pane>
-      <el-tab-pane label="死亡人员" v-if="resiDetailObj.deathFlag">
+      <el-tab-pane label="死亡人员"
+                   v-if="resiDetailObj.deathFlag">
         <el-row>
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
@@ -1400,7 +1367,8 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="迁出" v-if="qcShowStatus">
+      <el-tab-pane label="迁出"
+                   v-if="qcShowStatus">
         <el-row>
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
@@ -1516,7 +1484,8 @@
           </el-col>
         </el-row>
       </el-tab-pane>
-      <el-tab-pane label="公益岗人员" v-if="gygShowStatus">
+      <el-tab-pane label="公益岗人员"
+                   v-if="gygShowStatus">
         <el-row>
           <el-col :span="8">
             <div class="f-flex f-bto16 f-top24">
@@ -1540,6 +1509,8 @@
 
 <script>
 import { requestPost, requestGet } from "@/js/dai/request";
+import { idTypeList } from "@/js/columns/constants";
+
 export default {
   name: "resInfo",
   props: {
@@ -1547,7 +1518,7 @@ export default {
       type: String,
     },
   },
-  data() {
+  data () {
     return {
       tableData: [], //更新记录
       resiDetailObj: {},
@@ -1592,7 +1563,7 @@ export default {
       householdArr: [],
       houseArr: [],
       unemploymentArr: [],
-      careerArr:[],
+      careerArr: [],
       chronicArr: [],
       resideArr: [],
       marriageArr: [],
@@ -1602,10 +1573,12 @@ export default {
       categoryDictArr: [],
       showFlagIdCardBtn: true,
       showFlagMobileBtn: true,
+      nationalityList: [],
+      idTypeList,
     };
   },
   computed: {
-    gridName() {
+    gridName () {
       let arr = [];
       if (
         this.resiDetailObj.houseInfo &&
@@ -1617,7 +1590,7 @@ export default {
       }
       return arr;
     },
-    homeName(item) {
+    homeName (item) {
       let arr = [];
       if (
         this.resiDetailObj.houseInfo &&
@@ -1629,7 +1602,7 @@ export default {
       }
       return arr;
     },
-    educationText() {
+    educationText () {
       let text = "--";
       this.educationDictonArr.forEach((item) => {
         if (item.value == this.eduInfoDto.cultureLevel) {
@@ -1638,7 +1611,7 @@ export default {
       });
       return text;
     },
-    hobbyCodeArr() {
+    hobbyCodeArr () {
       let arr = [];
       if (this.hobbyInfoObj.hobbyCode) {
         let test = this.hobbyInfoObj.hobbyCode.split(",");
@@ -1654,7 +1627,7 @@ export default {
       }
       return arr;
     },
-    educationText() {
+    educationText () {
       let text = "--";
       this.educationDictonArr.forEach((item) => {
         if (item.value == this.eduInfoDto.cultureLevel) {
@@ -1663,7 +1636,7 @@ export default {
       });
       return text;
     },
-    PostText() {
+    PostText () {
       let text = "--";
       this.PostDictonArr.forEach((item) => {
         if (item.value == this.postDto.jobPost) {
@@ -1672,7 +1645,7 @@ export default {
       });
       return text;
     },
-    resiClass() {
+    resiClass () {
       let flag = true;
       var num = 0;
       if (this.resiDetailObj.categoryInfo != "undefined") {
@@ -1691,7 +1664,7 @@ export default {
       }
       return flag;
     },
-    categoryText() {
+    categoryText () {
       let text = "--";
       this.categoryDictArr.forEach((item) => {
         if (item.value == this.resiHealthInfonObj.disabilityCategoryCode) {
@@ -1700,7 +1673,7 @@ export default {
       });
       return text;
     },
-    disabilityLevelText() {
+    disabilityLevelText () {
       let text = "--";
       this.disability_levelArr.forEach((item) => {
         if (item.value == this.resiHealthInfonObj.disabilityLevel) {
@@ -1709,7 +1682,7 @@ export default {
       });
       return text;
     },
-    illnessText() {
+    illnessText () {
       let text = "--";
       this.illnessArr.forEach((item) => {
         if (item.value == this.resiHealthInfonObj.illnessCode) {
@@ -1718,7 +1691,7 @@ export default {
       });
       return text;
     },
-    chronicText() {
+    chronicText () {
       let text = "--";
       this.chronicArr.forEach((item) => {
         if (item.value == this.resiHealthInfonObj.chronicDiseaseCode) {
@@ -1727,7 +1700,7 @@ export default {
       });
       return text;
     },
-    householdText() {
+    householdText () {
       let text = "--";
       this.householdArr.forEach((item) => {
         if (item.value == this.residentResideInfoObj.householdSituation) {
@@ -1736,7 +1709,7 @@ export default {
       });
       return text;
     },
-    relationshipText() {
+    relationshipText () {
       let text = "--";
       this.relationshipArr.forEach((item) => {
         if (item.value == this.residentFamilyInfoObj.houseHolderRel) {
@@ -1745,7 +1718,7 @@ export default {
       });
       return text;
     },
-    elderlyRelationText() {
+    elderlyRelationText () {
       let text = "--";
       this.relationshipArr.forEach((item) => {
         if (item.value == this.residentFamilyInfoObj.elderlyRelation) {
@@ -1754,7 +1727,7 @@ export default {
       });
       return text;
     },
-    resideText() {
+    resideText () {
       let text = "--";
       this.resideArr.forEach((item) => {
         if (item.value == this.residentFamilyInfoObj.resideSituation) {
@@ -1763,7 +1736,7 @@ export default {
       });
       return text;
     },
-    categoryDictText() {
+    categoryDictText () {
       let text = "--";
       this.marriageArr.forEach((item) => {
         if (item.value == this.residentFamilyInfoObj.marriage) {
@@ -1772,7 +1745,7 @@ export default {
       });
       return text;
     },
-    spouseText() {
+    spouseText () {
       let text = "--";
       this.spouseArr.forEach((item) => {
         if (item.value == this.residentFamilyInfoObj.spouseSituation) {
@@ -1781,7 +1754,7 @@ export default {
       });
       return text;
     },
-    houseText() {
+    houseText () {
       let text = "--";
       this.houseArr.forEach((item) => {
         if (item.value == this.residentEnsureHouseObj.housingNature) {
@@ -1790,7 +1763,7 @@ export default {
       });
       return text;
     },
-    unemploymentText() {
+    unemploymentText () {
       let text = "--";
       console.log(this.unemploymentArr);
       this.unemploymentArr.forEach((item) => {
@@ -1800,7 +1773,7 @@ export default {
       });
       return text;
     },
-    careerText(){
+    careerText () {
       let text = "--";
       console.log(this.careerArr);
       this.careerArr.forEach((item) => {
@@ -1810,7 +1783,7 @@ export default {
       });
       return text;
     },
-    volunteerCategoryArr() {
+    volunteerCategoryArr () {
       let arr = [];
       if (this.residentVolunteerObj.volunteerCategory) {
         let test = this.residentVolunteerObj.volunteerCategory.split(",");
@@ -1826,7 +1799,7 @@ export default {
       }
       return arr;
     },
-    specialDtoArrText() {
+    specialDtoArrText () {
       let arr = [];
       let temp = [];
       if (this.residentSpecialObj.specialCategoryCode) {
@@ -1843,7 +1816,7 @@ export default {
       }
       return temp;
     },
-    dyShowStatus() {
+    dyShowStatus () {
       let flag = false;
       console.log(this.resiDetailObj);
       if (this.resiDetailObj.categoryInfo) {
@@ -1858,7 +1831,7 @@ export default {
       return flag;
     },
 
-    bzfShowStatus() {
+    bzfShowStatus () {
       let flag = false;
       if (this.resiDetailObj.categoryInfo) {
         if (this.resiDetailObj.categoryInfo.ensureHouseFlag == 1) {
@@ -1871,7 +1844,7 @@ export default {
       }
       return flag;
     },
-    syShowStatus() {
+    syShowStatus () {
       let flag = false;
       if (this.resiDetailObj.categoryInfo) {
         if (this.resiDetailObj.categoryInfo.unemployedFlag == 1) {
@@ -1884,7 +1857,7 @@ export default {
       }
       return flag;
     },
-    tyjrShowStatus() {
+    tyjrShowStatus () {
       let flag = false;
       if (this.resiDetailObj.categoryInfo) {
         if (this.resiDetailObj.categoryInfo.veteranFlag == 1) {
@@ -1897,7 +1870,7 @@ export default {
       }
       return flag;
     },
-    tzryShowStatus() {
+    tzryShowStatus () {
       let flag = false;
       if (this.resiDetailObj.categoryInfo) {
         if (this.resiDetailObj.categoryInfo.unitedFrontFlag == 1) {
@@ -1910,7 +1883,7 @@ export default {
       }
       return flag;
     },
-    zyzShowStatus() {
+    zyzShowStatus () {
       let flag = false;
       if (this.resiDetailObj.categoryInfo) {
         if (this.resiDetailObj.categoryInfo.volunteerFlag == 1) {
@@ -1923,7 +1896,7 @@ export default {
       }
       return flag;
     },
-    lnrShowStatus() {
+    lnrShowStatus () {
       let flag = false;
       if (this.resiDetailObj.categoryInfo) {
         if (this.resiDetailObj.categoryInfo.oldPeopleFlag == 1) {
@@ -1936,7 +1909,7 @@ export default {
       }
       return flag;
     },
-    tsrqShowStatus() {
+    tsrqShowStatus () {
       let flag = false;
       if (this.resiDetailObj.categoryInfo) {
         if (this.resiDetailObj.categoryInfo.specialCrowdFlag == 1) {
@@ -1949,7 +1922,7 @@ export default {
       }
       return flag;
     },
-    qcShowStatus() {
+    qcShowStatus () {
       let flag = false;
       console.log(this.resiDetailObj);
       if (this.resiDetailObj.houseInfo) {
@@ -1963,7 +1936,7 @@ export default {
       }
       return flag;
     },
-    gygShowStatus() {
+    gygShowStatus () {
       let flag = false;
       if (this.resiDetailObj.categoryInfo) {
         if (this.resiDetailObj.categoryInfo.publicWelfareFlag == 1) {
@@ -1978,24 +1951,54 @@ export default {
     },
   },
   watch: {},
-  created() {
+  async created () {
+    await this.getNationalityList();
     this.getResiDetail();
     this.getEduInfoDtoObj();
     this.getEducation();
     this.getdisabilityNationClass();
+
   },
   methods: {
-    getResiDetail() {
+
+    async getNationalityList () {
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'nationality' });
+        this.nationalityList = data.data
+      } catch (error) {
+        console.log(error, `获取 ${dictType} 字典`);
+      }
+    },
+    getResiDetail () {
       this.$http
         .post(`/actual/base/residentBaseInfo/detail/${this.resiId}`)
         .then((res) => {
           this.resiDetailObj = res.data.data;
+          console.log('nationalityList', this.nationalityList)
+          this.resiDetailObj.nationalityName = ''
+          this.nationalityList.forEach(element => {
+
+            if (element.value === res.data.data.nationality) {
+              this.resiDetailObj.nationalityName = element.label
+            }
+          });
+          console.log('idTypeList', this.idTypeList)
+          this.resiDetailObj.idTypeName = ''
+          this.idTypeList.forEach(element => {
+
+            if (element.value === res.data.data.idType) {
+              this.resiDetailObj.idTypeName = element.label
+            }
+          });
+
+
+
         })
         .catch((err) => {
           console.log(err);
         });
     },
-    handleFilterSpan(row, item) {
+    handleFilterSpan (row, item) {
       let _val = "";
       if (item.itemType === "radio" && item.options.length > 0) {
         item.options.forEach((n) => {
@@ -2006,7 +2009,7 @@ export default {
 
       return _val || row[item.columnName];
     },
-    async getVolunteerNation() {
+    async getVolunteerNation () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "VOLUNTEER_CATEGORY",
@@ -2016,7 +2019,7 @@ export default {
         console.log(error, "获取志愿者字典");
       }
     },
-    handleClick(tab) {
+    handleClick (tab) {
       if (tab._props.label == "教育") {
         this.getEducation();
         this.getEduInfoDtoObj();
@@ -2076,7 +2079,7 @@ export default {
         this.getChangepostDtoById();
       }
     },
-    async getEduInfoDtoObj() {
+    async getEduInfoDtoObj () {
       try {
         const { data } = await this.$http.get(
           `/actual/base/residentEduInfo/detail/${this.resiId}`
@@ -2090,7 +2093,7 @@ export default {
         console.log(error);
       }
     },
-    async getChangeRecordDetailById() {
+    async getChangeRecordDetailById () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentChangeRecord/getChangeRecordDetailById/${this.resiId}`
@@ -2104,7 +2107,7 @@ export default {
         console.log(error);
       }
     },
-    async getChangepostDtoById() {
+    async getChangepostDtoById () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/publicWelfarePost/detail`,
@@ -2120,7 +2123,7 @@ export default {
       }
     },
     //获取兴趣爱好
-    async getResidentHobbyInfoObj() {
+    async getResidentHobbyInfoObj () {
       try {
         const { data } = await this.$http.get(
           `/actual/base/residentHobbyInfo/detail/${this.resiId}`
@@ -2134,7 +2137,7 @@ export default {
         console.log(error);
       }
     },
-    async gethobbyNation() {
+    async gethobbyNation () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "SPECIAL_SKILL",
@@ -2145,7 +2148,7 @@ export default {
       }
     },
     //获取宗教信仰
-    async getResidentReligionObj() {
+    async getResidentReligionObj () {
       try {
         const { data } = await this.$http.get(
           `/actual/base/residentReligion/detail/${this.resiId}`
@@ -2160,7 +2163,7 @@ export default {
       }
     },
     //获取健康信息
-    async getHealthInfoDetailById() {
+    async getHealthInfoDetailById () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentHealthInfo/getHealthInfoDetailById/${this.resiId}`
@@ -2175,7 +2178,7 @@ export default {
       }
     },
     //获取特殊人群
-    async getresidentSpecial() {
+    async getresidentSpecial () {
       try {
         const { data } = await this.$http.get(
           `/actual/base/residentSpecial/detail/${this.resiId}`
@@ -2190,7 +2193,7 @@ export default {
       }
     },
     //获取出生人员详情
-    async getResidentBirthRecord() {
+    async getResidentBirthRecord () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentBirthRecord/detail/${this.resiId}`
@@ -2205,7 +2208,7 @@ export default {
       }
     },
     //获取死亡人员详情
-    async getResidentDeathRecord() {
+    async getResidentDeathRecord () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentDeathRecord/detail/${this.resiId}`
@@ -2220,7 +2223,7 @@ export default {
       }
     },
     //获取迁出详情
-    async getResidentMoveOutRecord() {
+    async getResidentMoveOutRecord () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentMoveOutRecord/detail/${this.resiId}`
@@ -2235,7 +2238,7 @@ export default {
       }
     },
     //获取工作信息
-    async getResidentWorkInfoObj() {
+    async getResidentWorkInfoObj () {
       try {
         const { data } = await this.$http.get(
           `/actual/base/residentWorkInfo/detail/${this.resiId}`
@@ -2250,7 +2253,7 @@ export default {
       }
     },
     //获取党员信息
-    async getResidentPartyMemberInfo() {
+    async getResidentPartyMemberInfo () {
       try {
         const { data } = await this.$http.get(
           `/actual/base/residentPartyMemberInfo/detail/${this.resiId}`
@@ -2262,7 +2265,7 @@ export default {
       }
     },
     //获取保障房
-    async getResidentEnsureHouse() {
+    async getResidentEnsureHouse () {
       try {
         const { data } = await this.$http.get(
           `/actual/base/residentEnsureHouse/detail/${this.resiId}`
@@ -2277,7 +2280,7 @@ export default {
       }
     },
     //获取失业
-    async getResidentUnemployed() {
+    async getResidentUnemployed () {
       try {
         const { data } = await this.$http.get(
           `/actual/base/residentUnemployed/detail/${this.resiId}`
@@ -2292,7 +2295,7 @@ export default {
       }
     },
     //获取统战
-    async getResidentUnitedFront() {
+    async getResidentUnitedFront () {
       try {
         const { data } = await this.$http.get(
           `/actual/base/residentUnitedFront/detail/${this.resiId}`
@@ -2307,7 +2310,7 @@ export default {
       }
     },
     //获取经济状况
-    async getEconomyDetailById() {
+    async getEconomyDetailById () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentEconomy/getEconomyDetailById/${this.resiId}`
@@ -2321,7 +2324,7 @@ export default {
         console.log(error);
       }
     },
-    async getHousing() {
+    async getHousing () {
       try {
         let { data } = await this.$http.post("sys/dict/data/house", {
           formCode: "resi_base_info",
@@ -2332,7 +2335,7 @@ export default {
       }
     },
     //获取残疾类别字典
-    async getdisabilityNation() {
+    async getdisabilityNation () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "disability_category_code",
@@ -2343,7 +2346,7 @@ export default {
         console.log(error, "获取残疾类别字典");
       }
     },
-    async getResidentNation() {
+    async getResidentNation () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "special_resident_category",
@@ -2353,7 +2356,7 @@ export default {
         console.log(error, "获取特殊人群字典");
       }
     },
-    async getMarriageNation() {
+    async getMarriageNation () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "marriage",
@@ -2364,7 +2367,7 @@ export default {
       }
     },
     // 获取残疾等级字典
-    async getdisabilityNationClass() {
+    async getdisabilityNationClass () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "disability_level",
@@ -2374,7 +2377,7 @@ export default {
         console.log(error, "获取残疾等级字典");
       }
     },
-    async getSpouse() {
+    async getSpouse () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "spouse_situation",
@@ -2384,7 +2387,7 @@ export default {
         console.log(error, "获取配偶情况字典");
       }
     },
-    async getrelationshipArr() {
+    async getrelationshipArr () {
       try {
         const { data } = await this.$http.post("sys/dict/data/relationship", {
           formCode: "resi_base_info",
@@ -2395,7 +2398,7 @@ export default {
       }
     },
     //获取老年人信息详情
-    async getOldPeopleDetailById() {
+    async getOldPeopleDetailById () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentOldPeople/getOldPeopleDetailById/${this.resiId}`
@@ -2409,7 +2412,7 @@ export default {
         console.log(error);
       }
     },
-    async getillnessNation() {
+    async getillnessNation () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "illness_code",
@@ -2420,7 +2423,7 @@ export default {
       }
     },
     //居住
-    async getResideInfoDetailById() {
+    async getResideInfoDetailById () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentResideInfo/getResideInfoDetailById/${this.resiId}`
@@ -2435,7 +2438,7 @@ export default {
       }
     },
     //获取退役军人信息
-    async getVeteranDetailById() {
+    async getVeteranDetailById () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentVeteran/getVeteranDetailById/${this.resiId}`
@@ -2450,7 +2453,7 @@ export default {
       }
     },
     //家庭信息
-    async getFamilyInfoDetailById() {
+    async getFamilyInfoDetailById () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentFamilyInfo/getFamilyInfoDetailById/${this.resiId}`
@@ -2465,7 +2468,7 @@ export default {
       }
     },
     //志愿者信息详情
-    async getVolunteerDetailById() {
+    async getVolunteerDetailById () {
       try {
         const { data } = await this.$http.post(
           `/actual/base/residentVolunteer/getVolunteerDetailById/${this.resiId}`
@@ -2479,7 +2482,7 @@ export default {
         console.log(error);
       }
     },
-    async getEducation() {
+    async getEducation () {
       try {
         let { data } = await this.$http.post("sys/dict/data/education", {
           formCode: "resi_base_info",
@@ -2489,7 +2492,7 @@ export default {
         console.log(error, "获取学历字典");
       }
     },
-    async getPostNation() {
+    async getPostNation () {
       try {
         let { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "welfare_post",
@@ -2499,7 +2502,7 @@ export default {
         console.log(error, "获取学历字典");
       }
     },
-    async getchronicNation() {
+    async getchronicNation () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "chronic_disease_code",
@@ -2509,7 +2512,7 @@ export default {
         console.log(error, "获取所患慢病字典");
       }
     },
-    async getHouseholdNation() {
+    async getHouseholdNation () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "household_situation",
@@ -2519,7 +2522,7 @@ export default {
         console.log(error, "获取人户状况字典");
       }
     },
-    async getResideNation() {
+    async getResideNation () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "reside_situation",
@@ -2529,7 +2532,7 @@ export default {
         console.log(error, "获取居住情况字典");
       }
     },
-    async getUnemployment() {
+    async getUnemployment () {
       try {
         const { data } = await this.$http.post("sys/dict/data/dictlist", {
           dictType: "unemployment_cause",
@@ -2540,15 +2543,15 @@ export default {
       }
     },
 
-    async getCareer(){
+    async getCareer () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'career_goals'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'career_goals' })
         this.careerArr = data.data;
       } catch (error) {
-        console.log(error,'获取就业愿望字典');
+        console.log(error, '获取就业愿望字典');
       }
     },
-    async handleTuomin(type) {
+    async handleTuomin (type) {
       const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.resiId}`;
       const { data, code, msg } = await requestPost(url);
       if (code === 0) {
diff --git a/src/views/modules/base/residentManagement/housingNature/addForm.vue b/src/views/modules/base/residentManagement/housingNature/addForm.vue
index 45f4072fb..05b20c615 100644
--- a/src/views/modules/base/residentManagement/housingNature/addForm.vue
+++ b/src/views/modules/base/residentManagement/housingNature/addForm.vue
@@ -13,7 +13,7 @@
             <div class="info-prop"
                  v-if="formType == 'detail'">
               <span class="info-title-2">所属组织: </span>
-
+              <span>{{ formData.agencyName || "--" }}</span>
             </div>
             <el-form-item v-else
                           label="所属组织"
@@ -157,7 +157,7 @@
             <div class="info-prop"
                  v-if="formType == 'detail'">
               <span class="info-title-2">民族: </span>
-              <span>{{ nationName || "--" }}</span>
+              <span>{{ nationName(formData.nation) }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
                           label="民族"
@@ -180,7 +180,7 @@
                 formData.localResidenceFlag != null
                   ? formData.localResidenceFlag == 1
                     ? "是"
-                    : formData.gender == 2
+                    : formData.localResidenceFlag == 0
                     ? "否"
                     : "--"
                   : "--"
@@ -242,7 +242,7 @@
             <div class="info-prop"
                  v-if="formType == 'detail'">
               <span class="info-title-2">所在社区: </span>
-              <span>{{ formData.liveCommunityName || "--" }}</span>
+              <span>{{ formData.liveCommunity || "--" }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
                           label="所在社区"
@@ -256,7 +256,8 @@
             <div class="info-prop"
                  v-if="formType == 'detail'">
               <span class="info-title-2">是否为低保: </span>
-              <span>{{  formData.subsistenceAllowanceFlag?formData.subsistenceAllowanceFlag=='1'?'是':formData.subsistenceAllowanceFlag=='0'?'否':'--':'--' }}</span>
+
+              <span>{{ formData.subsistenceAllowanceFlag==1?'是':formData.subsistenceAllowanceFlag==0?'否':'--' }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
                           label="是否为低保"
@@ -309,7 +310,7 @@
             <div class="info-prop"
                  v-if="formType == 'detail'">
               <span class="info-title-2">住房性质: </span>
-              <span>{{ formData.housingNatureName || "--" }}</span>
+              <span>{{ housingNatureName(formData.housingNature ) }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
                           label="住房性质"
@@ -432,7 +433,8 @@
     <div class="div_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
-      <el-button size="small"
+      <el-button v-if="formType!='detail'"
+                 size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -445,6 +447,7 @@ 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";
+import { isCard } from "@/utils/validate";
 
 let loading; // 加载动画
 
@@ -468,64 +471,56 @@ export default {
       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,
+        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: {
@@ -598,6 +593,20 @@ export default {
         }
       });
     },
+    nationName (val) {
+      let filtered = this.dicts.nationList.filter(
+        (item) => item.value == val
+      );
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : "--";
+    },
+    housingNatureName (val) {
+      let filtered = this.dicts.housingNatureList.filter(
+        (item) => item.value == val
+      );
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : "--";
+    },
     async getDicts () {
       try {
         const requests = [
@@ -689,6 +698,35 @@ export default {
       }
     },
   },
+  computed: {
+    dataRule () {
+      let checkIdCard = (rule, value, callback) => {
+        if (value === "") {
+          callback(new Error("请输入证件号"));
+        } else {
+          if (!isCard(value)) {
+            callback(new Error("请输入正确的证件号"));
+          }
+          callback();
+        }
+      };
+      return {
+
+        agencyId: [{ required: true, message: "所属组织不能为空", trigger: "bulr" }],
+        name: [{ required: true, message: "姓名不能为空", trigger: "bulr" }],
+        idNum: [
+          { required: true, message: "证件号不能为空", trigger: "bulr" },
+          { required: true, validator: checkIdCard, trigger: "blur" },
+        ],
+        idType: [
+          { required: true, message: "证件类型不能为空", trigger: "bulr" },
+        ],
+
+
+      }
+
+    },
+  },
 };
   </script>
       
@@ -718,7 +756,7 @@ export default {
 .info-prop {
   margin-top: 29px;
   .info-title-2 {
-    width: 100px;
+    width: 120px;
     text-align: right;
     display: inline-block;
     padding-right: 10px;
diff --git a/src/views/modules/base/residentManagement/housingNature/housingNature.vue b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
index abf873e00..31c77edfa 100644
--- a/src/views/modules/base/residentManagement/housingNature/housingNature.vue
+++ b/src/views/modules/base/residentManagement/housingNature/housingNature.vue
@@ -497,6 +497,9 @@ export default {
 
     //   编辑触发事件
     async handleEdit (row) {
+      this.addDiaTitle = "编辑";
+      this.formType = "edit";
+      this.showAdd = true;
       this.$nextTick(() => {
         this.$refs.ref_add_form.initForm("edit", row);
       });
@@ -534,12 +537,12 @@ export default {
     },
     //   删除处理
     async cancelFuwu (ids) {
-      const url = "/actual/base/resiHousingNature/delete";
+      const url = "/actual/base/resiCategorized/ensureHouse/deleteBatch";
 
       let params = {
         ids: ids
       }
-      const { data, code, msg } = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, ids);
       if (code === 0) {
         this.$message.success("删除成功！");
         this.getTableData();
diff --git a/src/views/modules/base/residentManagement/tefu/addForm.vue b/src/views/modules/base/residentManagement/tefu/addForm.vue
index 45f4072fb..a4560f009 100644
--- a/src/views/modules/base/residentManagement/tefu/addForm.vue
+++ b/src/views/modules/base/residentManagement/tefu/addForm.vue
@@ -13,7 +13,7 @@
             <div class="info-prop"
                  v-if="formType == 'detail'">
               <span class="info-title-2">所属组织: </span>
-
+              <span>{{ formData.agencyName || "--" }}</span>
             </div>
             <el-form-item v-else
                           label="所属组织"
@@ -72,7 +72,7 @@
             <div class="info-prop"
                  v-if="formType == 'detail'">
               <span class="info-title-2">证件类型: </span>
-              <span>{{ formData.idTypeName || "--" }}</span>
+              <span>{{ idTypeName(formData.idType)  }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
                           label="证件类型"
@@ -157,7 +157,7 @@
             <div class="info-prop"
                  v-if="formType == 'detail'">
               <span class="info-title-2">民族: </span>
-              <span>{{ nationName || "--" }}</span>
+              <span>{{ nationName(formData.nation) }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
                           label="民族"
@@ -180,7 +180,7 @@
                 formData.localResidenceFlag != null
                   ? formData.localResidenceFlag == 1
                     ? "是"
-                    : formData.gender == 2
+                    : formData.gender == 0
                     ? "否"
                     : "--"
                   : "--"
@@ -241,29 +241,18 @@
           <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>
+              <span class="info-title-2">婚姻状况: </span>
+              <span>{{ marriageName(formData.marriage) }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
-                          label="是否为低保"
+                          label="婚姻状况"
                           v-else>
-              <el-select v-model="formData.subsistenceAllowanceFlag"
+              <el-select v-model="formData.marriage"
+                         placeholder="请输入"
+                         size="small"
+                         class="u-item-width-normal"
                          clearable>
-                <el-option v-for="item in binaryOptionList"
+                <el-option v-for="item in dicts.marriageList"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
@@ -271,52 +260,51 @@
               </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>
+              <span class="info-title-2">银行卡号: </span>
+              <span>{{  formData.bankAccount||'--' }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
-                          label="房东姓名"
+                          label="银行卡号"
                           v-else>
-              <el-input v-model="formData.landlordName"
+              <el-input v-model="formData.bankAccount"
                         placeholder="请输入"
                         clearable></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <div class="info-prop"
                  v-if="formType == 'detail'">
-              <span class="info-title-2">房东身份证号: </span>
-              <span>{{  formData.landlordIdNum|| "--" }}</span>
+              <span class="info-title-2">备注: </span>
+              <span>{{ formData.remark || "--" }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
-                          label="房东身份证号"
+                          label="备注"
+                          class="wd-wr"
                           v-else>
-              <el-input v-model="formData.landlordIdNum"
+              <el-input v-model="formData.remark"
                         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>
+              <span class="info-title-2">特扶类别: </span>
+              <span>{{ specialSupportTypeName(formData.specialSupportType) }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
-                          label="住房性质"
+                          label="特扶类别"
                           v-else>
-              <el-select v-model="formData.housingNature"
+              <el-select v-model="formData.specialSupportType"
                          clearable>
-                <el-option v-for="item in dicts.housingNatureList"
+                <el-option v-for="item in specialSupportTypeList"
                            :key="item.value"
                            :label="item.label"
                            :value="item.value">
@@ -324,54 +312,67 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+
+        </el-row>
+
+        <el-row>
+          <el-col v-if="formData.specialSupportType==='2'"
+                  :span="12">
             <div class="info-prop"
                  v-if="formType == 'detail'">
-              <span class="info-title-2">领取通知书日期: </span>
-              <span>{{  formData.notificationRcvDate||'' }}</span>
+              <span class="info-title-2">子女姓名: </span>
+              <span>{{  formData.childName||'--' }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
-                          label="领取通知书日期"
+                          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-input v-model="formData.childName"
+                        placeholder="请输入"
+                        clearable></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12">
+          <el-col v-if="formData.specialSupportType"
+                  :span="12">
             <div class="info-prop"
                  v-if="formType == 'detail'">
-              <span class="info-title-2">保障类型: </span>
-              <span>{{ formData.securityType || "--" }}</span>
+              <span class="info-title-2">子女性别: </span>
+              <span>{{
+                formData.childGender
+                  ? formData.childGender == "1"
+                    ? "男"
+                    : formData.childGender == "2"
+                    ? "女"
+                    : "--"
+                  : "--"
+              }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
-                          label="保障类型"
+                          label="子女性别"
                           v-else>
-              <el-input v-model="formData.securityType"
-                        placeholder="请输入"
-                        clearable></el-input>
+              <el-select v-model="formData.childGender"
+                         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-col :span="12">
+          <el-col v-if="formData.specialSupportType==='1'"
+                  :span="12">
             <div class="info-prop"
                  v-if="formType == 'detail'">
-              <span class="info-title-2">发证日期: </span>
-              <span>{{ formData.certificateDate || "--" }}</span>
+              <span class="info-title-2">子女死亡日期: </span>
+              <span>{{  formData.childDeathDate||'' }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
-                          label="发证日期"
+                          label="子女死亡日期"
                           v-else>
-              <el-date-picker v-model="formData.certificateDate"
+              <el-date-picker v-model="formData.childDeathDate"
                               type="date"
                               value-format="yyyy-MM-dd"
-                              placeholder="发证日期"
+                              placeholder="选择日期"
                               style="width: 202px"
                               clearable>
               </el-date-picker>
@@ -379,60 +380,54 @@
           </el-col>
         </el-row>
 
-        <el-row>
+        <el-row v-if="formData.specialSupportType==='2'">
           <el-col :span="12">
             <div class="info-prop"
                  v-if="formType == 'detail'">
-              <span class="info-title-2">补贴编号: </span>
-              <span>{{ formData.subsidyNum || "--" }}</span>
+              <span class="info-title-2">伤残类别: </span>
+              <span>{{ childDisabilityCategoryCodeName(formData.childDisabilityCategoryCode) }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
-                          label="补贴编号"
+                          label="伤残类别"
                           v-else>
-              <el-input v-model="formData.subsidyNum"
-                        placeholder="请输入"
-                        clearable></el-input>
+              <el-select v-model="formData.childDisabilityCategoryCode"
+                         clearable>
+                <el-option v-for="item in dicts.childDisabilityCategoryCodeList"
+                           :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.subsidyAmount || "--" }}</span>
+              <span class="info-title-2">伤残等级: </span>
+              <span>{{ childDisabilityLevelName(formData.childDisabilityLevel) }}</span>
             </div>
             <el-form-item :label-width="labelWidth"
-                          label="补贴金额"
+                          label="伤残等级"
                           v-else>
-              <el-input v-model="formData.subsidyAmount"
-                        placeholder="请输入"
-                        clearable></el-input>
+              <el-select v-model="formData.childDisabilityLevel"
+                         clearable>
+                <el-option v-for="item in dicts.childDisabilityLevelList"
+                           :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.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"
+      <el-button v-if="formType!='detail'"
+                 size="small"
                  type="primary"
                  :disabled="btnDisable"
                  @click="handleComfirm">确 定</el-button>
@@ -445,6 +440,7 @@ 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";
+import { isCard } from "@/utils/validate";
 
 let loading; // 加载动画
 
@@ -468,73 +464,110 @@ export default {
       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,
+        agencyId: '',
+        name: "",
+        mobile: "",
+        idType: "",
+        idNum: "",
+        birthday: "",
+        gender: null,
+        nation: "",
+        localResidenceFlag: null,
+        placeOfDomicile: "",//户籍地址
+        currentResidence: "",//现居地址
+        marriage: '',//婚姻状况
+        bankAccount: '', //银行卡号
+        specialSupportType: '',//特扶类别
+        childName: '',//子女姓名
+        childGender: '',//子女性别
+        childDeathDate: '',//子女死亡日期
+        childDisabilityCategoryCode: '',//伤残类别
+        childDisabilityLevel: '',//伤残等级
+        remark: '',     //备注   
+
+
+        // agencyId: "1582261714844827649",
+        // bankAccount: "33333",
+        // birthday: "2023-08-08 00:00:00",
+        // currentResidence: "现居地址",
+        // gender: "1",
+        // idNum: "211103199101010000",
+        // idType: 1,
+        // localResidenceFlag: 1,
+        // marriage: "weihun",
+        // mobile: "15111111111",
+
+        // nation: "1",
+        // placeOfDomicile: "户籍地址",
+        // remark: "备注",
+
+        // specialSupportType: "1",
+        // name: "失独",
+        // childGender: "1",
+        // childDeathDate: "2023-08-24",
+
+        // specialSupportType: "2",
+        // name: "伤残",
+        // childName: "子女姓名",
+        // childGender: "1",
+        // childDisabilityCategoryCode: "",
+        // childDisabilityLevel: "",
+
+
       },
 
       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: "",
 
+      specialSupportTypeList: [
+        {
+          value: '1',
+          label: '失独'
+        },
+        {
+          value: '2',
+          label: '伤残'
+        }
+      ],
+
       dicts: {
         nationList: [],
-        housingNatureList: [],
+        childDisabilityCategoryCodeList: [],
+        childDisabilityLevelList: [],
+        marriageList: [],
 
       },
     };
   },
+  computed: {
+    dataRule () {
+      let checkIdCard = (rule, value, callback) => {
+        if (value === "") {
+          callback(new Error("请输入证件号"));
+        } else {
+          if (!isCard(value)) {
+            callback(new Error("请输入正确的证件号"));
+          }
+          callback();
+        }
+      };
+      return {
+        agencyId: [{ required: true, message: "所属组织不能为空", trigger: "bulr" }],
+        name: [{ required: true, message: "姓名不能为空", trigger: "bulr" }],
+        idNum: [
+          { required: true, message: "证件号不能为空", trigger: "bulr" },
+          { required: true, validator: checkIdCard, trigger: "blur" },
+        ],
+        idType: [{ required: true, message: "证件类型不能为空", trigger: "bulr" },],
+        childName: [{ required: true, message: "子女姓名不能为空", trigger: "bulr" },],
+      }
+
+    },
+  },
 
   watch: {},
 
@@ -555,7 +588,7 @@ export default {
       await this.getDetail(this.scopeId);
     },
     async getDetail (categorizedResiId) {
-      const url = `/actual/base/resiCategorized/ensureHouse/detail/${categorizedResiId}`;
+      const url = `/actual/base/resiCategorized/specialSupport/detail/${categorizedResiId}`;
       const { data, code, msg } = await requestGet(url);
       if (code === 0) {
         this.formData = { ...data };
@@ -584,8 +617,8 @@ export default {
         }
         const url =
           this.formType === "edit"
-            ? "/actual/base/resiCategorized/ensureHouse/update"
-            : "/actual/base/resiCategorized/ensureHouse/create";
+            ? "/actual/base/resiCategorized/specialSupport/update"
+            : "/actual/base/resiCategorized/specialSupport/create";
         // console.log(this.formData)
         // return false
         const { data, code, msg } = await requestPost(url, this.formData);
@@ -605,14 +638,22 @@ export default {
             formCode: "resi_base_info",
           }),
 
+          this.$http.post('sys/dict/data/dictlist', {
+            'dictType': 'disability_category_code'
+          }),
+          this.$http.post('sys/dict/data/dictlist', {
+            'dictType': 'disability_level'
+          }),
           this.$http.post("sys/dict/data/dictlist", {
-            dictType: "house",
+            dictType: "marriage"
           }),
 
         ];
         const dictKeys = [
           "nationList",
-          "housingNatureList",
+          "childDisabilityCategoryCodeList",
+          "childDisabilityLevelList",
+          "marriageList",
 
         ]; // 对应的键名
 
@@ -628,6 +669,48 @@ export default {
         console.log("获取字典失败: ", error);
       }
     },
+    nationName (val) {
+      let filtered = this.dicts.nationList.filter(
+        (item) => item.value == val
+      );
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : "--";
+    },
+    marriageName (val) {
+      let filtered = this.dicts.marriageList.filter(
+        (item) => item.value == val
+      );
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : "--";
+    },
+    idTypeName (val) {
+      let filtered = this.idTypeList.filter(
+        (item) => item.value == val
+      );
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : "--";
+    },
+    specialSupportTypeName (val) {
+      let filtered = this.specialSupportTypeList.filter(
+        (item) => item.value == val
+      );
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : "--";
+    },
+    childDisabilityLevelName (val) {
+      let filtered = this.dicts.childDisabilityLevelList.filter(
+        (item) => item.value == val
+      );
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : "--";
+    },
+    childDisabilityCategoryCodeName (val) {
+      let filtered = this.dicts.childDisabilityCategoryCodeList.filter(
+        (item) => item.value == val
+      );
+      let str = filtered.length > 0 ? filtered[0].label : null;
+      return str ? str : "--";
+    },
     getGridList () {
       const { user } = this.$store.state
       this.dataListLoading = true
diff --git a/src/views/modules/base/residentManagement/tefu/tefuList.vue b/src/views/modules/base/residentManagement/tefu/tefuList.vue
index 0976721a4..9bab86415 100644
--- a/src/views/modules/base/residentManagement/tefu/tefuList.vue
+++ b/src/views/modules/base/residentManagement/tefu/tefuList.vue
@@ -242,7 +242,7 @@
 
           <el-table-column prop="mobile"
                            align="center"
-                           width="150"
+                           width="120"
                            label="联系电话"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -255,7 +255,7 @@
 
           <el-table-column prop="placeOfDomicile"
                            align="center"
-                           width="150"
+                           width="80"
                            label="本地户籍"
                            :show-overflow-tooltip="true">
             <template slot-scope="scope">
@@ -294,7 +294,7 @@
 
           <el-table-column prop="marriageName"
                            align="center"
-                           width="100"
+                           width="80"
                            label="婚姻状况"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -306,7 +306,7 @@
           </el-table-column>
           <el-table-column prop="homeName"
                            align="center"
-                           width="100"
+                           width="150"
                            label="所属房屋"
                            :show-overflow-tooltip="true">
           </el-table-column>
@@ -516,6 +516,9 @@ export default {
 
     //   编辑触发事件
     async handleEdit (row) {
+      this.addDiaTitle = "编辑";
+      this.formType = "edit";
+      this.showAdd = true;
       this.$nextTick(() => {
         this.$refs.ref_add_form.initForm("edit", row);
       });
@@ -554,11 +557,11 @@ export default {
     //   删除处理
     async cancelFuwu (ids) {
 
-      const url = "/actual/base/resiCategorized/specialSupport/delete";
+      const url = "/actual/base/resiCategorized/specialSupport/deleteBatch";
       let params = {
         ids: ids
       }
-      const { data, code, msg } = await requestPost(url, params);
+      const { data, code, msg } = await requestPost(url, ids);
       if (code === 0) {
         this.$message.success("删除成功！");
         this.getTableData();
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 3a314a19a..e5c701260 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -1,173 +1,218 @@
 
 <template>
-	<div>
-		<div class="g-row">
-			<div class="g-row-left">
-				<div class="m-box m-search">
-					<div class="wrap">
-						<div class="title">
-							<span>社区查询</span>
-						</div>
-
-						<div class="tabs">
-							<div :class="{ 'z-on': searchData.type == 'jumin' }" @click="searchDataTab('jumin')">
-								查居民
-							</div>
-							<div :class="{ 'z-on': searchData.type == 'fangwu' }" @click="searchDataTab('fangwu')">
-								查房屋
-							</div>
-						</div>
-
-						<div class="search">
-							<div class="search-input">
-								<div class="input">
-									<input type="text" :placeholder="typePlaceholder[searchData.type]
-										" v-model="searchData.searchKey" @keyup.enter="handleClickSearchBtn" />
-
-									<div class="close-btn" v-if="searchData.searchKey != ''"
-										@click="searchData.searchKey = ''">
-										<img src="@/assets/img/shequ/close.png" />
-									</div>
-								</div>
-								<div class="btn" @click="handleClickSearchBtn">
-									查一下
-								</div>
-							</div>
-
-						</div>
-					</div>
-				</div>
-				<div class=" m-pan m-box">
-					<div class="header">
-						<img src="@/assets/images/index/title-icon-sqzl.png" />
-						<span>社区总览</span>
-					</div>
-					<div class="flex_box">
-						<div class="cnt">
-							<div class="cnt-left">
-								<div class="subtitle">
-									<img src="@/assets/images/index/i-sqjj.png" />
-									<span>社区简介</span>
-								</div>
-								<p>
-									{{ pandectData.deptName }}，<span v-if="pandectData.gridCount">划分为{{
+  <div>
+    <div class="g-row">
+      <div class="g-row-left">
+        <div class="m-box m-search">
+          <div class="wrap">
+            <div class="title">
+              <span>社区查询</span>
+            </div>
+
+            <div class="tabs">
+              <div :class="{ 'z-on': searchData.type == 'jumin' }"
+                   @click="searchDataTab('jumin')">
+                查居民
+              </div>
+              <div :class="{ 'z-on': searchData.type == 'fangwu' }"
+                   @click="searchDataTab('fangwu')">
+                查房屋
+              </div>
+            </div>
+
+            <div class="search">
+              <div class="search-input">
+                <div class="input">
+                  <input type="text"
+                         :placeholder="typePlaceholder[searchData.type]
+										"
+                         v-model="searchData.searchKey"
+                         @keyup.enter="handleClickSearchBtn" />
+
+                  <div class="close-btn"
+                       v-if="searchData.searchKey != ''"
+                       @click="searchData.searchKey = ''">
+                    <img src="@/assets/img/shequ/close.png" />
+                  </div>
+                </div>
+                <div class="btn"
+                     @click="handleClickSearchBtn">
+                  查一下
+                </div>
+              </div>
+
+            </div>
+          </div>
+        </div>
+        <div class=" m-pan m-box">
+          <div class="header">
+            <img src="@/assets/images/index/title-icon-sqzl.png" />
+            <span>社区总览</span>
+          </div>
+          <div class="flex_box">
+            <div class="cnt">
+              <div class="cnt-left">
+                <div class="subtitle">
+                  <img src="@/assets/images/index/i-sqjj.png" />
+                  <span>社区简介</span>
+                </div>
+                <p>
+                  {{ pandectData.deptName }}，<span v-if="pandectData.gridCount">划分为{{
 										pandectData.underCount }}个{{
 											pandectData.underName
-										}}，</span>  现有房屋{{ pandectData.homeCount }}间，自住房屋{{
+										}}，</span> 现有房屋{{ pandectData.homeCount }}间，自住房屋{{
 										pandectData.selfStay
 									}}间、出租房屋{{
 										pandectData.rentOut
 									}}间、闲置房屋{{
 										pandectData.vacantHouse
 									}}间，现有居民{{pandectData.resiCount}}户、{{pandectData.totalResidents}}人，其中常住人口{{pandectData.permanentResiCount}}人，流动人口{{pandectData.floatingResiCount}}人，各类群体分布如下：
-								</p>
+                </p>
 
-								<div class="subtitle">
-									<img src="@/assets/images/index/i-fxjg.png" />
-									<span>分析结果</span>
-								</div>
+                <div class="subtitle">
+                  <img src="@/assets/images/index/i-fxjg.png" />
+                  <span>分析结果</span>
+                </div>
 
-								<p class="hint" v-if="resiCategory.list.length > 0">
-									根据数据分析结果，建议重点关注
-									<b>{{ resiCategory.list[0].name }}、{{
+                <p class="hint"
+                   v-if="resiCategory.list.length > 0">
+                  根据数据分析结果，建议重点关注
+                  <b>{{ resiCategory.list[0].name }}、{{
 										resiCategory.list[1].name
 									}}、{{ resiCategory.list[2].name }}</b>
-									三类群体，开展相关的社区服务和活动。
-								</p>
-							</div>
-							<el-tabs v-model="activeName" style="width: calc(100% - 240px - 40px);margin-left: auto;">
-								<el-tab-pane label="居民分类统计" name="resi">
-									<div class="cnt-right">
-										<div class="list">
-											<div class="item" @click="handleClickCategory(item)" :key="item.code" v-for="(
+                  三类群体，开展相关的社区服务和活动。
+                </p>
+              </div>
+              <el-tabs v-model="activeName"
+                       style="width: calc(100% - 240px - 40px);margin-left: auto;">
+                <el-tab-pane label="居民分类统计"
+                             name="resi">
+                  <div class="cnt-right">
+                    <div class="list">
+                      <div class="item"
+                           @click="handleClickCategory(item)"
+                           :key="item.code"
+                           v-for="(
 													item, index
 												) in resiCategory.list">
-												<div>
-													{{
+                        <div>
+                          {{
 														("0" + (index + 1)).substr(-2)
 													}}.
-												</div>
-												<div class="item-name">
-													{{ item.name }}
-												</div>
-												<div class="item-div"></div>
-												<div class="item-count">
-													{{ item.count }}人
-												</div>
-												<div class="item-progress">
-													<b :style="{
+                        </div>
+                        <div class="item-name">
+                          {{ item.name }}
+                        </div>
+                        <div class="item-div"></div>
+                        <div class="item-count">
+                          {{ item.count }}人
+                        </div>
+                        <div class="item-progress">
+                          <b :style="{
 														width: item.per + '%',
 													}"></b>
-												</div>
-												<div class="item-per">
-													{{ item.per }} %
-												</div>
-											</div>
-										</div>
-									</div>
-								</el-tab-pane>
-								<el-tab-pane label="智能预测" name="zhineng">
-
-								</el-tab-pane>
-							</el-tabs>
-						</div>
-					</div>
-				</div>
-			</div>
-			<div class="g-row-right">
-				<div class="m-box m-tx">
-						<div class="header">
-							<img
-								src="@/assets/images/index/title-icon-zntx.png"
-							/>
-							<span>智能提醒</span>
-						</div>
-						<div class="more" @click="toNoticePage">更多></div>
-						<div class="cnt" v-if="noticeData.length > 0">
-							<div @click="handleClickNotice(item)" class="item" :key="'notice' + item.targetId + index"
-									v-for="(item, index) in noticeData">
-									<div class="item_left">
-										<i class="i-tag" v-if="item.readFlag == 1">已读</i>
-									<i class="i-tag" v-else>未读</i>
-									</div>
-									<div class="item_right">
-										<div class="item-date">
-											{{ item.createdTime }}
-										</div>
-										<div class="item-title">
-											{{ item.content }}
-										</div>
-									</div>
-								</div>
-						</div>
-
-						<div class="cnt" v-else>
-							<div class="empty">
-								<img
-									src="~@/assets/images/shuju/renfang/index/empty.png"
-								/>
-								<span>暂无提醒～</span>
-							</div>
-						</div>
-					</div>
-				<div class="m-box m-tb">
-					<div class="wrap">
-						<div class="header">
-							<img
-								src="@/assets/images/index/title-icon-zntb.png"
-							/>
-							<span>不满意事项月度趋势分析</span>
-						</div>
-					</div>
-					<!-- <div class="more">更多></div> -->
-					<div class="cnt">
-						<div id="my_chart" style="width: 100%;height: 230px; position: relative;top:-10px"></div>
-					</div>
-				</div>
-				</div>
-		</div>
-		<fastcall ref="fastcall" />
-	</div>
+                        </div>
+                        <div class="item-per">
+                          {{ item.per }} %
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </el-tab-pane>
+                <el-tab-pane label="智能预测"
+                             name="zhineng">
+                  <div class="cnt-right">
+                    <div class="list">
+                      <div class="item"
+                           :key="item.code"
+                           v-for="(
+													item, index
+												) in znycCategory.list">
+                        <div>
+                          {{
+														("0" + (index + 1)).substr(-2)
+													}}.
+                        </div>
+                        <div class="item-name">
+                          {{ item.name }}
+                        </div>
+                        <div class="item-div"></div>
+                        <div class="item-count">
+                          {{ item.count }}人
+                        </div>
+                        <div class="item-progress">
+                          <b :style="{
+														width: item.per + '%',
+													}"></b>
+                        </div>
+                        <div class="item-per">
+                          {{ item.per }} %
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </el-tab-pane>
+              </el-tabs>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="g-row-right">
+        <div class="m-box m-tx">
+          <div class="header">
+            <img src="@/assets/images/index/title-icon-zntx.png" />
+            <span>智能提醒</span>
+          </div>
+          <div class="more"
+               @click="toNoticePage">更多></div>
+          <div class="cnt"
+               v-if="noticeData.length > 0">
+            <div @click="handleClickNotice(item)"
+                 class="item"
+                 :key="'notice' + item.targetId + index"
+                 v-for="(item, index) in noticeData">
+              <div class="item_left">
+                <i class="i-tag"
+                   v-if="item.readFlag == 1">已读</i>
+                <i class="i-tag"
+                   v-else>未读</i>
+              </div>
+              <div class="item_right">
+                <div class="item-date">
+                  {{ item.createdTime }}
+                </div>
+                <div class="item-title">
+                  {{ item.content }}
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="cnt"
+               v-else>
+            <div class="empty">
+              <img src="~@/assets/images/shuju/renfang/index/empty.png" />
+              <span>暂无提醒～</span>
+            </div>
+          </div>
+        </div>
+        <div class="m-box m-tb">
+          <div class="wrap">
+            <div class="header">
+              <img src="@/assets/images/index/title-icon-zntb.png" />
+              <span>不满意事项月度趋势分析</span>
+            </div>
+          </div>
+          <!-- <div class="more">更多></div> -->
+          <div class="cnt">
+            <div id="my_chart"
+                 style="width: 100%;height: 230px; position: relative;top:-10px"></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <fastcall ref="fastcall" />
+  </div>
 </template>
 <script>
 import { requestPost, requestGet } from "@/js/dai/request";
@@ -178,297 +223,336 @@ import fastcall from "@/views/modules/cpts/fastcall";
 import * as echarts from 'echarts';
 
 export default {
-	components: { fastcall },
-
-	data() {
-		return {
-			searchStatus: "ini", //ing over
-			searchData: {
-				type: "jumin",
-				searchKey: "",
-			},
-
-			typePlaceholder: {
-				jumin: "请输入姓名或联系电话或证件号",
-				fangwu: "请输入小区名称或楼栋名称",
-				xuqiu: "请输入需求人或需求内容或服务方",
-			},
-
-			resiCategory: {
-				loading: false,
-				total: "",
-				list: [],
-			},
-
-			orgData: {
-				id: "",
-				level: "agency",
-			},
-
-			pandectData: {
-				communityName: "",
-				streetName: "",
-				gridCount: "",
-				resiCount: "",
-				homeCount: "",
-				floatingResiCount: "",
-				permanentResiCount: "",
-			},
-
-			noticeData: [],
-
-			activeName: 'resi',
-
-			option: {
-				tooltip: {
-					trigger: 'axis'
-				},
-				legend: {
-					data: ['12345不满意数', '省满意调查不满意数', '社区自评不满意数'],
-					bottom: '10%',
-					icon: 'rect',
-					itemWidth: 20,
-					itemHeight: 5,
-					itemGap: 20,
-				},
-				grid: {
-					left: '3%',
-					right: '4%',
-					bottom: '25%',
-					containLabel: true
-				},
-				toolbox: {
-					// feature: {
-					// 	saveAsImage: {}
-					// }
-				},
-				xAxis: {
-					type: 'category',
-					boundaryGap: false,
-					data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月']
-				},
-				yAxis: {
-					type: 'value'
-				},
-				series: [
-					{
-						name: '12345不满意数',
-						type: 'line',
-						stack: 'Total',
-						data: [120, 132, 101, 134, 90, 230, 210]
-					},
-					{
-						name: '省满意调查不满意数',
-						type: 'line',
-						stack: 'Total',
-						data: [220, 182, 191, 234, 290, 330, 310]
-					},
-					{
-						name: '社区自评不满意数',
-						type: 'line',
-						stack: 'Total',
-						data: [150, 232, 201, 154, 190, 330, 410]
-					}
-				]
-			},
-			myChart: {}
-		}
-	},
-	computed: {
-		maxTableHeight() {
-			// return this.clientHeight - 450;
-			return 420;
-		},
-		...mapGetters(["clientHeight"]),
-	},
-	watch: {
-		"searchData.searchKey": function (val) {
-			if (val == "") {
-				this.searchStatus = "ini";
-			}
-		},
-		$route: {
-			handler: function (newVal, oldVal) {
-				if (newVal.name == "home") {
-					this.getApiData();
-				}
-			},
-			deep: true,
-			immediate: true,
-		},
-	},
-	mounted() {
-		this.getApiData();
-		this.$nextTick(() => {
-			this.initChart()
-		})
-		console.log(
-			"dynamicMenuRoutes----------------------------",
-			this.$store.state.sidebarMenuList
-		);
-	},
-	methods: {
-		initChart() {
-			this.myChart = echarts.init(document.getElementById('my_chart'));
-			this.myChart.setOption(this.option)
-			window.addEventListener('resize', this.handleWindowResize);
-		},
-		handleWindowResize() {
-			if (this.myChart) {
-				this.myChart.resize();
-			}
-		},
-		searchDataTab(str) {
-			this.searchData.type = str;
-		},
-		handleClickCategory(item) {
-			this.$router.push({
-				name: "base-resi",
-				params: {
-					category: item.code
-				}
-			});
-
-		},
-		async readClearOne(item) {
-			console.log("item", item)
-			const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`
-			const { data, code, msg } = await requestPost(url)
-			if (code == 0) {
-				this.getNoticeData()
-			} else if (code >= 8000) {
-				this.$message.error(msg)
-			}
-		},
-		handleClickNotice(item) {
-			const { msgType, targetId } = item;
-			this.readClearOne(item)
-			if (msgType == "community_house") {
-				this.$refs.fastcall.showHouseInfo(targetId);
-			} else if (msgType == "resident_base_info") {
-				this.$refs.fastcall.showResiInfo(targetId);
-			}
-		},
-
-		toNoticePage() {
-			this.$router.push({
-				path: "/main/home-notice",
-			});
-		},
-
-		toSearchPage(type, searchKey) {
-			this.$router.push({
-				path: "/main/shequ-chaxun"
-			});
-			localStorage.setItem('homeSearchType', type)
-			localStorage.setItem('homeSearchKey', searchKey)
-		},
-
-		handleClickSearchBtn(str) {
-			const {
-				searchData: { type, searchKey },
-			} = this;
-			if (str) {
-				this.toSearchPage(type, searchKey);
-				return
-			}
-			if (!searchKey) return this.$message.error("请输入搜索条件");
-			this.toSearchPage(type, searchKey);
-		},
-
-		async getApiData() {
-			await this.getOrgData();
-			this.getWarningList();
-			this.getPandectData();
-			this.getNoticeData();
-		},
-
-		//加载组织数据
-		async getOrgData() {
-			const url = "/gov/org/agency/maporg";
-			let params = {
-				orgId: "",
-				level: "",
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				this.orgData = data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		//加载组织数据
-		async getPandectData() {
-			const url = "/actual/base/residentHouseMerge/communityOverview";
-			let params = {
-				// orgId: "",
-				// level: "",
-			};
-
-			const { data, code, msg } = await requestGet(url, params);
-
-			if (code === 0) {
-				if (data) {
-					this.pandectData = data;
-				}
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		//加载组织数据
-		async getNoticeData() {
-			const url = "/message/intelligentMessage/list";
-			let params = {
-				last: "10",
-			};
-
-			const { data, code, msg } = await requestGet(url, params);
-
-			if (code === 0) {
-				if (data) {
-					this.noticeData = data;
-				}
-			} else {
-				this.$message.error(msg);
-			}
-		},
-
-		//加载组织数据
-		async getWarningList() {
-			const url = "/actual/base/resiCategory/categoryCountList";
-			let params = {
-				// id: this.orgData.id,
-				// level: "agency",
-			};
-
-			this.resiCategory.loading = true;
-			const { data, code, msg } = await requestGet(url, params);
-			this.resiCategory.loading = false;
-
-			if (code === 0) {
-				if (data) {
-					this.resiCategory.count = data.resiCount;
-					this.resiCategory.list = data.categoryList.map((item) => {
-						return {
-							code: item.categoryName,
-							name: resiCategoryMap[item.categoryName] || "",
-							count: item.categoryCount,
-							per: parseInt(
-								(100 * item.categoryCount) / data.resiCount
-							),
-							const: "const",
-						};
-					});
-				}
-			} else {
-				this.$message.error(msg);
-			}
-		},
-	},
+  components: { fastcall },
+
+  data () {
+    return {
+      searchStatus: "ini", //ing over
+      searchData: {
+        type: "jumin",
+        searchKey: "",
+      },
+
+      typePlaceholder: {
+        jumin: "请输入姓名或联系电话或证件号",
+        fangwu: "请输入小区名称或楼栋名称",
+        xuqiu: "请输入需求人或需求内容或服务方",
+      },
+
+      resiCategory: {
+        loading: false,
+        total: "",
+        list: [],
+      },
+      znycCategory: {
+        loading: false,
+        total: "",
+        list: [],
+      },
+
+      orgData: {
+        id: "",
+        level: "agency",
+      },
+
+      pandectData: {
+        communityName: "",
+        streetName: "",
+        gridCount: "",
+        resiCount: "",
+        homeCount: "",
+        floatingResiCount: "",
+        permanentResiCount: "",
+      },
+
+      noticeData: [],
+
+      activeName: 'resi',
+
+      option: {
+        tooltip: {
+          trigger: 'axis'
+        },
+        legend: {
+          data: ['12345不满意数', '省满意调查不满意数', '社区自评不满意数'],
+          bottom: '10%',
+          icon: 'rect',
+          itemWidth: 20,
+          itemHeight: 5,
+          itemGap: 20,
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '25%',
+          containLabel: true
+        },
+        toolbox: {
+          // feature: {
+          // 	saveAsImage: {}
+          // }
+        },
+        xAxis: {
+          type: 'category',
+          boundaryGap: false,
+          data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月']
+        },
+        yAxis: {
+          type: 'value'
+        },
+        series: [
+          {
+            name: '12345不满意数',
+            type: 'line',
+            stack: 'Total',
+            data: [120, 132, 101, 134, 90, 230, 210]
+          },
+          {
+            name: '省满意调查不满意数',
+            type: 'line',
+            stack: 'Total',
+            data: [220, 182, 191, 234, 290, 330, 310]
+          },
+          {
+            name: '社区自评不满意数',
+            type: 'line',
+            stack: 'Total',
+            data: [150, 232, 201, 154, 190, 330, 410]
+          }
+        ]
+      },
+      myChart: {}
+    }
+  },
+  computed: {
+    maxTableHeight () {
+      // return this.clientHeight - 450;
+      return 420;
+    },
+    ...mapGetters(["clientHeight"]),
+  },
+  watch: {
+    "searchData.searchKey": function (val) {
+      if (val == "") {
+        this.searchStatus = "ini";
+      }
+    },
+    $route: {
+      handler: function (newVal, oldVal) {
+        if (newVal.name == "home") {
+          this.getApiData();
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  mounted () {
+    this.getApiData();
+    this.$nextTick(() => {
+      this.initChart()
+    })
+    console.log(
+      "dynamicMenuRoutes----------------------------",
+      this.$store.state.sidebarMenuList
+    );
+  },
+  methods: {
+    initChart () {
+      this.myChart = echarts.init(document.getElementById('my_chart'));
+      this.myChart.setOption(this.option)
+      window.addEventListener('resize', this.handleWindowResize);
+    },
+    handleWindowResize () {
+      if (this.myChart) {
+        this.myChart.resize();
+      }
+    },
+    searchDataTab (str) {
+      this.searchData.type = str;
+    },
+    handleClickCategory (item) {
+      this.$router.push({
+        name: "base-resi",
+        params: {
+          category: item.code
+        }
+      });
+
+    },
+    async readClearOne (item) {
+      console.log("item", item)
+      const url = `/message/intelligentMessage/msg/clearOne/?msgId=${item.id}`
+      const { data, code, msg } = await requestPost(url)
+      if (code == 0) {
+        this.getNoticeData()
+      } else if (code >= 8000) {
+        this.$message.error(msg)
+      }
+    },
+    handleClickNotice (item) {
+      const { msgType, targetId } = item;
+      this.readClearOne(item)
+      if (msgType == "community_house") {
+        this.$refs.fastcall.showHouseInfo(targetId);
+      } else if (msgType == "resident_base_info") {
+        this.$refs.fastcall.showResiInfo(targetId);
+      }
+    },
+
+    toNoticePage () {
+      this.$router.push({
+        path: "/main/home-notice",
+      });
+    },
+
+    toSearchPage (type, searchKey) {
+      this.$router.push({
+        path: "/main/shequ-chaxun"
+      });
+      localStorage.setItem('homeSearchType', type)
+      localStorage.setItem('homeSearchKey', searchKey)
+    },
+
+    handleClickSearchBtn (str) {
+      const {
+        searchData: { type, searchKey },
+      } = this;
+      if (str) {
+        this.toSearchPage(type, searchKey);
+        return
+      }
+      if (!searchKey) return this.$message.error("请输入搜索条件");
+      this.toSearchPage(type, searchKey);
+    },
+
+    async getApiData () {
+      await this.getOrgData();
+      this.getWarningList();
+      this.getZnycList();
+      this.getPandectData();
+      this.getNoticeData();
+    },
+
+    //加载组织数据
+    async getOrgData () {
+      const url = "/gov/org/agency/maporg";
+      let params = {
+        orgId: "",
+        level: "",
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.orgData = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getPandectData () {
+      const url = "/actual/base/residentHouseMerge/communityOverview";
+      let params = {
+        // orgId: "",
+        // level: "",
+      };
+
+      const { data, code, msg } = await requestGet(url, params);
+
+      if (code === 0) {
+        if (data) {
+          this.pandectData = data;
+        }
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getNoticeData () {
+      const url = "/message/intelligentMessage/list";
+      let params = {
+        last: "10",
+      };
+
+      const { data, code, msg } = await requestGet(url, params);
+
+      if (code === 0) {
+        if (data) {
+          this.noticeData = data;
+        }
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getWarningList () {
+      const url = "/actual/base/resiCategory/categoryCountList";
+      let params = {
+        // id: this.orgData.id,
+        // level: "agency",
+      };
+
+      this.resiCategory.loading = true;
+      const { data, code, msg } = await requestGet(url, params);
+      this.resiCategory.loading = false;
+
+      if (code === 0) {
+        if (data) {
+          this.resiCategory.count = data.resiCount;
+          this.resiCategory.list = data.categoryList.map((item) => {
+            return {
+              code: item.categoryName,
+              name: resiCategoryMap[item.categoryName] || "",
+              count: item.categoryCount,
+              per: parseInt(
+                (100 * item.categoryCount) / data.resiCount
+              ),
+              const: "const",
+            };
+          });
+        }
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    //加载智能预测数据
+    async getZnycList () {
+      const url = "/actual/base/resiCategory/intelligentPredictioncategoryCountList";
+      // const url = "/actual/base/resiCategory/categoryCountList";
+      let params = {
+        // id: this.orgData.id,
+        // level: "agency",
+      };
+
+      this.znycCategory.loading = true;
+      const { data, code, msg } = await requestGet(url, params);
+      this.znycCategory.loading = false;
+
+      if (code === 0) {
+        if (data) {
+          this.znycCategory.count = data.resiCount;
+          this.znycCategory.list = data.categoryList.map((item) => {
+            return {
+              code: item.categoryName,
+              name: resiCategoryMap[item.categoryName] || "",
+              count: item.categoryCountNext,
+              // per: parseInt(
+              //   (100 * item.categoryCount) / data.resiCount
+              // ),
+              per: item.change_ratio,
+              const: "const",
+            };
+          });
+        }
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
 };
 </script>