From bee9c390df7f1614a4a46a140abaff7909b0b947 Mon Sep 17 00:00:00 2001
From: jiangyuying <jiang478938504@126.com>
Date: Mon, 28 Aug 2023 15:20:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/columns/constants/index.js             |  26 +
 src/views/components/resiForm.vue             | 851 +++++++++++++-----
 src/views/components/resiSearch.vue           |   2 +-
 src/views/modules/base/resi.vue               |  19 +-
 .../louzhang/louzhangList.vue                 |   3 +-
 5 files changed, 663 insertions(+), 238 deletions(-)

diff --git a/src/js/columns/constants/index.js b/src/js/columns/constants/index.js
index 99938e1f0..ca4f99438 100644
--- a/src/js/columns/constants/index.js
+++ b/src/js/columns/constants/index.js
@@ -59,3 +59,29 @@ export const dormitoryTypeList = [
     value: '0'
   }
 ]
+export const idTypeList = [
+  {
+    label: '其他',
+    value: 0
+  },
+  {
+    label: '身份证',
+    value: 1
+  },
+  {
+    label: '护照',
+    value: 2
+  },
+  {
+    label: '港澳通行证',
+    value: 3
+  },
+  {
+    label: '军人证',
+    value: 4
+  },
+  {
+    label: '台胞证',
+    value: 5
+  }
+]
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 9688fd38f..4fce6bbb0 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -119,8 +119,7 @@
                      :placeholder="`请选择${item.label}`"
                      size="small"
                      clearable
-                     class="u-item-width-normal"
-                     @change="handelminzu">
+                     class="u-item-width-normal">
             <el-option v-for="items in item.opction "
                        :key="items.value"
                        :label="items.label"
@@ -177,78 +176,60 @@
             <section v-if="item.groupId == itemj.id"
                      class="f-flex"
                      style="flex-wrap: wrap;">
-              <el-form-item v-for="(itemk,index) in itemj.children"
-                            :key="index"
-                            label-width="105px"
-                            :label="itemk.label"
-                            :class="itemk.itemType=='textarea'?'textareaDidth':''">
-                <template v-if="itemk.itemType == 'radio1'">
-                  <section class="u-item-width-normal">
-                    <el-radio v-for="ns in itemk.opction"
-                              :key="ns.value"
-                              size="small"
-                              v-model.trim="form[itemj.id][itemk.formName]"
-                              :label="ns.value">
-                      {{ ns.label }}
-                    </el-radio>
-                  </section>
-                </template>
-                <template v-else-if="itemk.itemType=='select1'">
-                  <el-select v-model="form[itemj.id][itemk.formName]"
-                             :placeholder="`请选择${itemk.label}`"
+              <template v-if="itemj.id==='specialSupportDto'">
+                <el-form-item label-width="105px"
+                              label="银行卡号">
+                  <el-input :placeholder="`请输入银行卡号`"
+                            class="u-item-width-normal"
+                            size="small"
+                            v-model.trim="form[itemj.id].bankAccount"
+                            clearable>
+                  </el-input>
+                </el-form-item>
+                <el-form-item label-width="105px"
+                              label="特扶类别">
+
+                  <el-select v-model="form[itemj.id].specialSupportType"
+                             :placeholder="`请选择特扶类别`"
                              size="small"
-                             :multiple="itemk.formName=='specialCategoryCode'"
-                             :collapse-tags="itemk.formName=='specialCategoryCode'"
                              clearable
-                             :style="{'width':itemk.formName=='specialCategoryCode'?'183px':''}"
                              class="u-item-width-normal">
-                    <el-option v-for="items in itemk.opction"
+                    <el-option v-for="items in itemj.children[1].opction"
                                :key="items.value"
                                :label="items.label"
                                :value="items.value">
                     </el-option>
                   </el-select>
-                </template>
-                <template v-else-if="itemk.itemType=='textarea1'">
-                  <el-input type="textarea"
-                            :placeholder="`请输入${itemk.label}`"
-                            class="item-width-textarea"
-                            maxlength="120"
-                            show-word-limit
-                            resize="none"
-                            rows="3"
-                            v-model.trim="form[itemj.id][itemk.formName]">
-                  </el-input>
-                </template>
-                <template v-else-if="itemk.itemType=='input1'">
-                  <el-input :placeholder="`请输入${itemk.label}`"
+
+                </el-form-item>
+                <el-form-item v-if="form[itemj.id].specialSupportType==='2'"
+                              label-width="105px"
+                              label="子女姓名">
+                  <el-input :placeholder="`请输入子女姓名`"
                             class="u-item-width-normal"
-                            :style="{'margin-right':itemk.label == '备注'?'50px':''}"
-                            v-model.trim="form[itemj.id][itemk.formName]"
+                            size="small"
+                            v-model.trim="form[itemj.id].childName"
                             clearable>
                   </el-input>
-                </template>
-                <template v-else-if="itemk.itemType=='inputNum'">
-                  <el-input :placeholder="`请输入${itemk.label}`"
-                            class="u-item-width-normal-text"
-                            :style="{'margin-right':itemk.label == '备注'?'50px':''}"
-                            v-model.trim="form[itemj.id][itemk.formName]"
-                            clearable
-                            @blur="checkNumberInput(itemj.id,itemk.formName)">
-                  </el-input><span class="u-data-tag">元</span>
-                </template>
-                <template v-else-if="itemk.itemType=='checkbox'">
-                  <el-checkbox-group size="small"
-                                     v-model="form[itemj.id][itemk.formName]">
-                    <el-checkbox v-for="items in itemk.opction"
-                                 :label="items.value"
-                                 :style="{'margin-right':items.label != itemk.label? '' :'19px'}"
-                                 :key="items.value"
-                                 :value="items.value">{{items.label}}</el-checkbox>
-                  </el-checkbox-group>
-                </template>
-                <template v-else-if="itemk.itemType == 'datepicker1'">
-                  <el-date-picker v-model.trim="form[itemj.id][itemk.formName]"
+                </el-form-item>
+                <el-form-item label-width="105px"
+                              label="子女性别">
+                  <el-select v-model="form[itemj.id].childGender"
+                             :placeholder="`请选择子女性别`"
+                             size="small"
+                             clearable
+                             class="u-item-width-normal">
+                    <el-option v-for="items in itemj.children[3].opction"
+                               :key="items.value"
+                               :label="items.label"
+                               :value="items.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item v-if="form[itemj.id].specialSupportType==='1'"
+                              label-width="105px"
+                              label="子女死亡日期">
+                  <el-date-picker v-model.trim="form[itemj.id].childDeathDate"
                                   class="u-item-width-normal"
                                   type="date"
                                   size="small"
