From 4f00e7a07abbd654df1974db76edd96f2b7b1022 Mon Sep 17 00:00:00 2001
From: jiangyuying <jiang478938504@126.com>
Date: Fri, 11 Aug 2023 16:03:31 +0800
Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiForm.vue             | 3727 +++++++++--------
 .../modules/base/community/buildTable.vue     |    3 +-
 .../modules/base/community/community.vue      |    2 +-
 .../modules/base/community/roomTable.vue      |    5 +
 src/views/modules/base/resi.vue               | 3510 ++++++++--------
 5 files changed, 3592 insertions(+), 3655 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 779e978f2..ffa5967e6 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -1,160 +1,254 @@
 <template>
-  <div
-       class="g-main ">
-    <el-form
-             class="resi-form m-search"
+  <div class="g-main ">
+    <el-form class="resi-form m-search"
              :model="form"
-             ref="formId"
-             >
-             <el-form-item prop="gridId" :rules="rulesForm.gridId"
-                            label="所属组织" label-width="100px" >
-                  <el-select v-model.trim="form.gridId"
-                             placeholder="请选择网格"
-                             size="small"
-                             clearable
-                             class="u-item-width-normal"
-                             @change="handleChangeGrid">
-                    <el-option v-for="item in optionsG"
-                               :key="item.value"
-                               :label="item.label"
-                               :value="item.value">
-                    </el-option>
-                  </el-select>
+             ref="formId">
+      <el-form-item prop="gridId"
+                    :rules="rulesForm.gridId"
+                    label="所属组织"
+                    label-width="100px">
+        <el-select v-model.trim="form.gridId"
+                   placeholder="请选择网格"
+                   size="small"
+                   clearable
+                   class="u-item-width-normal"
+                   @change="handleChangeGrid">
+          <el-option v-for="item in optionsG"
+                     :key="item.value"
+                     :label="item.label"
+                     :value="item.value">
+          </el-option>
+        </el-select>
 
-              </el-form-item>
-              <el-form-item label="所属房屋"
-                            label-width="100px"
-                            :required="true"
-                            >
-                  <div class="f-flex">
-                      <el-form-item prop="villageId" 
-                                    class="u-item-width-communitycascader f-bto0" 
-                                    :rules="rulesForm.villageId" >
-                        <el-select v-model.trim="form.villageId"
-                                  placeholder="请选择小区"
-                                  size="small"
-                                  class="u-item-width-communitycascader f-bto0"
-                                  clearable
-                                  @change="handleChangeV">
-                          <el-option v-for="item in optionsV"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value">
-                          </el-option>
-                        </el-select>
-                      </el-form-item>
-                      <el-form-item prop="buildId" :rules="rulesForm.buildId">
-                        <el-select v-model.trim="form.buildId"
-                                  placeholder="楼号"
-                                  size="small"
-                                  clearable
-                                  class="u-item-width-buildcascader f-bto0"
-                                  @change="handleChangeB">
-                          <el-option v-for="item in optionsB"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value">
-                          </el-option>
-                        </el-select>
-                      </el-form-item>
-                      <el-form-item prop="unitId" :rules="rulesForm.unitId">
-                        <el-select v-model.trim="form.unitId"
-                                  placeholder="单元"
-                                  size="small"
-                                  clearable
-                                  class="u-item-width-buildcascader f-bto0"
-                                  @change="handleChangeD">
-                          <el-option v-for="item in optionsD"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value">
-                          </el-option>
-                        </el-select>
-                      </el-form-item>
-                      <el-form-item prop="homeId" :rules="rulesForm.homeId">
-                        <el-select v-model.trim="form.homeId"
-                                  placeholder="房号"
-                                  size="small"
-                                  clearable
-                                  class="u-item-width-buildcascader f-bto0"
-                                  @change="handleChangeH">
-                          <el-option v-for="item in optionsH"
-                                    :key="item.value"
-                                    :label="item.label"
-                                    :value="item.value">
-                          </el-option>
-                        </el-select>
-                      </el-form-item>
-                  </div>
-              </el-form-item>
-              <el-form-item v-for="(item,index)  in basicInformation" 
-                            :label-width="'100px'" 
-                            :label="item.label" 
-                            :key="index" 
-                            :class="item.itemType=='textarea'?'textareaDidth':''" 
-                            :rules="item.rules" 
-                            :prop="item.formName">
-                  <template v-if="item.itemType == 'radio'" >
-                      <section class="u-item-width-normal">
-                        <el-radio v-for="ns in item.opction"
-                                  :key="ns.value"
-                                  size="small"
-                                  v-model.trim="form[item.formName]"
-                                  :label="ns.value">
-                                  {{ ns.label }}</el-radio>
-                      </section>
-                  </template>
-                  <template v-if="item.itemType == 'input'" >
-                    <el-input
-                              clearable
+      </el-form-item>
+      <el-form-item label="所属房屋"
+                    label-width="100px"
+                    :required="true">
+        <div class="f-flex">
+          <el-form-item prop="villageId"
+                        class="u-item-width-communitycascader f-bto0"
+                        :rules="rulesForm.villageId">
+            <el-select v-model.trim="form.villageId"
+                       placeholder="请选择小区"
+                       size="small"
+                       class="u-item-width-communitycascader f-bto0"
+                       clearable
+                       @change="handleChangeV">
+              <el-option v-for="item in optionsV"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="buildId"
+                        :rules="rulesForm.buildId">
+            <el-select v-model.trim="form.buildId"
+                       placeholder="楼号"
+                       size="small"
+                       clearable
+                       class="u-item-width-buildcascader f-bto0"
+                       @change="handleChangeB">
+              <el-option v-for="item in optionsB"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="unitId"
+                        :rules="rulesForm.unitId">
+            <el-select v-model.trim="form.unitId"
+                       placeholder="单元"
+                       size="small"
+                       clearable
+                       class="u-item-width-buildcascader f-bto0"
+                       @change="handleChangeD">
+              <el-option v-for="item in optionsD"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="homeId"
+                        :rules="rulesForm.homeId">
+            <el-select v-model.trim="form.homeId"
+                       placeholder="房号"
+                       size="small"
+                       clearable
+                       class="u-item-width-buildcascader f-bto0"
+                       @change="handleChangeH">
+              <el-option v-for="item in optionsH"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+      </el-form-item>
+      <el-form-item v-for="(item,index)  in basicInformation"
+                    :label-width="'100px'"
+                    :label="item.label"
+                    :key="index"
+                    :class="item.itemType=='textarea'?'textareaDidth':''"
+                    :rules="item.rules"
+                    :prop="item.formName">
+        <template v-if="item.itemType == 'radio'">
+          <section class="u-item-width-normal">
+            <el-radio v-for="ns in item.opction"
+                      :key="ns.value"
+                      size="small"
+                      v-model.trim="form[item.formName]"
+                      :label="ns.value">
+              {{ ns.label }}</el-radio>
+          </section>
+        </template>
+        <template v-if="item.itemType == 'input'">
+          <el-input clearable
+                    size="small"
+                    :placeholder="`请输入${item.label}`"
+                    v-model.trim="form[item.formName]"
+                    class="u-item-width-normal"
+                    @blur="handleValidBlur(item)">
+          </el-input>
+        </template>
+        <template v-else-if="item.itemType == 'select'">
+          <el-select v-model="form[item.formName]"
+                     :placeholder="`请选择${item.label}`"
+                     size="small"
+                     clearable
+                     class="u-item-width-normal"
+                     @change="handelminzu">
+            <el-option v-for="items in item.opction "
+                       :key="items.value"
+                       :label="items.label"
+                       :value="items.value">
+            </el-option>
+          </el-select>
+        </template>
+        <template v-else-if="item.itemType == 'textarea'">
+          <el-input type="textarea"
+                    placeholder="请输入内容"
+                    class="item-width-textarea"
+                    maxlength="120"
+                    show-word-limit
+                    resize="none"
+                    rows="3"
+                    v-model.trim="form[item.formName]">
+          </el-input>
+        </template>
+        <template v-else-if="item.itemType == 'checkbox'"
+                  :label="item.label">
+          <el-checkbox v-for="(items,indexs) in item.opction"
+                       style="width:70px"
+                       :key="indexs"
+                       :label="items.label"
+                       :true-label="'1'"
+                       :false-label="'0'"
+                       size="small"
+                       v-model="form[items.formName]"
+                       @change="val => handleChangeCheckbox(val,items)">
+          </el-checkbox>
+        </template>
+        <template v-else-if="item.itemType == 'datepicker'"
+                  :label="item.label">
+          <el-date-picker v-model.trim="form.birthday"
+                          class="u-item-width-normal"
+                          type="date"
+                          size="small"
+                          clearable
+                          placeholder="选择日期"
+                          format="yyyy 年 MM 月 dd 日"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </template>
+
+      </el-form-item>
+      <!-- 这里开始就是底部的input了------------------------------------------------------------------->
+      <el-tabs v-model="activeName"
+               @tab-click="handleClick">
+        <el-tab-pane v-for="item in tabsList"
+                     :key="item.groupId"
+                     :label="item.label"
+                     :name="'group' + item.groupId">
+          <template v-for="itemj in footerInputList">
+            <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"
-                              :placeholder="`请输入${item.label}`"
-                              v-model.trim="form[item.formName]"
-                              class="u-item-width-normal"  @blur="handleValidBlur(item)"
-                           >
-                    </el-input>
-                  </template>
-                  <template v-else-if="item.itemType == 'select'">
-                    <el-select
-                             v-model="form[item.formName]"
-                             :placeholder="`请选择${item.label}`"
+                              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}`"
                              size="small"
+                             :multiple="itemk.formName=='specialCategoryCode'"
+                             :collapse-tags="itemk.formName=='specialCategoryCode'"
                              clearable
-                             class="u-item-width-normal"
-                             @change="handelminzu"
-                             >
-                    <el-option v-for="items in item.opction "
+                             :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="item.itemType == 'textarea'">
-                             <el-input
-                              type="textarea"
-                              placeholder="请输入内容"
-                              class="item-width-textarea"
-                              maxlength="120"
-                              show-word-limit
-                              resize="none"
-                              rows="3"
-                              v-model.trim="form[item.formName]"
-
-                            >
-                            </el-input>
-                  </template>
-                  <template v-else-if="item.itemType == 'checkbox'"  :label="item.label">
-                        <el-checkbox v-for="(items,indexs) in item.opction" style="width:70px" :key="indexs" :label="items.label" :true-label="'1'" :false-label="'0'"
-                        size="small"
-                        v-model="form[items.formName]"
-                        @change="val => handleChangeCheckbox(val,items)"
-                        >
-                        </el-checkbox>
-                  </template>
-                  <template v-else-if="item.itemType == 'datepicker'"  :label="item.label">
-                    <el-date-picker
-                                  v-model.trim="form.birthday"
+                </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}`"
+                            class="u-item-width-normal"
+                            :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}`"
+                            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]"
                                   class="u-item-width-normal"
                                   type="date"
                                   size="small"
@@ -163,129 +257,26 @@
                                   format="yyyy 年 MM 月 dd 日"
                                   value-format="yyyy-MM-dd">
                   </el-date-picker>
-                  </template>
-
+                </template>
+                <template v-else-if="itemk.itemType == 'cascader1'">
+                  <el-cascader :props="{ emitPath: false }"
+                               :options="itemk.opction"
+                               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"
+                                   :min="1"
+                                   :max="10"
+                                   v-model.trim="form[itemj.id][itemk.formName]"></el-input-number>
+                </template>
               </el-form-item>
-              <!-- 这里开始就是底部的input了------------------------------------------------------------------->
-              <el-tabs v-model="activeName"
-                          @tab-click="handleClick">
-                    <el-tab-pane v-for="item in tabsList"
-                                :key="item.groupId"
-                                :label="item.label"
-                                :name="'group' + item.groupId">
-                        <template v-for="itemj in footerInputList">
-                            <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}`"
-                                                  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"
-                                                    :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}`"
-                                            class="u-item-width-normal"
-                                            :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}`"
-                                            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]"
-                                                    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"
-                                              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" 
-                                                   :min="1" 
-                                                   :max="10" 
-                                                   v-model.trim="form[itemj.id][itemk.formName]"></el-input-number>
-                                </template>
-                              </el-form-item>
-                            </section>
-                        </template>
-                    </el-tab-pane>
-              </el-tabs>
+            </section>
+          </template>
+        </el-tab-pane>
+      </el-tabs>
     </el-form>
   </div>
 </template>