@@ -257,22 +238,157 @@
                                   format="yyyy 年 MM 月 dd 日"
                                   value-format="yyyy-MM-dd">
                   </el-date-picker>
-                </template>
-                <template v-else-if="itemk.itemType == 'cascader1'">
-                  <el-cascader :props="{ emitPath: false }"
-                               :options="itemk.opction"
-                               clearable
+                </el-form-item>
+                <el-form-item v-if="form[itemj.id].specialSupportType==='2'"
+                              label-width="105px"
+                              label="伤残类别">
+                  <el-select v-model="form[itemj.id].childDisabilityCategoryCode"
+                             :placeholder="`请选择伤残类别`"
+                             size="small"
+                             clearable
+                             class="u-item-width-normal">
+                    <el-option v-for="items in itemj.children[5].opction"
+                               :key="items.value"
+                               :label="items.label"
+                               :value="items.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item v-if="form[itemj.id].specialSupportType==='2'"
+                              label-width="105px"
+                              label="伤残等级">
+                  <el-select v-model="form[itemj.id].childDisabilityLevel"
+                             :placeholder="`请选择伤残等级`"
+                             size="small"
+                             clearable
+                             class="u-item-width-normal">
+                    <el-option v-for="items in itemj.children[6].opction"
+                               :key="items.value"
+                               :label="items.label"
+                               :value="items.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+
+                <el-form-item label-width="105px"
+                              label="备注"
+                              class="textareaDidth">
+                  <el-input type="textarea"
+                            :placeholder="`请输入备注`"
+                            class="item-width-textarea"
+                            maxlength="120"
+                            size="small"
+                            show-word-limit
+                            resize="none"
+                            rows="3"
+                            v-model.trim="form[itemj.id].remark">
+                  </el-input>
+                </el-form-item>
+              </template>
+              <template v-else>
+                <el-form-item v-for="(itemk,index) in itemj.children"
+                              :key="index"
+                              label-width="105px"
+                              :label="itemk.label"
+                              :class="itemk.itemType=='textarea'?'textareaDidth':''">
+                  <template v-if="itemk.itemType == 'radio1'">
+                    <section class="u-item-width-normal">
+                      <el-radio v-for="ns in itemk.opction"
+                                :key="ns.value"
+                                size="small"
+                                v-model.trim="form[itemj.id][itemk.formName]"
+                                :label="ns.value">
+                        {{ ns.label }}
+                      </el-radio>
+                    </section>
+                  </template>
+                  <template v-else-if="itemk.itemType=='select1' &&itemk.showFlag!=='0' ">
+                    <el-select v-model="form[itemj.id][itemk.formName]"
+                               :placeholder="`请选择${itemk.label}`"
                                size="small"
-                               :label="itemk.opction.label"
-                               :value="itemk.opction.value"></el-cascader>
-                </template>
-                <template v-else-if="itemk.itemType == 'number'">
-                  <el-input-number class="u-item-width-normal"
-                                   :min="1"
-                                   :max="10"
-                                   v-model.trim="form[itemj.id][itemk.formName]"></el-input-number>
-                </template>
-              </el-form-item>
+                               :multiple="itemk.formName=='specialCategoryCode'"
+                               :collapse-tags="itemk.formName=='specialCategoryCode'"
+                               clearable
+                               :style="{'width':itemk.formName=='specialCategoryCode'?'183px':''}"
+                               class="u-item-width-normal">
+                      <el-option v-for="items in itemk.opction"
+                                 :key="items.value"
+                                 :label="items.label"
+                                 :value="items.value">
+                      </el-option>
+                    </el-select>
+                  </template>
+                  <template v-else-if="itemk.itemType=='textarea1'">
+                    <el-input type="textarea"
+                              :placeholder="`请输入${itemk.label}`"
+                              class="item-width-textarea"
+                              maxlength="120"
+                              size="small"
+                              show-word-limit
+                              resize="none"
+                              rows="3"
+                              v-model.trim="form[itemj.id][itemk.formName]">
+                    </el-input>
+                  </template>
+                  <template v-else-if="itemk.itemType=='input1'">
+                    <el-input :placeholder="`请输入${itemk.label}`"
+                              class="u-item-width-normal"
+                              size="small"
+                              :style="{'margin-right':itemk.label == '备注'?'50px':''}"
+                              v-model.trim="form[itemj.id][itemk.formName]"
+                              clearable>
+                    </el-input>
+                  </template>
+                  <template v-else-if="itemk.itemType=='inputNum'">
+                    <el-input :placeholder="`请输入${itemk.label}`"
+                              size="small"
+                              class="u-item-width-normal-text"
+                              :style="{'margin-right':itemk.label == '备注'?'50px':''}"
+                              v-model.trim="form[itemj.id][itemk.formName]"
+                              clearable
+                              @blur="checkNumberInput(itemj.id,itemk.formName)">
+                    </el-input><span class="u-data-tag">元</span>
+                  </template>
+                  <template v-else-if="itemk.itemType=='checkbox'">
+                    <el-checkbox-group size="small"
+                                       v-model="form[itemj.id][itemk.formName]">
+                      <el-checkbox v-for="items in itemk.opction"
+                                   :label="items.value"
+                                   :style="{'margin-right':items.label != itemk.label? '' :'19px'}"
+                                   :key="items.value"
+                                   :value="items.value">{{items.label}}</el-checkbox>
+                    </el-checkbox-group>
+                  </template>
+                  <template v-else-if="itemk.itemType == 'datepicker1' &&itemk.showFlag!=='0'">
+                    <el-date-picker v-model.trim="form[itemj.id][itemk.formName]"
+                                    class="u-item-width-normal"
+                                    type="date"
+                                    size="small"
+                                    clearable
+                                    placeholder="选择日期"
+                                    format="yyyy 年 MM 月 dd 日"
+                                    value-format="yyyy-MM-dd">
+                    </el-date-picker>
+                  </template>
+                  <template v-else-if="itemk.itemType == 'cascader1'">
+                    <el-cascader :props="{ emitPath: false }"
+                                 :options="itemk.opction"
+                                 class="u-item-width-normal"
+                                 clearable
+                                 size="small"
+                                 :label="itemk.opction.label"
+                                 :value="itemk.opction.value"></el-cascader>
+                  </template>
+                  <template v-else-if="itemk.itemType == 'number'">
+                    <el-input-number class="u-item-width-normal"
+                                     size="small"
+                                     :min="1"
+                                     :max="10"
+                                     v-model.trim="form[itemj.id][itemk.formName]"></el-input-number>
+                  </template>
+
+                </el-form-item>
+              </template>
             </section>
           </template>
         </el-tab-pane>
@@ -284,6 +400,7 @@
 <script>
 import { isCard, isPassport, isMobile, isPhone } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