@@ -298,965 +289,1003 @@ export default {
   name: 'resiForm',
   props: {
     formId: {
-        type: String,
-        default: 'resiForm'
-      },
+      type: String,
+      default: 'resiForm'
+    },
   },
   data () {
-   return {
-    optionsV: [],
-    optionsB: [],
-    optionsH: [],
-    optionsD: [],
-    optionsG: [],
-    activeName: 'groupeduInfoDto',
-    validateFlag:null,
-    disabilityCategoryCode:[],
-    tabFlag:true,
-    // 基本信息input
-    basicInformation: [
-      {
-        label:"本地户籍",
-        itemType:"radio",
-        formName:"localResidenceFlag",
-        opction:[
-          {label:'是',value:'1'},
-          {label:'否',value:'0'}
-        ],
-      },
-      {
-        label:"居民姓名",
-        itemType:"input",
-        requiredFlag:true,
-        formName:"name",
-        rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}],
-        opction:[],
-      },
-      {
-        label:"联系电话",
-        itemType:"input",
-        formName:"mobile",
-        // rules:[{required:true,message:'联系电话不能为空',trigger:'change' | blur },],
-        opction:[],
-      },
-      {
-        label:"证件号",
-        itemType:"input",
-        formName:"idNum",
-        rules:[{required:true,message:'证件号不能为空'},
-          { 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)){
+    return {
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+      optionsG: [],
+      activeName: 'groupeduInfoDto',
+      validateFlag: null,
+      disabilityCategoryCode: [],
+      tabFlag: true,
+      // 基本信息input
+      basicInformation: [
+        {
+          label: "本地户籍",
+          itemType: "radio",
+          formName: "localResidenceFlag",
+          opction: [
+            { label: '是', value: '1' },
+            { label: '否', value: '0' }
+          ],
+        },
+        {
+          label: "居民姓名",
+          itemType: "input",
+          requiredFlag: true,
+          formName: "name",
+          rules: [{ required: true, message: '居民姓名不能为空', trigger: 'blur' }],
+          opction: [],
+        },
+        {
+          label: "联系电话",
+          itemType: "input",
+          formName: "mobile",
+          // rules:[{required:true,message:'联系电话不能为空',trigger:'change' | blur },],
+          opction: [],
+        },
+        {
+          label: "证件号",
+          itemType: "input",
+          formName: "idNum",
+          rules: [{ required: true, message: '证件号不能为空' },
+          {
+            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()
-            },trigger:'change' | blur }
-        ],
-        opction:[],
-      },
-      {
-        label:"性别",
-        itemType:"radio",
-        formName:"gender",
-        opction:[
-          {label:'男',value:'1'},
-          {label:'女',value:'2'}
-        ],
-      },
-      {
-        label:"民族",
-        itemType:"select",
-        formName:"nation",
-        // rules:[{required:true,message:'民族不能为空',trigger:'change' | blur },],
-        opction:[],
-      },
-      {
-        label:'生日',
-        itemType:"datepicker",
-        formName:'birthday'
-      },
-      {
-        label:'备注',
-        itemType:"textarea",
-        formName:'remark'
-      },
-      {
-        label:'居民分类',
-        itemType:"checkbox",
-        opction:[
-          {label:'党员',value:'0', formName:"partyFlag"},
-          {label:'低保人员',value:'0', formName:"subsistenceAllowanceFlag"},
-          {label:'保障房人员',value:'0', formName:"ensureHouseFlag"},
-          {label:'失业人员',value:'0', formName:"unemployedFlag"},
-          {label:'育龄妇女',value:'0', formName:"fertileWomanFlag"},
-          {label:'退役军人',value:'0', formName:"veteranFlag"},
-          {label:'统战人员',value:'0', formName:"unitedFrontFlag"},
-          {label:'信访人员',value:'0', formName:"petitionOfficerFlag"},
-          {label:'志愿者',value:'0', formName:"volunteerFlag"},
-          {label:'特扶人员',value:'0', formName:"bereavedPersonFlag"},
-          {label:'租户',value:'0', formName:"tenantFlag"},
-          {label:'流动人口',value:'0', formName:"floatingFlag"},
-          {label:'特殊人群',value:'0', formName:"specialCrowdFlag"},
-          {label:'老年人',value:'0', formName:"oldPeopleFlag"},
-          {label:'空巢老人',value:'0', formName:"emptyNesterFlag"},
-          {label:'独居老人',value:'0', formName:"liveAloneFlag"},
-          {label:'失能老人',value:'0', formName:"disabledFlag"},
-          {label:'失智老人',value:'0', formName:"dementedFlag"},
-          {label:'残疾',value:'0', formName:"disabilityFlag"},
-          {label:'大病',value:'0', formName:"seriousIllnessFlag"},
-          {label:'慢病',value:'0', formName:"chronicDiseaseFlag"},
-          {label:'公益岗人员',value:'0', formName:"publicWelfareFlag"}
-        ]
-      }
-    ],
-    // 底部input
-    footerInputList:[
-      {
-        id:'eduInfoDto',
-        children:[
-          {
-            label:"文化程度",
-            itemType:"select1",
-            formName:"cultureLevel",
-            opction:[]
-          },
-          {
-            label:"备注",
-            itemType:"textarea1",
-            formName:"eduRemark",
-            opction:[]
+            }, trigger: 'change' | blur
           }
-        ]
-      },
-      {
-        id:'hobbyInfoDto',
-        children:[{
-          label:"兴趣特长",
-          itemType:"checkbox",
-          formName:"hobbyCode",
-          opction:[
-            
-        ]},
+          ],
+          opction: [],
+        },
         {
-          label:'兴趣',
-          itemType:"input1",
-          formName:"interestDesc",
+          label: "性别",
+          itemType: "radio",
+          formName: "gender",
+          opction: [
+            { label: '男', value: '1' },
+            { label: '女', value: '2' }
+          ],
         },
         {
-          label:'备注',
-          itemType:"textarea1",
-          formName:"hobbyRemark",
-        }]
-      },
-      {
-        id:'religionDto',
-        children:[
-          {
-            label:"宗教",
-            itemType:"input1",
-            formName:"religion",
-            opction:[]
-          },
-          {
-            label:"备注",
-            itemType:"textarea1",
-            formName:"religionRemark",
-            opction:[]
-          }
-        ]
-      },
-      {
-        id:'healthDto',
-        children:[
-          {
-            label:"残疾类别",
-            itemType:"select1",
-            formName:"disabilityCategoryCode",
-            opction:this.disabilityCategoryCode
-          },
-          {
-            label:"残疾等级",
-            itemType:"select1",
-            formName:"disabilityLevel",
-            opction:[
-              {label:'一级',value:'0'},
-              {label:'二级',value:'1'}
-            ]
-          },
-          {
-            label:"残疾证号",
-            itemType:"input1",
-            formName:"disabilityNum",
-            opction:[]
-          },
-          {
-            label:"残疾说明",
-            itemType:"input1",
-            formName:"disabilityDesc",
-            opction:[]
-          },
-          {
-            label:"监护人",
-            itemType:"radio1",
-            formName:"guardianFlag",
-            opction:[
-              {label:'有',formName:'',value:1},
-              {label:'无',formName:'',value:0}
-            ]
-          },
-          {
-            label:"技能特长",
-            itemType:"radio1",
-            formName:"specialSkillFlag",
-            opction:[
-              {label:'有',formName:'',value:1},
-              {label:'无',formName:'',value:0}
-            ]
-          },
-          {
-            label:"劳动能力",
-            itemType:"radio1",
-            formName:"workCapacityFlag",
-            opction:[
-              {label:'有',formName:'',value:1},
-              {label:'无',formName:'',value:0}
-            ]
-          },
-          {
-            label:"非义务教育阶段助学",
-            itemType:"radio1",
-            formName:"voluntaryEducationFlag",
-            opction:[
-              {label:'有',formName:'',value:1},
-              {label:'无',formName:'',value:0}
+          label: "民族",
+          itemType: "select",
+          formName: "nation",
+          // rules:[{required:true,message:'民族不能为空',trigger:'change' | blur },],
+          opction: [],
+        },
+        {
+          label: '生日',
+          itemType: "datepicker",
+          formName: 'birthday'
+        },
+        {
+          label: '备注',
+          itemType: "textarea",
+          formName: 'remark'
+        },
+        {
+          label: '居民分类',
+          itemType: "checkbox",
+          opction: [
+            { label: '党员', value: '0', formName: "partyFlag" },
+            { label: '低保人员', value: '0', formName: "subsistenceAllowanceFlag" },
+            { label: '保障房人员', value: '0', formName: "ensureHouseFlag" },
+            { label: '失业人员', value: '0', formName: "unemployedFlag" },
+            { label: '育龄妇女', value: '0', formName: "fertileWomanFlag" },
+            { label: '退役军人', value: '0', formName: "veteranFlag" },
+            { label: '统战人员', value: '0', formName: "unitedFrontFlag" },
+            { label: '信访人员', value: '0', formName: "petitionOfficerFlag" },
+            { label: '志愿者', value: '0', formName: "volunteerFlag" },
+            { label: '特扶人员', value: '0', formName: "bereavedPersonFlag" },
+            { label: '租户', value: '0', formName: "tenantFlag" },
+            { label: '流动人口', value: '0', formName: "floatingFlag" },
+            { label: '特殊人群', value: '0', formName: "specialCrowdFlag" },
+            { label: '老年人', value: '0', formName: "oldPeopleFlag" },
+            { label: '空巢老人', value: '0', formName: "emptyNesterFlag" },
+            { label: '独居老人', value: '0', formName: "liveAloneFlag" },
+            { label: '失能老人', value: '0', formName: "disabledFlag" },
+            { label: '失智老人', value: '0', formName: "dementedFlag" },
+            { label: '残疾', value: '0', formName: "disabilityFlag" },
+            { label: '大病', value: '0', formName: "seriousIllnessFlag" },
+            { label: '慢病', value: '0', formName: "chronicDiseaseFlag" },
+            { label: '公益岗人员', value: '0', formName: "publicWelfareFlag" }
+          ]
+        }
+      ],
+      // 底部input
+      footerInputList: [
+        {
+          id: 'eduInfoDto',
+          children: [
+            {
+              label: "文化程度",
+              itemType: "select1",
+              formName: "cultureLevel",
+              opction: []
+            },
+            {
+              label: "备注",
+              itemType: "textarea1",
+              formName: "eduRemark",
+              opction: []
+            }
+          ]
+        },
+        {
+          id: 'hobbyInfoDto',
+          children: [{
+            label: "兴趣特长",
+            itemType: "checkbox",
+            formName: "hobbyCode",
+            opction: [
+
             ]
           },
           {
-            label:"所患大病",
-            itemType:"select1",
-            formName:"illnessCode",
-            opction:[]
-          },
-          {
-            label:"大病患病时间",
-            itemType:"datepicker1",
-            formName:"illnessTime",
-            opction:[]
-          },
-          {
-            label:"所患慢性病",
-            itemType:"select1",
-            formName:"chronicDiseaseCode",
-            opction:[]
+            label: '兴趣',
+            itemType: "input1",
+            formName: "interestDesc",
           },
           {
-            label:"慢病患病时间",
-            itemType:"datepicker1",
-            formName:"chronicDiseaseTime",
-            opction:[]
+            label: '备注',
+            itemType: "textarea1",
+            formName: "hobbyRemark",
+          }]
+        },
+        {
+          id: 'religionDto',
+          children: [
+            {
+              label: "宗教",
+              itemType: "input1",
+              formName: "religion",
+              opction: []
+            },
+            {
+              label: "备注",
+              itemType: "textarea1",
+              formName: "religionRemark",
+              opction: []
+            }
+          ]
+        },
+        {
+          id: 'healthDto',
+          children: [
+            {
+              label: "残疾类别",
+              itemType: "select1",
+              formName: "disabilityCategoryCode",
+              opction: this.disabilityCategoryCode
+            },
+            {
+              label: "残疾等级",
+              itemType: "select1",
+              formName: "disabilityLevel",
+              opction: [
+                { label: '一级', value: '0' },
+                { label: '二级', value: '1' }
+              ]
+            },
+            {
+              label: "残疾证号",
+              itemType: "input1",
+              formName: "disabilityNum",
+              opction: []
+            },
+            {
+              label: "残疾说明",
+              itemType: "input1",
+              formName: "disabilityDesc",
+              opction: []
+            },
+            {
+              label: "监护人",
+              itemType: "radio1",
+              formName: "guardianFlag",
+              opction: [
+                { label: '有', formName: '', value: 1 },
+                { label: '无', formName: '', value: 0 }
+              ]
+            },
+            {
+              label: "技能特长",
+              itemType: "radio1",
+              formName: "specialSkillFlag",
+              opction: [
+                { label: '有', formName: '', value: 1 },
+                { label: '无', formName: '', value: 0 }
+              ]
+            },
+            {
+              label: "劳动能力",
+              itemType: "radio1",
+              formName: "workCapacityFlag",
+              opction: [
+                { label: '有', formName: '', value: 1 },
+                { label: '无', formName: '', value: 0 }
+              ]
+            },
+            {
+              label: "非义务教育阶段助学",
+              itemType: "radio1",
+              formName: "voluntaryEducationFlag",
+              opction: [
+                { label: '有', formName: '', value: 1 },
+                { label: '无', formName: '', value: 0 }
+              ]
+            },
+            {
+              label: "所患大病",
+              itemType: "select1",
+              formName: "illnessCode",
+              opction: []
+            },
+            {
+              label: "大病患病时间",
+              itemType: "datepicker1",
+              formName: "illnessTime",
+              opction: []
+            },
+            {
+              label: "所患慢性病",
+              itemType: "select1",
+              formName: "chronicDiseaseCode",
+              opction: []
+            },
+            {
+              label: "慢病患病时间",
+              itemType: "datepicker1",
+              formName: "chronicDiseaseTime",
+              opction: []
+            },
+            {
+              label: "是否参保",
+              itemType: "radio1",
+              formName: "insuredFlag",
+              opction: [
+                { label: '是', formName: '', value: 1 },
+                { label: '否', formName: '', value: 0 }
+              ]
+            },
+            {
+              label: "自付金额",
+              itemType: "inputNum",
+              formName: "selfPayAmount",
+              opction: []
+            },
+            {
+              label: "救助金额",
+              itemType: "inputNum",
+              formName: "deliveranceAmount",
+              opction: []
+            },
+            {
+              label: "救助时间",
+              itemType: "datepicker1",
+              formName: "deliveranceTime",
+              opction: []
+            },
+            {
+              label: "享受救助明细序号",
+              itemType: "input1",
+              formName: "deliveranceNum",
+              opction: []
+            },
+            {
+              label: "备注",
+              itemType: "textarea1",
+              formName: "healthRemark",
+              opction: []
+            }
+          ]
+        },
+        {
+          id: 'workInfoDto',
+          children: [
+            {
+              label: "工作单位",
+              itemType: "input1",
+              formName: "workUnit",
+              opction: []
+            },
+            {
+              label: "职业",
+              itemType: "input1",
+              formName: "occupation",
+              opction: []
+            },
+            {
+              label: "离退休时间",
+              itemType: "datepicker1",
+              formName: "retireTime",
+              opction: []
+            },
+            {
+              label: "备注",
+              itemType: "textarea1",
+              formName: "workRemark",
+              opction: []
+            }
+          ]
+        }, {
+          id: "economyDto",
+          children: [
+            {
+              label: "退休金额",
+              itemType: "inputNum",
+              formName: "retirementAmount",
+              opction: []
+            },
+            {
+              label: "月收入",
+              itemType: "inputNum",
+              formName: "monthIncome",
+              opction: []
+            },
+          ]
+        },
+        {
+          id: "resideInfoDto",
+          children: [
+            {
+              label: "籍贯",
+              itemType: "input1",
+              formName: "nativePlace",
+              opction: []
+            },
+            {
+              label: "户籍所在地",
+              itemType: "input1",
+              formName: "placeOfDomicile",
+              opction: []
+            },
+            {
+              label: "现居住地址",
+              itemType: "input1",
+              formName: "currentResidence",
+              opction: []
+            },
+            {
+              label: "人户状况",
+              itemType: "select1",
+              formName: "householdSituation",
+              opction: []
+            },
+            {
+              label: "备注",
+              itemType: "textarea1",
+              formName: "resiRemark",
+              opction: []
+            }
+          ]
+        },
+        {
+          id: "familyInfoDto",
+          children: [
+            {
+              label: "与户主关系",
+              itemType: "select1",
+              formName: "houseHolderRel",
+              opction: []
+            },
+            {
+              label: "居住情况",
+              itemType: "select1",
+              formName: "resideSituation",
+              opction: []
+            },
+            {
+              label: "婚姻状况",
+              itemType: "select1",
+              formName: "marriage",
+              opction: []
+            },
+            {
+              label: "配偶情况",
+              itemType: "select1",
+              formName: "spouseSituation",
+              opction: []
+            },
+            {
+              label: "该居民有无赡养人",
+              itemType: "radio1",
+              formName: "elderlyFlag",
+              opction: [
+                { label: '有', value: 1 },
+                { label: '无', value: 0 }
+              ]
+            },
+            {
+              label: "该居民与赡养人关系",
+              itemType: "select1",
+              formName: "elderlyRelation",
+              opction: []
+            },
+            {
+              label: "赡养人联系电话",
+              itemType: "input1",
+              formName: "dependantMobile",
+              opction: [
+              ]
+            }, {
+              label: "备注",
+              itemType: "textarea1",
+              formName: "familyInfoRemark",
+              opction: [
+              ]
+            }
+          ]
+        }, {
+          id: "parymemberInfoDto",
+          children: [
+            {
+              label: "入党时间",
+              itemType: "datepicker1",
+              formName: "joinTime",
+              opction: [
+              ]
+            },
+            {
+              label: "转正时间",
+              itemType: "datepicker1",
+              formName: "positiveTime",
+              opction: [
+              ]
+            },
+            {
+              label: "所属党组织",
+              itemType: "cascader1",
+              formName: "partyOrgId",
+              opction: [
+              ]
+            },
+            {
+              label: "流动党员",
+              itemType: "radio1",
+              formName: "flowFlag",
+              opction: [
+                { label: '是', value: 1 },
+                { label: '否', value: 0 },
+              ]
+            },
+            {
+              label: "流动党员活动证号",
+              itemType: "input1",
+              formName: "flowActNum",
+              opction: [
+
+              ]
+            },
+            {
+              label: "职务",
+              itemType: "select1",
+              formName: "partyJob",
+              opction: [
+              ]
+            },
+            {
+              label: "是否退休",
+              itemType: "radio1",
+              formName: "retiredFlag",
+              opction: [
+                { label: '是', value: 1 },
+                { label: '否', value: 0 },
+              ]
+            }, {
+              label: "党员中心户",
+              itemType: "radio1",
+              formName: "centerFlag",
+              opction: [
+                { label: '是', value: 1 },
+                { label: '否', value: 0 },
+              ]
+            }, {
+              label: "入党时所在党支部	",
+              itemType: "input1",
+              formName: "joinBranchName",
+              opction: [
+
+              ]
+            }, {
+              label: "组织关系转入社区时间",
+              itemType: "datepicker1",
+              formName: "joinCommunityTime",
+              opction: [
+              ]
+            },
+            // {
+            // label:"是否请长假",
+            // itemType:"radio1",
+            // formName:"longHolidayFlag",
+            // opction:[
+            //   {label:'是',value:1},
+            //   {label:'否',value:0},
+            // ]}
+          ]
+        }, {
+          id: 'ensureHouseDto',
+          children: [
+
+            {
+              label: "住房性质",
+              itemType: "select1",
+              formName: "housingNature",
+              opction: [
+              ]
+            },
+            {
+              label: "保障类型",
+              itemType: "input1",
+              formName: "securityType",
+              opction: [
+              ]
+            }, {
+              label: "发证日期",
+              itemType: "datepicker1",
+              formName: "certificateDate",
+              opction: [
+              ]
+            },
+            {
+              label: "补贴编号",
+              itemType: "input1",
+              formName: "subsidyNum",
+              opction: [
+
+              ]
+            },
+            {
+              label: "补贴金额	",
+              itemType: "inputNum",
+              formName: "subsidyAmount",
+              opction: [
+              ]
+            }
+          ]
+        }, {
+          id: 'unemployedDto',
+          children: [
+            {
+              label: "原工作单位",
+              itemType: "input1",
+              formName: "originWorkUnit",
+            },
+            {
+              label: "失业时间",
+              itemType: "datepicker1",
+              formName: "unemploymentTime",
+              opction: [
+                { label: '是', value: 1 },
+                { label: '否', value: 0 },
+              ]
+            }, {
+              label: "失业证号",
+              itemType: "input1",
+              formName: "unemploymentNum",
+              opction: [
+              ]
+            },
+            {
+              label: "再就业优惠证号",
+              itemType: "input1",
+              formName: "employmentNum",
+              opction: [
+
+              ]
+            },
+            {
+              label: "技术特长",
+              itemType: "input1",
+              formName: "specialSkill",
+              opction: [
+              ]
+            }, {
+              label: "失业原因",
+              itemType: "select1",
+              formName: "unemploymentReason",
+              opction: [
+              ]
+            }, {
+              label: "是否就业困难对象",
+              itemType: "radio1",
+              formName: "employmentHardFlag",
+              opction: [
+                { label: '是', value: 1 },
+                { label: '否', value: 0 }
+              ]
+            }, {
+              label: "劳动能力就业愿望",
+              itemType: "select1",
+              formName: "employmentWish",
+              opction: [
+              ]
+            }
+          ]
+        }, {
+          id: 'veteranDto',
+          children: [
+            {
+              label: "入伍时间",
+              itemType: "datepicker1",
+              formName: "joinArmyTime",
+              opction: [
+              ]
+            },
+            {
+              label: "退伍时间",
+              itemType: "datepicker1",
+              formName: "leaveArmyTime",
+              opction: [
+              ]
+            },
+            {
+              label: "服役单位",
+              itemType: "input1",
+              formName: "serviceUnit",
+              opction: [
+              ]
+            },
+            {
+              label: "接收单位",
+              itemType: "input1",
+              formName: "receiveUnit	",
+              opction: [
+              ]
+            },
+            {
+              label: "待安置补助金",
+              itemType: "inputNum",
+              formName: "settlementAmount",
+              opction: [
+
+              ]
+            },
+            {
+              label: "培训状况",
+              itemType: "input1",
+              formName: "trainDesc",
+              opction: [
+              ]
+            },
+            {
+              label: "参战时间开始日期",
+              itemType: "datepicker1",
+              formName: "joinWarStartTime",
+              opction: [
+              ]
+            },
+            {
+              label: "参战时间截止日期",
+              itemType: "datepicker1",
+              formName: "joinWarEndTime",
+              opction: [
+              ]
+            },
+            {
+              label: "现就业情况",
+              itemType: "input1",
+              formName: "employmentSituation",
+              opction: [
+              ]
+            },
+            {
+              label: "是否办理公益性岗位",
+              itemType: "radio1",
+              formName: "pubWelfareJobFlag",
+              opction: [
+                { label: '是', value: 1 },
+                { label: '否', value: 0 },
+              ]
+            }
+          ]
+        },
+        {
+          id: 'unitedFrontDto',
+          children: [{
+            label: "职务",
+            itemType: "input1",
+            formName: "duty",
           },
           {
-            label:"是否参保",
-            itemType:"radio1",
-            formName:"insuredFlag",
-            opction:[
-              {label:'是',formName:'',value:1},
-              {label:'否',formName:'',value:0}
+            label: "探亲情况	",
+            itemType: "input1",
+            formName: "visitation",
+          }]
+        }, {
+          id: 'volunteerDto',
+          children: [{
+            label: "志愿者类别",
+            itemType: "checkbox",
+            formName: "volunteerCategory",
+            opction: [
             ]
           },
           {
-            label:"自付金额",
-            itemType:"inputNum",
-            formName:"selfPayAmount",
-            opction:[]
-          },
-          {
-            label:"救助金额",
-            itemType:"inputNum",
-            formName:"deliveranceAmount",
-            opction:[]
-          },
-          {
-            label:"救助时间",
-            itemType:"datepicker1",
-            formName:"deliveranceTime",
-            opction:[]
-          },
-          {
-            label:"享受救助明细序号",
-            itemType:"input1",
-            formName:"deliveranceNum",
-            opction:[]
-          },
-          {
-            label:"备注",
-            itemType:"textarea1",
-            formName:"healthRemark",
-            opction:[]
-          }
-        ]
-      },
-      {
-        id:'workInfoDto',
-        children:[
-          {
-            label:"工作单位",
-            itemType:"input1",
-            formName:"workUnit",
-            opction:[]
-          },
-          {
-            label:"职业",
-            itemType:"input1",
-            formName:"occupation",
-            opction:[]
-          },
-          {
-            label:"离退休时间",
-            itemType:"datepicker1",
-            formName:"retireTime",
-            opction:[]
-          },
-          {
-            label:"备注",
-            itemType:"textarea1",
-            formName:"workRemark",
-            opction:[]
+            label: '备注',
+            itemType: "textarea1",
+            formName: "volunteerRemark",
           }
-        ]
-      },{
-        id:"economyDto",
-        children:[
-          {
-          label:"退休金额",
-            itemType:"inputNum",
-            formName:"retirementAmount",
-            opction:[]
-          },
-          {
-          label:"月收入",
-            itemType:"inputNum",
-            formName:"monthIncome",
-            opction:[]
+          ]
+        }, {
+          id: 'oldPeopleDto',
+          children: [{
+            label: '高龄补助',
+            itemType: "inputNum",
+            formName: "oldSubsidy",
+          },]
+        }, {
+          id: 'specialDto',
+          children: [{
+            label: '人群类别',
+            itemType: "select1",
+            formName: "specialCategoryCode",
+            opction: []
+          },]
+        },
+        {
+          id: 'birthRecordDTO',
+          children: [{
+            label: '出生地',
+            itemType: "input1",
+            formName: "birthplace",
           },
-        ]
-      },
-      {
-        id:"resideInfoDto",
-        children:[
           {
-          label:"籍贯",
-            itemType:"input1",
-            formName:"nativePlace",
-            opction:[]
+            label: '父亲姓名',
+            itemType: "input1",
+            formName: "father",
           },
           {
-          label:"户籍所在地",
-            itemType:"input1",
-            formName:"placeOfDomicile",
-            opction:[]
+            label: '母亲姓名',
+            itemType: "input1",
+            formName: "mother",
           },
           {
-          label:"现居住地址",
-            itemType:"input1",
-            formName:"currentResidence",
-            opction:[]
+            label: '胎次',
+            itemType: "number",
+            formName: "count",
           },
           {
-          label:"人户状况",
-            itemType:"select1",
-            formName:"householdSituation",
-            opction:[]
+            label: '申报日期',
+            itemType: "datepicker1",
+            formName: "reportDate",
+          }]
+        }, {
+          id: 'postDto',
+          children: [{
+            label: '入职时间',
+            itemType: "datepicker1",
+            formName: "hiredate",
+            opction: []
+          }, {
+            label: '岗位类型',
+            itemType: "select1",
+            formName: "jobPost",
+            opction: []
           },
-          {
-          label:"备注",
-            itemType:"textarea1",
-            formName:"resiRemark",
-            opction:[]
-          }
-        ]
-      },
-      {
-        id:"familyInfoDto",
-        children:[
-        {
-        label:"与户主关系",
-          itemType:"select1",
-          formName:"houseHolderRel",
-          opction:[]
+          ]
         },
-        {
-        label:"居住情况",
-          itemType:"select1",
-          formName:"resideSituation",
-          opction:[]
+      ],
+      newForm: {},
+      form: {
+        agencyName: this.$store.state.user.agencyName,
+        agencyId: this.$store.state.user.agencyId,
+        resiId: '', // 详情拿到
+        houseMergeId: '', // 详情拿到
+        categoryId: '', // 详情拿到
+        gridName: '',
+        gridId: '', //所属网格id
+        villageId: '', //小区id
+        buildId: '', //楼栋id
+        unitId: '', //单元id
+        homeId: '', //房屋id
+        name: '', //姓名
+        nation: '', //民族
+        remark: '', //备注
+        localResidenceFlag: '1', //本地户籍
+        birthday: '', //生日
+        idNum: '', //证件号
+        gender: '', // 性别
+        mobile: '', //联系电话
+        partyFlag: '0',//党员
+        subsistenceAllowanceFlag: '0', //低保
+        ensureHouseFlag: '0', //保障房
+        unemployedFlag: '0',//失业
+        fertileWomanFlag: '0', //育龄妇女
+        veteranFlag: '0', //退役军人
+        unitedFrontFlag: '0',//统战人员
+        petitionOfficerFlag: '0',//信访人员
+        volunteerFlag: '0', //志愿者
+        bereavedPersonFlag: '0', //失独
+        tenantFlag: '0', //租户
+        floatingFlag: '0',//流动人口
+        specialCrowdFlag: '0',//特殊人群
+        oldPeopleFlag: '0', //老年人
+        emptyNesterFlag: '0', //空巢
+        liveAloneFlag: '0', //独居老人
+        publicWelfareFlag: '0',
+        disabledFlag: '0', //失能老人
+        dementedFlag: '0', //失智老人
+        disabilityFlag: '0',//是否残疾
+        seriousIllnessFlag: '0', //大病
+        chronicDiseaseFlag: '0', //慢病
+        eduInfoDto: { // 教育信息
+          cultureLevel: '',
+          eduRemark: ''
         },
-        {
-        label:"婚姻状况",
-          itemType:"select1",
-          formName:"marriage",
-          opction:[]
+        hobbyInfoDto: { //兴趣爱好
+          hobbyCode: [],//兴趣特长
+          interestDesc: '',//兴趣
+          hobbyRemark: ''//备注
         },
-        {
-        label:"配偶情况",
-          itemType:"select1",
-          formName:"spouseSituation",
-          opction:[]
+        religionDto: {
+          religion: '',
+          religionRemark: ''
         },
-        {
-        label:"该居民有无赡养人",
-          itemType:"radio1",
-          formName:"elderlyFlag",
-          opction:[
-            {label:'有',value:1},
-            {label:'无',value:0}
-          ]
+        healthDto: { // 健康
+          disabilityCategoryCode: '',//残疾类别
+          disabilityLevel: '',//残疾等级
+          disabilityNum: '',//残疾证号
+          disabilityDesc: '',//残疾说明
+          guardianFlag: 1,//有无监护人
+          specialSkillFlag: 1,//有无技能特长【有:1 无:0】
+          workCapacityFlag: 1,//有无劳动能力【有:1 无:0】
+          voluntaryEducationFlag: 1,//有无非义务教育阶段助学【有:1 无:0】
+          illnessCode: '',//所患大病字典code
+          illnessTime: '',//大病患病时间yyyy-MM-dd
+          chronicDiseaseCode: '',//所患慢性病code
+          chronicDiseaseTime: '',//慢病患病时间
+          insuredFlag: '',//是否参保【是:1 否:0】
+          selfPayAmount: '',//自付金额
+          deliveranceAmount: '',//救助金额
+          deliveranceTime: '',//救助时间
+          deliveranceNum: '',//享受救助明细序号
+          healthRemark: ''//备注
         },
-        {
-        label:"该居民与赡养人关系",
-          itemType:"select1",
-          formName:"elderlyRelation",
-          opction:[]
+        workInfoDto: { //工作
+          workUnit: '',//工作单位
+          occupation: '',//职业
+          retireTime: '',//离退休时间
+          workRemark: '',//备注
         },
-        {
-        label:"赡养人联系电话",
-        itemType:"input1",
-        formName:"dependantMobile",
-        opction:[
-        ]}, {
-        label:"备注",
-        itemType:"textarea1",
-        formName:"familyInfoRemark",
-        opction:[
-        ]}
-        ]
-      },{
-        id:"parymemberInfoDto",
-        children:[
-        {
-        label:"入党时间",
-        itemType:"datepicker1",
-        formName:"joinTime",
-        opction:[
-        ]},
-        {
-        label:"转正时间",
-        itemType:"datepicker1",
-        formName:"positiveTime",
-        opction:[
-        ]},
-        {
-        label:"所属党组织",
-        itemType:"cascader1",
-        formName:"partyOrgId",
-        opction:[
-        ]},
-        {
-        label:"流动党员",
-        itemType:"radio1",
-        formName:"flowFlag",
-        opction:[
-          {label:'是',value:1},
-          {label:'否',value:0},
-        ]},
-        {
-        label:"流动党员活动证号",
-        itemType:"input1",
-        formName:"flowActNum",
-        opction:[
-
-        ]},
-        {
-        label:"职务",
-        itemType:"select1",
-        formName:"partyJob",
-        opction:[
-        ]},
-        {
-        label:"是否退休",
-        itemType:"radio1",
-        formName:"retiredFlag",
-        opction:[
-          {label:'是',value:1},
-          {label:'否',value:0},
-        ]}, {
-        label:"党员中心户",
-        itemType:"radio1",
-        formName:"centerFlag",
-        opction:[
-          {label:'是',value:1},
-          {label:'否',value:0},
-        ]},{
-        label:"入党时所在党支部	",
-        itemType:"input1",
-        formName:"joinBranchName",
-        opction:[
-
-        ]},{
-        label:"组织关系转入社区时间",
-        itemType:"datepicker1",
-        formName:"joinCommunityTime",
-        opction:[
-        ]},
-        // {
-        // label:"是否请长假",
-        // itemType:"radio1",
-        // formName:"longHolidayFlag",
-        // opction:[
-        //   {label:'是',value:1},
-        //   {label:'否',value:0},
-        // ]}
-        ]
-      },{
-        id:'ensureHouseDto',
-        children:[
-
-        {
-        label:"住房性质",
-        itemType:"select1",
-        formName:"housingNature",
-        opction:[
-        ]},
-        {
-        label:"保障类型",
-        itemType:"input1",
-        formName:"securityType",
-        opction:[
-        ]},{
-        label:"发证日期",
-        itemType:"datepicker1",
-        formName:"certificateDate",
-        opction:[
-        ]},
-        {
-        label:"补贴编号",
-        itemType:"input1",
-        formName:"subsidyNum",
-        opction:[
-
-        ]},
-        {
-        label:"补贴金额	",
-        itemType:"inputNum",
-        formName:"subsidyAmount",
-        opction:[
-        ]}
-        ]
-      },{
-        id:'unemployedDto',
-        children:[
-        {
-        label:"原工作单位",
-        itemType:"input1",
-        formName:"originWorkUnit",
+        economyDto: {//经济
+          retirementAmount: '',//退休金额
+          monthIncome: '',//月收入
         },
-        {
-        label:"失业时间",
-        itemType:"datepicker1",
-        formName:"unemploymentTime",
-        opction:[
-          {label:'是',value:1},
-          {label:'否',value:0},
-        ]},{
-        label:"失业证号",
-        itemType:"input1",
-        formName:"unemploymentNum",
-        opction:[
-        ]},
-        {
-        label:"再就业优惠证号",
-        itemType:"input1",
-        formName:"employmentNum",
-        opction:[
-
-        ]},
-        {
-        label:"技术特长",
-        itemType:"input1",
-        formName:"specialSkill",
-        opction:[
-        ]},{
-        label:"失业原因",
-        itemType:"select1",
-        formName:"unemploymentReason",
-        opction:[
-        ]} ,{
-        label:"是否就业困难对象",
-        itemType:"radio1",
-        formName:"employmentHardFlag",
-        opction:[
-          {label:'是',value:1},
-          {label:'否',value:0}
-        ]}, {
-        label:"劳动能力就业愿望",
-        itemType:"select1",
-        formName:"employmentWish",
-        opction:[
-        ]}
-        ]
-      },{
-        id:'veteranDto',
-        children:[
-        {
-        label:"入伍时间",
-        itemType:"datepicker1",
-        formName:"joinArmyTime",
-        opction:[
-        ]},
-        {
-        label:"退伍时间",
-        itemType:"datepicker1",
-        formName:"leaveArmyTime",
-        opction:[
-        ]},
-        {
-        label:"服役单位",
-        itemType:"input1",
-        formName:"serviceUnit",
-        opction:[
-        ]},
-        {
-        label:"接收单位",
-        itemType:"input1",
-        formName:"receiveUnit	",
-        opction:[
-        ]},
-        {
-        label:"待安置补助金",
-        itemType:"inputNum",
-        formName:"settlementAmount",
-        opction:[
-
-        ]},
-        {
-        label:"培训状况",
-        itemType:"input1",
-        formName:"trainDesc",
-        opction:[
-        ]},
-        {
-        label:"参战时间开始日期",
-        itemType:"datepicker1",
-        formName:"joinWarStartTime",
-        opction:[
-        ]},
-        {
-        label:"参战时间截止日期",
-        itemType:"datepicker1",
-        formName:"joinWarEndTime",
-        opction:[
-        ]} ,
-        {
-        label:"现就业情况",
-        itemType:"input1",
-        formName:"employmentSituation",
-        opction:[
-        ]},
-        {
-        label:"是否办理公益性岗位",
-        itemType:"radio1",
-        formName:"pubWelfareJobFlag",
-        opction:[
-          {label:'是',value:1},
-          {label:'否',value:0},
-        ]}
-        ]
-      },
-      {
-        id:'unitedFrontDto',
-        children:[{
-          label:"职务",
-          itemType:"input1",
-          formName:"duty",
+        resideInfoDto: {//居住信息
+          nativePlace: '',//籍贯
+          placeOfDomicile: '',//户籍所在地
+          currentResidence: '',//现居住地
+          householdSituation: '',//人户情况，字典code
+          resiRemark: '',//备注
         },
-        {
-          label:"探亲情况	",
-          itemType:"input1",
-          formName:"visitation",
-        }]
-      },{
-        id:'volunteerDto',
-        children:[{
-          label:"志愿者类别",
-          itemType:"checkbox",
-          formName:"volunteerCategory",
-          opction:[
-        ]},
-        {
-          label:'备注',
-          itemType:"textarea1",
-          formName:"volunteerRemark",
-        }
-      ]
-      },{
-        id:'oldPeopleDto',
-        children:[ {
-          label:'高龄补助',
-          itemType:"inputNum",
-          formName:"oldSubsidy",
-        },]
-      },{
-        id:'specialDto',
-        children:[ {
-          label:'人群类别',
-          itemType:"select1",
-          formName:"specialCategoryCode",
-          opction:[]
-        },]
-      },
-      {
-        id:'birthRecordDTO',
-        children:[{
-          label:'出生地',
-          itemType:"input1",
-          formName:"birthplace",
+        familyInfoDto: {//家庭
+          houseHolderRel: '',//与户主关系
+          resideSituation: '',//居住情况
+          marriage: '',//婚姻状况
+          spouseSituation: '',//配偶情况
+          elderlyFlag: 1,//有无赡养人【有:1 无:0】
+          elderlyRelation: '',//与赡养人关系【字典表】
+          dependantMobile: '',//赡养人联系电话
+          familyInfoRemark: '',//备注
         },
-        {
-          label:'父亲姓名',
-          itemType:"input1",
-          formName:"father",
+        parymemberInfoDto: {//党员信息
+          joinTime: '',//入党时间yyyy-MM-dd
+          positiveTime: '',//转正时间yyyy-MM-dd
+          partyOrgId: '',//所属支部
+          flowFlag: 1,//是否流动党员：1是，0否
+          flowActNum: '',//流动党员活动证号
+          partyJob: '',//职务，字典code
+          retiredFlag: 1,//是否退休：1是，0否
+          centerFlag: 1,//是否党员中心户：1是，0否
+          joinBranchName: '',//入党时所在党支部
+          joinCommunityTime: '',//组织关系转入社区时间yyyy-MM-dd
+          longHolidayFlag: 1,//是否请长假：1是，0否
         },
-        {
-          label:'母亲姓名',
-          itemType:"input1",
-          formName:"mother",
+        ensureHouseDto: {//保障房信息
+          housingNature: '',//住房性质，字典code
+          securityType: '',//保障类型
+          certificateDate: '',//发证日期yyyy-MM-dd
+          subsidyNum: '',//补贴编号
+          subsidyAmount: '',//补贴金额
         },
-        {
-          label:'胎次',
-          itemType:"number",
-          formName:"count",
+        unemployedDto: {//失业信息
+          originWorkUnit: '',//原工作单位
+          unemploymentTime: '',//失业时间yyyy-MM-dd
+          unemploymentNum: '',//失业证号
+          employmentNum: '',//再就业优惠证号
+          specialSkill: '',//技术特长
+          unemploymentReason: '',//失业原因【字典表】code
+          employmentHardFlag: 1,//是否就业困难对象；1是0不是
+          employmentWish: '',//劳动能力就业愿望
         },
-        {
-          label:'申报日期',
-          itemType:"datepicker1",
-          formName:"reportDate",
-        }]
-      },{
-        id:'postDto',
-        children:[   {
-          label:'入职时间',
-          itemType:"datepicker1",
-        formName:"hiredate",
-          opction:[]
-        },{
-          label:'岗位类型',
-          itemType:"select1",
-          formName:"jobPost",
-          opction:[]
+        veteranDto: {//退役军人
+          joinArmyTime: '',//入伍时间
+          leaveArmyTime: '',//退伍时间
+          serviceUnit: '',//服役单位
+          receiveUnit: '',//接收单位
+          settlementAmount: '',//待安置补助金
+          trainDesc: '',//培训状况
+          employmentSituation: '',//现就业情况
+          joinWarStartTime: '',//参战时间开始日期yyyy-MM-dd
+          joinWarEndTime: '',//参战时间截止日期yyyy-MM-dd
+          pubWelfareJobFlag: 1,//是否办理公益性岗位;1是0否
         },
-      ]
-      },
-    ],
-    newForm: {},
-    form:{
-          agencyName:this.$store.state.user.agencyName,
-          agencyId:this.$store.state.user.agencyId,
-          resiId: '', // 详情拿到
-          houseMergeId: '', // 详情拿到
-          categoryId: '', // 详情拿到
-          gridName:'',
-          gridId:'', //所属网格id
-          villageId: '', //小区id
-          buildId: '', //楼栋id
-          unitId: '', //单元id
-          homeId: '', //房屋id
-          name:'', //姓名
-          nation:'', //民族
-          remark:'', //备注
-          localResidenceFlag:'1', //本地户籍
-          birthday:'', //生日
-          idNum:'', //证件号
-          gender:'', // 性别
-          mobile:'', //联系电话
-          partyFlag:'0',//党员
-          subsistenceAllowanceFlag:'0', //低保
-          ensureHouseFlag:'0', //保障房
-          unemployedFlag:'0',//失业
-          fertileWomanFlag:'0', //育龄妇女
-          veteranFlag:'0', //退役军人
-          unitedFrontFlag:'0',//统战人员
-          petitionOfficerFlag:'0',//信访人员
-          volunteerFlag:'0', //志愿者
-          bereavedPersonFlag:'0', //失独
-          tenantFlag:'0', //租户
-          floatingFlag:'0',//流动人口
-          specialCrowdFlag:'0',//特殊人群
-          oldPeopleFlag:'0', //老年人
-          emptyNesterFlag:'0', //空巢
-          liveAloneFlag:'0', //独居老人
-          publicWelfareFlag:'0',
-          disabledFlag:'0', //失能老人
-          dementedFlag:'0', //失智老人
-          disabilityFlag:'0',//是否残疾
-          seriousIllnessFlag:'0', //大病
-          chronicDiseaseFlag:'0', //慢病
-          eduInfoDto:{ // 教育信息
-            cultureLevel:'',
-            eduRemark:''
-          },
-          hobbyInfoDto:{ //兴趣爱好
-            hobbyCode:[],//兴趣特长
-            interestDesc:'',//兴趣
-            hobbyRemark:''//备注
-          },
-          religionDto:{
-            religion:'',
-            religionRemark:''
-          },
-          healthDto:{ // 健康
-            disabilityCategoryCode:'',//残疾类别
-            disabilityLevel:'',//残疾等级
-            disabilityNum:'',//残疾证号
-            disabilityDesc:'',//残疾说明
-            guardianFlag:1,//有无监护人
-            specialSkillFlag:1,//有无技能特长【有:1 无:0】
-            workCapacityFlag:1,//有无劳动能力【有:1 无:0】
-            voluntaryEducationFlag:1,//有无非义务教育阶段助学【有:1 无:0】
-            illnessCode:'',//所患大病字典code
-            illnessTime:'',//大病患病时间yyyy-MM-dd
-            chronicDiseaseCode:'',//所患慢性病code
-            chronicDiseaseTime:'',//慢病患病时间
-            insuredFlag:'',//是否参保【是:1 否:0】
-            selfPayAmount:'',//自付金额
-            deliveranceAmount:'',//救助金额
-            deliveranceTime:'',//救助时间
-            deliveranceNum:'',//享受救助明细序号
-            healthRemark:''//备注
-          },
-          workInfoDto:{ //工作
-            workUnit:'',//工作单位
-            occupation:'',//职业
-            retireTime:'',//离退休时间
-            workRemark:'',//备注
-          },
-          economyDto:{//经济
-            retirementAmount:'',//退休金额
-            monthIncome:'',//月收入
-          },
-          resideInfoDto:{//居住信息
-            nativePlace:'',//籍贯
-            placeOfDomicile:'',//户籍所在地
-            currentResidence:'',//现居住地
-            householdSituation:'',//人户情况，字典code
-            resiRemark:'',//备注
-          },
-          familyInfoDto:{//家庭
-            houseHolderRel:'',//与户主关系
-            resideSituation:'',//居住情况
-            marriage:'',//婚姻状况
-            spouseSituation:'',//配偶情况
-            elderlyFlag:1,//有无赡养人【有:1 无:0】
-            elderlyRelation:'',//与赡养人关系【字典表】
-            dependantMobile:'',//赡养人联系电话
-            familyInfoRemark:'',//备注
-          },
-          parymemberInfoDto:{//党员信息
-            joinTime:'',//入党时间yyyy-MM-dd
-            positiveTime:'',//转正时间yyyy-MM-dd
-            partyOrgId:'',//所属支部
-            flowFlag:1,//是否流动党员：1是，0否
-            flowActNum:'',//流动党员活动证号
-            partyJob:'',//职务，字典code
-            retiredFlag:1,//是否退休：1是，0否
-            centerFlag:1,//是否党员中心户：1是，0否
-            joinBranchName:'',//入党时所在党支部
-            joinCommunityTime:'',//组织关系转入社区时间yyyy-MM-dd
-            longHolidayFlag:1,//是否请长假：1是，0否
-          },
-          ensureHouseDto:{//保障房信息
-            housingNature:'',//住房性质，字典code
-            securityType:'',//保障类型
-            certificateDate:'',//发证日期yyyy-MM-dd
-            subsidyNum:'',//补贴编号
-            subsidyAmount:'',//补贴金额
-          },
-          unemployedDto:{//失业信息
-            originWorkUnit:'',//原工作单位
-            unemploymentTime:'',//失业时间yyyy-MM-dd
-            unemploymentNum:'',//失业证号
-            employmentNum:'',//再就业优惠证号
-            specialSkill:'',//技术特长
-            unemploymentReason:'',//失业原因【字典表】code
-            employmentHardFlag:1,//是否就业困难对象；1是0不是
-            employmentWish:'',//劳动能力就业愿望
-          },
-          veteranDto:{//退役军人
-            joinArmyTime:'',//入伍时间
-            leaveArmyTime:'',//退伍时间
-            serviceUnit:'',//服役单位
-            receiveUnit:'',//接收单位
-            settlementAmount:'',//待安置补助金
-            trainDesc:'',//培训状况
-            employmentSituation:'',//现就业情况
-            joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd
-            joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd
-            pubWelfareJobFlag:1,//是否办理公益性岗位;1是0否
-          },
-          unitedFrontDto:{//统战人员
-            duty:'',//职务
-            visitation:'',//探亲情况
-          },
-          volunteerDto:{//志愿者信息
-            volunteerCategory:[],//志愿者类别
-            volunteerRemark:''//备注
+        unitedFrontDto: {//统战人员
+          duty: '',//职务
+          visitation: '',//探亲情况
+        },
+        volunteerDto: {//志愿者信息
+          volunteerCategory: [],//志愿者类别
+          volunteerRemark: ''//备注
 
-          },
-          oldPeopleDto:{
-            oldSubsidy:''//高龄补助
-          },
-          
-          specialDto:{//特殊人群
-            id:'',//人群类别【字典表】,可多选，以英文逗号隔开；
-            specialCategoryCode:[]
-          },
-          postDto:{
-            hiredate:'',//入职时间
-            jobPost:'',//岗位类型
-            userId:''
-          },
-          birthRecordDTO:{
-            birthplace: '',
-            father: '',
-            mother: '',
-            count: 0,
-            reportDate: ''
-          }
-    },
-    rulesForm: {
-          villageId: [{ required: true, message: `请选择小区`, trigger: 'blur' }],
-          gridId: [{ required: true, message: `请选择网格`, trigger: 'blur' }],
-          buildId: [{ required: true, message: `请选择楼号`, trigger: 'blur' }],
-          unitId: [{ required: true, message: `请选择单元`, trigger: 'blur' }],
-          homeId: [{ required: true, message: `请选择房号`, trigger: 'blur' }],
-          NAME:[{ required: true, message: `请选择房号`, trigger: 'blur' }]
-    },
-    // 底部tabs选项
-    tabsList:[
-      {groupId:'eduInfoDto',label:'教育'},
-      {groupId:'hobbyInfoDto',label:'兴趣爱好'},
-      {groupId:'religionDto',label:'宗教信仰'},
-      {groupId:'healthDto',label:'健康'},
-      {groupId:'workInfoDto',label:'工作'},
-      {groupId:'economyDto',label:'经济情况'},
-      {groupId:'resideInfoDto',label:'居住'},
-      {groupId:'familyInfoDto',label:'家庭'},
-      {groupId:'birthRecordDTO',label:'出生信息'},
-    ]
-   }
+        },
+        oldPeopleDto: {
+          oldSubsidy: ''//高龄补助
+        },
+
+        specialDto: {//特殊人群
+          id: '',//人群类别【字典表】,可多选，以英文逗号隔开；
+          specialCategoryCode: []
+        },
+        postDto: {
+          hiredate: '',//入职时间
+          jobPost: '',//岗位类型
+          userId: ''
+        },
+        birthRecordDTO: {
+          birthplace: '',
+          father: '',
+          mother: '',
+          count: 0,
+          reportDate: ''
+        }
+      },
+      rulesForm: {
+        villageId: [{ required: true, message: `请选择小区`, trigger: 'blur' }],
+        gridId: [{ required: true, message: `请选择网格`, trigger: 'blur' }],
+        buildId: [{ required: true, message: `请选择楼号`, trigger: 'blur' }],
+        unitId: [{ required: true, message: `请选择单元`, trigger: 'blur' }],
+        homeId: [{ required: true, message: `请选择房号`, trigger: 'blur' }],
+        NAME: [{ required: true, message: `请选择房号`, trigger: 'blur' }]
+      },
+      // 底部tabs选项
+      tabsList: [
+        { groupId: 'eduInfoDto', label: '教育' },
+        { groupId: 'hobbyInfoDto', label: '兴趣爱好' },
+        { groupId: 'religionDto', label: '宗教信仰' },
+        { groupId: 'healthDto', label: '健康' },
+        { groupId: 'workInfoDto', label: '工作' },
+        { groupId: 'economyDto', label: '经济情况' },
+        { groupId: 'resideInfoDto', label: '居住' },
+        { groupId: 'familyInfoDto', label: '家庭' },
+        { groupId: 'birthRecordDTO', label: '出生信息' },
+      ]
+    }
   },
   computed: {
   },
   watch: {
-    form:{
-    handler (val, val2) {
-     for(let i in this.form){
-        if(typeof(this.form[i]) === "object"){
-          this.tabFlag = false
+    form: {
+      handler (val, val2) {
+        for (let i in this.form) {
+          if (typeof (this.form[i]) === "object") {
+            this.tabFlag = false
+          }
         }
-     }
-    },
-      deep:true,
-      immediate:true
+      },
+      deep: true,
+      immediate: true
     },
   },
   created () {
@@ -1267,20 +1296,20 @@ export default {
     this.setNewForm()
   },
   methods: {
-    submit_from(){
+    submit_from () {
       this.setJSON()
       var flag = false
-      this.$refs.formId.validate(v=>{
+      this.$refs.formId.validate(v => {
         this.validateFlag = v
         flag = v
 
       })
-      if(flag){
+      if (flag) {
         return JSON.stringify(this.newForm)
       }
       return false
     },
-    async old_from(data) {
+    async old_from (data) {
       this.getFormData(data)
       await this.getValiheList()
       await this.getBuildList()
@@ -1288,7 +1317,7 @@ export default {
       await this.getHouseList()
       await this.residentEduInfo(this.form.resiId)
     },
-    getAllDict(){
+    getAllDict () {
       // 民族字典
       this.getDictList()
       // 关系字典
@@ -1339,239 +1368,239 @@ export default {
         return this.$message.error('网络错误')
       })
     },
-    handelminzu(val){
+    handelminzu (val) {
       this.newForm.nation = val
     },
-    async getdisabilityDict(){
+    async getdisabilityDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_category_code'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'disability_category_code' })
         this.footerInputList.forEach(c => {
 
-          for(let i of c.children){
-              if(i.formName == 'disabilityCategoryCode'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'disabilityCategoryCode') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取残疾字典');
+        console.log(error, '获取残疾字典');
       }
 
     },
-    async getVolunteerDict(){
+    async getVolunteerDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'VOLUNTEER_CATEGORY'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'VOLUNTEER_CATEGORY' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'volunteerCategory'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'volunteerCategory') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取志愿者字典');
+        console.log(error, '获取志愿者字典');
       }
 
     },
-    async gethobbyDict(){
+    async gethobbyDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'SPECIAL_SKILL'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'SPECIAL_SKILL' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'hobbyCode'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'hobbyCode') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取兴趣爱好字典');
+        console.log(error, '获取兴趣爱好字典');
       }
 
     },
-    async getdisabilityDictClass(){
+    async getdisabilityDictClass () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_level'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'disability_level' })
         this.footerInputList.forEach(c => {
 
-          for(let i of c.children){
-              if(i.formName == 'disabilityLevel'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'disabilityLevel') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取残疾等级字典');
+        console.log(error, '获取残疾等级字典');
       }
 
     },
-    async getillnessDict(){
+    async getillnessDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'illness_code'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'illness_code' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'illnessCode'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'illnessCode') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取所患大病字典');
+        console.log(error, '获取所患大病字典');
       }
     },
-    async getchronicDict(){
+    async getchronicDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'chronic_disease_code'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'chronic_disease_code' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'chronicDiseaseCode'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'chronicDiseaseCode') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取所患慢病字典');
+        console.log(error, '获取所患慢病字典');
       }
     },
-    async getWelfareDict(){
+    async getWelfareDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'welfare_post'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'welfare_post' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'jobPost'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'jobPost') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取公益岗位字典');
+        console.log(error, '获取公益岗位字典');
       }
     },
-    async getUnemployment(){
+    async getUnemployment () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'unemployment_cause'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'unemployment_cause' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'unemploymentReason'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'unemploymentReason') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取失业原因字典');
+        console.log(error, '获取失业原因字典');
       }
     },
-    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.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'employmentWish'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'employmentWish') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取就业愿望字典');
+        console.log(error, '获取就业愿望字典');
       }
     },
-    
-    async getHouseholdDict(){
+
+    async getHouseholdDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'household_situation'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'household_situation' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'householdSituation'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'householdSituation') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取人户状况字典');
+        console.log(error, '获取人户状况字典');
       }
     },
-    async getMarriageDict(){
+    async getMarriageDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'marriage'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'marriage' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'marriage'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'marriage') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取婚姻状况字典');
+        console.log(error, '获取婚姻状况字典');
       }
     },
-    async getResideDict(){
+    async getResideDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'reside_situation'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'reside_situation' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'resideSituation'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'resideSituation') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取居住情况字典');
+        console.log(error, '获取居住情况字典');
       }
     },
-    async getSpouseDict(){
+    async getSpouseDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'spouse_situation'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'spouse_situation' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'spouseSituation'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'spouseSituation') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取配偶情况字典');
+        console.log(error, '获取配偶情况字典');
       }
     },
-    async getResidentDict(){
+    async getResidentDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'special_resident_category'})
-        console.log(data.data,'see');
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'special_resident_category' })
+        console.log(data.data, 'see');
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'specialCategoryCode'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'specialCategoryCode') {
+              i.opction = data.data
+            }
           }
         })
 
       } catch (error) {
-        console.log(error,'获取配偶情况字典');
+        console.log(error, '获取配偶情况字典');
       }
     },
-    async getPartyDict(){
+    async getPartyDict () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'party_job'})
+        const { data } = await this.$http.post('sys/dict/data/dictlist', { 'dictType': 'party_job' })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'partyJob'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'partyJob') {
+              i.opction = data.data
+            }
           }
         })
       } catch (error) {
-        console.log(error,'获取职务字典');
+        console.log(error, '获取职务字典');
       }
     },
     getBuildList () {
@@ -1610,50 +1639,51 @@ export default {
         return this.$message.error('网络错误')
       })
     },
-    handleChangeCheckbox(e,val){
-      this.handleTabShow(val,e)
+    handleChangeCheckbox (e, val) {
+      this.handleTabShow(val, e)
     },
-    handleTabShow(val,e){
-      if(e == 1){
-      if(val.formName == 'partyFlag'){
-        this.tabsList.push({label:'党员',id:'0',groupId:'parymemberInfoDto'})
-      }else if(val.formName == 'ensureHouseFlag'){
-        this.tabsList.push({label:'保障房信息',id:'1',groupId:'ensureHouseDto'})
-      }else if(val.formName == 'unemployedFlag'){
-        this.tabsList.push({label:'失业',id:'2',groupId:'unemployedDto'})
-      }else if(val.formName == 'veteranFlag'){
-        this.tabsList.push({label:'退役军人',id:'3',groupId:'veteranDto'})
-      }else if(val.formName == 'unitedFrontFlag'){
-        this.tabsList.push({label:'统战',id:'4',groupId:'unitedFrontDto'})
-      }else if(val.formName == 'volunteerFlag'){
-        this.tabsList.push({label:'志愿者信息',id:'5',groupId:'volunteerDto'})
-      }else if(val.formName == 'oldPeopleFlag'){
-        this.tabsList.push({label:'老年人',id:'6',groupId:'oldPeopleDto'})
-      }else if(val.formName == 'specialCrowdFlag') {
-        this.tabsList.push({label:'特殊人群',id:'7',groupId:'specialDto'})
-      }else if(val.formName == 'publicWelfareFlag') {
-        this.tabsList.push({label:'公益岗人员',id:'7',groupId:'postDto'})
-      }
+    handleTabShow (val, e) {
+
+      if (e == 1) {
+        if (val.formName == 'partyFlag') {
+          this.tabsList.push({ label: '党员', id: '0', groupId: 'parymemberInfoDto' })
+        } else if (val.formName == 'ensureHouseFlag') {
+          this.tabsList.push({ label: '保障房信息', id: '1', groupId: 'ensureHouseDto' })
+        } else if (val.formName == 'unemployedFlag') {
+          this.tabsList.push({ label: '失业', id: '2', groupId: 'unemployedDto' })
+        } else if (val.formName == 'veteranFlag') {
+          this.tabsList.push({ label: '退役军人', id: '3', groupId: 'veteranDto' })
+        } else if (val.formName == 'unitedFrontFlag') {
+          this.tabsList.push({ label: '统战', id: '4', groupId: 'unitedFrontDto' })
+        } else if (val.formName == 'volunteerFlag') {
+          this.tabsList.push({ label: '志愿者信息', id: '5', groupId: 'volunteerDto' })
+        } else if (val.formName == 'oldPeopleFlag') {
+          this.tabsList.push({ label: '老年人', id: '6', groupId: 'oldPeopleDto' })
+        } else if (val.formName == 'specialCrowdFlag') {
+          this.tabsList.push({ label: '特殊人群', id: '7', groupId: 'specialDto' })
+        } else if (val.formName == 'publicWelfareFlag') {
+          this.tabsList.push({ label: '公益岗人员', id: '7', groupId: 'postDto' })
+        }
       } else {
-      let i = val.formName == 'partyFlag'?'0': 
-              val.formName == 'ensureHouseFlag'?'1':
-              val.formName == 'unemployedFlag'?'2':
-              val.formName == 'veteranFlag'?'3':
-              val.formName == 'unitedFrontFlag'?'4':
-              val.formName == 'volunteerFlag'?'5':
-              val.formName == 'oldPeopleFlag'?'6':
-              val.formName == 'specialCrowdFlag'?'7':
-              val.formName == 'publicWelfareFlag'?'8':''
-      if(i != ''){
-            this.tabsList.forEach(item =>{
-              if(i != item.id){
-                this.tabsList = this.tabsList.filter(items=>items.id!=i)
-              }
+        let i = val.formName == 'partyFlag' ? '0' :
+          val.formName == 'ensureHouseFlag' ? '1' :
+            val.formName == 'unemployedFlag' ? '2' :
+              val.formName == 'veteranFlag' ? '3' :
+                val.formName == 'unitedFrontFlag' ? '4' :
+                  val.formName == 'volunteerFlag' ? '5' :
+                    val.formName == 'oldPeopleFlag' ? '6' :
+                      val.formName == 'specialCrowdFlag' ? '7' :
+                        val.formName == 'publicWelfareFlag' ? '8' : ''
+        if (i != '') {
+          this.tabsList.forEach(item => {
+            if (i != item.id) {
+              this.tabsList = this.tabsList.filter(items => items.id != i)
+            }
           })
         }
       }
     },
-    checkNumberInput(itemj,itemk) {
+    checkNumberInput (itemj, itemk) {
       if (isNaN(this.form[itemj][itemk])) {
         this.$message.error("请输入数字");
         this.form[itemj][itemk] = "";
@@ -1665,10 +1695,10 @@ export default {
     },
     handleChangeGrid (val) {
       console.log('val', val)
-      for(let n of this.optionsG){
-          if(n.value == val){
+      for (let n of this.optionsG) {
+        if (n.value == val) {
           this.form.gridName = n.label
-          }
+        }
       }
       this.form.villageId = ''
       this.form.buildId = ''
@@ -1706,27 +1736,27 @@ 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
-        let huji = '', i = 0
-        if (user.areaCodePath && user.areaCodePath.length > 0) {
-            i = user.areaCodePath.length - 1
-            huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
-        }
+      console.log('n---', item)
+      if (item.formName !== 'idNum') return
+      if (!isCard(this.form.idNum) && !isPassport(this.form.idNum)) return
+      const { user } = this.$store.state
+      let huji = '', i = 0
+      if (user.areaCodePath && user.areaCodePath.length > 0) {
+        i = user.areaCodePath.length - 1
+        huji = user.areaCodePath[i].length > 6 ? user.areaCodePath[i].substr(0, 6) : user.areaCodePath[i]
+      }
 
-        if (this.form.idNum.length === 18 || this.form.idNum.length === 15) {
-            const _id = this.form.idNum.substr(0, 6)
-            const { sex, birth, age } = computedCard(this.form.idNum)
-            this.form.birthday = birth
-            this.form.gender = sex == 1 ? '1' : '2'
-            this.form.oldPeopleFlag = age >= 60 ? 1 : 0
-            // this.form.IS_BDHJ = huji == _id ? '1' : ''
-              // 身份证前端验证角色方法 因原型没有注释
-            // this.validateIdcard(this.form.idNum)
-            console.log('age-----', age, _id)
-        }
+      if (this.form.idNum.length === 18 || this.form.idNum.length === 15) {
+        const _id = this.form.idNum.substr(0, 6)
+        const { sex, birth, age } = computedCard(this.form.idNum)
+        this.form.birthday = birth
+        this.form.gender = sex == 1 ? '1' : '2'
+        this.form.oldPeopleFlag = age >= 60 ? 1 : 0
+        // this.form.IS_BDHJ = huji == _id ? '1' : ''
+        // 身份证前端验证角色方法 因原型没有注释
+        // this.validateIdcard(this.form.idNum)
+        console.log('age-----', age, _id)
+      }
 
     },
     handleChangeV (val) {
@@ -1752,8 +1782,8 @@ export default {
     async handleClick (tab, event) {
       console.log(tab);
       console.log(event);
-      console.log(this.form.resiId );
-    
+      console.log(this.form.resiId);
+
       if (tab._props.label == '教育') {
         if (!this.form.resiId) {
           this.newForm.eduInfoDto = this.form.eduInfoDto
@@ -1916,36 +1946,36 @@ export default {
       } else this.form.IS_TENANT = '0'
     },
     //获取民族字典
-    async getDictList(){
+    async getDictList () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/nation',{formCode: "resi_base_info"})
+        const { data } = await this.$http.post('sys/dict/data/nation', { formCode: "resi_base_info" })
         this.dictList = data
         this.basicInformation.forEach(c => {
-          if(c.formName == 'nation'){
+          if (c.formName == 'nation') {
             c.opction = data.data
             console.log(c.opction);
           }
         })
       } catch (error) {
-        console.log(error,'获取民族字典');
+        console.log(error, '获取民族字典');
       }
     },
     // 获取人物关系字典
-    async getRelationship(){
+    async getRelationship () {
       try {
-        const { data } = await this.$http.post('sys/dict/data/relationship',{formCode: "resi_base_info"})
+        const { data } = await this.$http.post('sys/dict/data/relationship', { formCode: "resi_base_info" })
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'houseHolderRel' ||i.formName == 'elderlyRelation' ){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'houseHolderRel' || i.formName == 'elderlyRelation') {
+              i.opction = data.data
+            }
           }
         })
-        } catch (error) {
-          console.log(error,'获取民族字典');
-        }
+      } catch (error) {
+        console.log(error, '获取民族字典');
+      }
     },
-    
+
     getTreeData (data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {
@@ -1961,156 +1991,156 @@ export default {
       });
       return arr;
     },
-    async getEducation(){
+    async getEducation () {
       try {
-        let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"})
+        let { data } = await this.$http.post('sys/dict/data/education', { formCode: "resi_base_info" })
         data.data = this.getTreeData(data.data)
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'cultureLevel'){
-                  i.opction = data.data
-                  console.log( i.opction );
-              }
+          for (let i of c.children) {
+            if (i.formName == 'cultureLevel') {
+              i.opction = data.data
+              console.log(i.opction);
+            }
           }
         })
-        } catch (error) {
-          console.log(error,'获取民族字典');
-        }
+      } catch (error) {
+        console.log(error, '获取民族字典');
+      }
     },
-    async getHousing(){
+    async getHousing () {
       try {
-        let { data } = await this.$http.post('sys/dict/data/house',{formCode: "resi_base_info"})
+        let { data } = await this.$http.post('sys/dict/data/house', { formCode: "resi_base_info" })
         data.data = this.getTreeData(data.data)
         this.footerInputList.forEach(c => {
-          for(let i of c.children){
-              if(i.formName == 'housingNature'){
-                  i.opction = data.data
-              }
+          for (let i of c.children) {
+            if (i.formName == 'housingNature') {
+              i.opction = data.data
+            }
           }
         })
       } catch (error) {
-        console.log(error,'获取住房性质字典');
+        console.log(error, '获取住房性质字典');
       }
     },
-    getFormData(data) {
-        this.form.resiId = data.resiId
-        this.form.buildId = data.houseInfo.buildId
-        this.form.gridId = data.houseInfo.gridId
-        this.form.gridName = data.houseInfo.gridName
-        this.form.homeId = data.houseInfo.homeId
-        this.form.homeName = data.houseInfo.homeName
-        this.form.houseMergeId = data.houseInfo.mergeId
-        this.form.unitId = data.houseInfo.unitId
-        this.form.villageId = data.houseInfo.villageId
-        this.form.birthday = data.birthday
-        this.form.gender = data.gender
-        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.remark = data.remark ? data.remark : ''
-        if (data.categoryInfo) {
-          this.form.categoryId = data.categoryInfo.id,// 临时写死
+    getFormData (data) {
+      this.form.resiId = data.resiId
+      this.form.buildId = data.houseInfo.buildId
+      this.form.gridId = data.houseInfo.gridId
+      this.form.gridName = data.houseInfo.gridName
+      this.form.homeId = data.houseInfo.homeId
+      this.form.homeName = data.houseInfo.homeName
+      this.form.houseMergeId = data.houseInfo.mergeId
+      this.form.unitId = data.houseInfo.unitId
+      this.form.villageId = data.houseInfo.villageId
+      this.form.birthday = data.birthday
+      this.form.gender = data.gender
+      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.remark = data.remark ? data.remark : ''
+      if (data.categoryInfo) {
+        this.form.categoryId = data.categoryInfo.id,// 临时写死
           this.form.partyFlag = data.categoryInfo.partyFlag.toString()
-          this.form.subsistenceAllowanceFlag = data.categoryInfo.subsistenceAllowanceFlag.toString()
-          this.form.ensureHouseFlag = data.categoryInfo.ensureHouseFlag.toString()
-          this.form.unemployedFlag = data.categoryInfo.unemployedFlag.toString()
-          this.form.fertileWomanFlag = data.categoryInfo.fertileWomanFlag.toString()
-          this.form.veteranFlag = data.categoryInfo.veteranFlag.toString()
-          this.form.unitedFrontFlag = data.categoryInfo.unitedFrontFlag.toString()
-          this.form.petitionOfficerFlag = data.categoryInfo.petitionOfficerFlag.toString()
-          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.disabledFlag = data.categoryInfo.disabledFlag.toString()
-          this.form.dementedFlag = data.categoryInfo.dementedFlag.toString()
-          this.form.disabilityFlag = data.categoryInfo.disabilityFlag.toString()
-          this.form.seriousIllnessFlag = data.categoryInfo.seriousIllnessFlag.toString()
-          this.form.chronicDiseaseFlag = data.categoryInfo.chronicDiseaseFlag.toString()
-          this.form.specialCrowdFlag = data.categoryInfo.specialCrowdFlag.toString()
-          this.form.tenantFlag = data.categoryInfo.tenantFlag.toString()
-          this.form.floatingFlag = data.categoryInfo.floatingFlag.toString()
-          this.form.liveAloneFlag = data.categoryInfo.liveAloneFlag.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'})
-          if(this.form.veteranFlag == '1') this.tabsList.push({label:'退役军人',id:'3',groupId:'veteranDto'})
-          if(this.form.unitedFrontFlag == '1') this.tabsList.push({label:'统战',id:'4',groupId:'unitedFrontDto'})
-          if(this.form.volunteerFlag == '1') this.tabsList.push({label:'志愿者信息',id:'5',groupId:'volunteerDto'})
-          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'})
-        }
-        let {categoryId, resiId, buildId, gridId, gridName, homeId, homeName,houseMergeId,unitId,
-          villageId,birthday,gender,idNum,localResidenceFlag,mobile,name,nation,remark,
-          partyFlag,subsistenceAllowanceFlag,ensureHouseFlag,unemployedFlag,fertileWomanFlag,veteranFlag,unitedFrontFlag,
-          petitionOfficerFlag,volunteerFlag,oldPeopleFlag,emptyNesterFlag,bereavedPersonFlag,disabledFlag,
-          dementedFlag,disabilityFlag,seriousIllnessFlag,chronicDiseaseFlag,specialCrowdFlag,tenantFlag,floatingFlag,liveAloneFlag,publicWelfareFlag} = this.form
-        this.newForm = {
-          categoryId,
-          resiId,
-          buildId,
-          gridId,
-          gridName,
-          homeId,
-          homeName,
-          houseMergeId,
-          unitId,
-          villageId,
-          birthday,
-          gender,
-          idNum,
-          localResidenceFlag,
-          mobile,
-          name,
-          nation,
-          remark,
-          partyFlag,
-          subsistenceAllowanceFlag,
-          ensureHouseFlag,
-          unemployedFlag,
-          fertileWomanFlag,
-          veteranFlag,
-          unitedFrontFlag,
-          petitionOfficerFlag,
-          volunteerFlag,
-          oldPeopleFlag,
-          emptyNesterFlag,
-          bereavedPersonFlag,
-          disabledFlag,
-          dementedFlag,
-          disabilityFlag,
-          seriousIllnessFlag,
-          chronicDiseaseFlag,
-          specialCrowdFlag,
-          tenantFlag,
-          floatingFlag,
-          liveAloneFlag,
-          publicWelfareFlag
-        }
-        // this.newForm = {...this.form}
+        this.form.subsistenceAllowanceFlag = data.categoryInfo.subsistenceAllowanceFlag.toString()
+        this.form.ensureHouseFlag = data.categoryInfo.ensureHouseFlag.toString()
+        this.form.unemployedFlag = data.categoryInfo.unemployedFlag.toString()
+        this.form.fertileWomanFlag = data.categoryInfo.fertileWomanFlag.toString()
+        this.form.veteranFlag = data.categoryInfo.veteranFlag.toString()
+        this.form.unitedFrontFlag = data.categoryInfo.unitedFrontFlag.toString()
+        this.form.petitionOfficerFlag = data.categoryInfo.petitionOfficerFlag.toString()
+        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.disabledFlag = data.categoryInfo.disabledFlag.toString()
+        this.form.dementedFlag = data.categoryInfo.dementedFlag.toString()
+        this.form.disabilityFlag = data.categoryInfo.disabilityFlag.toString()
+        this.form.seriousIllnessFlag = data.categoryInfo.seriousIllnessFlag.toString()
+        this.form.chronicDiseaseFlag = data.categoryInfo.chronicDiseaseFlag.toString()
+        this.form.specialCrowdFlag = data.categoryInfo.specialCrowdFlag.toString()
+        this.form.tenantFlag = data.categoryInfo.tenantFlag.toString()
+        this.form.floatingFlag = data.categoryInfo.floatingFlag.toString()
+        this.form.liveAloneFlag = data.categoryInfo.liveAloneFlag.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' })
+        if (this.form.veteranFlag == '1') this.tabsList.push({ label: '退役军人', id: '3', groupId: 'veteranDto' })
+        if (this.form.unitedFrontFlag == '1') this.tabsList.push({ label: '统战', id: '4', groupId: 'unitedFrontDto' })
+        if (this.form.volunteerFlag == '1') this.tabsList.push({ label: '志愿者信息', id: '5', groupId: 'volunteerDto' })
+        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' })
+      }
+      let { categoryId, resiId, buildId, gridId, gridName, homeId, homeName, houseMergeId, unitId,
+        villageId, birthday, gender, idNum, localResidenceFlag, mobile, name, nation, remark,
+        partyFlag, subsistenceAllowanceFlag, ensureHouseFlag, unemployedFlag, fertileWomanFlag, veteranFlag, unitedFrontFlag,
+        petitionOfficerFlag, volunteerFlag, oldPeopleFlag, emptyNesterFlag, bereavedPersonFlag, disabledFlag,
+        dementedFlag, disabilityFlag, seriousIllnessFlag, chronicDiseaseFlag, specialCrowdFlag, tenantFlag, floatingFlag, liveAloneFlag, publicWelfareFlag } = this.form
+      this.newForm = {
+        categoryId,
+        resiId,
+        buildId,
+        gridId,
+        gridName,
+        homeId,
+        homeName,
+        houseMergeId,
+        unitId,
+        villageId,
+        birthday,
+        gender,
+        idNum,
+        localResidenceFlag,
+        mobile,
+        name,
+        nation,
+        remark,
+        partyFlag,
+        subsistenceAllowanceFlag,
+        ensureHouseFlag,
+        unemployedFlag,
+        fertileWomanFlag,
+        veteranFlag,
+        unitedFrontFlag,
+        petitionOfficerFlag,
+        volunteerFlag,
+        oldPeopleFlag,
+        emptyNesterFlag,
+        bereavedPersonFlag,
+        disabledFlag,
+        dementedFlag,
+        disabilityFlag,
+        seriousIllnessFlag,
+        chronicDiseaseFlag,
+        specialCrowdFlag,
+        tenantFlag,
+        floatingFlag,
+        liveAloneFlag,
+        publicWelfareFlag
+      }
+      // this.newForm = {...this.form}
     },
     // 教育信息详情
-    residentEduInfo(id) {
-      if(this.newForm.eduInfoDto) return
+    residentEduInfo (id) {
+      if (this.newForm.eduInfoDto) return
       this.$http.get(`/actual/base/residentEduInfo/detail/${id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg);
         } else {
           this.form.eduInfoDto = res.data ? res.data : { // 教育信息
-            cultureLevel:'',
-            eduRemark:''
+            cultureLevel: '',
+            eduRemark: ''
           }
           this.newForm.eduInfoDto = this.form.eduInfoDto
         }
       })
     },
     // 兴趣爱好详情
-    residentHobbyInfo(id) {
-      if(this.newForm.hobbyInfoDto) return
+    residentHobbyInfo (id) {
+      if (this.newForm.hobbyInfoDto) return
       this.$http.get(`/actual/base/residentHobbyInfo/detail/${id}`).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg);
@@ -2119,471 +2149,471 @@ export default {
             res.data.hobbyCode = res.data.hobbyCode.split(',')
           }
           this.form.hobbyInfoDto = res.data ? res.data : { //兴趣爱好
-            hobbyCode:[],//兴趣特长
-            interestDesc:'',//兴趣
-            hobbyRemark:''//备注
+            hobbyCode: [],//兴趣特长
+            interestDesc: '',//兴趣
+            hobbyRemark: ''//备注
           }
           this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
         }
       })
     },
     // 宗教信仰详情
-    residentReligion(id) {
-      if(this.newForm.religionDto) return
+    residentReligion (id) {
+      if (this.newForm.religionDto) return
       this.$http.get(`/actual/base/residentReligion/detail/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.religionDto = res.data ? res.data : {
-              religion:'',
-              religionRemark:''
-            }
-
-            this.newForm.religionDto = this.form.religionDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.religionDto = res.data ? res.data : {
+            religion: '',
+            religionRemark: ''
           }
-        })
+
+          this.newForm.religionDto = this.form.religionDto
+        }
+      })
     },
     // 健康信息详情
-    getHealthInfoDetailById(id) {
-      if(this.newForm.healthDto) return
-        this.$http.post(`/actual/base/residentHealthInfo/getHealthInfoDetailById/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.healthDto = res.data ? res.data : { // 健康
-              disabilityCategoryCode:'',//残疾类别
-              disabilityLevel:'',//残疾等级
-              disabilityNum:'',//残疾证号
-              disabilityDesc:'',//残疾说明
-              guardianFlag:1,//有无监护人
-              specialSkillFlag:1,//有无技能特长【有:1 无:0】
-              workCapacityFlag:1,//有无劳动能力【有:1 无:0】
-              voluntaryEducationFlag:1,//有无非义务教育阶段助学【有:1 无:0】
-              illnessCode:'',//所患大病字典code
-              illnessTime:'',//大病患病时间yyyy-MM-dd
-              chronicDiseaseCode:'',//所患慢性病code
-              chronicDiseaseTime:'',//慢病患病时间
-              insuredFlag:1,//是否参保【是:1 否:0】
-              selfPayAmount:'',//自付金额
-              deliveranceAmount:'',//救助金额
-              deliveranceTime:'',//救助时间
-              deliveranceNum:'',//享受救助明细序号
-              healthRemark:''//备注
-            }
-            this.newForm.healthDto = this.form.healthDto
+    getHealthInfoDetailById (id) {
+      if (this.newForm.healthDto) return
+      this.$http.post(`/actual/base/residentHealthInfo/getHealthInfoDetailById/${id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.healthDto = res.data ? res.data : { // 健康
+            disabilityCategoryCode: '',//残疾类别
+            disabilityLevel: '',//残疾等级
+            disabilityNum: '',//残疾证号
+            disabilityDesc: '',//残疾说明
+            guardianFlag: 1,//有无监护人
+            specialSkillFlag: 1,//有无技能特长【有:1 无:0】
+            workCapacityFlag: 1,//有无劳动能力【有:1 无:0】
+            voluntaryEducationFlag: 1,//有无非义务教育阶段助学【有:1 无:0】
+            illnessCode: '',//所患大病字典code
+            illnessTime: '',//大病患病时间yyyy-MM-dd
+            chronicDiseaseCode: '',//所患慢性病code
+            chronicDiseaseTime: '',//慢病患病时间
+            insuredFlag: 1,//是否参保【是:1 否:0】
+            selfPayAmount: '',//自付金额
+            deliveranceAmount: '',//救助金额
+            deliveranceTime: '',//救助时间
+            deliveranceNum: '',//享受救助明细序号
+            healthRemark: ''//备注
           }
-        })
-      
+          this.newForm.healthDto = this.form.healthDto
+        }
+      })
+
     },
     // 工作信息详情
-    residentWorkInfo(id) {
-      if(this.newForm.healthDto) return
+    residentWorkInfo (id) {
+      if (this.newForm.healthDto) return
       this.$http.get(`/actual/base/residentWorkInfo/detail/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.workInfoDto = res.data ? res.data : { //工作
-              workUnit:'',//工作单位
-              occupation:'',//职业	
-              retireTime:'',//离退休时间		
-              workRemark:'',//备注		
-            }
-
-            this.newForm.workInfoDto = this.form.workInfoDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.workInfoDto = res.data ? res.data : { //工作
+            workUnit: '',//工作单位
+            occupation: '',//职业	
+            retireTime: '',//离退休时间		
+            workRemark: '',//备注		
           }
-        })
+
+          this.newForm.workInfoDto = this.form.workInfoDto
+        }
+      })
     },
     // 经济状况详情
-    getEconomyDetailById(id) {
-      if(this.newForm.economyDto) return
+    getEconomyDetailById (id) {
+      if (this.newForm.economyDto) return
       this.$http.post(`/actual/base/residentEconomy/getEconomyDetailById/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.economyDto = res.data ? res.data : {//经济
-              retirementAmount:'',//退休金额	
-              monthIncome:'',//月收入
-            }
-            this.newForm.economyDto = this.form.economyDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.economyDto = res.data ? res.data : {//经济
+            retirementAmount: '',//退休金额	
+            monthIncome: '',//月收入
           }
-        })
+          this.newForm.economyDto = this.form.economyDto
+        }
+      })
     },
     // 居住信息详情
-    getResideInfoDetailById(id) {
-      if(this.newForm.resideInfoDto) return
+    getResideInfoDetailById (id) {
+      if (this.newForm.resideInfoDto) return
       this.$http.post(`/actual/base/residentResideInfo/getResideInfoDetailById/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.resideInfoDto = res.data ? res.data : {//居住信息
-              nativePlace:'',//籍贯
-              placeOfDomicile:'',//户籍所在地	
-              currentResidence:'',//现居住地	
-              householdSituation:'',//人户情况，字典code
-              resiRemark:'',//备注
-            }
-            this.newForm.resideInfoDto = this.form.resideInfoDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.resideInfoDto = res.data ? res.data : {//居住信息
+            nativePlace: '',//籍贯
+            placeOfDomicile: '',//户籍所在地	
+            currentResidence: '',//现居住地	
+            householdSituation: '',//人户情况，字典code
+            resiRemark: '',//备注
           }
-        })
+          this.newForm.resideInfoDto = this.form.resideInfoDto
+        }
+      })
     },
     // 家庭信息详情
-    getFamilyInfoDetailById(id) {
-      if(this.newForm.familyInfoDto) return
+    getFamilyInfoDetailById (id) {
+      if (this.newForm.familyInfoDto) return
       this.$http.post(`/actual/base/residentFamilyInfo/getFamilyInfoDetailById/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.familyInfoDto = res.data ? res.data : {//家庭
-              houseHolderRel:'',//与户主关系	
-              resideSituation:'',//居住情况		
-              marriage:'',//婚姻状况		
-              spouseSituation:'',//配偶情况		
-              elderlyFlag:1,//有无赡养人【有:1 无:0】		
-              elderlyRelation:'',//与赡养人关系【字典表】		
-              dependantMobile:'',//赡养人联系电话			
-              familyInfoRemark:'',//备注		
-            }
-            this.newForm.familyInfoDto = this.form.familyInfoDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.familyInfoDto = res.data ? res.data : {//家庭
+            houseHolderRel: '',//与户主关系	
+            resideSituation: '',//居住情况		
+            marriage: '',//婚姻状况		
+            spouseSituation: '',//配偶情况		
+            elderlyFlag: 1,//有无赡养人【有:1 无:0】		
+            elderlyRelation: '',//与赡养人关系【字典表】		
+            dependantMobile: '',//赡养人联系电话			
+            familyInfoRemark: '',//备注		
           }
-        })
+          this.newForm.familyInfoDto = this.form.familyInfoDto
+        }
+      })
     },
     // 出生信息