+import { idTypeList } from "@/js/columns/constants";
 
 export default {
   name: 'resiForm',
@@ -330,6 +447,19 @@ export default {
           // rules:[{required:true,message:'联系电话不能为空',trigger:'change' | blur },],
           opction: [],
         },
+        {
+          label: '国籍',
+          itemType: "select",
+          formName: 'nationality',
+          opction: [],
+        },
+        {
+          label: '证件类型',
+          itemType: "select",
+          formName: 'idType',
+          rules: [{ required: true, message: '证件类型不能为空' }],
+          opction: idTypeList,
+        },
         {
           label: "证件号",
           itemType: "input",
@@ -338,7 +468,7 @@ export default {
           {
             validator: (rule, value, callback) => {
               if (!/^[1-9]\d{5}(?:18|19|20)\d{2}(?:0[1-9]|10|11|12)(?:0[1-9]|[1-2]\d|30|31)\d{3}[\dXx]$/.test(value)) {
-                //  console.log(/^[a-zA-Z]\w{5,17}$/.test(value));
+
                 return callback(new Error('证件格式不符合'));
               }
               callback()
@@ -368,6 +498,7 @@ export default {
           itemType: "datepicker",
           formName: 'birthday'
         },
+
         {
           label: '备注',
           itemType: "textarea",
@@ -386,7 +517,7 @@ export default {
             { label: '统战人员', value: '0', formName: "unitedFrontFlag" },
             { label: '信访人员', value: '0', formName: "petitionOfficerFlag" },
             { label: '志愿者', value: '0', formName: "volunteerFlag" },
-            { label: '特扶人员', value: '0', formName: "bereavedPersonFlag" },
+            { label: '特扶人员', value: '0', formName: "specialSupportFlag" },
             { label: '租户', value: '0', formName: "tenantFlag" },
             { label: '流动人口', value: '0', formName: "floatingFlag" },
             { label: '特殊人群', value: '0', formName: "specialCrowdFlag" },
@@ -399,6 +530,7 @@ export default {
             { label: '大病', value: '0', formName: "seriousIllnessFlag" },
             { label: '慢病', value: '0', formName: "chronicDiseaseFlag" },
             { label: '公益岗人员', value: '0', formName: "publicWelfareFlag" }
+
           ]
         }
       ],
@@ -427,9 +559,7 @@ export default {
             label: "兴趣特长",
             itemType: "checkbox",
             formName: "hobbyCode",
-            opction: [
-
-            ]
+            opction: []
           },
           {
             label: '兴趣',
@@ -633,6 +763,12 @@ export default {
               formName: "monthIncome",
               opction: []
             },
+            {
+              label: "银行账号",
+              itemType: "input1",
+              formName: "bankAccount",
+              opction: []
+            },
           ]
         },
         {
@@ -763,9 +899,7 @@ export default {
               label: "流动党员活动证号",
               itemType: "input1",
               formName: "flowActNum",
-              opction: [
-
-              ]
+              opction: []
             },
             {
               label: "职务",
@@ -774,6 +908,12 @@ export default {
               opction: [
               ]
             },
+            {
+              label: "工作职责",
+              itemType: "input1",
+              formName: "duty",
+              opction: []
+            },
             {
               label: "是否退休",
               itemType: "radio1",
@@ -790,6 +930,14 @@ export default {
                 { label: '是', value: 1 },
                 { label: '否', value: 0 },
               ]
+            }, {
+              label: "免学习",
+              itemType: "radio1",
+              formName: "studyNotNeed",
+              opction: [
+                { label: '是', value: 1 },
+                { label: '否', value: 0 },
+              ]
             }, {
               label: "入党时所在党支部	",
               itemType: "input1",
@@ -816,7 +964,6 @@ export default {
         }, {
           id: 'ensureHouseDto',
           children: [
-
             {
               label: "住房性质",
               itemType: "select1",
@@ -834,16 +981,13 @@ export default {
               label: "发证日期",
               itemType: "datepicker1",
               formName: "certificateDate",
-              opction: [
-              ]
+              opction: []
             },
             {
               label: "补贴编号",
               itemType: "input1",
               formName: "subsidyNum",
-              opction: [
-
-              ]
+              opction: []
             },
             {
               label: "补贴金额	",
@@ -851,7 +995,25 @@ export default {
               formName: "subsidyAmount",
               opction: [
               ]
-            }
+            },
+            {
+              label: "房东姓名",
+              itemType: "input1",
+              formName: "landlordName",
+              opction: []
+            },
+            {
+              label: "房东证件号",
+              itemType: "input1",
+              formName: "landlordIdNum",
+              opction: []
+            },
+            {
+              label: "通知书领取日期",
+              itemType: "datepicker1",
+              formName: "notificationRcvDate",
+              opction: []
+            },
           ]
         }, {
           id: 'unemployedDto',
@@ -1075,6 +1237,100 @@ export default {
           },
           ]
         },
+        {
+          id: 'tenantDto',
+          children: [
+            {
+              label: "合同开始时间",
+              itemType: "datepicker1",
+              formName: "contractStartDate",
+              opction: []
+            },
+            {
+              label: "合同结束时间",
+              itemType: "datepicker1",
+              formName: "contractEndDate",
+              opction: []
+            },
+          ]
+        },
+        {
+          id: 'specialSupportDto',
+          children: [
+            {//0
+              label: "银行卡号",
+              itemType: "input1",
+              formName: "bankAccount",
+              opction: [
+              ]
+            },
+            {//1
+              label: "特扶类别",
+              itemType: "select2",
+              formName: "specialSupportType",
+              opction: [
+                {
+                  value: '1',
+                  label: '失独'
+                },
+                {
+                  value: '2',
+                  label: '伤残'
+                }
+              ]
+            },
+            {//2
+              label: "子女姓名",
+              itemType: "input1",
+              formName: "childName",
+              opction: [
+              ]
+            },
+            {//3
+              label: "子女性别",
+              itemType: "input1",
+              formName: "childGender",
+              opction: [
+                {
+                  value: '1',
+                  label: '男'
+                },
+                {
+                  value: '2',
+                  label: '女'
+                }
+              ]
+            },
+            {//4
+              label: "子女死亡日期",
+              itemType: "datepicker1",
+              formName: "certificateDate",
+              opction: [],
+              showFlag: '0'//不显示
+            },
+            {//5
+              label: "伤残类别",
+              itemType: "select1",
+              formName: "childDisabilityCategoryCode",
+              opction: [
+              ],
+              showFlag: '0'//不显示
+            },
+            {//6
+              label: "伤残等级",
+              itemType: "select1",
+              formName: "childDisabilityLevel",
+              opction: [
+              ],
+              showFlag: '0'//不显示
+            },
+            {
+              label: '备注',
+              itemType: "textarea",
+              formName: 'remark'
+            },
+          ]
+        },
       ],
       newForm: {},
       form: {
@@ -1091,9 +1347,11 @@ export default {
         homeId: '', //房屋id
         name: '', //姓名
         nation: '', //民族
+        nationality: '', //国籍
         remark: '', //备注
         localResidenceFlag: '1', //本地户籍
         birthday: '', //生日
+        idType: '', //证件类别
         idNum: '', //证件号
         gender: '', // 性别
         mobile: '', //联系电话
@@ -1106,7 +1364,7 @@ export default {
         unitedFrontFlag: '0',//统战人员
         petitionOfficerFlag: '0',//信访人员
         volunteerFlag: '0', //志愿者
-        bereavedPersonFlag: '0', //失独
+        specialSupportFlag: '0', //特扶人员
         tenantFlag: '0', //租户
         floatingFlag: '0',//流动人口
         specialCrowdFlag: '0',//特殊人群
@@ -1119,6 +1377,7 @@ export default {
         disabilityFlag: '0',//是否残疾
         seriousIllnessFlag: '0', //大病
         chronicDiseaseFlag: '0', //慢病
+
         eduInfoDto: { // 教育信息
           cultureLevel: '',
           eduRemark: ''
@@ -1161,6 +1420,7 @@ export default {
         economyDto: {//经济
           retirementAmount: '',//退休金额
           monthIncome: '',//月收入
+          bankAccount: '',//银行账号
         },
         resideInfoDto: {//居住信息
           nativePlace: '',//籍贯
@@ -1186,8 +1446,10 @@ export default {
           flowFlag: 1,//是否流动党员：1是，0否
           flowActNum: '',//流动党员活动证号
           partyJob: '',//职务，字典code
+          duty: '',//职责，字典code
           retiredFlag: 1,//是否退休：1是，0否
           centerFlag: 1,//是否党员中心户：1是，0否
+          studyNotNeed: 1,//免学习：1是，0否
           joinBranchName: '',//入党时所在党支部
           joinCommunityTime: '',//组织关系转入社区时间yyyy-MM-dd
           // longHolidayFlag: 1,//是否请长假：1是，0否
@@ -1198,6 +1460,9 @@ export default {
           certificateDate: '',//发证日期yyyy-MM-dd
           subsidyNum: '',//补贴编号
           subsidyAmount: '',//补贴金额
+          landlordName: '',//房东姓名
+          landlordIdNum: '',//房东证件号
+          notificationRcvDate: '',//通知书领取日期
         },
         unemployedDto: {//失业信息
           originWorkUnit: '',//原工作单位
@@ -1249,7 +1514,23 @@ export default {
           mother: '',
           count: 0,
           reportDate: ''
-        }
+        },
+        //租户
+        tenantDto: {
+          contractStartDate: '',//合同开始时间
+          contractEndDate: '',//合同结束时间
+        },
+        //特扶人员
+        specialSupportDto: {
+          bankAccount: '',//银行卡号
+          specialSupportType: '',//特扶类别
+          childName: '',//子女姓名
+          childGender: '',//子女性别
+          childDeathDate: '',//子女死亡日期
+          childDisabilityCategoyCode: '',//伤残类别
+          childDisabilityLevel: '',//伤残等级
+          remark: ''//备注
+        },
       },
       rulesForm: {
         villageId: [{ required: true, message: `请选择小区`, trigger: 'blur' }],
@@ -1296,8 +1577,10 @@ export default {
     this.setNewForm()
   },
   methods: {
+
     submit_from () {
       this.setJSON()
+
       var flag = false
       this.$refs.formId.validate(v => {
         this.validateFlag = v
@@ -1307,6 +1590,7 @@ export default {
       if (flag) {
         return JSON.stringify(this.newForm)
       }
+
       return false
     },
     async old_from (data) {
@@ -1317,10 +1601,13 @@ export default {
       await this.getHouseList()
       await this.residentEduInfo(this.form.resiId)
     },
-    async getAllDict() {
+    async getAllDict () {
       try {
         await Promise.all([
           this.getDictList(),
+          this.getGuojiDictList(),
+          this.getSclbDictList(),
+          this.getScdjDictList(),
           this.getRelationship(),
           this.getEducation(),
           this.getdisabilityDict(),
@@ -1351,7 +1638,7 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         } else {
-          console.log('获取查询详情成功', res.data)
+
           this.optionsG = res.data
         }
       }).catch(() => {
@@ -1364,64 +1651,80 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         } else {
-          console.log('获取查询详情成功', res.data)
+
           this.optionsV = res.data
         }
       }).catch(() => {
         return this.$message.error('网络错误')
       })
     },
-    handelminzu (val) {
-      this.newForm.nation = val
+    // handelminzu (val) {
+    //   this.newForm.nation = val
+    // },
+
+
+    //获取国籍字典
+    async getGuojiDictList () {
+      await this.getDictDataBasic('nationality', 'nationality')
+    },
+
+    //获取伤残类别字典
+    async getSclbDictList () {
+      await this.getDictData('disability_category_code', 'childDisabilityCategoryCode')
+    },
+    //获取伤残等级字典
+    async getScdjDictList () {
+      await this.getDictData('disability_level', 'childDisabilityLevel')
     },
     async getdisabilityDict () {
-      await this.getDictData('disability_category_code','disabilityCategoryCode')
+      await this.getDictData('disability_category_code', 'disabilityCategoryCode')
     },
     async getVolunteerDict () {
-      await this.getDictData('VOLUNTEER_CATEGORY','volunteerCategory')
+      await this.getDictData('VOLUNTEER_CATEGORY', 'volunteerCategory')
     },
     async gethobbyDict () {
-      await this.getDictData('SPECIAL_SKILL','hobbyCode')
+      await this.getDictData('SPECIAL_SKILL', 'hobbyCode')
     },
     async getdisabilityDictClass () {
-      await this.getDictData('disability_level','disabilityLevel')
+      await this.getDictData('disability_level', 'disabilityLevel')
     },
     async getillnessDict () {
-      await this.getDictData('illness_code','illnessCode')
+      await this.getDictData('illness_code', 'illnessCode')
     },
     async getchronicDict () {
-      await this.getDictData('chronic_disease_code','chronicDiseaseCode')
+      await this.getDictData('chronic_disease_code', 'chronicDiseaseCode')
     },
     async getWelfareDict () {
-      await this.getDictData('welfare_post','jobPost')
+      await this.getDictData('welfare_post', 'jobPost')
     },
     async getUnemployment () {
-      await this.getDictData('unemployment_cause','unemploymentReason')
+      await this.getDictData('unemployment_cause', 'unemploymentReason')
     },
     async getCareer () {
-      await this.getDictData('career_goals','employmentWish')
+      await this.getDictData('career_goals', 'employmentWish')
     },
 
     async getHouseholdDict () {
-      await this.getDictData('household_situation','householdSituation')
+      await this.getDictData('household_situation', 'householdSituation')
     },
     async getMarriageDict () {
-      await this.getDictData('marriage','marriage')
+      await this.getDictData('marriage', 'marriage')
     },
     async getResideDict () {
-      await this.getDictData('reside_situation','resideSituation')
+      await this.getDictData('reside_situation', 'resideSituation')
     },
     async getPartyDict () {
-      await this.getDictData('party_job','partyJob')
+      await this.getDictData('party_job', 'partyJob')
     },
     async getSpouseDict () {
-      await this.getDictData('spouse_situation','spouseSituation')
+      await this.getDictData('spouse_situation', 'spouseSituation')
     },
     async getResidentDict () {
-      await this.getDictData('special_resident_category','specialCategoryCode')
+      await this.getDictData('special_resident_category', 'specialCategoryCode')
     },
-    // 运营端控制字典统一调用
-    async getDictData(dictType, formName) {
+    // 底部form  运营端控制字典统一调用
+    async getDictData (dictType, formName) {
+
       try {
         const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': dictType });
         this.footerInputList.forEach(c => {
@@ -1431,17 +1734,32 @@ export default {
             }
           }
         });
+
       } catch (error) {
         console.log(error, `获取 ${dictType} 字典`);
       }
     },
-   
+    // 基础信息 运营端控制字典统一调用
+    async getDictDataBasic (dictType, formName) {
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': dictType });
+        this.basicInformation.forEach(c => {
+
+          if (c.formName == formName) {
+            c.opction = data.data;
+          }
+
+        });
+      } catch (error) {
+        console.log(error, `获取 ${dictType} 字典`);
+      }
+    },
+
     getBuildList () {
       this.$http.post('/actual/base/communityBuilding/buildingoption', { quartersId: this.form.villageId }).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         } else {
-          console.log('获取查询详情成功', res.data)
           this.optionsB = res.data
         }
       }).catch(() => {
@@ -1453,7 +1771,6 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         } else {
-          console.log('获取查询详情成功', res.data)
           this.optionsD = res.data
         }
       }).catch(() => {
@@ -1465,7 +1782,6 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
         } else {
-          console.log('获取查询详情成功', res.data)
           this.optionsH = res.data
         }
       }).catch(() => {
@@ -1473,9 +1789,9 @@ export default {
       })
     },
     handleChangeCheckbox (item, val) {
-      this.handleTabShow(item,val )
+      this.handleTabShow(item, val)
     },
-    handleTabShow(item, val) {
+    handleTabShow (item, val) {
       const mapping = {
         partyFlag: { label: '党员', id: '0', groupId: 'parymemberInfoDto' },
         ensureHouseFlag: { label: '保障房信息', id: '1', groupId: 'ensureHouseDto' },
@@ -1485,7 +1801,9 @@ export default {
         volunteerFlag: { label: '志愿者信息', id: '5', groupId: 'volunteerDto' },
         oldPeopleFlag: { label: '老年人', id: '6', groupId: 'oldPeopleDto' },
         specialCrowdFlag: { label: '特殊人群', id: '7', groupId: 'specialDto' },
-        publicWelfareFlag: { label: '公益岗人员', id: '8', groupId: 'postDto' }
+        publicWelfareFlag: { label: '公益岗人员', id: '8', groupId: 'postDto' },
+        tenantFlag: { label: '租户', id: '9', groupId: 'tenantDto' },
+        specialSupportFlag: { label: '特扶人员', id: '10', groupId: 'specialSupportDto' },
       };
 
       if (val == 1 && mapping[item.formName]) {
@@ -1497,20 +1815,19 @@ export default {
     },
 
     checkNumberInput (itemj, itemk) {
-      if(this.form[itemj][itemk]){
+      if (this.form[itemj][itemk]) {
         if (isNaN(this.form[itemj][itemk])) {
-        this.$message.error("请输入数字");
-        this.form[itemj][itemk] = "";
-      } else {
-        this.form[itemj][itemk] = parseFloat(
-          this.form[itemj][itemk]
-        );
-      }
+          this.$message.error("请输入数字");
+          this.form[itemj][itemk] = "";
+        } else {
+          this.form[itemj][itemk] = parseFloat(
+            this.form[itemj][itemk]
+          );
+        }
       }
-    
+
     },
     handleChangeGrid (val) {
-      console.log('val', val)
       for (let n of this.optionsG) {
         if (n.value == val) {
           this.form.gridName = n.label
@@ -1534,7 +1851,7 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            console.log('获取查询详情成功', res.data)
+
 
             if (res.data.isVolunteer == '1') this.form.volunteerFlag = true
             else this.form.volunteerFlag = false
@@ -1552,7 +1869,7 @@ export default {
     },
     // 证件号失去焦点事件
     handleValidBlur (item) {
-      console.log('n---', item)
+
       if (item.formName !== 'idNum') return
       if (!isCard(this.form.idNum) && !isPassport(this.form.idNum)) return
       const { user } = this.$store.state
@@ -1571,12 +1888,12 @@ export default {
         // this.form.IS_BDHJ = huji == _id ? '1' : ''
         // 身份证前端验证角色方法 因原型没有注释
         // this.validateIdcard(this.form.idNum)
-        console.log('age-----', age, _id)
+
       }
 
     },
     handleChangeV (val) {
-      console.log('val', val)
+
       this.form.buildId = ''
       this.form.unitId = ''
       this.form.homeId = ''
@@ -1585,7 +1902,7 @@ export default {
       this.getHouseList()
     },
     handleChangeB (val) {
-      console.log('val', val)
+
       this.form.unitId = ''
       this.form.homeId = ''
       this.getUniList()
@@ -1596,83 +1913,89 @@ export default {
       this.getHouseList()
     },
     async handleClickTab (tab, event) {
-      console.log(tab);
-      console.log(event);
-      console.log(this.form.resiId );
+
       const tabMapping = {
-      '教育': {
-        dtoKey: 'eduInfoDto',
-        fn: this.residentEduInfo
-      },
-      '兴趣爱好': {
-        dtoKey: 'hobbyInfoDto',
-        fn: this.residentHobbyInfo
-      },
-      '宗教信仰': {
-        dtoKey: 'religionDto',
-        fn: this.residentReligion
-      },
-      '健康': {
-        dtoKey: 'healthDto',
-        fn: this.getHealthInfoDetailById
-      },
-      '工作': {
-        dtoKey: 'workInfoDto',
-        fn: this.residentWorkInfo
-      },
-      '经济情况': {
-        dtoKey: 'economyDto',
-        fn: this.getEconomyDetailById
-      },
-      '居住': {
-        dtoKey: 'resideInfoDto',
-        fn: this.getResideInfoDetailById
-      },
-      '家庭': {
-        dtoKey: 'familyInfoDto',
-        fn: this.getFamilyInfoDetailById
-      },
-      '出生信息': {
-        dtoKey: 'birthRecordDTO',
-        fn: this.residentBirthRecord
-      },
-      '党员': {
-        dtoKey: 'parymemberInfoDto',
-        fn: this.residentPartyMemberInfo
-      },
-      '保障房信息': {
-        dtoKey: 'ensureHouseDto',
-        fn: this.residentEnsureHouse
-      },
-      '失业': {
-        dtoKey: 'unemployedDto',
-        fn: this.residentUnemployed
-      },
-      '退役军人': {
-        dtoKey: 'veteranDto',
-        fn: this.getVeteranDetailById
-      },
-      '统战': {
-        dtoKey: 'unitedFrontDto',
-        fn: this.residentUnitedFront
-      },
-      '志愿者信息': {
-        dtoKey: 'volunteerDto',
-        fn: this.getVolunteerDetailById
-      },
-      '特殊人群': {
-        dtoKey: 'specialDto',
-        fn: this.residentSpecial
-      },
-      '老年人': {
-        dtoKey: 'oldPeopleDto',
-        fn: this.getOldPeopleDetailById
-      },
-      '公益岗人员': {
-        dtoKey: 'postDto',
-        fn: this.getWelfareDetailById
-      },
-    };  
+        '教育': {
+          dtoKey: 'eduInfoDto',
+          fn: this.residentEduInfo
+        },
+        '兴趣爱好': {
+          dtoKey: 'hobbyInfoDto',
+          fn: this.residentHobbyInfo
+        },
+        '宗教信仰': {
+          dtoKey: 'religionDto',
+          fn: this.residentReligion
+        },
+        '健康': {
+          dtoKey: 'healthDto',
+          fn: this.getHealthInfoDetailById
+        },
+        '工作': {
+          dtoKey: 'workInfoDto',
+          fn: this.residentWorkInfo
+        },
+        '经济情况': {
+          dtoKey: 'economyDto',
+          fn: this.getEconomyDetailById
+        },
+        '居住': {
+          dtoKey: 'resideInfoDto',
+          fn: this.getResideInfoDetailById
+        },
+        '家庭': {
+          dtoKey: 'familyInfoDto',
+          fn: this.getFamilyInfoDetailById
+        },
+        '出生信息': {
+          dtoKey: 'birthRecordDTO',
+          fn: this.residentBirthRecord
+        },
+        '党员': {
+          dtoKey: 'parymemberInfoDto',
+          fn: this.residentPartyMemberInfo
+        },
+        '保障房信息': {
+          dtoKey: 'ensureHouseDto',
+          fn: this.residentEnsureHouse
+        },
+        '失业': {
+          dtoKey: 'unemployedDto',
+          fn: this.residentUnemployed
+        },
+        '退役军人': {
+          dtoKey: 'veteranDto',
+          fn: this.getVeteranDetailById
+        },
+        '统战': {
+          dtoKey: 'unitedFrontDto',
+          fn: this.residentUnitedFront
+        },
+        '志愿者信息': {
+          dtoKey: 'volunteerDto',
+          fn: this.getVolunteerDetailById
+        },
+        '特殊人群': {
+          dtoKey: 'specialDto',
+          fn: this.residentSpecial
+        },
+        '老年人': {
+          dtoKey: 'oldPeopleDto',
+          fn: this.getOldPeopleDetailById
+        },
+        '公益岗人员': {
+          dtoKey: 'postDto',
+          fn: this.getWelfareDetailById
+        },
+        '租户': {
+          dtoKey: 'tenantDto',
+          fn: this.getTenantInfo
+        },
+        '特扶人员': {
+          dtoKey: 'specialSupportDto',
+          fn: this.getSpecialSupportInfo
+        },
+      };
       let currentTab = tabMapping[tab._props.label];
 
       if (currentTab) {
@@ -1741,13 +2064,14 @@ export default {
         this.basicInformation.forEach(c => {
           if (c.formName == 'nation') {
             c.opction = data.data
-            console.log(c.opction);
+
           }
         })
       } catch (error) {
-        console.log(error, '获取民族字典');
+
       }
     },
+
     // 获取人物关系字典
     async getRelationship () {
       try {
@@ -1760,7 +2084,7 @@ export default {
           }
         })
       } catch (error) {
-        console.log(error, '获取民族字典');
+
       }
     },
 
@@ -1787,12 +2111,12 @@ export default {
           for (let i of c.children) {
             if (i.formName == 'cultureLevel') {
               i.opction = data.data
-              console.log(i.opction);
+
             }
           }
         })
       } catch (error) {
-        console.log(error, '获取民族字典');
+
       }
     },
     async getHousing () {
@@ -1807,7 +2131,6 @@ export default {
           }
         })
       } catch (error) {
-        console.log(error, '获取住房性质字典');
       }
     },
     getFormData (data) {
@@ -1822,11 +2145,13 @@ export default {
       this.form.villageId = data.houseInfo.villageId
       this.form.birthday = data.birthday
       this.form.gender = data.gender
+      this.form.idType = data.idType
       this.form.idNum = data.idNum
       this.form.localResidenceFlag = (data.localResidenceFlag !== null && data.localResidenceFlag !== undefined) ? data.localResidenceFlag.toString() : '';
       this.form.mobile = data.mobile ? data.mobile : ''
       this.form.name = data.name
       this.form.nation = data.nation ? data.nation : ''
+      this.form.nationality = data.nationality ? data.nationality : ''
       this.form.remark = data.remark ? data.remark : ''
       if (data.categoryInfo) {
         this.form.categoryId = data.categoryInfo.id,// 临时写死
@@ -1841,7 +2166,7 @@ export default {
         this.form.volunteerFlag = data.categoryInfo.volunteerFlag.toString()
         this.form.oldPeopleFlag = data.categoryInfo.oldPeopleFlag.toString()
         this.form.emptyNesterFlag = data.categoryInfo.emptyNesterFlag.toString()
-        this.form.bereavedPersonFlag = data.categoryInfo.bereavedPersonFlag.toString()
+        this.form.specialSupportFlag = data.categoryInfo.specialSupportFlag.toString()
         this.form.disabledFlag = data.categoryInfo.disabledFlag.toString()
         this.form.dementedFlag = data.categoryInfo.dementedFlag.toString()
         this.form.disabilityFlag = data.categoryInfo.disabilityFlag.toString()
@@ -1852,6 +2177,8 @@ export default {
         this.form.floatingFlag = data.categoryInfo.floatingFlag.toString()
         this.form.liveAloneFlag = data.categoryInfo.liveAloneFlag.toString()
         this.form.publicWelfareFlag = data.categoryInfo.publicWelfareFlag.toString()
+        this.form.publicWelfareFlag = data.categoryInfo.publicWelfareFlag.toString()
+
         if (this.form.partyFlag == '1') this.tabsList.push({ label: '党员', id: '0', groupId: 'parymemberInfoDto' })
         if (this.form.ensureHouseFlag == '1') this.tabsList.push({ label: '保障房信息', id: '1', groupId: 'ensureHouseDto' })
         if (this.form.unemployedFlag == '1') this.tabsList.push({ label: '失业', id: '2', groupId: 'unemployedDto' })
@@ -1861,11 +2188,14 @@ export default {
         if (this.form.oldPeopleFlag == '1') this.tabsList.push({ label: '老年人', id: '6', groupId: 'oldPeopleDto' })
         if (this.form.specialCrowdFlag == '1') this.tabsList.push({ label: '特殊人群', id: '7', groupId: 'specialDto' })
         if (this.form.publicWelfareFlag == '1') this.tabsList.push({ label: '公益岗人员', id: '8', groupId: 'postDto' })
+        if (this.form.tenantFlag == '1') this.tabsList.push({ label: '租户', id: '9', groupId: 'tenantDto' })
+        if (this.form.specialSupportFlag == '1') this.tabsList.push({ label: '特扶人员', id: '10', groupId: 'specialSupportDto' })
+
       }
       let { categoryId, resiId, buildId, gridId, gridName, homeId, homeName, houseMergeId, unitId,
-        villageId, birthday, gender, idNum, localResidenceFlag, mobile, name, nation, remark,
+        villageId, birthday, gender, idType, idNum, localResidenceFlag, mobile, name, nation, nationality, remark,
         partyFlag, subsistenceAllowanceFlag, ensureHouseFlag, unemployedFlag, fertileWomanFlag, veteranFlag, unitedFrontFlag,
-        petitionOfficerFlag, volunteerFlag, oldPeopleFlag, emptyNesterFlag, bereavedPersonFlag, disabledFlag,
+        petitionOfficerFlag, volunteerFlag, oldPeopleFlag, emptyNesterFlag, specialSupportFlag, disabledFlag,
         dementedFlag, disabilityFlag, seriousIllnessFlag, chronicDiseaseFlag, specialCrowdFlag, tenantFlag, floatingFlag, liveAloneFlag, publicWelfareFlag } = this.form
       this.newForm = {
         categoryId,
@@ -1880,11 +2210,13 @@ export default {
         villageId,
         birthday,
         gender,
+        idType,
         idNum,
         localResidenceFlag,
         mobile,
         name,
         nation,
+        nationality,
         remark,
         partyFlag,
         subsistenceAllowanceFlag,
@@ -1897,7 +2229,7 @@ export default {
         volunteerFlag,
         oldPeopleFlag,
         emptyNesterFlag,
-        bereavedPersonFlag,
+        specialSupportFlag,
         disabledFlag,
         dementedFlag,
         disabilityFlag,
@@ -1907,7 +2239,8 @@ export default {
         tenantFlag,
         floatingFlag,
         liveAloneFlag,
-        publicWelfareFlag
+        publicWelfareFlag,
+
       }
     },
     // 教育信息详情
@@ -2020,6 +2353,7 @@ export default {
           this.form.economyDto = res.data ? res.data : {//经济
             retirementAmount: '',//退休金额	
             monthIncome: '',//月收入
+            bankAccount: '',//银行账号
           }
           this.newForm.economyDto = this.form.economyDto
         }
@@ -2095,11 +2429,14 @@ export default {
             partyOrgId: '',//所属党组织
             flowFlag: null,//是否流动党员：1是，0否	
             flowActNum: '',//流动党员活动证号	
+            duty: '',//职责
             partyJob: '',//职务，字典code
             retiredFlag: null,//是否退休：1是，0否
             centerFlag: null,//是否党员中心户：1是，0否
+            studyNotNeed: null,//免学习：1是，0否
             joinBranchName: '',//入党时所在党支部
             joinCommunityTime: '',//组织关系转入社区时间yyyy-MM-dd
+            joinCommunityTime: '',//组织关系转入社区时间yyyy-MM-dd
             // longHolidayFlag: null,//是否请长假：1是，0否
           }
           this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
@@ -2119,6 +2456,9 @@ export default {
             certificateDate: '',//发证日期yyyy-MM-dd
             subsidyNum: '',//补贴编号	
             subsidyAmount: null,//补贴金额	
+            landlordName: '',//房东姓名	
+            landlordIdNum: '',//房东证件号	
+            notificationRcvDate: '',//通知书领取日期	
           }
           this.newForm.ensureHouseDto = this.form.ensureHouseDto
         }
@@ -2252,6 +2592,45 @@ export default {
         }
       })
     },
+
+    // 租户详情
+    getTenantInfo (id) {
+      if (this.newForm.tenantDto) return//???
+      this.$http.get(`/actual/base/residentTenant/detailByResiId/${id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.tenantDto = res.data ? res.data : {//租户信息
+            contractStartDate: '',//合同开始时间
+            contractEndDate: '',//合同结束时间
+          }
+          this.newForm.tenantDto = this.form.tenantDto
+        }
+      })
+    },
+
+    // 特扶人员信息详情
+    getSpecialSupportInfo (id) {
+      if (this.newForm.specialSupportDto) return//???
+      this.$http.get(`/actual/base/resiCategorized/specialSupport/detail/${id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.specialSupportDto = res.data ? res.data : {//特扶人员信息
+            bankAccount: '',//银行卡号
+            specialSupportType: '',//特扶类别
+            childName: '',//子女姓名
+            childGender: '',//子女性别
+            childDeathDate: '',//子女死亡日期
+            childDisabilityCategoyCode: '',//伤残类别
+            childDisabilityLevel: '',//伤残等级
+            remark: ''//备注
+          }
+          this.newForm.specialSupportDto = this.form.specialSupportDto
+        }
+      })
+    },
+
     setNewForm () {
       this.newForm = {
         agencyName: this.$store.state.user.agencyName,
@@ -2267,9 +2646,11 @@ export default {
         homeId: '', //房屋id
         name: '', //姓名
         nation: '', //民族
+        nationality: '',//国籍
         remark: '', //备注
         localResidenceFlag: '', //本地户籍
         birthday: '', //生日
+        idType: '', //证件类型
         idNum: '', //证件号
         gender: '', // 性别
         mobile: '', //联系电话
@@ -2282,7 +2663,7 @@ export default {
         unitedFrontFlag: '0',//统战人员
         petitionOfficerFlag: '0',//信访人员
         volunteerFlag: '0', //志愿者
-        bereavedPersonFlag: '0', //失独
+        specialSupportFlag: '0',//特扶人员
         tenantFlag: '0', //租户
         floatingFlag: '0',//流动人口
         specialCrowdFlag: '0',//特殊人群
@@ -2295,6 +2676,7 @@ export default {
         seriousIllnessFlag: '0', //大病
         chronicDiseaseFlag: '0', //慢病
         publicWelfareFlag: '0',//公益岗
+
       }
 
       this.newForm.eduInfoDto = this.form.eduInfoDto
@@ -2318,6 +2700,8 @@ export default {
         this.newForm.localResidenceFlag = this.form.localResidenceFlag,
         this.newForm.birthday = this.form.birthday,
         this.newForm.idNum = this.form.idNum,
+        this.newForm.idType = this.form.idType,
+        this.newForm.nationality = this.form.nationality,
         this.newForm.gender = this.form.gender,
         this.newForm.mobile = this.form.mobile,
         this.newForm.partyFlag = this.form.partyFlag,
@@ -2329,7 +2713,7 @@ export default {
         this.newForm.unitedFrontFlag = this.form.unitedFrontFlag,
         this.newForm.petitionOfficerFlag = this.form.petitionOfficerFlag,
         this.newForm.volunteerFlag = this.form.volunteerFlag,
-        this.newForm.bereavedPersonFlag = this.form.bereavedPersonFlag,
+        this.newForm.specialSupportFlag = this.form.specialSupportFlag,
         this.newForm.tenantFlag = this.form.tenantFlag,
         this.newForm.floatingFlag = this.form.floatingFlag,
         this.newForm.specialCrowdFlag = this.form.specialCrowdFlag,
@@ -2342,6 +2726,7 @@ export default {
         this.newForm.seriousIllnessFlag = this.form.seriousIllnessFlag,
         this.newForm.chronicDiseaseFlag = this.form.chronicDiseaseFlag,
         this.newForm.publicWelfareFlag = this.form.publicWelfareFlag
+
       if (this.newForm.eduInfoDto) {
         this.newForm.eduInfoDto = this.form.eduInfoDto
       }
@@ -2391,6 +2776,7 @@ export default {
       }
 
       if (this.newForm.volunteerDto) {
+
         this.newForm.volunteerDto = this.form.volunteerDto
       }
 
@@ -2403,6 +2789,15 @@ export default {
       if (this.newForm.postDto) {
         this.newForm.postDto = this.form.postDto
       }
+      if (this.newForm.tenantDto) {
+
+        this.newForm.tenantDto = this.form.tenantDto
+      }
+
+      if (this.newForm.specialSupportDto) {
+
+        this.newForm.specialSupportDto = this.form.specialSupportDto
+      }
     }
   }
 }
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index fbd05f8ac..173e60b13 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -833,7 +833,7 @@ export default {
         agencyIdTemp = this.form.agencyId[this.form.agencyId.length - 1]
       }
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', {
+        .post('/actual/base/communityQuarters/listQuartersOptions', {
           gridId: this.form.agencyId[1],
           agencyId: this.form.agencyId[0],
           // agencyId: user.agencyId
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 9471c3815..2bb43445a 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -145,7 +145,7 @@
               <template v-if="scope.row.categoryInfo">
                 <div class="resiCategoryInfoBox">
                   {{
-									scope.row.categoryInfo.bereavedPersonFlag ==
+									scope.row.categoryInfo.specialSupportFlag ==
 									1
 										? "特扶人员 "
 										: ""
@@ -332,7 +332,7 @@
 				formName === '社区居民基本信息录入表' ? '新增居民' : formName
 			"
                :visible.sync="dialogVisible"
-               width="986px"
+               width="1086px"
                top="5vh"
                append-to-body
                class="dialog-h"
@@ -518,9 +518,11 @@ export default {
         { columnName: "name", label: "姓名", width: 80 },
         { columnName: "birthday", label: "生日", width: 100 },
         { columnName: "gender", label: "性别", width: 50 },
+        { columnName: "nationalityName", label: "国籍", width: 50 },
         { columnName: "agencyName", label: "所属组织", width: 150 },
         { columnName: "gridName", label: "所属网格", width: 150 },
         { columnName: "homeName", label: "所属房屋", width: 150 },
+        { columnName: "idTypeName", label: "证件类型", width: 80 },
         { columnName: "idNum", label: "证件号", width: 170 },
         { columnName: "categoryInfo", label: "居民分类" },
         { columnName: "mobile", label: "联系电话", width: 110 },
@@ -583,6 +585,7 @@ export default {
         categoryKey: "resi_info",
       },
     });
+    this.handleSearchFrom()
   },
 
   methods: {
@@ -1063,7 +1066,7 @@ export default {
         return;
       }
       const _baseForm = JSON.parse(this.$refs.baseForm.submit_from());
-      console.log(_baseForm);
+
       _baseForm.partyFlag = parseInt(_baseForm.partyFlag); //党员
       _baseForm.subsistenceAllowanceFlag = parseInt(
         _baseForm.subsistenceAllowanceFlag
@@ -1080,9 +1083,9 @@ export default {
       //信访人员
       _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
       _baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag); //志愿者
-      _baseForm.bereavedPersonFlag = parseInt(
-        _baseForm.bereavedPersonFlag
-      ); //失独
+      _baseForm.specialSupportFlag = parseInt(
+        _baseForm.specialSupportFlag
+      ); //特扶
       _baseForm.tenantFlag = parseInt(_baseForm.tenantFlag); //租户
       _baseForm.floatingFlag = parseInt(_baseForm.floatingFlag); //流动人口
       _baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag); //特殊人群
@@ -1155,7 +1158,7 @@ export default {
             specialCategoryCode;
         }
       }
-      console.log(_baseForm);
+      console.log('居民信息提交表单：', _baseForm);
       this.submitAdd(_baseForm);
     },
     handleDel (row) {
@@ -1181,7 +1184,7 @@ export default {
       this.dialogVisible = false;
     },
     async submitAdd (arr) {
-      console.log(arr);
+
       this.btnLoading = true;
       await this.$http
         .post(
diff --git a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
index 9279f8171..74cfba2ae 100644
--- a/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
+++ b/src/views/modules/base/residentManagement/louzhang/louzhangList.vue
@@ -373,7 +373,7 @@ export default {
     getValiheList () {
 
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', {
+        .post('/actual/base/communityQuarters/listQuartersOptions', {
           gridId: '',
           agencyId: '',
           // agencyId: user.agencyId
@@ -531,6 +531,7 @@ export default {
       const { data, code, msg } = await requestPost(url, {
         pageSize,
         pageNo,
+        agencyId: this.agencyId,
         ...formData,
       });
       this.tableLoading = false;