-    residentBirthRecord(id) {
-      if(this.newForm.birthRecordDTO) return
+    residentBirthRecord (id) {
+      if (this.newForm.birthRecordDTO) return
       this.$http.post(`/actual/base/residentBirthRecord/detail/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.birthRecordDTO = res.data ? res.data : { //出生
-              birthplace: '',
-              father: '',
-              mother: '',
-              count: 0,
-              reportDate: ''
-            }
-            this.newForm.birthRecordDTO = this.form.birthRecordDTO
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.birthRecordDTO = res.data ? res.data : { //出生
+            birthplace: '',
+            father: '',
+            mother: '',
+            count: 0,
+            reportDate: ''
           }
-        })
+          this.newForm.birthRecordDTO = this.form.birthRecordDTO
+        }
+      })
     },
     // 党员信息详情
-    residentPartyMemberInfo(id) {
-      if(this.newForm.parymemberInfoDto) return
+    residentPartyMemberInfo (id) {
+      if (this.newForm.parymemberInfoDto) return
       this.$http.get(`/actual/base/residentPartyMemberInfo/detail/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.parymemberInfoDto = res.data ? res.data : {//党员信息
-              joinTime:'',//入党时间yyyy-MM-dd
-              positiveTime:'',//转正时间yyyy-MM-dd	
-              partyOrgId:'',//所属党组织
-              flowFlag:null,//是否流动党员：1是，0否	
-              flowActNum:'',//流动党员活动证号	
-              partyJob:'',//职务，字典code
-              retiredFlag:null,//是否退休：1是，0否
-              centerFlag:null,//是否党员中心户：1是，0否
-              joinBranchName:'',//入党时所在党支部
-              joinCommunityTime:'',//组织关系转入社区时间yyyy-MM-dd
-              longHolidayFlag:null,//是否请长假：1是，0否
-            }
-            this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.parymemberInfoDto = res.data ? res.data : {//党员信息
+            joinTime: '',//入党时间yyyy-MM-dd
+            positiveTime: '',//转正时间yyyy-MM-dd	
+            partyOrgId: '',//所属党组织
+            flowFlag: null,//是否流动党员：1是，0否	
+            flowActNum: '',//流动党员活动证号	
+            partyJob: '',//职务，字典code
+            retiredFlag: null,//是否退休：1是，0否
+            centerFlag: null,//是否党员中心户：1是，0否
+            joinBranchName: '',//入党时所在党支部
+            joinCommunityTime: '',//组织关系转入社区时间yyyy-MM-dd
+            longHolidayFlag: null,//是否请长假：1是，0否
           }
-        })
+          this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
+        }
+      })
     },
     // 保障房信息详情
-    residentEnsureHouse(id) {
-      if(this.newForm.ensureHouseDto) return
+    residentEnsureHouse (id) {
+      if (this.newForm.ensureHouseDto) return
       this.$http.get(`/actual/base/residentEnsureHouse/detail/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.ensureHouseDto = res.data ? res.data : {//保障房信息
-              housingNature:'',//住房性质，字典code
-              securityType:'',//保障类型	
-              certificateDate:'',//发证日期yyyy-MM-dd
-              subsidyNum:'',//补贴编号	
-              subsidyAmount:'',//补贴金额	
-            }
-            this.newForm.ensureHouseDto = this.form.ensureHouseDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.ensureHouseDto = res.data ? res.data : {//保障房信息
+            housingNature: '',//住房性质，字典code
+            securityType: '',//保障类型	
+            certificateDate: '',//发证日期yyyy-MM-dd
+            subsidyNum: '',//补贴编号	
+            subsidyAmount: '',//补贴金额	
           }
-        })
+          this.newForm.ensureHouseDto = this.form.ensureHouseDto
+        }
+      })
     },
     // 失业信息详情
-    residentUnemployed(id) {
-      if(this.newForm.unemployedDto) return
+    residentUnemployed (id) {
+      if (this.newForm.unemployedDto) return
       this.$http.get(`/actual/base/residentUnemployed/detail/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.unemployedDto = res.data ? res.data : {//失业信息
-              originWorkUnit:'',//原工作单位
-              unemploymentTime:'',//失业时间yyyy-MM-dd	
-              unemploymentNum:'',//失业证号	
-              employmentNum:'',//再就业优惠证号	
-              specialSkill:'',//技术特长	
-              unemploymentReason:'',//失业原因【字典表】code	
-              employmentHardFlag:null,//是否就业困难对象；1是0不是	
-              employmentWish:'',//劳动能力就业愿望	
-            }
-            this.newForm.unemployedDto = this.form.unemployedDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.unemployedDto = res.data ? res.data : {//失业信息
+            originWorkUnit: '',//原工作单位
+            unemploymentTime: '',//失业时间yyyy-MM-dd	
+            unemploymentNum: '',//失业证号	
+            employmentNum: '',//再就业优惠证号	
+            specialSkill: '',//技术特长	
+            unemploymentReason: '',//失业原因【字典表】code	
+            employmentHardFlag: null,//是否就业困难对象；1是0不是	
+            employmentWish: '',//劳动能力就业愿望	
           }
-        })
+          this.newForm.unemployedDto = this.form.unemployedDto
+        }
+      })
     },
     // 退役军人信息详情
-    getVeteranDetailById(id) {
-      if(this.newForm.veteranDto) return
+    getVeteranDetailById (id) {
+      if (this.newForm.veteranDto) return
       this.$http.post(`/actual/base/residentVeteran/getVeteranDetailById/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.veteranDto = res.data ? res.data : {//退役军人
-              joinArmyTime:'',//入伍时间
-              leaveArmyTime:'',//退伍时间
-              serviceUnit:'',//服役单位	
-              receiveUnit:'',//接收单位	
-              settlementAmount:'',//待安置补助金	
-              trainDesc:'',//培训状况	
-              employmentSituation:'',//现就业情况	
-              joinWarStartTime:'',//参战时间开始日期yyyy-MM-dd	
-              joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd	
-              pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
-            }
-            this.newForm.veteranDto = this.form.veteranDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.veteranDto = res.data ? res.data : {//退役军人
+            joinArmyTime: '',//入伍时间
+            leaveArmyTime: '',//退伍时间
+            serviceUnit: '',//服役单位	
+            receiveUnit: '',//接收单位	
+            settlementAmount: '',//待安置补助金	
+            trainDesc: '',//培训状况	
+            employmentSituation: '',//现就业情况	
+            joinWarStartTime: '',//参战时间开始日期yyyy-MM-dd	
+            joinWarEndTime: '',//参战时间截止日期yyyy-MM-dd	
+            pubWelfareJobFlag: null,//是否办理公益性岗位;1是0否
           }
-        })
+          this.newForm.veteranDto = this.form.veteranDto
+        }
+      })
     },
     // 统战人员详情
-    residentUnitedFront(id) {
-      if(this.newForm.unitedFrontDto) return
+    residentUnitedFront (id) {
+      if (this.newForm.unitedFrontDto) return
       this.$http.get(`/actual/base/residentUnitedFront/detail/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.unitedFrontDto = res.data ? res.data : {//统战人员
-              duty:'',//职务
-              visitation:'',//探亲情况	
-            }
-            this.newForm.unitedFrontDto = this.form.unitedFrontDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.unitedFrontDto = res.data ? res.data : {//统战人员
+            duty: '',//职务
+            visitation: '',//探亲情况	
           }
-        })
+          this.newForm.unitedFrontDto = this.form.unitedFrontDto
+        }
+      })
     },
     // 志愿者信息详情
-    getVolunteerDetailById(id) {
-     if(this.newForm.volunteerDto) return
+    getVolunteerDetailById (id) {
+      if (this.newForm.volunteerDto) return
       this.$http.post(`/actual/base/residentVolunteer/getVolunteerDetailById/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            if (res.data) {
-              res.data.volunteerCategory = res.data.volunteerCategory.split(',')
-            }
-            this.form.volunteerDto = res.data ? res.data : {//志愿者信息	
-              volunteerCategory:[],//志愿者类别
-              volunteerRemark:''//备注
-            }
-
-            this.newForm.volunteerDto = this.form.volunteerDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          if (res.data) {
+            res.data.volunteerCategory = res.data.volunteerCategory.split(',')
           }
-        })
+          this.form.volunteerDto = res.data ? res.data : {//志愿者信息	
+            volunteerCategory: [],//志愿者类别
+            volunteerRemark: ''//备注
+          }
+
+          this.newForm.volunteerDto = this.form.volunteerDto
+        }
+      })
     },
     // 老年人信息详情
-    getOldPeopleDetailById(id) {
-      if(this.newForm.oldPeopleDto) return
+    getOldPeopleDetailById (id) {
+      if (this.newForm.oldPeopleDto) return
       this.$http.post(`/actual/base/residentOldPeople/getOldPeopleDetailById/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.oldPeopleDto = res.data ? res.data : {
-              oldSubsidy:''//高龄补助	
-            }
-
-            this.newForm.oldPeopleDto = this.form.oldPeopleDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.oldPeopleDto = res.data ? res.data : {
+            oldSubsidy: ''//高龄补助	
           }
-        })
-    },
-     // 公益岗人员信息详情
-     getWelfareDetailById(id) {
-      if(this.newForm.postDto) return
-      this.$http.post(`/actual/base/publicWelfarePost/detail`,{id:id}).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            this.form.postDto = res.data ? res.data : {
-              hiredate:'',//入职时间
-              jobPost:'',	//岗位类型
-              userId:id
-            }
 
-            this.newForm.postDto = this.form.postDto
+          this.newForm.oldPeopleDto = this.form.oldPeopleDto
+        }
+      })
+    },
+    // 公益岗人员信息详情
+    getWelfareDetailById (id) {
+      if (this.newForm.postDto) return
+      this.$http.post(`/actual/base/publicWelfarePost/detail`, { id: id }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          this.form.postDto = res.data ? res.data : {
+            hiredate: '',//入职时间
+            jobPost: '',	//岗位类型
+            userId: id
           }
-        })
+
+          this.newForm.postDto = this.form.postDto
+        }
+      })
     },
     // 特殊人群信息
-    residentSpecial(id) {
-      if(this.newForm.specialDto) return
+    residentSpecial (id) {
+      if (this.newForm.specialDto) return
       this.$http.get(`/actual/base/residentSpecial/detail/${id}`).then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg);
-          } else {
-            if (res.data) {
-              res.data.specialCategoryCode = res.data.specialCategoryCode.split(',')
-            }
-            this.form.specialDto = res.data ? res.data : {//特殊人群
-              specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开；	
-            }
-
-            this.newForm.specialDto = this.form.specialDto
+        if (res.code !== 0) {
+          return this.$message.error(res.msg);
+        } else {
+          if (res.data) {
+            res.data.specialCategoryCode = res.data.specialCategoryCode.split(',')
           }
-        })
+          this.form.specialDto = res.data ? res.data : {//特殊人群
+            specialCategoryCode: []//人群类别【字典表】,可多选，以英文逗号隔开；	
+          }
+
+          this.newForm.specialDto = this.form.specialDto
+        }
+      })
     },
-    setNewForm() {
+    setNewForm () {
       this.newForm = {
-        agencyName:this.$store.state.user.agencyName,
-        agencyId:this.$store.state.user.agencyId,
+        agencyName: this.$store.state.user.agencyName,
+        agencyId: this.$store.state.user.agencyId,
         resiId: '', // 详情拿到
         houseMergeId: '', // 详情拿到
         categoryId: '', // 详情拿到
-        gridName:'',
-        gridId:'', //所属网格id
+        gridName: '',
+        gridId: '', //所属网格id
         villageId: '', //小区id
         buildId: '', //楼栋id
         unitId: '', //单元id
         homeId: '', //房屋id
-        name:'', //姓名
-        nation:'', //民族
-        remark:'', //备注
-        localResidenceFlag:'', //本地户籍
-        birthday:'', //生日
-        idNum:'', //证件号
-        gender:'', // 性别
-        mobile:'', //联系电话
-        partyFlag:'0',//党员
-        subsistenceAllowanceFlag:'0', //低保
-        ensureHouseFlag:'0', //保障房
-        unemployedFlag:'0',//失业
-        fertileWomanFlag:'0', //育龄妇女
-        veteranFlag:'0', //退役军人
-        unitedFrontFlag:'0',//统战人员
-        petitionOfficerFlag:'0',//信访人员
-        volunteerFlag:'0', //志愿者
-        bereavedPersonFlag:'0', //失独
-        tenantFlag:'0', //租户
-        floatingFlag:'0',//流动人口
-        specialCrowdFlag:'0',//特殊人群
-        oldPeopleFlag:'0', //老年人
-        emptyNesterFlag:'0', //空巢
-        liveAloneFlag:'0', //独居老人
-        disabledFlag:'0', //失能老人
-        dementedFlag:'0', //失智老人
-        disabilityFlag:'0',//是否残疾
-        seriousIllnessFlag:'0', //大病
-        chronicDiseaseFlag:'0', //慢病
-        publicWelfareFlag:'0',//公益岗
+        name: '', //姓名
+        nation: '', //民族
+        remark: '', //备注
+        localResidenceFlag: '', //本地户籍
+        birthday: '', //生日
+        idNum: '', //证件号
+        gender: '', // 性别
+        mobile: '', //联系电话
+        partyFlag: '0',//党员
+        subsistenceAllowanceFlag: '0', //低保
+        ensureHouseFlag: '0', //保障房
+        unemployedFlag: '0',//失业
+        fertileWomanFlag: '0', //育龄妇女
+        veteranFlag: '0', //退役军人
+        unitedFrontFlag: '0',//统战人员
+        petitionOfficerFlag: '0',//信访人员
+        volunteerFlag: '0', //志愿者
+        bereavedPersonFlag: '0', //失独
+        tenantFlag: '0', //租户
+        floatingFlag: '0',//流动人口
+        specialCrowdFlag: '0',//特殊人群
+        oldPeopleFlag: '0', //老年人
+        emptyNesterFlag: '0', //空巢
+        liveAloneFlag: '0', //独居老人
+        disabledFlag: '0', //失能老人
+        dementedFlag: '0', //失智老人
+        disabilityFlag: '0',//是否残疾
+        seriousIllnessFlag: '0', //大病
+        chronicDiseaseFlag: '0', //慢病
+        publicWelfareFlag: '0',//公益岗
       }
 
       this.newForm.eduInfoDto = this.form.eduInfoDto
       console.log(this.newForm.specialDto);
     },
-    setJSON() {
+    setJSON () {
       this.newForm.agencyName = this.form.agencyName,
-      this.newForm.agencyId = this.form.agencyId,
-      this.newForm.resiId = this.form.resiId,
-      this.newForm.houseMergeId = this.form.houseMergeId,
-      this.newForm.categoryId = this.form.categoryId,
-      this.newForm.gridName = this.form.gridName,
-      this.newForm.gridId = this.form.gridId,
-      this.newForm.villageId = this.form.villageId,
-      this.newForm.buildId = this.form.buildId,
-      this.newForm.unitId = this.form.unitId,
-      this.newForm.homeId = this.form.homeId,
-      this.newForm.name = this.form.name,
-      this.newForm.vnation = this.form.vnation,
-      this.newForm.remark = this.form.remark,
-      this.newForm.localResidenceFlag = this.form.localResidenceFlag,
-      this.newForm.birthday = this.form.birthday,
-      this.newForm.idNum = this.form.idNum,
-      this.newForm.gender = this.form.gender,
-      this.newForm.mobile = this.form.mobile,
-      this.newForm.partyFlag = this.form.partyFlag,
-      this.newForm.subsistenceAllowanceFlag = this.form.subsistenceAllowanceFlag,
-      this.newForm.ensureHouseFlag = this.form.ensureHouseFlag,
-      this.newForm.unemployedFlag = this.form.unemployedFlag,
-      this.newForm.fertileWomanFlag = this.form.fertileWomanFlag,
-      this.newForm.veteranFlag = this.form.veteranFlag,
-      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.tenantFlag = this.form.tenantFlag,
-      this.newForm.floatingFlag = this.form.floatingFlag,
-      this.newForm.specialCrowdFlag = this.form.specialCrowdFlag,
-      this.newForm.oldPeopleFlag = this.form.oldPeopleFlag,
-      this.newForm.emptyNesterFlag = this.form.emptyNesterFlag,
-      this.newForm.liveAloneFlag = this.form.liveAloneFlag,
-      this.newForm.disabledFlag = this.form.disabledFlag,
-      this.newForm.dementedFlag = this.form.dementedFlag,
-      this.newForm.disabilityFlag = this.form.disabilityFlag,
-      this.newForm.seriousIllnessFlag = this.form.seriousIllnessFlag,
-      this.newForm.chronicDiseaseFlag = this.form.chronicDiseaseFlag,
-      this.newForm.publicWelfareFlag = this.form.publicWelfareFlag
-      if(this.newForm.eduInfoDto) {
+        this.newForm.agencyId = this.form.agencyId,
+        this.newForm.resiId = this.form.resiId,
+        this.newForm.houseMergeId = this.form.houseMergeId,
+        this.newForm.categoryId = this.form.categoryId,
+        this.newForm.gridName = this.form.gridName,
+        this.newForm.gridId = this.form.gridId,
+        this.newForm.villageId = this.form.villageId,
+        this.newForm.buildId = this.form.buildId,
+        this.newForm.unitId = this.form.unitId,
+        this.newForm.homeId = this.form.homeId,
+        this.newForm.name = this.form.name,
+        this.newForm.vnation = this.form.vnation,
+        this.newForm.remark = this.form.remark,
+        this.newForm.localResidenceFlag = this.form.localResidenceFlag,
+        this.newForm.birthday = this.form.birthday,
+        this.newForm.idNum = this.form.idNum,
+        this.newForm.gender = this.form.gender,
+        this.newForm.mobile = this.form.mobile,
+        this.newForm.partyFlag = this.form.partyFlag,
+        this.newForm.subsistenceAllowanceFlag = this.form.subsistenceAllowanceFlag,
+        this.newForm.ensureHouseFlag = this.form.ensureHouseFlag,
+        this.newForm.unemployedFlag = this.form.unemployedFlag,
+        this.newForm.fertileWomanFlag = this.form.fertileWomanFlag,
+        this.newForm.veteranFlag = this.form.veteranFlag,
+        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.tenantFlag = this.form.tenantFlag,
+        this.newForm.floatingFlag = this.form.floatingFlag,
+        this.newForm.specialCrowdFlag = this.form.specialCrowdFlag,
+        this.newForm.oldPeopleFlag = this.form.oldPeopleFlag,
+        this.newForm.emptyNesterFlag = this.form.emptyNesterFlag,
+        this.newForm.liveAloneFlag = this.form.liveAloneFlag,
+        this.newForm.disabledFlag = this.form.disabledFlag,
+        this.newForm.dementedFlag = this.form.dementedFlag,
+        this.newForm.disabilityFlag = this.form.disabilityFlag,
+        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
       }
-      if(this.newForm.hobbyInfoDto) {
+      if (this.newForm.hobbyInfoDto) {
         this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
       }
-      if(this.newForm.religionDto) {
+      if (this.newForm.religionDto) {
         this.newForm.religionDto = this.form.religionDto
       }
-      if(this.newForm.healthDto) {
+      if (this.newForm.healthDto) {
         this.newForm.healthDto = this.form.healthDto
       }
-      if(this.newForm.workInfoDto) {
+      if (this.newForm.workInfoDto) {
         this.newForm.workInfoDto = this.form.workInfoDto
       }
-      if(this.newForm.economyDto) {
+      if (this.newForm.economyDto) {
         this.newForm.economyDto = this.form.economyDto
       }
 
-      if(this.newForm.resideInfoDto) {
+      if (this.newForm.resideInfoDto) {
         this.newForm.resideInfoDto = this.form.resideInfoDto
       }
-      if(this.newForm.familyInfoDto) {
+      if (this.newForm.familyInfoDto) {
         this.newForm.familyInfoDto = this.form.familyInfoDto
       }
-      if(this.newForm.birthRecordDTO) {
+      if (this.newForm.birthRecordDTO) {
         this.newForm.birthRecordDTO = this.form.birthRecordDTO
       }
-      
-      if(this.newForm.parymemberInfoDto) {
+
+      if (this.newForm.parymemberInfoDto) {
         this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
       }
 
-      if(this.newForm.ensureHouseDto) {
+      if (this.newForm.ensureHouseDto) {
         this.newForm.ensureHouseDto = this.form.ensureHouseDto
       }
 
-      if(this.newForm.unemployedDto) {
+      if (this.newForm.unemployedDto) {
         this.newForm.unemployedDto = this.form.unemployedDto
       }
 
-      if(this.newForm.veteranDto) {
+      if (this.newForm.veteranDto) {
         this.newForm.veteranDto = this.form.veteranDto
       }
-      if(this.newForm.unitedFrontDto) {
+      if (this.newForm.unitedFrontDto) {
         this.newForm.unitedFrontDto = this.form.unitedFrontDto
       }
 
-      if(this.newForm.volunteerDto) {
+      if (this.newForm.volunteerDto) {
         this.newForm.volunteerDto = this.form.volunteerDto
       }
 
-      if(this.newForm.oldPeopleDto) {
+      if (this.newForm.oldPeopleDto) {
         this.newForm.oldPeopleDto = this.form.oldPeopleDto
       }
-      if(this.newForm.specialDto){
+      if (this.newForm.specialDto) {
         this.newForm.specialDto = this.form.specialDto
       }
-      if(this.newForm.postDto){
+      if (this.newForm.postDto) {
         this.newForm.postDto = this.form.postDto
       }
     }
@@ -2593,38 +2623,37 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
-.resi-form{
-    display: flex;
-    flex-wrap: wrap;
+.resi-form {
+  display: flex;
+  flex-wrap: wrap;
 }
-.textareaDidth{
+.textareaDidth {
   width: 100%;
 }
-.f-flex ::v-deep .el-form-item--medium{
+.f-flex ::v-deep .el-form-item--medium {
   margin-right: 2px;
 }
-.item-width-textarea{
+.item-width-textarea {
   width: 437px;
   height: 80px;
 }
-::v-deep .el-textarea__inner{
+::v-deep .el-textarea__inner {
   padding: 6px 15px;
 }
-::v-deep .el-tabs--top{
+::v-deep .el-tabs--top {
   width: 100%;
-  .el-tabs__content{
+  .el-tabs__content {
     width: 100%;
     display: flex;
   }
 }
-.m-search{
+.m-search {
   padding: 0 !important;
   margin: 0 !important;
-  box-shadow:none !important;
-  -webkit-box-shadow:none !important;
+  box-shadow: none !important;
+  -webkit-box-shadow: none !important;
 }
-.f-bto0{
+.f-bto0 {
   margin-bottom: 0px !important;
 }
-
 </style>
diff --git a/src/views/modules/base/community/buildTable.vue b/src/views/modules/base/community/buildTable.vue
index 40c799f74..0375a5498 100644
--- a/src/views/modules/base/community/buildTable.vue
+++ b/src/views/modules/base/community/buildTable.vue
@@ -477,10 +477,11 @@ export default {
 
         });
         this.tableData = data.list
-        this.addDisabled = false
+
       } else {
         this.$message.error(msg)
       }
+      this.addDisabled = false
       this.tableLoading = false
     },
 
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index c17c73e04..0b6475557 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -698,7 +698,7 @@ export default {
         this.treeData = [];
         this.treeData.push(data);
         // 默认加载第一层
-        debugger
+
         this.autoOpenArr.push(data.id)
         if (!isRefresh && data) {
           this.selTreeObj = data;
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 7ea93dc05..5b806443d 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -7,6 +7,7 @@
                    class="diy-button--blue"
                    icon="el-icon-plus"
                    size="small"
+                   :disabled="addDisabled"
                    @click="handleAdd">新增房屋</el-button>
 
         <div class="u-btn-upload"
@@ -343,6 +344,8 @@ export default {
       yihuyidangDisabled: false,
 
       displayedBaobiaoBtn: false,
+      addDisabled: true,
+
 
       btnAuths: {
         ic_house_add: false, //新增
@@ -479,6 +482,7 @@ export default {
     async loadTable (source, treeObj) {
       this.source = source;
       this.tableLoading = true;
+      this.addDisabled = true
       console.log(treeObj, source);
       if (source === "tree") {
         //来源于tree，查询数据清空
@@ -552,6 +556,7 @@ export default {
       } else {
         this.$message.error(msg);
       }
+      this.addDisabled = false
       this.tableLoading = false;
     },
 
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 0f07f9e18..767bcc5b6 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1,94 +1,70 @@
 <template>
-	<div class="g-main">
-		<div class="m-search">
-			<section
-				:class="
+  <div class="g-main">
+    <div class="m-search">
+      <section :class="
 					showSercahStatus
 						? 'm-form-box-height-auto'
 						: 'm-form-box-height'
-				"
-			>
-				<resi-search ref="myResiSearch" />
-			</section>
-			<el-row class="resi-search">
-				<el-col :span="24">
-					<el-button
-						size="small"
-						type="primary"
-						@click="handleSearchFrom"
-						>智能查询</el-button
-					>
-					<el-button
-						style="margin-left: 10px"
-						size="small"
-						plain
-						class="f-right5 diy-button--white"
-						@click="resetSearchForm"
-						>重置</el-button
-					>
-					<el-button
-						size="small"
-						type="primary"
-						@click="handleSearchFrom"
-						>查询</el-button
-					>
-					<el-button
-						type="text"
-						size="small"
-						style="margin-left: 10px"
-						class="f-right5"
-						@click="showSercahStatus = !showSercahStatus"
-					>
-						<i
-							:class="
+				">
+        <resi-search ref="myResiSearch" />
+      </section>
+      <el-row class="resi-search">
+        <el-col :span="24">
+          <el-button size="small"
+                     type="primary"
+                     @click="handleSearchFrom">智能查询</el-button>
+          <el-button style="margin-left: 10px"
+                     size="small"
+                     plain
+                     class="f-right5 diy-button--white"
+                     @click="resetSearchForm">重置</el-button>
+          <el-button size="small"
+                     type="primary"
+                     @click="handleSearchFrom">查询</el-button>
+          <el-button type="text"
+                     size="small"
+                     style="margin-left: 10px"
+                     class="f-right5"
+                     @click="showSercahStatus = !showSercahStatus">
+            <i :class="
 								showSercahStatus
 									? 'el-icon-arrow-up'
 									: 'el-icon-arrow-down'
-							"
-						></i>
-						{{ showSercahStatus ? "收起" : "展开" }}
-					</el-button>
-				</el-col>
-			</el-row>
-		</div>
-
-		<div class="m-table">
-			<div class="div_btn">
-				<div class="div_btn_left">
-					<el-button
-						class="diy-button--add"
-						v-if="btnAuths.ic_resi_add"
-						size="small"
-						@click="handleAdd"
-						type="primary"
-						icon="el-icon-plus"
-					>
-						新增</el-button
-					>
-					<el-button
-						v-if="btnAuths.ic_resi_export"
-						style="margin-left: 10px"
-						size="small"
-						class="diy-button--white"
-						@click="diyExport"
-						plain
-						>导出</el-button
-					>
-					<el-button
-						v-if="btnAuths.ic_resi_export"
-						style="margin-left: 10px"
-						size="small"
-						class="diy-button--white"
-						@click=""
-						plain
-						>核对</el-button
-					>
-					<!-- <el-button v-if="btnAuths.ic_resi_import"
+							"></i>
+            {{ showSercahStatus ? "收起" : "展开" }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </div>
+
+    <div class="m-table">
+      <div class="div_btn">
+        <div class="div_btn_left">
+          <el-button class="diy-button--add"
+                     v-if="btnAuths.ic_resi_add"
+                     size="small"
+                     @click="handleAdd"
+                     type="primary"
+                     icon="el-icon-plus">
+            新增</el-button>
+          <el-button v-if="btnAuths.ic_resi_export"
+                     style="margin-left: 10px"
+                     size="small"
+                     class="diy-button--white"
+                     @click="diyExport"
+                     plain>导出</el-button>
+          <el-button v-if="btnAuths.ic_resi_export"
+                     style="margin-left: 10px"
+                     size="small"
+                     class="diy-button--white"
+                     @click=""
+                     plain>核对</el-button>
+          <!-- <el-button v-if="btnAuths.ic_resi_import"
                      style="margin-left:10px"
                      class="diy-button--blue"
                      size="small"
                      @click="handleExportModule('room')">下载模板</el-button> -->
-					<!-- <el-upload v-if="btnAuths.ic_resi_import"
+          <!-- <el-upload v-if="btnAuths.ic_resi_import"
                      :headers="$getElUploadHeaders()"
                      ref="upload"
                      class="upload-demo"
@@ -108,473 +84,399 @@
                        :loading="importLoading">{{ importBtnTitle }}</el-button>
           </el-upload> -->
 
-					<el-button
-						v-if="
+          <el-button v-if="
 							btnAuths.ic_resi_smart_import && displayedBaobiaoBtn
 						"
-						style="margin-left: 10px"
-						size="small"
-						@click="reportForm"
-						class="diy-button--white"
-						>核对</el-button
-					>
-
-					<el-button
-						style="margin-left: 10px"
-						v-if="btnAuths.ic_resi_batch_del"
-						size="small"
-						class="diy-button--white"
-						plain
-						@click="deleteBatch"
-						>批量删除</el-button
-					>
-					<!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
-				</div>
-			</div>
-
-			<el-table
-				ref="ref_table"
-				class="m-table-item"
-				:data="tableData"
-				v-loading="tableLoading"
-				border
-				style="width: 100%"
-				:height="tableHeight"
-				@select-all="selectAll"
-				@selection-change="selectionChange"
-			>
-			<!-- 为啥要谁都能删除居民? -->
-			<!-- :selectable="checkSelectable" -->
-				<el-table-column
-					type="selection"
-					fixed="left"
-					align="center"
-					width="50"
-				/>
-				<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 || ''"
-				>
-					<template slot-scope="scope">
-						<a
-							v-if="
+                     style="margin-left: 10px"
+                     size="small"
+                     @click="reportForm"
+                     class="diy-button--white">核对</el-button>
+
+          <el-button style="margin-left: 10px"
+                     v-if="btnAuths.ic_resi_batch_del"
+                     size="small"
+                     class="diy-button--white"
+                     plain
+                     @click="deleteBatch">批量删除</el-button>
+          <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
+        </div>
+      </div>
+
+      <el-table ref="ref_table"
+                class="m-table-item"
+                :data="tableData"
+                v-loading="tableLoading"
+                border
+                style="width: 100%"
+                :height="tableHeight"
+                @select-all="selectAll"
+                @selection-change="selectionChange">
+        <!-- 为啥要谁都能删除居民? -->
+        <!-- :selectable="checkSelectable" -->
+        <el-table-column type="selection"
+                         fixed="left"
+                         align="center"
+                         width="50" />
+        <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 || ''">
+          <template slot-scope="scope">
+            <a v-if="
 								item.columnName == 'NAME' &&
 								btnAuths.ic_resi_view
 							"
-							class="name-a"
-						>
-							{{ handleFilterSpan(scope.row, item) }}
-						</a>
-						<div v-else-if="item.columnName == 'gender'">
-							{{ scope.row.gender == 1 ? "男" : "女" }}
-						</div>
-						<div v-else-if="item.columnName == 'birthday'">
-							{{
+               class="name-a">
+              {{ handleFilterSpan(scope.row, item) }}
+            </a>
+            <div v-else-if="item.columnName == 'gender'">
+              {{ scope.row.gender == 1 ? "男" : "女" }}
+            </div>
+            <div v-else-if="item.columnName == 'birthday'">
+              {{
 								scope.row.birthday
 									? scope.row.birthday.substr(0, 10)
 									: ""
 							}}
-						</div>
-						<div v-else-if="item.columnName == 'idNum'">
-							{{
+            </div>
+            <div v-else-if="item.columnName == 'idNum'">
+              {{
 								scope.row.idNum
 									? `${scope.row.idNum.substr(0, 11)}` +
 									  "******" +
 									  `${scope.row.idNum.substr(16, 2)}`
 									: "--"
 							}}
-						</div>
-						<div v-else-if="item.columnName == 'mobile'">
-							{{
+            </div>
+            <div v-else-if="item.columnName == 'mobile'">
+              {{
 								scope.row.mobile
 									? `${scope.row.mobile.substr(0, 3)}` +
 									  "******" +
 									  `${scope.row.mobile.substr(7, 4)}`
 									: "--"
 							}}
-						</div>
-						<div v-else-if="item.columnName == 'categoryInfo'">
-							<template v-if="scope.row.categoryInfo">
-								{{
+            </div>
+            <div v-else-if="item.columnName == 'categoryInfo'">
+              <template v-if="scope.row.categoryInfo">
+                {{
 									scope.row.categoryInfo.bereavedPersonFlag ==
 									1
 										? "特扶人员 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.chronicDiseaseFlag ==
 									1
 										? "慢病 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.dementedFlag == 1
 										? "失智老人 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.disabilityFlag == 1
 										? "残疾 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.disabledFlag == 1
 										? "失能老人 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.emptyNesterFlag == 1
 										? "空巢老人 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.ensureHouseFlag == 1
 										? "保障房人员 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.fertileWomanFlag == 1
 										? "育龄妇女 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.floatingFlag == 1
 										? "流动人口 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.liveAloneFlag == 1
 										? "独居老人 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.oldPeopleFlag == 1
 										? "老年人 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.partyFlag == 1
 										? "党员 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo
 										.petitionOfficerFlag == 1
 										? "信访人员 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.seriousIllnessFlag ==
 									1
 										? "大病 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.specialCrowdFlag == 1
 										? "特殊人群 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo
 										.subsistenceAllowanceFlag == 1
 										? "低保人员 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.tenantFlag == 1
 										? "租户 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.unemployedFlag == 1
 										? "失业 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.unitedFrontFlag == 1
 										? "统战人员 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.veteranFlag == 1
 										? "退役军人 "
 										: ""
 								}}
-								{{
+                {{
 									scope.row.categoryInfo.volunteerFlag == 1
 										? "志愿者 "
 										: ""
 								}}
-							</template>
-						</div>
-						<span v-else>{{
+              </template>
+            </div>
+            <span v-else>{{
 							handleFilterSpan(scope.row, item)
 						}}</span>
-					</template>
-				</el-table-column>
-				<el-table-column
-					fixed="right"
-					label="操作"
-					align="center"
-					width="200"
-				>
-					<template slot-scope="scope">
-						<el-button
-							v-if="btnAuths.ic_resi_view"
-							type="text"
-							size="small"
-							@click="handleLook(scope.row)"
-							>查看</el-button
-						>
-
-						<template v-if="filterEdit(scope.row.agencyId)">
-							<el-button
-								v-if="btnAuths.ic_resi_update"
-								style="margin-right: 10px"
-								@click="handleEdit(scope.row)"
-								size="small"
-								type="text"
-								>编辑</el-button
-							>
-
-							<el-popconfirm
-								v-if="btnAuths.ic_resi_del"
-								title="删除之后无法回复，确认删除？"
-								@onConfirm="handleDel(scope.row)"
-							>
-								<el-button
-									size="small"
-									type="text"
-									slot="reference"
-									>删除</el-button
-								>
-							</el-popconfirm>
-
-							<el-dropdown
-								trigger="click"
-								style="margin-left: 10px"
-								@command="
+          </template>
+        </el-table-column>
+        <el-table-column fixed="right"
+                         label="操作"
+                         align="center"
+                         width="200">
+          <template slot-scope="scope">
+            <el-button v-if="btnAuths.ic_resi_view"
+                       type="text"
+                       size="small"
+                       @click="handleLook(scope.row)">查看</el-button>
+
+            <template v-if="filterEdit(scope.row.agencyId)">
+              <el-button v-if="btnAuths.ic_resi_update"
+                         style="margin-right: 10px"
+                         @click="handleEdit(scope.row)"
+                         size="small"
+                         type="text">编辑</el-button>
+
+              <el-popconfirm v-if="btnAuths.ic_resi_del"
+                             title="删除之后无法回复，确认删除？"
+                             @onConfirm="handleDel(scope.row)">
+                <el-button size="small"
+                           type="text"
+                           slot="reference">删除</el-button>
+              </el-popconfirm>
+
+              <el-dropdown trigger="click"
+                           style="margin-left: 10px"
+                           @command="
 									(command) =>
 										handelRegister(command, scope.row)
-								"
-							>
-								<el-button
-									class="div-table-button--blue"
-									size="small"
-									type="text"
-									style="font-size: 10px"
-								>
-									▪▪▪</el-button
-								>
-								<el-dropdown-menu slot="dropdown">
-									<el-dropdown-item
-										v-if="
+								">
+                <el-button class="div-table-button--blue"
+                           size="small"
+                           type="text"
+                           style="font-size: 10px">
+                  ▪▪▪</el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item v-if="
 											false && btnAuths.ic_resi_change_rec
 										"
-										command="bgjl"
-										>变更记录</el-dropdown-item
-									>
-									<el-dropdown-item
-										v-if="btnAuths.ic_resi_update"
-										command="swdj"
-										>死亡登记</el-dropdown-item
-									>
-									<el-dropdown-item
-										v-if="btnAuths.ic_resi_update"
-										command="qcdj"
-										>迁出登记</el-dropdown-item
-									>
-								</el-dropdown-menu>
-							</el-dropdown>
-						</template>
-					</template>
-				</el-table-column>
-			</el-table>
-
-			<div class="div-flex">
-				<div class="m-page">
-					<el-pagination
-						@size-change="handleSizeChange"
-						@current-change="handleCurrentChange"
-						:current-page.sync="currentPage"
-						:page-sizes="[20, 50, 100, 200]"
-						:page-size="pageSize"
-						layout="sizes, prev, pager, next, total"
-						:total="total"
-					>
-					</el-pagination>
-				</div>
-			</div>
-		</div>
-
-		<el-dialog
-			:title="
+                                    command="bgjl">变更记录</el-dropdown-item>
+                  <el-dropdown-item v-if="btnAuths.ic_resi_update"
+                                    command="swdj">死亡登记</el-dropdown-item>
+                  <el-dropdown-item v-if="btnAuths.ic_resi_update"
+                                    command="qcdj">迁出登记</el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="div-flex">
+        <div class="m-page">
+          <el-pagination @size-change="handleSizeChange"
+                         @current-change="handleCurrentChange"
+                         :current-page.sync="currentPage"
+                         :page-sizes="[20, 50, 100, 200]"
+                         :page-size="pageSize"
+                         layout="sizes, prev, pager, next, total"
+                         :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+
+    <el-dialog :title="
 				formName === '社区居民基本信息录入表' ? '新增居民' : formName
 			"
-			:visible.sync="dialogVisible"
-			width="986px"
-			top="5vh"
-			append-to-body
-			class="dialog-h"
-			:close-on-click-modal="false"
-			:before-close="handlerCancle"
-		>
-			<div class="dialog-h-content scroll-h">
-				<resi-form
-					v-if="dialogVisible"
-					ref="baseForm"
-					:fixed="true"
-					:form-list="formList"
-					:resi-id="editUserId"
-					@changegroup="handleChangeGroup"
-				/>
-			</div>
-
-			<div class="resi-btns">
-				<el-button
-					size="small"
-					v-if="false"
-					@click="handlerReset"
-					class="diy-button--common"
-					>重置</el-button
-				>
-				<el-button size="small" class="diy-button--white" @click="handlerCancle" plain
-					>取消</el-button
-				>
-				<el-button
-					v-if="!editUserId"
-					type="primary"
-					size="small"
-					:loading="btnLoading"
-					@click="handleSUbmit"
-					>保存</el-button
-				>
-
-				<el-button
-					v-else
-					type="primary"
-					size="small"
-					:loading="btnLoading"
-					@click="handleEditSUbmit"
-					>提交</el-button
-				>
-			</div>
-		</el-dialog>
-
-		<el-dialog
-			title="居民详情"
-			:visible.sync="dialogVisible2"
-			width="986px"
-			top="5vh"
-			append-to-body
-			class="dialog-h"
-			:close-on-click-modal="false"
-			:before-close="
+               :visible.sync="dialogVisible"
+               width="986px"
+               top="5vh"
+               append-to-body
+               class="dialog-h"
+               :close-on-click-modal="false"
+               :before-close="handlerCancle">
+      <div class="dialog-h-content scroll-h">
+        <resi-form v-if="dialogVisible"
+                   ref="baseForm"
+                   :fixed="true"
+                   :form-list="formList"
+                   :resi-id="editUserId"
+                   @changegroup="handleChangeGroup" />
+      </div>
+
+      <div class="resi-btns">
+        <el-button size="small"
+                   v-if="false"
+                   @click="handlerReset"
+                   class="diy-button--common">重置</el-button>
+        <el-button size="small"
+                   class="diy-button--white"
+                   @click="handlerCancle"
+                   plain>取消</el-button>
+        <el-button v-if="!editUserId"
+                   type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleSUbmit">保存</el-button>
+
+        <el-button v-else
+                   type="primary"
+                   size="small"
+                   :loading="btnLoading"
+                   @click="handleEditSUbmit">提交</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="居民详情"
+               :visible.sync="dialogVisible2"
+               width="986px"
+               top="5vh"
+               append-to-body
+               class="dialog-h"
+               :close-on-click-modal="false"
+               :before-close="
 				() => {
 					this.dialogVisible2 = false;
 				}
-			"
-		>
-			<div class="dialog-h-content scroll-h">
-				<resi-info
-					v-if="dialogVisible2"
-					ref="resiInfo"
-					:fixed="true"
-					:resi-id="lookResiId"
-				/>
-			</div>
-
-			<div class="resi-btns">
-				<el-button size="small"  class="diy-button--white" plain @click="dialogVisible2 = false"
-					>关闭</el-button
-				>
-			</div>
-		</el-dialog>
-
-		<!-- 变更记录 -->
-		<el-dialog
-			:visible.sync="changeRecordShow"
-			:close-on-click-modal="false"
-			:close-on-press-escape="false"
-			:title="'变更记录'"
-			width="1150px"
-			top="5vh"
-			@closed="diaClose"
-		>
-			<resi-change-record ref="ref_changerecord"></resi-change-record>
-		</el-dialog>
-
-		<el-dialog
-			:visible.sync="diyDialog"
-			:close-on-click-modal="false"
-			:close-on-press-escape="false"
-			width="1150px"
-			top="5vh"
-			class="dialog-h"
-		>
-			<diy-info
-				v-if="diyDialog"
-				ref="ref_diy"
-				:list="exportList"
-				:search="{
+			">
+      <div class="dialog-h-content scroll-h">
+        <resi-info v-if="dialogVisible2"
+                   ref="resiInfo"
+                   :fixed="true"
+                   :resi-id="lookResiId" />
+      </div>
+
+      <div class="resi-btns">
+        <el-button size="small"
+                   class="diy-button--white"
+                   plain
+                   @click="dialogVisible2 = false">关闭</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 变更记录 -->
+    <el-dialog :visible.sync="changeRecordShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'变更记录'"
+               width="1150px"
+               top="5vh"
+               @closed="diaClose">
+      <resi-change-record ref="ref_changerecord"></resi-change-record>
+    </el-dialog>
+
+    <el-dialog :visible.sync="diyDialog"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               width="1150px"
+               top="5vh"
+               class="dialog-h">
+      <diy-info v-if="diyDialog"
+                ref="ref_diy"
+                :list="exportList"
+                :search="{
 					formCode: 'resident_base_info',
 					pageNo: currentPage,
 					pageSize: pageSize,
 					conditions: conditions,
 				}"
-				@close="handleDiyClose"
-			></diy-info>
-		</el-dialog>
-
-		<baobiao ref="baobiao" />
-
-		<!-- 迁出登记 -->
-		<el-dialog
-			:visible.sync="tranferShow"
-			:close-on-click-modal="false"
-			:close-on-press-escape="false"
-			:title="'迁出登记'"
-			width="562px"
-			top="5vh"
-			class="dialog-h"
-			@closed="diaClose"
-		>
-			<resi-change-transfer
-				ref="ref_change_transfer"
-				@dialogCancle="transferClose"
-			></resi-change-transfer>
-		</el-dialog>
-
-		<!-- 死亡登记 -->
-		<el-dialog
-			:visible.sync="deathShow"
-			:close-on-click-modal="false"
-			:close-on-press-escape="false"
-			:title="'死亡登记'"
-			width="620px"
-			top="5vh"
-			class="dialog-h"
-			@closed="diaClose"
-		>
-			<resideath-add
-				ref="ref_death"
-				@dialogCancle="deathClose"
-			></resideath-add>
-		</el-dialog>
-	</div>
+                @close="handleDiyClose"></diy-info>
+    </el-dialog>
+
+    <baobiao ref="baobiao" />
+
+    <!-- 迁出登记 -->
+    <el-dialog :visible.sync="tranferShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'迁出登记'"
+               width="562px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <resi-change-transfer ref="ref_change_transfer"
+                            @dialogCancle="transferClose"></resi-change-transfer>
+    </el-dialog>
+
+    <!-- 死亡登记 -->
+    <el-dialog :visible.sync="deathShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'死亡登记'"
+               width="620px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+      <resideath-add ref="ref_death"
+                     @dialogCancle="deathClose"></resideath-add>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -597,1265 +499,1265 @@ import util from "@/js/util";
 import dateFormat from "dai-js/tools/dateFormat";
 
 export default {
-	components: {
-		baobiao,
-		resiSearch,
-		resiForm,
-		resiInfo,
-		resiTransfer,
-		resiChangeRecord,
-		diyInfo,
-
-		resiChangeTransfer,
-		resideathAdd,
-	},
-	data() {
-		return {
-			activeNames: [],
-			showSercahStatus: false,
-			diyDialog: false,
-			openSearch: false,
-			exportBtn: false,
-			exportBtnTitle: "导出",
-			importBtnTitle: "导入",
-			importLoading: false,
-			rowVisible: false,
-			tableLoading: false,
-			btnLoading: false,
-			disabled: false,
-			pageLoading: false,
-			selAllFlag: false,
-			selAllFlagDisabled: false,
-			isIndeterminate: false,
-			dialogEditVisible: false,
-			dialogVisible: false,
-			// 显示人员详情
-			dialogVisible2: false,
-			resiDetailList: {}, //人员详情数据
-			lookResiId: "",
-
-			uploadUlr:
-				window.SITE_CONFIG["apiURL"] +
-				"/epmetuser/icresiuser/importExcel",
-			currentPage: 1,
-			pageSize: 20,
-			total: null,
-			resideathAddObj1: {}, // 死亡登记子组件
-			conditions: [],
-			activeName: "",
-			tableData: [],
-			searchList: [],
-			exportList: [],
-			editAgencyId: "",
-			editForm: {
-				GRID_ID: "",
-				VILLAGE_ID: "",
-				BUILD_ID: "",
-				HOME_ID: "",
-			},
-			editTableName: {},
-			formName: "",
-			formList: [],
-			tableHeader: [
-				{ columnName: "name", label: "姓名", width: 150 },
-				{ columnName: "birthday", label: "生日", width: 150 },
-				{ columnName: "gender", label: "性别", width: 80 },
-				{ columnName: "gridName", label: "所属网格" },
-				{ columnName: "homeName", label: "所属房屋" },
-				{ columnName: "idNum", label: "证件号", width: 200 },
-				{ columnName: "categoryInfo", label: "居民分类", width: 200 },
-				{ columnName: "mobile", label: "联系电话", width: 150 },
-			],
-			tabsList: [],
-			selection: [],
-
-			defaultCategotyKey: "",
-
-			tranferShow: false,
-			deathShow: false,
-			changeRecordShow: false,
-			lookInfo: {
-				userId: "",
-				gridName: "",
-			},
-			editUserId: "",
-
-			displayedBaobiaoBtn: false,
-
-			btnAuths: {
-				ic_resi_add: true, //新增
-				ic_resi_import: true, //导入
-				ic_resi_export: true, //导出
-				ic_resi_batch_del: true, //批量删除
-				ic_resi_smart_import: true, //智能填表
-				ic_resi_del: true, //删除
-				ic_resi_view: true, //查看
-				ic_resi_update: true, //修改
-				ic_resi_change_rec: true, //变更记录
-				ic_resi_view_real_data: true, //显示脱敏信息
-			},
-
-			queryConditions: [],
-			searchFlag:false
-		};
-	},
-
-	props: {},
-
-	// async activated() {
-	//   console.log("this.$route.query---", this.$route.query);
-	//   if (this.$route.query && this.$route.query.columnName) {
-	//     this.searchList = [];
-	//     let query = this.$route.query;
-	//     this.defaultCategotyKey = query.columnName;
-	//     console.log("defaultCategotyKey----", this.defaultCategotyKey);
-	//   }
-	// },
-
-	computed: {
-		...mapGetters(["clientHeight", "iframeHeight"]),
-		tableHeight() {
-			return this.$store.state.inIframe
+  components: {
+    baobiao,
+    resiSearch,
+    resiForm,
+    resiInfo,
+    resiTransfer,
+    resiChangeRecord,
+    diyInfo,
+
+    resiChangeTransfer,
+    resideathAdd,
+  },
+  data () {
+    return {
+      activeNames: [],
+      showSercahStatus: false,
+      diyDialog: false,
+      openSearch: false,
+      exportBtn: false,
+      exportBtnTitle: "导出",
+      importBtnTitle: "导入",
+      importLoading: false,
+      rowVisible: false,
+      tableLoading: false,
+      btnLoading: false,
+      disabled: false,
+      pageLoading: false,
+      selAllFlag: false,
+      selAllFlagDisabled: false,
+      isIndeterminate: false,
+      dialogEditVisible: false,
+      dialogVisible: false,
+      // 显示人员详情
+      dialogVisible2: false,
+      resiDetailList: {}, //人员详情数据
+      lookResiId: "",
+
+      uploadUlr:
+        window.SITE_CONFIG["apiURL"] +
+        "/epmetuser/icresiuser/importExcel",
+      currentPage: 1,
+      pageSize: 20,
+      total: null,
+      resideathAddObj1: {}, // 死亡登记子组件
+      conditions: [],
+      activeName: "",
+      tableData: [],
+      searchList: [],
+      exportList: [],
+      editAgencyId: "",
+      editForm: {
+        GRID_ID: "",
+        VILLAGE_ID: "",
+        BUILD_ID: "",
+        HOME_ID: "",
+      },
+      editTableName: {},
+      formName: "",
+      formList: [],
+      tableHeader: [
+        { columnName: "name", label: "姓名", width: 150 },
+        { columnName: "birthday", label: "生日", width: 150 },
+        { columnName: "gender", label: "性别", width: 80 },
+        { columnName: "gridName", label: "所属网格" },
+        { columnName: "homeName", label: "所属房屋" },
+        { columnName: "idNum", label: "证件号", width: 200 },
+        { columnName: "categoryInfo", label: "居民分类", width: 200 },
+        { columnName: "mobile", label: "联系电话", width: 150 },
+      ],
+      tabsList: [],
+      selection: [],
+
+      defaultCategotyKey: "",
+
+      tranferShow: false,
+      deathShow: false,
+      changeRecordShow: false,
+      lookInfo: {
+        userId: "",
+        gridName: "",
+      },
+      editUserId: "",
+
+      displayedBaobiaoBtn: false,
+
+      btnAuths: {
+        ic_resi_add: true, //新增
+        ic_resi_import: true, //导入
+        ic_resi_export: true, //导出
+        ic_resi_batch_del: true, //批量删除
+        ic_resi_smart_import: true, //智能填表
+        ic_resi_del: true, //删除
+        ic_resi_view: true, //查看
+        ic_resi_update: true, //修改
+        ic_resi_change_rec: true, //变更记录
+        ic_resi_view_real_data: true, //显示脱敏信息
+      },
+
+      queryConditions: [],
+      searchFlag: false
+    };
+  },
+
+  props: {},
+
+  // async activated() {
+  //   console.log("this.$route.query---", this.$route.query);
+  //   if (this.$route.query && this.$route.query.columnName) {
+  //     this.searchList = [];
+  //     let query = this.$route.query;
+  //     this.defaultCategotyKey = query.columnName;
+  //     console.log("defaultCategotyKey----", this.defaultCategotyKey);
+  //   }
+  // },
+
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight () {
+      return this.$store.state.inIframe
         ? this.clientHeight - 450 + this.iframeHeigh
         : this.clientHeight - 450;
-		},
-	},
-
-	async created() {
-		this.updateBtnAuths();
-
-		// if (this.$route.query) {
-		//   let query = this.$route.query;
-		//   this.defaultCategotyKey = query.columnName;
-		// }
-
-		// await this.getFormList()
-		// console.log('this.$refs.resiSearch', this)
-		this.pageLoading = true;
-		console.log("storeoooo----0000", this.$store);
-	},
-
-	async mounted() {
-		this.searchH = this.$refs.myResiSearch.offsetHeight;
-	
-		this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
-			elseParams: {
-				categoryKeys: ["resi_info"],
-				categoryKey: "resi_info",
-			},
-		});
-		this.getQueryConditions();
-	},
-
-	methods: {
-		// 更新按钮权限
-		updateBtnAuths() {
-			let rot = this.$route;
-			if (Array.isArray(rot.meta.btns)) {
-				rot.meta.btns.forEach((item) => {
-					this.btnAuths[item.permissions] = true;
-				});
-			}
-		},
-		handelRegister(command, row) {
-			console.log(command);
-			console.log(row);
-			if (command == "bgjl") {
-				this.handleChangeRecord(row);
-			} else if (command == "swdj") {
-				this.handleDeath(row);
-			} else if (command == "qcdj") {
-				this.handleChangeTransfer(row);
-			}
-		},
-		reportForm() {
-			this.$refs.baobiao.init({
-				elseParams: {
-					categoryKeys: ["resi_info"],
-					categoryKey: "resi_info",
-					paramMap: {
-						searchForm: {
-							formCode: "resident_base_info",
-							pageNo: this.currentPage,
-							pageSize: this.pageSize,
-							conditions: this.conditions,
-						},
-					},
-				},
-			});
-		},
-		handleSearchFrom() {
-			let obj = this.$refs.myResiSearch.form;
-			let categoryArr = this.$refs.myResiSearch.form.categoryKey;
-			let agencyId = this.$refs.myResiSearch.form.agencyId;
-			this.searchFlag = true
-			if (
-				typeof obj.categoryKey == "object" &&
-				obj.categoryKey.length != 0
-			) {
-				obj.categoryKey = obj.categoryKey.join(",");
-			} else {
-				obj.categoryKey = "";
-			}
-			if (typeof obj.agencyId == "object" && obj.agencyId.length != 0) {
-				// obj.agencyId = obj.agencyId.join(",");
-				obj.agencyId = obj.agencyId[obj.agencyId.length-1]
-			} else {
-				obj.agencyId = "";
-			}
-			obj.level = this.$refs.myResiSearch.level ? this.$refs.myResiSearch.level :''
-			this.currentPage = 1;
-			this.getTableData(obj);
-
-			let conditions = this.queryConditions
-				.filter((item) => obj[item.humpName])
-				.map((item) => {
-					let queryType = "equal";
-					const { humpName } = item;
-					if (
-						humpName == "name" ||
-						humpName == "mobile" ||
-						humpName == "idNum"
-					) {
-						queryType = "like";
-					}
-					return {
-						...item,
-						queryType,
-						columnValue: [obj[item.humpName]],
-					};
-				});
-			if (obj.birthdayStart || obj.birthdayEnd) {
-				conditions.push({
-					queryType: "daterange",
-					columnValue: [
-						obj.birthdayStart || "",
-						obj.birthdayEnd || "",
-					],
-					columnName: "BIRTHDAY",
-					label: "出生日期",
-					tableName: "resident_base_info",
-				});
-			}
-			if (obj.ageStart || obj.ageEnd) {
-				let ageStart = obj.ageStart || 0;
-				let ageEnd = obj.ageEnd || 200;
-				let currentYear = new Date().getFullYear();
-				let dateStart = dateFormat(
-					new Date(new Date().setFullYear(currentYear - ageStart)),
-					"yyyy-MM-dd"
-				);
-				let dateEnd = dateFormat(
-					new Date(new Date().setFullYear(currentYear - ageEnd)),
-					"yyyy-MM-dd"
-				);
-				conditions.push({
-					queryType: "daterange",
-					columnValue: [dateEnd, dateStart],
-					columnName: "BIRTHDAY",
-					label: "出生日期",
-					tableName: "resident_base_info",
-				});
-			}
-			this.conditions = conditions;
-			console.log(obj, this.conditions);
-
-			this.$refs.myResiSearch.form.categoryKey = categoryArr;
-			this.$refs.myResiSearch.form.agencyId = agencyId;
-		},
-		// 是否可以选中
-		checkSelectable(row, index) {
-			return this.filterEdit(row.agencyId);
-		},
-
-		//迁出记录
-		async handleChangeTransfer(row) {
-			this.tranferShow = true;
-			await nextTick(200);
-			this.$refs.ref_change_transfer.initForm(row);
-		},
-		//死亡记录
-		async handleDeath(row) {
-			console.log("=====", row);
-			this.deathShow = true;
-			await nextTick(200);
-			this.$refs.ref_death.initForm(row);
-		},
-
-		//变更记录
-		async handleChangeRecord(row) {
-			this.changeRecordShow = true;
-			await nextTick(200);
-			this.$refs.ref_changerecord.initForm(row);
-		},
-
-		diaClose() {
-			this.tranferShow = false;
-			this.deathShow = false;
-			this.changeRecordShow = false;
-		},
-
-		transferClose() {
-			this.tranferShow = false;
-			this.getTableData();
-		},
-		deathClose() {
-			this.deathShow = false;
-			this.getTableData();
-		},
-		handleDiyClose() {
-			this.diyDialog = false;
-		},
-		handleOpenSearch() {
-			if (!this.openSearch)
-				this.activeNames = [this.searchList[0].itemGroupId];
-			this.openSearch = !this.openSearch;
-		},
-		async diyExport() {
-			await this.getExportList();
-		},
-		computedWidth(label, type) {
-			let wd = "";
-			if (type == "input" || type == "select") wd = 40 * label.length;
-			else if (type == "radio") wd = 20 * label.length;
-			console.log("type-----wd", wd);
-			return wd > 80 ? wd : 80;
-		},
-		filterEdit(id) {
-			const { user } = this.$store.state;
-			// return true; //临时放开权限，正式需要注释掉
-			return id === user.agencyId;
-		},
-		selectionChange(selection) {
-			this.selection = selection;
-			if (selection.length === this.tableData.length) {
-				this.selAllFlag = true;
-				this.isIndeterminate = false;
-			} else if (selection.length > 0) {
-				this.selAllFlag = false;
-				this.isIndeterminate = true;
-			} else {
-				this.selAllFlag = false;
-				this.isIndeterminate = false;
-			}
-		},
-		handleSelectAll(selectAllFlag) {
-			// if (this.tableData.length == 0) {
-			//   this.selAllFlag = false
-			//   return
-			// }
-			this.$refs.ref_table.clearSelection();
-			if (selectAllFlag) {
-				this.tableData.forEach((row) => {
-					// this.$refs.ref_table.toggleRowSelection(row);
-					if (row.isChecked) {
-						this.$refs.ref_table.toggleRowSelection(row);
-					}
-				});
-			}
-		},
-		selectAll(selection) {
-			this.selection = selection;
-
-			if (selection.length > 0) {
-				this.selAllFlag = true;
-			} else {
-				this.selAllFlag = false;
-			}
-		},
-
-		deleteBatch() {
-			if (this.selection.length > 0) {
-				this.$confirm("删除之后无法恢复，确认删除？", "提示", {
-					confirmButtonText: "确定",
-					cancelButtonText: "取消",
-					type: "warning",
-				})
-					.then(() => {
-						this.deleteresiBatch();
-					})
-					.catch((err) => {
-						if (err == "cancel") {
-							// this.$message({
-							//   type: "info",
-							//   message: "已取消删除"
-							// });
-						}
-					});
-			} else {
-				this.$message.warning("请先选择要删除的居民");
-			}
-		},
-		handleSizeChange(val) {
-			console.log(`每页 ${val} 条`);
-			this.pageSize = val;
-			this.getTableData();
-		},
-		handleCurrentChange(val) {
-			console.log(`当前页: ${val}`);
-			let obj = this.$refs.myResiSearch.form;
-			let categoryArr = this.$refs.myResiSearch.form.categoryKey;
-			let agencyId = this.$refs.myResiSearch.form.agencyId;
-			if (
-				typeof obj.categoryKey == "object" &&
-				obj.categoryKey.length != 0
-			) {
-				obj.categoryKey = obj.categoryKey.join(",");
-			} else {
-				obj.categoryKey = "";
-			}
-			if (typeof obj.agencyId == "object" && obj.agencyId.length != 0) {
-				obj.agencyId = obj.agencyId[obj.agencyId.length-1]
-			} else {
-				obj.agencyId = "";
-			}
-			this.currentPage = val;
-			if(this.searchFlag){
-			this.getTableData(obj);
-			}else{
-			this.getTableData();
-			}
-			this.$refs.myResiSearch.form.categoryKey = categoryArr;
-			this.$refs.myResiSearch.form.agencyId = agencyId;
-		},
-		handleFilterSpan(row, item) {
-			let _val = "";
-			if (item.itemType === "radio" && item.options.length > 0) {
-				item.options.forEach((n) => {
-					if (n.value === row[item.columnName]) _val = n.label;
-				});
-				if (row[item.columnName] == "0") return (_val = "");
-			}
-
-			return _val || row[item.columnName];
-		},
-
-		resetSearchForm() {
-			this.searchFlag = false
-			for (const n in this.$refs.myResiSearch.form) {
-				this.$refs.myResiSearch.form[n] = "";
-
-			}
-			this.$refs.myResiSearch.level = ''
-			this.getTableData();
-		},
-		async handleExportModule() {
-			let url = "/epmetuser/icresiuser/import/download-template";
-
-			let params = {};
-			await this.$http({
-				method: "POST",
-				url,
-				responseType: "blob",
-				data: params,
-			})
-				.then((res) => {
-					console.log("res----dddd", res);
-					// this.download(res.data, title + '.xls')
-					if (res.headers["content-disposition"]) {
-						let fileName = window.decodeURI(
-							res.headers["content-disposition"]
-								.split(";")[1]
-								.split("=")[1]
-						);
-						console.log("filename", fileName);
-						let blob = new Blob([res.data], {
-							type: "application/vnd.ms-excel",
-						});
-						var url = window.URL.createObjectURL(blob);
-						var aLink = document.createElement("a");
-						aLink.style.display = "none";
-						aLink.href = url;
-						aLink.setAttribute("download", fileName);
-						document.body.appendChild(aLink);
-						aLink.click();
-						document.body.removeChild(aLink); //下载完成移除元素
-						window.URL.revokeObjectURL(url); //释放掉blob对象
-					} else this.$message.error("下载失败");
-				})
-				.catch((err) => {
-					console.log("err", err);
-					return this.$message.error("网络错误");
-				});
-		},
-		// 下载文件
-		download(data, fileName) {
-			console.log("data", data);
-			if (!data) {
-				return;
-			}
-
-			var csvData = new Blob([data]);
-
-			if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-				window.navigator.msSaveOrOpenBlob(csvData, fileName);
-			}
-			// for Non-IE (chrome, firefox etc.)
-			else {
-				var a = document.createElement("a");
-				document.body.appendChild(a);
-				a.style = "display: none";
-				var url = window.URL.createObjectURL(csvData);
-				a.href = url;
-				a.download = fileName;
-				a.click();
-				a.remove();
-				window.URL.revokeObjectURL(url);
-			}
-		},
-		async handleExport() {
-			this.exportBtn = true;
-			this.exportBtnTitle = "正在导出...";
-			let params = {
-				formCode: "resident_base_info",
-				conditions: this.conditions,
-			};
-
-			// .post('epmetuser/icresiuser/exportExcel', params)
-			await axios({
-				url:
-					window.SITE_CONFIG["apiURL"] +
-					"/epmetuser/icresiuser/exportExcel",
-				// url: 'epmetuser/icresiuser/exportExcel',
-				method: "post",
-				data: params,
-				responseType: "blob",
-			})
-				.then((res) => {
-					console.log("resllll", res);
-					let fileName = window.decodeURI(
-						res.headers["content-disposition"]
-							.split(";")[1]
-							.split("=")[1]
-					);
-					console.log("filename", fileName);
-					let blob = new Blob([res.data], {
-						type: "application/vnd.ms-excel",
-					});
-					var url = window.URL.createObjectURL(blob);
-					var aLink = document.createElement("a");
-					aLink.style.display = "none";
-					aLink.href = url;
-					aLink.setAttribute("download", fileName);
-					document.body.appendChild(aLink);
-					aLink.click();
-					document.body.removeChild(aLink); //下载完成移除元素
-					window.URL.revokeObjectURL(url); //释放掉blob对象
-				})
-				.catch((err) => {
-					console.log("获取导出情失败", err);
-					this.$message.error("获取导出失败");
-				});
-			this.exportBtnTitle = "导出";
-			this.exportBtn = false;
-		},
-		// 上传大图标成功
-		handleExcelSuccess(res, file) {
-			if (res.code === 0 && res.msg === "success") {
-				console.log("resss---ppp", res);
-			} else {
-				this.$message.error(res.msg);
-			}
-		},
-		handleProgress(event, file, fileList) {
-			console.log("percentage", file.percentage);
-		},
-
-		beforeExcelUpload(file) {
-			console.log("file", file);
-			const isType = file.type === "application/vnd.ms-excel";
-			const isTypeComputer =
-				file.type ===
-				"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
-			const fileType = isType || isTypeComputer;
-			const isLt1M = file.size / 1024 / 1024 < 100;
-			if (!fileType) {
-				this.$message.error("上传文件只能是xls/xlsx格式！");
-			}
-
-			if (!isLt1M) {
-				this.$message.error("上传文件大小不能超过 100MB!");
-			}
-			return fileType && isLt1M;
-		},
-		async uploadHttpRequest(file) {
-			this.importLoading = true;
-			this.importBtnTitle = "正在上传中...";
-			this.$message({
-				showClose: true,
-				dangerouslyUseHTMLString: true,
-				message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-				duration: 3000
-			});
-			let than = this
-			document.getElementById('clickA').addEventListener('click',function(){
-				than.$router.replace('/main/importRecord-index');
-			})
-			const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-			formData.append("file", file.file); //添加文件对象
-			await this.$http
-				.post("/epmetuser/icresiuser/importExcel", formData)
-				.then((res) => {
-					console.log("res-up", res);
-					if (res.data.code == 0 && res.data.msg == "success") {
-						// this.$message.success('导入成功')
-						this.getTableData();
-					} else this.$message.error(res.data.msg);
-				})
-				.catch((err) => {
-					console.log("失败", err);
-					file.onError(); //上传失败的文件会从文件列表中删除
-					// this.$message.error('导入失败')
-				});
-			// await axios({
-			//   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
-			//   method: 'post',
-			//   data: formData,
-			//   timeout: '300000',
-			//   responseType: 'blob'
-			// })
-			//   .then((res) => {
-			//     console.log('res-up', res)
-			//     // if (res.headers["content-disposition"]) {
-			//     //   let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-			//     //   console.log('filename', fileName)
-			//     //   let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-			//     //   var url = window.URL.createObjectURL(blob)
-			//     //   var aLink = document.createElement('a')
-			//     //   aLink.style.display = 'none'
-			//     //   aLink.href = url
-			//     //   aLink.setAttribute('download', fileName)
-			//     //   document.body.appendChild(aLink)
-			//     //   aLink.click()
-			//     //   document.body.removeChild(aLink) //下载完成移除元素
-			//     //   window.URL.revokeObjectURL(url) //释放掉blob对象
-			//     // }
-
-			//     this.getTableData()
-			//   })
-			//   .catch(err => {
-			//     console.log('失败', err)
-			//     file.onError() //上传失败的文件会从文件列表中删除
-			//     this.$message.error('导入失败')
-			//   })
-			this.importLoading = false;
-			this.importBtnTitle = "导入";
-			this.$refs.upload.clearFiles();
-		},
-		handleClick(tab, event) {
-			console.log(tab, event);
-		},
-
-		// 查看
-		async handleLook(row) {
-			this.lookResiId = row.resiId;
-			this.dialogVisible2 = true;
-		},
-
-		// 编辑
-		async handleEdit(row) {
-			this.editUserId = row.resiId;
-			this.formName = "编辑居民";
-			this.dialogVisible = true;
-			await this.residentBaseInfo();
-		},
-		// 获取详情
-		residentBaseInfo() {
-			this.$http
-				.post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`)
-				.then(({ data: res }) => {
-					if (res.code !== 0) {
-						return this.$message.error(res.msg);
-					} else {
-						this.$refs.baseForm.old_from(res.data);
-					}
-				})
-				.catch((err) => {
-					return this.$message.error("网络错误");
-				});
-		},
-		handlerReset() {
-			this.$refs.baseForm.resetForm();
-		},
-
-		async handleAdd() {
-			this.formName = "新增居民";
-			this.editUserId = "";
-			this.dialogVisible = true;
-		},
-
-		async handleChangeGroup(val) {
-			console.log("changeguoprrrrr----", val);
-			let { childGroup, value, partyInfo } = val;
-			let hasT = false;
-			let i = 0;
-			let list = [...this.tabsList];
-			list.forEach((item, index) => {
-				if (item.tableName === childGroup.tableName) {
-					hasT = true;
-					i = index;
-				}
-			});
-			if (value === true || value === "true") {
-				// console.log('changegroup----999', value)
-				if (!hasT) {
-					childGroup.itemList.forEach(async (item) => {
-						if (item.optionSourceType === "remote") {
-							await this.getOptionsList(
-								item.optionSourceValue
-							).then((res) => {
-								item.options = this.getTreeData(res);
-							});
-							// console.log('')
-						}
-					});
-					if (
-						partyInfo &&
-						partyInfo.length > 0 &&
-						childGroup.tableName == "ic_party_member"
-					) {
-						list.push({ ...childGroup, formInfo: partyInfo[0] });
-					} else list.push(childGroup);
-				}
-			} else {
-				// console.log('changegroup----000', value)
-				if (hasT) list.splice(i, 1);
-			}
-			this.tabsList = [...list];
-		},
-		formetForm() {
-			const _baseForm = this.$refs.baseForm.handleForm();
-			let arr = [];
-			if (_baseForm.length === 0) return false;
-			arr.push([..._baseForm]);
-			this.tabsList.forEach((item) => {
-				arr.push([
-					...this.$refs["group" + item.groupId][0].handleForm(),
-				]);
-			});
-			let arr2 = arr.reduce(function (a, b) {
-				return a.concat(b);
-			});
-			let noChange = true;
-			arr2.forEach((item) => {
-				if (item.list.length !== 0) noChange = false;
-			});
-			console.log("arr2", arr2);
-			if (noChange) {
-				this.$message.warning("您还没有做任何修改");
-				return false;
-			}
-			// 合并相同tableName的多个数组
-			let hash = {};
-			let i = 0;
-			let res = [];
-			let finalArr = [];
-			arr2.forEach(function (item) {
-				let name = item.tableName;
-				if (hash[name]) {
-					res[hash[name] - 1].list.push(...item.list);
-				} else {
-					hash[name] = ++i;
-					res.push({
-						list: [...item.list],
-						supportAdd: item.supportAdd,
-						tableName: name,
-					});
-				}
-			});
-			console.log("res", res);
-			// 多个list合并成一个list子集
-			res.forEach((item) => {
-				let _form = {};
-				item.list.length > 0 &&
-					item.list.forEach((n) => {
-						_form = { ..._form, ...n };
-					});
-				if (item.list.length > 0) {
-					finalArr.push({
-						tableName: item.tableName,
-						list: item.supportAdd ? [...item.list] : [{ ..._form }],
-					});
-				}
-			});
-			console.log("finalArr", finalArr);
-			return finalArr;
-		},
-		async handleEditSUbmit() {
-			this.handleSUbmit();
-		},
-
-		async handleSUbmit() {
-			if (!this.$refs.baseForm.submit_from()) {
-				return;
-			}
-			const _baseForm = JSON.parse(this.$refs.baseForm.submit_from());
-			console.log(_baseForm);
-			_baseForm.partyFlag = parseInt(_baseForm.partyFlag); //党员
-			_baseForm.subsistenceAllowanceFlag = parseInt(
-				_baseForm.subsistenceAllowanceFlag
-			); //低保
-			_baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag); //保障房
-			_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
-			(_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag)), //育龄妇女
-				(_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag)); //退役军人
-			_baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag); //统战人员
-			//公益岗人员
-			_baseForm.publicWelfareFlag = parseInt(
-				_baseForm.publicWelfareFlag
-			);
-			 //信访人员
-			_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
-			_baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag); //志愿者
-			_baseForm.bereavedPersonFlag = parseInt(
-				_baseForm.bereavedPersonFlag
-			); //失独
-			_baseForm.tenantFlag = parseInt(_baseForm.tenantFlag); //租户
-			_baseForm.floatingFlag = parseInt(_baseForm.floatingFlag); //流动人口
-			_baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag); //特殊人群
-			_baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag); //老年人
-			_baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag); //空巢
-			_baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag); //独居老人
-			_baseForm.disabledFlag = parseInt(_baseForm.disabledFlag); //失能老人
-			_baseForm.dementedFlag = parseInt(_baseForm.dementedFlag); //失智老人
-			_baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag); //是否残疾
-			_baseForm.seriousIllnessFlag = parseInt(
-				_baseForm.seriousIllnessFlag
-			); //大病
-			_baseForm.chronicDiseaseFlag = parseInt(
-				_baseForm.chronicDiseaseFlag
-			); //慢病
-			var hobbyCode = "";
-			if (_baseForm.hobbyInfoDto) {
-				if (_baseForm.hobbyInfoDto.hobbyCode.length === 0) {
-					hobbyCode = "";
-					_baseForm.hobbyInfoDto.hobbyCode = hobbyCode;
-				} else {
-					_baseForm.hobbyInfoDto.hobbyCode.forEach(
-						(element, index) => {
-							hobbyCode =
-								index === 0
-									? element
-									: hobbyCode + "," + element;
-						}
-					);
-					_baseForm.hobbyInfoDto.hobbyCode = hobbyCode;
-				}
-			}
-
-			var volunteerCategory = "";
-			if (_baseForm.volunteerDto) {
-				if (_baseForm.volunteerDto.volunteerCategory.length === 0) {
-					volunteerCategory = "";
-					_baseForm.volunteerDto.volunteerCategory =
-						volunteerCategory;
-				} else {
-					_baseForm.volunteerDto.volunteerCategory.forEach(
-						(element, index) => {
-							volunteerCategory =
-								index === 0
-									? element
-									: volunteerCategory + "," + element;
-						}
-					);
-					_baseForm.volunteerDto.volunteerCategory =
-						volunteerCategory;
-				}
-			}
-
-			var specialCategoryCode = "";
-			if (_baseForm.specialDto) {
-				if (_baseForm.specialDto.specialCategoryCode.length === 0) {
-					specialCategoryCode = "";
-					_baseForm.specialDto.specialCategoryCode =
-						specialCategoryCode;
-				} else {
-					_baseForm.specialDto.specialCategoryCode.forEach(
-						(element, index) => {
-							specialCategoryCode =
-								index === 0
-									? element
-									: specialCategoryCode + "," + element;
-						}
-					);
-					_baseForm.specialDto.specialCategoryCode =
-						specialCategoryCode;
-				}
-			}
-			console.log(_baseForm);
-			this.submitAdd(_baseForm);
-		},
-		handleDel(row) {
-			console.log("row1", row);
-			this.$http
-				.post("/actual/base/residentBaseInfo/batchdel", [row.resiId])
-				.then(({ data: res }) => {
-					console.log("row2", row);
-					if (res.code !== 0) {
-						return this.$message.error(res.msg);
-					} else {
-						console.log("row3", row);
-						this.$message.success("删除成功");
-						this.getTableData();
-					}
-				})
-				.catch((err) => {
-					console.log("row4", err);
-					return this.$message.error("网络错误");
-				});
-		},
-		handleFormatUrl(url) {
-			return url.includes("?");
-		},
-		handlerEditCancle() {
-			this.$refs.baseForm.resetForm();
-			this.tabsList.forEach((item) => {
-				this.$refs["group" + item.groupId][0].resetForm();
-			});
-			this.dialogEditVisible = false;
-		},
-		handlerCancle() {
-			// this.$refs.baseForm.resetForm();
-			// this.tabsList.forEach((item) => {
-			//   this.$refs["group" + item.groupId][0].resetForm();
-			// });
-			this.dialogVisible = false;
-		},
-		async submitAdd(arr) {
-			console.log(arr);
-			this.btnLoading = true;
-			await this.$http
-				.post(
-					arr.resiId
-						? "actual/base/residentBaseInfo/update"
-						: "/actual/base/residentBaseInfo/save",
-					arr
-				)
-				.then(({ data: res }) => {
-					if (res.code !== 0) {
-						return this.$message.error(res.msg);
-					} else {
-						this.$message.success("提交成功");
-						// this.$refs[formName].resetFields();
-
-						this.dialogVisible = false;
-					}
-				})
-				.catch(() => {
-					return this.$message.error("网络错误");
-				});
-			// console.log(this.$refs.baseForm.form);
-			this.btnLoading = false;
-			this.getTableData();
-		},
-		async submitEdit(arr) {
-			this.btnLoading = true;
-			await this.$http
-				.post("/epmetuser/icresiuser/edit", arr)
-				.then(({ data: res }) => {
-					if (res.code !== 0) {
-						return this.$message.error(res.msg);
-					} else {
-						this.$message.success("提交成功");
-						// this.$refs[formName].resetFields();
-						this.$refs.baseForm.resetForm();
-						this.tabsList.forEach((item) => {
-							this.$refs["group" + item.groupId][0].resetForm();
-						});
-						this.getTableData();
-						this.dialogEditVisible = false;
-					}
-				})
-				.catch(() => {
-					return this.$message.error("网络错误");
-				});
-			this.btnLoading = false;
-		},
-
-		async getTableData(obj) {
-			let params = {
-				pageNo: this.currentPage,
-				pageSize: this.pageSize,
-				...obj,
-			};
-
-			this.tableLoading = true;
-			const { data } = await this.$http.post(
-				"/actual/base/residentBaseInfo/page",
-				params
-			);
-			this.tableLoading = false;
-			if (data.code === 0) {
-				this.total = data.data.total;
-				this.tableData = data.data.list;
-			} else {
-				this.$message.error(data.msg);
-			}
-		},
-
-		// async getQueryConditions() {
-		// 	let params = {
-		// 		formCode: "resident_base_info",
-		// 		customerId: this.$store.state.user.customerId,
-		// 	};
+    },
+  },
+
+  async created () {
+    this.updateBtnAuths();
+
+    // if (this.$route.query) {
+    //   let query = this.$route.query;
+    //   this.defaultCategotyKey = query.columnName;
+    // }
+
+    // await this.getFormList()
+    // console.log('this.$refs.resiSearch', this)
+    this.pageLoading = true;
+    console.log("storeoooo----0000", this.$store);
+  },
+
+  async mounted () {
+    this.searchH = this.$refs.myResiSearch.offsetHeight;
+
+    this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+      elseParams: {
+        categoryKeys: ["resi_info"],
+        categoryKey: "resi_info",
+      },
+    });
+    this.getQueryConditions();
+  },
+
+  methods: {
+    // 更新按钮权限
+    updateBtnAuths () {
+      let rot = this.$route;
+      if (Array.isArray(rot.meta.btns)) {
+        rot.meta.btns.forEach((item) => {
+          this.btnAuths[item.permissions] = true;
+        });
+      }
+    },
+    handelRegister (command, row) {
+      console.log(command);
+      console.log(row);
+      if (command == "bgjl") {
+        this.handleChangeRecord(row);
+      } else if (command == "swdj") {
+        this.handleDeath(row);
+      } else if (command == "qcdj") {
+        this.handleChangeTransfer(row);
+      }
+    },
+    reportForm () {
+      this.$refs.baobiao.init({
+        elseParams: {
+          categoryKeys: ["resi_info"],
+          categoryKey: "resi_info",
+          paramMap: {
+            searchForm: {
+              formCode: "resident_base_info",
+              pageNo: this.currentPage,
+              pageSize: this.pageSize,
+              conditions: this.conditions,
+            },
+          },
+        },
+      });
+    },
+    handleSearchFrom () {
+      let obj = this.$refs.myResiSearch.form;
+      let categoryArr = this.$refs.myResiSearch.form.categoryKey;
+      let agencyId = this.$refs.myResiSearch.form.agencyId;
+      this.searchFlag = true
+      if (
+        typeof obj.categoryKey == "object" &&
+        obj.categoryKey.length != 0
+      ) {
+        obj.categoryKey = obj.categoryKey.join(",");
+      } else {
+        obj.categoryKey = "";
+      }
+      if (typeof obj.agencyId == "object" && obj.agencyId.length != 0) {
+        // obj.agencyId = obj.agencyId.join(",");
+        obj.agencyId = obj.agencyId[obj.agencyId.length - 1]
+      } else {
+        obj.agencyId = "";
+      }
+      obj.level = this.$refs.myResiSearch.level ? this.$refs.myResiSearch.level : ''
+      this.currentPage = 1;
+      this.getTableData(obj);
+
+      let conditions = this.queryConditions
+        .filter((item) => obj[item.humpName])
+        .map((item) => {
+          let queryType = "equal";
+          const { humpName } = item;
+          if (
+            humpName == "name" ||
+            humpName == "mobile" ||
+            humpName == "idNum"
+          ) {
+            queryType = "like";
+          }
+          return {
+            ...item,
+            queryType,
+            columnValue: [obj[item.humpName]],
+          };
+        });
+      if (obj.birthdayStart || obj.birthdayEnd) {
+        conditions.push({
+          queryType: "daterange",
+          columnValue: [
+            obj.birthdayStart || "",
+            obj.birthdayEnd || "",
+          ],
+          columnName: "BIRTHDAY",
+          label: "出生日期",
+          tableName: "resident_base_info",
+        });
+      }
+      if (obj.ageStart || obj.ageEnd) {
+        let ageStart = obj.ageStart || 0;
+        let ageEnd = obj.ageEnd || 200;
+        let currentYear = new Date().getFullYear();
+        let dateStart = dateFormat(
+          new Date(new Date().setFullYear(currentYear - ageStart)),
+          "yyyy-MM-dd"
+        );
+        let dateEnd = dateFormat(
+          new Date(new Date().setFullYear(currentYear - ageEnd)),
+          "yyyy-MM-dd"
+        );
+        conditions.push({
+          queryType: "daterange",
+          columnValue: [dateEnd, dateStart],
+          columnName: "BIRTHDAY",
+          label: "出生日期",
+          tableName: "resident_base_info",
+        });
+      }
+      this.conditions = conditions;
+      console.log(obj, this.conditions);
+
+      this.$refs.myResiSearch.form.categoryKey = categoryArr;
+      this.$refs.myResiSearch.form.agencyId = agencyId;
+    },
+    // 是否可以选中
+    checkSelectable (row, index) {
+      return this.filterEdit(row.agencyId);
+    },
+
+    //迁出记录
+    async handleChangeTransfer (row) {
+      this.tranferShow = true;
+      await nextTick(200);
+      this.$refs.ref_change_transfer.initForm(row);
+    },
+    //死亡记录
+    async handleDeath (row) {
+      console.log("=====", row);
+      this.deathShow = true;
+      await nextTick(200);
+      this.$refs.ref_death.initForm(row);
+    },
+
+    //变更记录
+    async handleChangeRecord (row) {
+      this.changeRecordShow = true;
+      await nextTick(200);
+      this.$refs.ref_changerecord.initForm(row);
+    },
+
+    diaClose () {
+      this.tranferShow = false;
+      this.deathShow = false;
+      this.changeRecordShow = false;
+    },
+
+    transferClose () {
+      this.tranferShow = false;
+      this.getTableData();
+    },
+    deathClose () {
+      this.deathShow = false;
+      this.getTableData();
+    },
+    handleDiyClose () {
+      this.diyDialog = false;
+    },
+    handleOpenSearch () {
+      if (!this.openSearch)
+        this.activeNames = [this.searchList[0].itemGroupId];
+      this.openSearch = !this.openSearch;
+    },
+    async diyExport () {
+      await this.getExportList();
+    },
+    computedWidth (label, type) {
+      let wd = "";
+      if (type == "input" || type == "select") wd = 40 * label.length;
+      else if (type == "radio") wd = 20 * label.length;
+      console.log("type-----wd", wd);
+      return wd > 80 ? wd : 80;
+    },
+    filterEdit (id) {
+      const { user } = this.$store.state;
+      // return true; //临时放开权限，正式需要注释掉
+      return id === user.agencyId;
+    },
+    selectionChange (selection) {
+      this.selection = selection;
+      if (selection.length === this.tableData.length) {
+        this.selAllFlag = true;
+        this.isIndeterminate = false;
+      } else if (selection.length > 0) {
+        this.selAllFlag = false;
+        this.isIndeterminate = true;
+      } else {
+        this.selAllFlag = false;
+        this.isIndeterminate = false;
+      }
+    },
+    handleSelectAll (selectAllFlag) {
+      // if (this.tableData.length == 0) {
+      //   this.selAllFlag = false
+      //   return
+      // }
+      this.$refs.ref_table.clearSelection();
+      if (selectAllFlag) {
+        this.tableData.forEach((row) => {
+          // this.$refs.ref_table.toggleRowSelection(row);
+          if (row.isChecked) {
+            this.$refs.ref_table.toggleRowSelection(row);
+          }
+        });
+      }
+    },
+    selectAll (selection) {
+      this.selection = selection;
+
+      if (selection.length > 0) {
+        this.selAllFlag = true;
+      } else {
+        this.selAllFlag = false;
+      }
+    },
+
+    deleteBatch () {
+      if (this.selection.length > 0) {
+        this.$confirm("删除之后无法恢复，确认删除？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.deleteresiBatch();
+          })
+          .catch((err) => {
+            if (err == "cancel") {
+              // this.$message({
+              //   type: "info",
+              //   message: "已取消删除"
+              // });
+            }
+          });
+      } else {
+        this.$message.warning("请先选择要删除的居民");
+      }
+    },
+    handleSizeChange (val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getTableData();
+    },
+    handleCurrentChange (val) {
+      console.log(`当前页: ${val}`);
+      let obj = this.$refs.myResiSearch.form;
+      let categoryArr = this.$refs.myResiSearch.form.categoryKey;
+      let agencyId = this.$refs.myResiSearch.form.agencyId;
+      if (
+        typeof obj.categoryKey == "object" &&
+        obj.categoryKey.length != 0
+      ) {
+        obj.categoryKey = obj.categoryKey.join(",");
+      } else {
+        obj.categoryKey = "";
+      }
+      if (typeof obj.agencyId == "object" && obj.agencyId.length != 0) {
+        obj.agencyId = obj.agencyId[obj.agencyId.length - 1]
+      } else {
+        obj.agencyId = "";
+      }
+      this.currentPage = val;
+      if (this.searchFlag) {
+        this.getTableData(obj);
+      } else {
+        this.getTableData();
+      }
+      this.$refs.myResiSearch.form.categoryKey = categoryArr;
+      this.$refs.myResiSearch.form.agencyId = agencyId;
+    },
+    handleFilterSpan (row, item) {
+      let _val = "";
+      if (item.itemType === "radio" && item.options.length > 0) {
+        item.options.forEach((n) => {
+          if (n.value === row[item.columnName]) _val = n.label;
+        });
+        if (row[item.columnName] == "0") return (_val = "");
+      }
+
+      return _val || row[item.columnName];
+    },
+
+    resetSearchForm () {
+      this.searchFlag = false
+      for (const n in this.$refs.myResiSearch.form) {
+        this.$refs.myResiSearch.form[n] = "";
+
+      }
+      this.$refs.myResiSearch.level = ''
+      this.getTableData();
+    },
+    async handleExportModule () {
+      let url = "/epmetuser/icresiuser/import/download-template";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          console.log("res----dddd", res);
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"]
+                .split(";")[1]
+                .split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    // 下载文件
+    download (data, fileName) {
+      console.log("data", data);
+      if (!data) {
+        return;
+      }
+
+      var csvData = new Blob([data]);
+
+      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+        window.navigator.msSaveOrOpenBlob(csvData, fileName);
+      }
+      // for Non-IE (chrome, firefox etc.)
+      else {
+        var a = document.createElement("a");
+        document.body.appendChild(a);
+        a.style = "display: none";
+        var url = window.URL.createObjectURL(csvData);
+        a.href = url;
+        a.download = fileName;
+        a.click();
+        a.remove();
+        window.URL.revokeObjectURL(url);
+      }
+    },
+    async handleExport () {
+      this.exportBtn = true;
+      this.exportBtnTitle = "正在导出...";
+      let params = {
+        formCode: "resident_base_info",
+        conditions: this.conditions,
+      };
+
+      // .post('epmetuser/icresiuser/exportExcel', params)
+      await axios({
+        url:
+          window.SITE_CONFIG["apiURL"] +
+          "/epmetuser/icresiuser/exportExcel",
+        // url: 'epmetuser/icresiuser/exportExcel',
+        method: "post",
+        data: params,
+        responseType: "blob",
+      })
+        .then((res) => {
+          console.log("resllll", res);
+          let fileName = window.decodeURI(
+            res.headers["content-disposition"]
+              .split(";")[1]
+              .split("=")[1]
+          );
+          console.log("filename", fileName);
+          let blob = new Blob([res.data], {
+            type: "application/vnd.ms-excel",
+          });
+          var url = window.URL.createObjectURL(blob);
+          var aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", fileName);
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+        })
+        .catch((err) => {
+          console.log("获取导出情失败", err);
+          this.$message.error("获取导出失败");
+        });
+      this.exportBtnTitle = "导出";
+      this.exportBtn = false;
+    },
+    // 上传大图标成功
+    handleExcelSuccess (res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        console.log("resss---ppp", res);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    handleProgress (event, file, fileList) {
+      console.log("percentage", file.percentage);
+    },
+
+    beforeExcelUpload (file) {
+      console.log("file", file);
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 100;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 100MB!");
+      }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest (file) {
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
+      this.$message({
+        showClose: true,
+        dangerouslyUseHTMLString: true,
+        message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+        duration: 3000
+      });
+      let than = this
+      document.getElementById('clickA').addEventListener('click', function () {
+        than.$router.replace('/main/importRecord-index');
+      })
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post("/epmetuser/icresiuser/importExcel", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            // this.$message.success('导入成功')
+            this.getTableData();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+      // await axios({
+      //   url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
+      //   method: 'post',
+      //   data: formData,
+      //   timeout: '300000',
+      //   responseType: 'blob'
+      // })
+      //   .then((res) => {
+      //     console.log('res-up', res)
+      //     // if (res.headers["content-disposition"]) {
+      //     //   let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+      //     //   console.log('filename', fileName)
+      //     //   let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+      //     //   var url = window.URL.createObjectURL(blob)
+      //     //   var aLink = document.createElement('a')
+      //     //   aLink.style.display = 'none'
+      //     //   aLink.href = url
+      //     //   aLink.setAttribute('download', fileName)
+      //     //   document.body.appendChild(aLink)
+      //     //   aLink.click()
+      //     //   document.body.removeChild(aLink) //下载完成移除元素
+      //     //   window.URL.revokeObjectURL(url) //释放掉blob对象
+      //     // }
+
+      //     this.getTableData()
+      //   })
+      //   .catch(err => {
+      //     console.log('失败', err)
+      //     file.onError() //上传失败的文件会从文件列表中删除
+      //     this.$message.error('导入失败')
+      //   })
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+      this.$refs.upload.clearFiles();
+    },
+    handleClick (tab, event) {
+      console.log(tab, event);
+    },
+
+    // 查看
+    async handleLook (row) {
+      this.lookResiId = row.resiId;
+      this.dialogVisible2 = true;
+    },
+
+    // 编辑
+    async handleEdit (row) {
+      this.editUserId = row.resiId;
+      this.formName = "编辑居民";
+      this.dialogVisible = true;
+      await this.residentBaseInfo();
+    },
+    // 获取详情
+    residentBaseInfo () {
+      this.$http
+        .post(`/actual/base/residentBaseInfo/detail/${this.editUserId}`)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$refs.baseForm.old_from(res.data);
+          }
+        })
+        .catch((err) => {
+          return this.$message.error("网络错误");
+        });
+    },
+    handlerReset () {
+      this.$refs.baseForm.resetForm();
+    },
+
+    async handleAdd () {
+      this.formName = "新增居民";
+      this.editUserId = "";
+      this.dialogVisible = true;
+    },
+
+    async handleChangeGroup (val) {
+      console.log("changeguoprrrrr----", val);
+      let { childGroup, value, partyInfo } = val;
+      let hasT = false;
+      let i = 0;
+      let list = [...this.tabsList];
+      list.forEach((item, index) => {
+        if (item.tableName === childGroup.tableName) {
+          hasT = true;
+          i = index;
+        }
+      });
+      if (value === true || value === "true") {
+        // console.log('changegroup----999', value)
+        if (!hasT) {
+          childGroup.itemList.forEach(async (item) => {
+            if (item.optionSourceType === "remote") {
+              await this.getOptionsList(
+                item.optionSourceValue
+              ).then((res) => {
+                item.options = this.getTreeData(res);
+              });
+              // console.log('')
+            }
+          });
+          if (
+            partyInfo &&
+            partyInfo.length > 0 &&
+            childGroup.tableName == "ic_party_member"
+          ) {
+            list.push({ ...childGroup, formInfo: partyInfo[0] });
+          } else list.push(childGroup);
+        }
+      } else {
+        // console.log('changegroup----000', value)
+        if (hasT) list.splice(i, 1);
+      }
+      this.tabsList = [...list];
+    },
+    formetForm () {
+      const _baseForm = this.$refs.baseForm.handleForm();
+      let arr = [];
+      if (_baseForm.length === 0) return false;
+      arr.push([..._baseForm]);
+      this.tabsList.forEach((item) => {
+        arr.push([
+          ...this.$refs["group" + item.groupId][0].handleForm(),
+        ]);
+      });
+      let arr2 = arr.reduce(function (a, b) {
+        return a.concat(b);
+      });
+      let noChange = true;
+      arr2.forEach((item) => {
+        if (item.list.length !== 0) noChange = false;
+      });
+      console.log("arr2", arr2);
+      if (noChange) {
+        this.$message.warning("您还没有做任何修改");
+        return false;
+      }
+      // 合并相同tableName的多个数组
+      let hash = {};
+      let i = 0;
+      let res = [];
+      let finalArr = [];
+      arr2.forEach(function (item) {
+        let name = item.tableName;
+        if (hash[name]) {
+          res[hash[name] - 1].list.push(...item.list);
+        } else {
+          hash[name] = ++i;
+          res.push({
+            list: [...item.list],
+            supportAdd: item.supportAdd,
+            tableName: name,
+          });
+        }
+      });
+      console.log("res", res);
+      // 多个list合并成一个list子集
+      res.forEach((item) => {
+        let _form = {};
+        item.list.length > 0 &&
+          item.list.forEach((n) => {
+            _form = { ..._form, ...n };
+          });
+        if (item.list.length > 0) {
+          finalArr.push({
+            tableName: item.tableName,
+            list: item.supportAdd ? [...item.list] : [{ ..._form }],
+          });
+        }
+      });
+      console.log("finalArr", finalArr);
+      return finalArr;
+    },
+    async handleEditSUbmit () {
+      this.handleSUbmit();
+    },
+
+    async handleSUbmit () {
+      if (!this.$refs.baseForm.submit_from()) {
+        return;
+      }
+      const _baseForm = JSON.parse(this.$refs.baseForm.submit_from());
+      console.log(_baseForm);
+      _baseForm.partyFlag = parseInt(_baseForm.partyFlag); //党员
+      _baseForm.subsistenceAllowanceFlag = parseInt(
+        _baseForm.subsistenceAllowanceFlag
+      ); //低保
+      _baseForm.ensureHouseFlag = parseInt(_baseForm.ensureHouseFlag); //保障房
+      _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
+      (_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag)), //育龄妇女
+        (_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag)); //退役军人
+      _baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag); //统战人员
+      //公益岗人员
+      _baseForm.publicWelfareFlag = parseInt(
+        _baseForm.publicWelfareFlag
+      );
+      //信访人员
+      _baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
+      _baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag); //志愿者
+      _baseForm.bereavedPersonFlag = parseInt(
+        _baseForm.bereavedPersonFlag
+      ); //失独
+      _baseForm.tenantFlag = parseInt(_baseForm.tenantFlag); //租户
+      _baseForm.floatingFlag = parseInt(_baseForm.floatingFlag); //流动人口
+      _baseForm.specialCrowdFlag = parseInt(_baseForm.specialCrowdFlag); //特殊人群
+      _baseForm.oldPeopleFlag = parseInt(_baseForm.oldPeopleFlag); //老年人
+      _baseForm.emptyNesterFlag = parseInt(_baseForm.emptyNesterFlag); //空巢
+      _baseForm.liveAloneFlag = parseInt(_baseForm.liveAloneFlag); //独居老人
+      _baseForm.disabledFlag = parseInt(_baseForm.disabledFlag); //失能老人
+      _baseForm.dementedFlag = parseInt(_baseForm.dementedFlag); //失智老人
+      _baseForm.disabilityFlag = parseInt(_baseForm.disabilityFlag); //是否残疾
+      _baseForm.seriousIllnessFlag = parseInt(
+        _baseForm.seriousIllnessFlag
+      ); //大病
+      _baseForm.chronicDiseaseFlag = parseInt(
+        _baseForm.chronicDiseaseFlag
+      ); //慢病
+      var hobbyCode = "";
+      if (_baseForm.hobbyInfoDto) {
+        if (_baseForm.hobbyInfoDto.hobbyCode.length === 0) {
+          hobbyCode = "";
+          _baseForm.hobbyInfoDto.hobbyCode = hobbyCode;
+        } else {
+          _baseForm.hobbyInfoDto.hobbyCode.forEach(
+            (element, index) => {
+              hobbyCode =
+                index === 0
+                  ? element
+                  : hobbyCode + "," + element;
+            }
+          );
+          _baseForm.hobbyInfoDto.hobbyCode = hobbyCode;
+        }
+      }
+
+      var volunteerCategory = "";
+      if (_baseForm.volunteerDto) {
+        if (_baseForm.volunteerDto.volunteerCategory.length === 0) {
+          volunteerCategory = "";
+          _baseForm.volunteerDto.volunteerCategory =
+            volunteerCategory;
+        } else {
+          _baseForm.volunteerDto.volunteerCategory.forEach(
+            (element, index) => {
+              volunteerCategory =
+                index === 0
+                  ? element
+                  : volunteerCategory + "," + element;
+            }
+          );
+          _baseForm.volunteerDto.volunteerCategory =
+            volunteerCategory;
+        }
+      }
+
+      var specialCategoryCode = "";
+      if (_baseForm.specialDto) {
+        if (_baseForm.specialDto.specialCategoryCode.length === 0) {
+          specialCategoryCode = "";
+          _baseForm.specialDto.specialCategoryCode =
+            specialCategoryCode;
+        } else {
+          _baseForm.specialDto.specialCategoryCode.forEach(
+            (element, index) => {
+              specialCategoryCode =
+                index === 0
+                  ? element
+                  : specialCategoryCode + "," + element;
+            }
+          );
+          _baseForm.specialDto.specialCategoryCode =
+            specialCategoryCode;
+        }
+      }
+      console.log(_baseForm);
+      this.submitAdd(_baseForm);
+    },
+    handleDel (row) {
+      console.log("row1", row);
+      this.$http
+        .post("/actual/base/residentBaseInfo/batchdel", [row.resiId])
+        .then(({ data: res }) => {
+          console.log("row2", row);
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log("row3", row);
+            this.$message.success("删除成功");
+            this.getTableData();
+          }
+        })
+        .catch((err) => {
+          console.log("row4", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    handleFormatUrl (url) {
+      return url.includes("?");
+    },
+    handlerEditCancle () {
+      this.$refs.baseForm.resetForm();
+      this.tabsList.forEach((item) => {
+        this.$refs["group" + item.groupId][0].resetForm();
+      });
+      this.dialogEditVisible = false;
+    },
+    handlerCancle () {
+      // this.$refs.baseForm.resetForm();
+      // this.tabsList.forEach((item) => {
+      //   this.$refs["group" + item.groupId][0].resetForm();
+      // });
+      this.dialogVisible = false;
+    },
+    async submitAdd (arr) {
+      console.log(arr);
+      this.btnLoading = true;
+      await this.$http
+        .post(
+          arr.resiId
+            ? "actual/base/residentBaseInfo/update"
+            : "/actual/base/residentBaseInfo/save",
+          arr
+        )
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("提交成功");
+            // this.$refs[formName].resetFields();
+
+            this.dialogVisible = false;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+      // console.log(this.$refs.baseForm.form);
+      this.btnLoading = false;
+      this.getTableData();
+    },
+    async submitEdit (arr) {
+      this.btnLoading = true;
+      await this.$http
+        .post("/epmetuser/icresiuser/edit", arr)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("提交成功");
+            // this.$refs[formName].resetFields();
+            this.$refs.baseForm.resetForm();
+            this.tabsList.forEach((item) => {
+              this.$refs["group" + item.groupId][0].resetForm();
+            });
+            this.getTableData();
+            this.dialogEditVisible = false;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+      this.btnLoading = false;
+    },
+
+    async getTableData (obj) {
+      let params = {
+        pageNo: this.currentPage,
+        pageSize: this.pageSize,
+        ...obj,
+      };
+
+      this.tableLoading = true;
+      const { data } = await this.$http.post(
+        "/actual/base/residentBaseInfo/page",
+        params
+      );
+      this.tableLoading = false;
+      if (data.code === 0) {
+        this.total = data.data.total;
+        this.tableData = data.data.list;
+      } else {
+        this.$message.error(data.msg);
+      }
+    },
+
+    // async getQueryConditions() {
+    // 	let params = {
+    // 		formCode: "resident_base_info",
+    // 		customerId: this.$store.state.user.customerId,
+    // 	};
     //
-		// 	const { data } = await this.$http.post(
-		// 		"/oper/customize/icform/queryItems",
-		// 		params
-		// 	);
+    // 	const { data } = await this.$http.post(
+    // 		"/oper/customize/icform/queryItems",
+    // 		params
+    // 	);
     //
-		// 	if (data.code === 0) {
-		// 		this.queryConditions = data.data.map((item) => {
-		// 			return {
-		// 				...item,
-		// 				humpName: util.capitalToHump(item.columnName),
-		// 			};
-		// 		});
-		// 		console.log(this.queryConditions);
-		// 	} else {
-		// 		this.$message.error(data.msg);
-		// 	}
-		// },
-
-		getrowInfo(id) {
-			let params = {
-				formCode: "resident_base_info",
-				icResiUserId: id,
-			};
-			this.$http
-				.post("/epmetuser/icresiuser/detail", params)
-				.then(({ data: res }) => {
-					if (res.code !== 0) {
-						return this.$message.error(res.msg);
-					} else {
-						// console.log('getrowInfo----', res.data)
-						let info = res.data;
-						this.editTableName = { ...info };
-						let list = info[this.formList[0].tableName][0];
-						for (let n in list) {
-							this.editForm[n] = list[n];
-						}
-						this.formList.forEach((item) => {
-							item.columnValue = list[item.columnName];
-							item.ID = list.ID;
-
-							if (
-								item.columnValue == "1" &&
-								item.itemType === "radio" &&
-								item.childGroup
-							) {
-								this.tabsList.push(item.childGroup);
-							}
-
-							// if (item.childGroup && info[item.childGroup.tableName]) {
-
-							// }
-						});
-						this.tabsList.forEach((item) => {
-							let _info = info[item.tableName];
-							if (item.supportAdd) {
-								// console.log('tabsList---333', item.label)
-								const _list = [...item.itemList];
-								let mutiList = [];
-								if (_info) {
-									_info.forEach((fo, index) => {
-										// console.log('mutiList----555' + index, mutiList, _list)
-										mutiList.splice(index, 0, {
-											row: index,
-											itemList: _list.map((m) => {
-												// console.log('itemList---item' + index, m)
-												return {
-													...m,
-													ID: fo.ID,
-													columnValue:
-														fo[m.columnName],
-												};
-											}),
-										});
-										// console.log('mutiList----666' + index, mutiList)
-									});
-								}
-								item.mutiList = mutiList;
-							} else {
-								if (_info) {
-									item.itemList.forEach((n) => {
-										n.ID = _info[0].ID;
-										n.columnValue = _info[0][n.columnName];
-									});
-								}
-							}
-						});
-						// console.log('getrowInfo---formname', this.tabsList)
-						this.dialogEditVisible = true;
-					}
-				})
-				.catch((err) => {
-					console.log("getrowInfo---formnameerr", err);
-					return this.$message.error("网络错误");
-				});
-		},
-		async getOptionsList(url) {
-			let options = [];
-			// console.log('getOptionsList----', url)
-			await this.$http
-				.post(url, { formCode: "resident_base_info" })
-				.then(({ data: res }) => {
-					if (res.code !== 0) {
-						return this.$message.error(res.msg);
-					} else {
-						options = res.data;
-					}
-				})
-				.catch(() => {
-					return this.$message.error("网络错误");
-				});
-			return options;
-		},
-
-		getTreeData(data) {
-			if (!Array.isArray(data)) return [];
-			let arr = data.map((item) => {
-				let _item = {};
-				if (item.children) {
-					if (item.children.length === 0)
-						_item = { ...item, children: undefined };
-					else
-						_item = {
-							...item,
-							children: this.getTreeData(item.children),
-						};
-				} else {
-					_item = { ...item };
-				}
-				return _item;
-			});
-			return arr;
-		},
-
-		async getFormList(type) {
-			await this.$http
-				.post("/oper/customize/icform/getcustomerform", {
-					formCode: "resident_base_info",
-					dynamic: true,
-				})
-				.then(({ data: res }) => {
-					if (res.code !== 0) {
-						return this.$message.error(res.msg);
-					} else {
-						console.log(res.data, "res.data");
-						console.log("获取详情成功getFormList");
-						let { itemList, groupList, formName } = res.data;
-						this.formName = formName;
-						this.activeName =
-							"group" + res.data.groupList[0].groupId;
-						if (type !== "edit") {
-							itemList.forEach(async (item) => {
-								if (item.optionSourceType === "remote") {
-									await this.getOptionsList(
-										item.optionSourceValue
-									).then((res) => {
-										item.options = this.getTreeData(res);
-									});
-								}
-							});
-						}
-						groupList.forEach((item) => {
-							item.itemList.forEach(async (n) => {
-								n.tableName = item.tableName;
-								if (
-									n.optionSourceType === "remote" &&
-									type !== "edit"
-								) {
-									await this.getOptionsList(
-										n.optionSourceValue
-									).then((res) => {
-										n.options = this.getTreeData(res);
-									});
-								}
-							});
-						});
-						this.formList = itemList;
-						this.tabsList = groupList;
-					}
-				})
-				.catch(() => {
-					return this.$message.error("网络错误");
-				});
-		},
-		async getExportList(type) {
-			const url = "/oper/customize/icformitemgroup/list";
-			let params = {
-				formCode: "resident_base_info",
-			};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				data.forEach((item) => {
-					(async (id) => {
-						// item.queryItemList = await this.getExportChildList(id)
-						item.queryItemList = [];
-					})(item.id);
-				});
-				this.exportList = [...data];
-				this.$nextTick(() => {
-					this.diyDialog = true;
-				});
-				console.log("获取详情成功getExportList----", this.exportList);
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async getExportChildList(groupId) {
-			const url = `/oper/customize/icformitem/getItemList/${groupId}`;
-			let params = {};
-
-			const { data, code, msg } = await requestPost(url, params);
-
-			if (code === 0) {
-				return data;
-			} else {
-				this.$message.error(msg);
-			}
-		},
-		async deleteresiBatch() {
-			if (this.selection.length === 0)
-				return this.$message.error("请选择之后进行操作");
-			let userIds = this.selection.map((item) => item.resiId);
-			this.$http
-				.post("/actual/base/residentBaseInfo/batchdel", userIds)
-				.then(({ data: res }) => {
-					if (res.code !== 0) {
-						return this.$message.error(res.msg);
-					} else {
-						this.$message.success("删除成功");
-						this.getTableData();
-					}
-				})
-				.catch((err) => {
-					console.log("row4", err);
-					return this.$message.error("网络错误");
-				});
-		},
-	},
-	watch: {
-		$route: {
-			handler: function (newVal, oldVal) {
-				if (newVal.name == "base-resi") {
-					this.getTableData({
-						categoryKey:
-							this.$store.state.categoryStr.categoryCode || "",
-						pageNo: this.currentPage,
-						pageSize: this.pageSize,
-					});
-					// this.$refs.myResiSearch.form.categoryKey.push(this.$store.state.categoryStr.categoryCode)
-					this.$store.commit("setCategoryCode", "");
-				}
-			},
-			deep: true,
-			immediate: true,
-		},
-	},
+    // 	if (data.code === 0) {
+    // 		this.queryConditions = data.data.map((item) => {
+    // 			return {
+    // 				...item,
+    // 				humpName: util.capitalToHump(item.columnName),
+    // 			};
+    // 		});
+    // 		console.log(this.queryConditions);
+    // 	} else {
+    // 		this.$message.error(data.msg);
+    // 	}
+    // },
+
+    getrowInfo (id) {
+      let params = {
+        formCode: "resident_base_info",
+        icResiUserId: id,
+      };
+      this.$http
+        .post("/epmetuser/icresiuser/detail", params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            // console.log('getrowInfo----', res.data)
+            let info = res.data;
+            this.editTableName = { ...info };
+            let list = info[this.formList[0].tableName][0];
+            for (let n in list) {
+              this.editForm[n] = list[n];
+            }
+            this.formList.forEach((item) => {
+              item.columnValue = list[item.columnName];
+              item.ID = list.ID;
+
+              if (
+                item.columnValue == "1" &&
+                item.itemType === "radio" &&
+                item.childGroup
+              ) {
+                this.tabsList.push(item.childGroup);
+              }
+
+              // if (item.childGroup && info[item.childGroup.tableName]) {
+
+              // }
+            });
+            this.tabsList.forEach((item) => {
+              let _info = info[item.tableName];
+              if (item.supportAdd) {
+                // console.log('tabsList---333', item.label)
+                const _list = [...item.itemList];
+                let mutiList = [];
+                if (_info) {
+                  _info.forEach((fo, index) => {
+                    // console.log('mutiList----555' + index, mutiList, _list)
+                    mutiList.splice(index, 0, {
+                      row: index,
+                      itemList: _list.map((m) => {
+                        // console.log('itemList---item' + index, m)
+                        return {
+                          ...m,
+                          ID: fo.ID,
+                          columnValue:
+                            fo[m.columnName],
+                        };
+                      }),
+                    });
+                    // console.log('mutiList----666' + index, mutiList)
+                  });
+                }
+                item.mutiList = mutiList;
+              } else {
+                if (_info) {
+                  item.itemList.forEach((n) => {
+                    n.ID = _info[0].ID;
+                    n.columnValue = _info[0][n.columnName];
+                  });
+                }
+              }
+            });
+            // console.log('getrowInfo---formname', this.tabsList)
+            this.dialogEditVisible = true;
+          }
+        })
+        .catch((err) => {
+          console.log("getrowInfo---formnameerr", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    async getOptionsList (url) {
+      let options = [];
+      // console.log('getOptionsList----', url)
+      await this.$http
+        .post(url, { formCode: "resident_base_info" })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            options = res.data;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+      return options;
+    },
+
+    getTreeData (data) {
+      if (!Array.isArray(data)) return [];
+      let arr = data.map((item) => {
+        let _item = {};
+        if (item.children) {
+          if (item.children.length === 0)
+            _item = { ...item, children: undefined };
+          else
+            _item = {
+              ...item,
+              children: this.getTreeData(item.children),
+            };
+        } else {
+          _item = { ...item };
+        }
+        return _item;
+      });
+      return arr;
+    },
+
+    async getFormList (type) {
+      await this.$http
+        .post("/oper/customize/icform/getcustomerform", {
+          formCode: "resident_base_info",
+          dynamic: true,
+        })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            console.log(res.data, "res.data");
+            console.log("获取详情成功getFormList");
+            let { itemList, groupList, formName } = res.data;
+            this.formName = formName;
+            this.activeName =
+              "group" + res.data.groupList[0].groupId;
+            if (type !== "edit") {
+              itemList.forEach(async (item) => {
+                if (item.optionSourceType === "remote") {
+                  await this.getOptionsList(
+                    item.optionSourceValue
+                  ).then((res) => {
+                    item.options = this.getTreeData(res);
+                  });
+                }
+              });
+            }
+            groupList.forEach((item) => {
+              item.itemList.forEach(async (n) => {
+                n.tableName = item.tableName;
+                if (
+                  n.optionSourceType === "remote" &&
+                  type !== "edit"
+                ) {
+                  await this.getOptionsList(
+                    n.optionSourceValue
+                  ).then((res) => {
+                    n.options = this.getTreeData(res);
+                  });
+                }
+              });
+            });
+            this.formList = itemList;
+            this.tabsList = groupList;
+          }
+        })
+        .catch(() => {
+          return this.$message.error("网络错误");
+        });
+    },
+    async getExportList (type) {
+      const url = "/oper/customize/icformitemgroup/list";
+      let params = {
+        formCode: "resident_base_info",
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        data.forEach((item) => {
+          (async (id) => {
+            // item.queryItemList = await this.getExportChildList(id)
+            item.queryItemList = [];
+          })(item.id);
+        });
+        this.exportList = [...data];
+        this.$nextTick(() => {
+          this.diyDialog = true;
+        });
+        console.log("获取详情成功getExportList----", this.exportList);
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getExportChildList (groupId) {
+      const url = `/oper/customize/icformitem/getItemList/${groupId}`;
+      let params = {};
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        return data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async deleteresiBatch () {
+      if (this.selection.length === 0)
+        return this.$message.error("请选择之后进行操作");
+      let userIds = this.selection.map((item) => item.resiId);
+      this.$http
+        .post("/actual/base/residentBaseInfo/batchdel", userIds)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.$message.success("删除成功");
+            this.getTableData();
+          }
+        })
+        .catch((err) => {
+          console.log("row4", err);
+          return this.$message.error("网络错误");
+        });
+    },
+  },
+  watch: {
+    $route: {
+      handler: function (newVal, oldVal) {
+        if (newVal.name == "base-resi") {
+          this.getTableData({
+            categoryKey:
+              this.$store.state.categoryStr.categoryCode || "",
+            pageNo: this.currentPage,
+            pageSize: this.pageSize,
+          });
+          // this.$refs.myResiSearch.form.categoryKey.push(this.$store.state.categoryStr.categoryCode)
+          this.$store.commit("setCategoryCode", "");
+        }
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
 };
 </script>
 
@@ -1863,176 +1765,176 @@ export default {
 @import "@/assets/scss/modules/management/list-main.scss";
 @import "@/assets/scss/buttonstyle.scss";
 ::v-deep .el-tabs__nav-next {
-	box-shadow: 2px 0px 9px 0px;
+  box-shadow: 2px 0px 9px 0px;
 }
 ::v-deep .el-tabs__nav-prev {
-	box-shadow: -1px 0px 7px 0px;
+  box-shadow: -1px 0px 7px 0px;
 }
 .dialog-h {
-	.el-dialog__body {
-		position: relative;
-		max-height: 83vh;
-		box-sizing: border-box;
-		padding: 0 0 20px !important;
-		.dialog-h-content {
-			max-height: calc(83vh - 80px);
-			box-sizing: border-box;
-			padding: 50px 70px;
-			overflow: auto;
-		}
-	}
+  .el-dialog__body {
+    position: relative;
+    max-height: 83vh;
+    box-sizing: border-box;
+    padding: 0 0 20px !important;
+    .dialog-h-content {
+      max-height: calc(83vh - 80px);
+      box-sizing: border-box;
+      padding: 50px 70px;
+      overflow: auto;
+    }
+  }
 }
 .resi-container ::v-deep .el-row {
-	margin-right: 0;
+  margin-right: 0;
 }
 .tabs-other-info {
-	// ::v-deep .el-tabs__nav-wrap::after,
-	::v-deep .el-tabs__active-bar_active {
-		background-color: #0055d7;
-	}
+  // ::v-deep .el-tabs__nav-wrap::after,
+  ::v-deep .el-tabs__active-bar_active {
+    background-color: #0055d7;
+  }
 }
 ::v-deep .el-tabs__item {
-	// width: 50px;
-	box-sizing: border-box;
-	padding: 0 10px !important;
-	font-size: 14px;
-	font-weight: 600;
-	color: #666666;
-	border-radius: 2px;
-	&:hover {
-		color: #0056d6;
-	}
+  // width: 50px;
+  box-sizing: border-box;
+  padding: 0 10px !important;
+  font-size: 14px;
+  font-weight: 600;
+  color: #666666;
+  border-radius: 2px;
+  &:hover {
+    color: #0056d6;
+  }
 }
 ::v-deep .el-tabs__item.is-active {
-	color: #0056d6;
+  color: #0056d6;
 }
 ::v-deep .el-tabs__active-bar {
-	background-color: #0056d6;
+  background-color: #0056d6;
 }
 .resi-container .resi-card {
-	position: relative;
-	overflow: visible;
+  position: relative;
+  overflow: visible;
 }
 ::v-deep .el-button--primary.is-plain {
-	color: #0055d7;
-	background: #ffffff;
-	border-color: #0055d7;
+  color: #0055d7;
+  background: #ffffff;
+  border-color: #0055d7;
 }
 .resi-container .resi-card-table {
-	::v-deep .el-table th {
-		color: #fff;
-		background-color: rgba(33, 149, 254, 1);
-		// border-right: 1px solid rgba(33, 149, 254, 1);
-	}
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
 }
 .collapse-title {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 .resi-table {
-	::v-deep .el-button--text {
-		text-decoration: underline;
-	}
-	::v-deep .btn-color-del {
-		margin-left: 10px;
-		color: rgba(213, 16, 16, 1);
-	}
-	::v-deep .btn-color-edit {
-		color: rgba(0, 167, 169, 1);
-	}
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
+  }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
 }
 .resi-search {
-	// padding-right: 20px;
-	margin-top: 10px;
-	.el-col {
-		text-align: right;
-	}
+  // padding-right: 20px;
+  margin-top: 10px;
+  .el-col {
+    text-align: right;
+  }
 }
 .resi-down {
-	position: absolute;
-	left: 50%;
-	bottom: -10px;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	width: 46px;
-	height: 12px;
-	box-sizing: border-box;
-	margin-left: -23rpx;
-	cursor: pointer;
-	background: #ffffff;
-	border-radius: 0 0 10px 10px;
-	img {
-		display: block;
-	}
+  position: absolute;
+  left: 50%;
+  bottom: -10px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 46px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-left: -23rpx;
+  cursor: pointer;
+  background: #ffffff;
+  border-radius: 0 0 10px 10px;
+  img {
+    display: block;
+  }
 }
 
 .resi-card-table {
-	margin-top: 20px;
+  margin-top: 20px;
 }
 .resi-row-btn {
-	display: flex;
-	margin-bottom: 13px;
-	.el-button {
-		margin-left: 10px;
-		border: 0;
-	}
-	// .el-button--success {
-	//   background: rgba(34, 193, 195, 1);
-	// }
-	// .el-button--warning {
-	//   background: rgba(254, 179, 73, 1);
-	// }
-	// .el-button--danger {
-	//   background: rgba(254, 98, 82, 1);
-	// }
+  display: flex;
+  margin-bottom: 13px;
+  .el-button {
+    margin-left: 10px;
+    border: 0;
+  }
+  // .el-button--success {
+  //   background: rgba(34, 193, 195, 1);
+  // }
+  // .el-button--warning {
+  //   background: rgba(254, 179, 73, 1);
+  // }
+  // .el-button--danger {
+  //   background: rgba(254, 98, 82, 1);
+  // }
 }
 .resi-other {
-	width: 100%;
-	display: flex;
-	.resi-other-title {
-		flex-shrink: 0;
-		// display: inline-block;
-		width: 100px;
-		box-sizing: border-box;
-		margin-bottom: 10px;
-		// padding: 6px 12px 0 0;
-		font-size: 16px;
-		font-weight: 500;
-		color: #333;
-		text-align: center;
-	}
-	.tabs-other-info {
-		// display: inline-block;
-		// flex: 1;
-		// padding-left: 60px;
-		width: calc(100% - 100px);
-	}
+  width: 100%;
+  display: flex;
+  .resi-other-title {
+    flex-shrink: 0;
+    // display: inline-block;
+    width: 100px;
+    box-sizing: border-box;
+    margin-bottom: 10px;
+    // padding: 6px 12px 0 0;
+    font-size: 16px;
+    font-weight: 500;
+    color: #333;
+    text-align: center;
+  }
+  .tabs-other-info {
+    // display: inline-block;
+    // flex: 1;
+    // padding-left: 60px;
+    width: calc(100% - 100px);
+  }
 }
 
 .resi-btns {
-	margin-top: 20px;
-	text-align: center;
-	text-align: right;
-	margin-right: 16px;
+  margin-top: 20px;
+  text-align: center;
+  text-align: right;
+  margin-right: 16px;
 }
 .div-flex {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	width: 100%;
-	.div_del {
-		margin-top: 15px;
-	}
-	.m-page {
-		margin-left: auto;
-	}
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  .div_del {
+    margin-top: 15px;
+  }
+  .m-page {
+    margin-left: auto;
+  }
 }
 .el-dropdown-menu {
-	::v-deep .el-dropdown-menu__item{
-		&:hover{
-			color: #0056d6;
-		}
-	}
+  ::v-deep .el-dropdown-menu__item {
+    &:hover {
+      color: #0056d6;
+    }
+  }
 }
 </style>