From 3e0cc9fafae64a1ac1a04276c87f666bdfacd6aa Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 10 Jan 2023 10:13:30 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E8=BF=81=E5=87=BA?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/plugins/change/changedeath.vue    | 484 +++++-----
 .../plugins/change/changerelocation.vue       | 911 ++++++++++--------
 .../modules/plugins/change/resideathAdd.vue   |  14 +-
 3 files changed, 765 insertions(+), 644 deletions(-)

diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index bf4e88a49..985366dab 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -1,128 +1,150 @@
 <template>
   <div class="g-main">
-    <div ref="searchDiv"
-         class="m-search">
-      <el-form :inline="true"
-               :model="dataForm"
-               @keyup.enter.native="getDataList()"
-               label-width="100px">
-        <el-form-item label="姓名"
-                      prop="name">
-          <el-input v-model="dataForm.name"
-                    size="small"
-                    class="u-item-width-normal"
-                    clearable
-                    placeholder="请输入姓名">
+    <div ref="searchDiv" class="m-search">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+        label-width="100px"
+      >
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="dataForm.name"
+            size="small"
+            class="u-item-width-normal"
+            clearable
+            placeholder="请输入姓名"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="证件号"
-                      prop="idCard">
-          <el-input v-model="dataForm.idCard"
-                    size="small"
-                    class="u-item-width-normal"
-                    clearable
-                    placeholder="请输入证件号">
+        <el-form-item label="证件号" prop="idCard">
+          <el-input
+            v-model="dataForm.idCard"
+            size="small"
+            class="u-item-width-normal"
+            clearable
+            placeholder="请输入证件号"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="手机"
-                      prop="mobile">
-          <el-input v-model="dataForm.mobile"
-                    size="small"
-                    class="u-item-width-normal"
-                    clearable
-                    placeholder="请输入手机">
+        <el-form-item label="手机" prop="mobile">
+          <el-input
+            v-model="dataForm.mobile"
+            size="small"
+            class="u-item-width-normal"
+            clearable
+            placeholder="请输入手机"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="死亡时间"
-                      prop="startTime">
-          <el-date-picker v-model="timeRange"
-                          type="daterange"
-                          class="u-item-width-daterange2"
-                          size="small"
-                          range-separator="至"
-                          start-placeholder="选择日期"
-                          end-placeholder="选择日期"
-                          value-format="yyyy-MM-dd">
+        <el-form-item label="死亡时间" prop="startTime">
+          <el-date-picker
+            v-model="timeRange"
+            type="daterange"
+            class="u-item-width-daterange2"
+            size="small"
+            range-separator="至"
+            start-placeholder="选择日期"
+            end-placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="享受福利"
-                      prop="isWelfare">
-          <el-select v-model="dataForm.isWelfare"
-                     size="small"
-                     class="u-item-width-normal"
-                     placeholder="请选择"
-                     clearable>
-            <el-option v-for="item in isWelfareArr"
-                       :key="item.dictValue"
-                       :label="item.dictName"
-                       :value="item.dictValue">
+        <!-- <el-form-item label="享受福利" prop="isWelfare">
+          <el-select
+            v-model="dataForm.isWelfare"
+            size="small"
+            class="u-item-width-normal"
+            placeholder="请选择"
+            clearable
+          >
+            <el-option
+              v-for="item in isWelfareArr"
+              :key="item.dictValue"
+              :label="item.dictName"
+              :value="item.dictValue"
+            >
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <div class="u-search-btn">
-          <el-button class="diy-button--white"
-                     size="small"
-                     @click="resetForm">重置</el-button>
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--blue"
-                     @click="getDataList">查询</el-button>
-
+          <el-button class="diy-button--white" size="small" @click="resetForm"
+            >重置</el-button
+          >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--blue"
+            @click="getDataList"
+            >查询</el-button
+          >
         </div>
       </el-form>
     </div>
     <div class="m-table">
       <div class="u-table-btn1">
-
-        <el-button size="small"
-                   class="diy-button--white"
-                   @click="exportHandle()">{{ $t('export') }}</el-button>
-
+        <el-button
+          size="small"
+          class="diy-button--white"
+          @click="exportHandle()"
+          >{{ $t("export") }}</el-button
+        >
       </div>
-      <el-table class="m-table-item"
-                v-loading="dataListLoading"
-                :data="dataList"
-                border>
+      <el-table
+        class="m-table-item"
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+      >
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
-        <el-table-column label="序号"
-                         type="index"
-                         fixed="left"
-                         align="center"
-                         width="50">
+        <el-table-column
+          label="序号"
+          type="index"
+          fixed="left"
+          align="center"
+          width="50"
+        >
         </el-table-column>
         <!--<el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="userId" label="epmet用户主键" header-align="center" align="center"></el-table-column>-->
-        <el-table-column prop="name"
-                         label="姓名"
-                         header-align="center"
-                         align="center">
+        <el-table-column
+          prop="name"
+          label="姓名"
+          header-align="center"
+          align="center"
+        >
           <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)"
-                       type="text"
-                       size="small"
-                       class="btn-color-look">{{scope.row.name}}</el-button>
+            <el-button
+              @click="handleLook(scope.row)"
+              type="text"
+              size="small"
+              class="btn-color-look"
+              >{{ scope.row.name }}</el-button
+            >
           </template>
         </el-table-column>
-        <el-table-column prop="idCard"
-                         label="证件号"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="mobile"
-                         label="手机号"
-                         header-align="center"
-                         align="center"></el-table-column>
-        <el-table-column prop="gender"
-                         label="性别"
-                         header-align="center"
-                         align="center">
+        <el-table-column
+          prop="idNum"
+          label="证件号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="mobile"
+          label="手机号"
+          header-align="center"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="gender"
+          label="性别"
+          header-align="center"
+          align="center"
+        >
           <template slot-scope="scope">
-            {{
-            scope.row.gender == '2'
-            ? "女"
-            : scope.row.gender
-            }}
+            {{ scope.row.gender == "2" ? "女" : scope.row.gender }}
           </template>
         </el-table-column>
         <!--<el-table-column prop="type" label="类型" header-align="center" align="center">-->
@@ -136,113 +158,137 @@
         <!--}}-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column prop="deathDate"
-                         label="死亡时间"
-                         header-align="center"
-                         align="center"></el-table-column>
+        <el-table-column
+          prop="deathDate"
+          label="死亡时间"
+          header-align="center"
+          align="center"
+        ></el-table-column>
         <!--<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="removeDate" label="移除时间" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="removeReason" label="移除原因" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="customerId" label="客户ID" header-align="center" align="center"></el-table-column>-->
-        <el-table-column :label="$t('handle')"
-                         fixed="right"
-                         header-align="center"
-                         align="center"
-                         width="140">
+        <el-table-column
+          :label="$t('handle')"
+          fixed="right"
+          header-align="center"
+          align="center"
+          width="140"
+        >
           <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--blue">查看</el-button>
+            <el-button
+              @click="handleLook(scope.row)"
+              type="text"
+              size="small"
+              class="div-table-button--blue"
+              >查看</el-button
+            >
             <!-- <el-button @click="handleChangeRecord(scope.row)"
                        type="text"
                        size="small"
                        class="div-table-button--blue">变更记录</el-button> -->
             <!--<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
             <!--<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
-            <el-popconfirm v-if="scope.row.status !== '0'"
-                           title="确认恢复？"
-                           @onConfirm="handleRecovery(scope.row)"
-                           @confirm="handleRecovery(scope.row)">
-              <el-button slot="reference"
-                         type="text"
-                         size="small"
-                         class="div-table-button--blue"
-                         style="margin-left: 10px">恢复</el-button>
+            <el-popconfirm
+              style="margin-left: 10px"
+              v-if="scope.row.status !== '0'"
+              title="确认恢复？"
+              @onConfirm="handleRecovery(scope.row)"
+              @confirm="handleRecovery(scope.row)"
+            >
+              <el-button
+                slot="reference"
+                type="text"
+                size="small"
+                class="div-table-button--blue"
+                >恢复</el-button
+              >
             </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination :current-page="page"
-                     :page-sizes="[10, 20, 50, 100]"
-                     :page-size="limit"
-                     :total="total"
-                     layout="total, sizes, prev, pager, next, jumper"
-                     @size-change="pageSizeChangeHandle"
-                     @current-change="pageCurrentChangeHandle">
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
       </el-pagination>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible"
-                   ref="addOrUpdate"
-                   @refreshDataList="getDataList"></add-or-update>
-    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
-                 :userId="lookInfo.userId"
-                 :gridName="lookInfo.gridName"
-                 @close="handleCancleLook" />
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+    ></add-or-update>
+    <people-more
+      v-if="showedPeopleMoreInfo && lookInfo.userId"
+      :userId="lookInfo.userId"
+      :gridName="lookInfo.gridName"
+      @close="handleCancleLook"
+    />
     <!-- 变更记录 -->
-    <el-dialog :visible.sync="changeRecordShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'变更记录'"
-               width="1150px"
-               top="5vh"
-               @closed="diaClose">
+    <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>
   </div>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './changedeath-add-or-update'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./changedeath-add-or-update";
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
-import nextTick from 'dai-js/tools/nextTick'
-import resiChangeRecord from '../../../components/resiChangeRecord.vue'
+import nextTick from "dai-js/tools/nextTick";
+import resiChangeRecord from "../../../components/resiChangeRecord.vue";
 import { requestPost } from "@/js/dai/request";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/epmetuser/rentDeath/page',
+        getDataListURL: "/actual/base/residentDeathRecord/page",
         getDataListIsPage: true,
-        deleteURL: '/epmetuser/rentDeath',
+        deleteURL: "/actual/base/residentDeathRecord/recovery",
         deleteIsBatch: true,
-        exportURL: '/epmetuser/rentDeath/export'
+        exportURL: "/actual/base/residentDeathRecord/export",
       },
-      timeRange: '',
+      timeRange: "",
       dataForm: {
-        id: '',
-        name: '',
-        isWelfare: ''
+        id: "",
+        name: "",
+        idCard: "",
+        mobile: "",
+        startDate: "",
+        endDate: "",
+        // isWelfare: "",
       },
       // 显示人员详情
       showedPeopleMoreInfo: false,
       lookInfo: {
-        userId: '',
-        gridName: ''
+        userId: "",
+        gridName: "",
       },
       isWelfareArr: [
-        { dictValue: '0', dictName: '否' },
-        { dictValue: '1', dictName: '是' }
+        { dictValue: "0", dictName: "否" },
+        { dictValue: "1", dictName: "是" },
       ],
-      changeRecordShow: false
-    }
+      changeRecordShow: false,
+    };
   },
   watch: {
-    timeRange (val) {
+    timeRange(val) {
       if (Array.isArray(val) && val.length == 2) {
         this.dataForm.startTime = val[0];
         this.dataForm.endTime = val[1];
@@ -250,21 +296,21 @@ export default {
         this.dataForm.startTime = "";
         this.dataForm.endTime = "";
       }
-    }
+    },
   },
   components: {
     AddOrUpdate,
     peopleMore,
-    resiChangeRecord
+    resiChangeRecord,
   },
   methods: {
-    async handleRecovery (rowData) {
-      console.log('11111')
-      const url = "/epmetuser/rentDeath/recovery";
+    async handleRecovery(rowData) {
+      console.log("11111");
+      const url = "/actual/base/residentDeathRecord/recovery";
 
       let params = {
-        id: rowData.id
-      }
+        id: rowData.id,
+      };
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.$message.success("恢复成功！");
@@ -273,77 +319,83 @@ export default {
         this.$message.success("操作失败！");
       }
     },
-    diaClose () {
-      this.changeRecordShow = false
+    diaClose() {
+      this.changeRecordShow = false;
     },
     //变更记录
-    async handleChangeRecord (row) {
-      this.changeRecordShow = true
+    async handleChangeRecord(row) {
+      this.changeRecordShow = true;
 
-      await nextTick(200)
+      await nextTick(200);
 
-      this.$refs.ref_changerecord.initForm(row)
+      this.$refs.ref_changerecord.initForm(row);
     },
-    exportHandle () {
-      const url = this.mixinViewModuleOptions.exportURL
+    exportHandle() {
+      const url = this.mixinViewModuleOptions.exportURL;
       this.$http({
-        method: 'GET',
+        method: "GET",
         url,
-        responseType: 'blob',
-        params: this.dataForm
-      }).then(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('网络错误')
+        responseType: "blob",
+        params: this.dataForm,
       })
+        .then((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("网络错误");
+        });
     },
-    resetForm (formName) {
+    resetForm(formName) {
       for (const n in this.dataForm) {
-        this.dataForm[n] = ''
+        this.dataForm[n] = "";
       }
-      this.timeRange = ''
-      this.getDataList()
+      this.timeRange = "";
+      this.getDataList();
     },
-    async handleLook (row) {
-      if (row.gridId !== '') {
-        const url = '/gov/org/grid/griddetail'
+    async handleLook(row) {
+      if (row.gridId !== "") {
+        const url = "/gov/org/grid/griddetail";
         let params = {
           gridId: row.gridId,
-        }
-        const { data, code, msg } = await requestPost(url, params)
+        };
+        const { data, code, msg } = await requestPost(url, params);
         if (code === 0) {
-          this.lookInfo.gridName = data.gridName
+          this.lookInfo.gridName = data.gridName;
         } else {
-          this.$message.error(msg)
+          this.$message.error(msg);
         }
       } else {
-        this.lookInfo.gridName = ''
+        this.lookInfo.gridName = "";
       }
-      this.lookInfo.userId = row.userId
-      this.showedPeopleMoreInfo = true
+      this.lookInfo.userId = row.userId;
+      this.showedPeopleMoreInfo = true;
     },
-    handleCancleLook () {
-      this.lookInfo.userId = ''
-      this.lookInfo.gridName = ''
-      this.showedPeopleMoreInfo = false
-    }
-  }
-}
+    handleCancleLook() {
+      this.lookInfo.userId = "";
+      this.lookInfo.gridName = "";
+      this.showedPeopleMoreInfo = false;
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 09a028bcf..4b9669681 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -1,127 +1,149 @@
 <template>
   <div class="g-main">
-    <div ref="searchForm"
-         class="m-search">
-      <el-form :inline="true"
-               :model="dataForm"
-               @keyup.enter.native="getDataList()"
-               label-width="100px">
-        <el-form-item label="所属网格"
-                      prop="gridId">
-          <el-select v-model.trim="dataForm.gridId"
-                     placeholder="请选择"
-                     clearable
-                     class="u-item-width-normal"
-                     @change="handleChangeGrid">
-            <el-option v-for="item in optionsG"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+    <div ref="searchForm" class="m-search">
+      <el-form
+        :inline="true"
+        :model="dataForm"
+        @keyup.enter.native="getDataList()"
+        label-width="100px"
+      >
+        <el-form-item label="所属网格" prop="gridId">
+          <el-select
+            v-model.trim="dataForm.gridId"
+            placeholder="请选择"
+            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="迁往何地">
-
-          <el-select v-model.trim="dataForm.villageId"
-                     placeholder="请选择小区"
-                     clearable
-                     class="u-item-width-communitycascader"
-                     @clear="handleClearVillage"
-                     @change="handleChangeV">
-            <el-option v-for="item in optionsV"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+          <el-select
+            v-model.trim="dataForm.villageId"
+            placeholder="请选择小区"
+            clearable
+            class="u-item-width-communitycascader"
+            @clear="handleClearVillage"
+            @change="handleChangeV"
+          >
+            <el-option
+              v-for="item in optionsV"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
 
-          <el-select v-model.trim="dataForm.buildId"
-                     placeholder="楼号"
-                     clearable
-                     class="u-item-width-buildcascader"
-                     style="margin-left:5px"
-                     :disabled="changeVDisabled"
-                     @clear="handleClearBuild"
-                     @change="handleChangeB">
-            <el-option v-for="item in optionsB"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+          <el-select
+            v-model.trim="dataForm.buildId"
+            placeholder="楼号"
+            clearable
+            class="u-item-width-buildcascader"
+            style="margin-left: 5px"
+            :disabled="changeVDisabled"
+            @clear="handleClearBuild"
+            @change="handleChangeB"
+          >
+            <el-option
+              v-for="item in optionsB"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
 
-          <el-select v-model.trim="dataForm.unitId"
-                     :disabled="changeBDisabled"
-                     placeholder="单元"
-                     clearable
-                     class="u-item-width-buildcascader"
-                     style="margin-left:5px"
-                     @click="handleClearDan"
-                     @change="handleChangeD">
-            <el-option v-for="item in optionsD"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+          <el-select
+            v-model.trim="dataForm.unitId"
+            :disabled="changeBDisabled"
+            placeholder="单元"
+            clearable
+            class="u-item-width-buildcascader"
+            style="margin-left: 5px"
+            @click="handleClearDan"
+            @change="handleChangeD"
+          >
+            <el-option
+              v-for="item in optionsD"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
 
-          <el-select v-model.trim="dataForm.homeId"
-                     :disabled="changeDDisabled"
-                     placeholder="房号"
-                     clearable
-                     class="u-item-width-buildcascader"
-                     style="margin-left:5px">
-            <el-option v-for="item in optionsH"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
+          <el-select
+            v-model.trim="dataForm.homeId"
+            :disabled="changeDDisabled"
+            placeholder="房号"
+            clearable
+            class="u-item-width-buildcascader"
+            style="margin-left: 5px"
+          >
+            <el-option
+              v-for="item in optionsH"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
             </el-option>
           </el-select>
-
         </el-form-item>
 
-        <el-form-item label="姓名"
-                      prop="name">
-          <el-input v-model="dataForm.name"
-                    size="small"
-                    class="u-item-width-normal"
-                    clearable
-                    placeholder="请输入姓名">
+        <el-form-item label="姓名" prop="name">
+          <el-input
+            v-model="dataForm.name"
+            size="small"
+            class="u-item-width-normal"
+            clearable
+            placeholder="请输入姓名"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="证件号"
-                      prop="idCard">
-          <el-input v-model="dataForm.idCard"
-                    size="small"
-                    class="u-item-width-normal"
-                    clearable
-                    placeholder="请输入证件号">
+        <el-form-item label="证件号" prop="idCard">
+          <el-input
+            v-model="dataForm.idCard"
+            size="small"
+            class="u-item-width-normal"
+            clearable
+            placeholder="请输入证件号"
+          >
           </el-input>
         </el-form-item>
-        <el-form-item label="手机"
-                      prop="mobile">
-          <el-input v-model="dataForm.mobile"
-                    size="small"
-                    class="u-item-width-normal"
-                    clearable
-                    placeholder="请输入手机">
+        <el-form-item label="手机" prop="mobile">
+          <el-input
+            v-model="dataForm.mobile"
+            size="small"
+            class="u-item-width-normal"
+            clearable
+            placeholder="请输入手机"
+          >
           </el-input>
         </el-form-item>
 
-        <el-form-item label="迁出时间"
-                      prop="startTime">
-          <el-date-picker v-model="timeRange"
-                          type="daterange"
-                          clearable
-                          size="small"
-                          class="u-item-width-daterange2"
-                          range-separator="至"
-                          start-placeholder="选择日期"
-                          end-placeholder="选择日期"
-                          value-format="yyyy-MM-dd">
+        <el-form-item label="迁出时间" prop="startTime">
+          <el-date-picker
+            v-model="timeRange"
+            type="daterange"
+            clearable
+            size="small"
+            class="u-item-width-daterange2"
+            range-separator="至"
+            start-placeholder="选择日期"
+            end-placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="享受福利"
+        <!-- <el-form-item label="享受福利"
                       prop="isWelfare">
           <el-select v-model="dataForm.isWelfare"
                      placeholder="请选择"
@@ -133,289 +155,325 @@
                        :value="item.dictValue">
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <div class="u-search-btn">
-          <el-button class="diy-button--white"
-                     size="small"
-                     @click="resetForm">重置</el-button>
-          <el-button style="margin-left:10px"
-                     size="small"
-                     class="diy-button--blue"
-                     @click="getDataList">查询</el-button>
-
+          <el-button class="diy-button--white" size="small" @click="resetForm"
+            >重置</el-button
+          >
+          <el-button
+            style="margin-left: 10px"
+            size="small"
+            class="diy-button--blue"
+            @click="getDataList"
+            >查询</el-button
+          >
         </div>
-        <!-- <el-form-item>
-          <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
-        </el-form-item> -->
-
       </el-form>
     </div>
+
     <div class="m-table">
       <div class="u-table-btn1">
-
-        <el-button size="small"
-                   class="diy-button--white"
-                   @click="exportHandle()">{{ $t('export') }}</el-button>
-
+        <el-button
+          size="small"
+          class="diy-button--white"
+          @click="exportHandle()"
+          >{{ $t("export") }}</el-button
+        >
       </div>
-      <el-table v-loading="dataListLoading"
-                :data="dataList"
-                border
-                :height="tableHeight"
-                @selection-change="dataListSelectionChangeHandle"
-                class="m-table-item">
+
+      <el-table
+        v-loading="dataListLoading"
+        :data="dataList"
+        border
+        :height="tableHeight"
+        @selection-change="dataListSelectionChangeHandle"
+        class="m-table-item"
+      >
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
-        <el-table-column label="序号"
-                         type="index"
-                         fixed="left"
-                         align="center"
-                         width="50">
+        <el-table-column
+          label="序号"
+          type="index"
+          fixed="left"
+          align="center"
+          width="50"
+        >
         </el-table-column>
-        <el-table-column prop="name"
-                         label="姓名"
-                         header-align="center"
-                         align="center"
-                         min-width="120"
-                         show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)"
-                       type="text"
-                       size="small"
-                       class="btn-color-look">{{scope.row.name}}</el-button>
-          </template>
+        <el-table-column
+          prop="name"
+          label="姓名"
+          header-align="center"
+          align="center"
+          min-width="120"
+          show-overflow-tooltip
+        >
         </el-table-column>
-        <el-table-column prop="agencyName"
-                         label="所属网格"
-                         header-align="center"
-                         align="center"
-                         min-width="120"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="oldAddress"
-                         label="所属房屋"
-                         header-align="center"
-                         align="center"
-                         min-width="120"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="ownerName"
-                         label="户主姓名"
-                         header-align="center"
-                         align="center"
-                         min-width="100"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="mobile"
-                         label="手机号"
-                         header-align="center"
-                         align="center"
-                         min-width="120"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="idCard"
-                         label="证件号"
-                         header-align="center"
-                         align="center"
-                         min-width="120"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="gender"
-                         label="性别"
-                         header-align="center"
-                         align="center"
-                         min-width="70"
-                         show-overflow-tooltip>
+        <el-table-column
+          prop="oleDeptName"
+          label="所属网格"
+          header-align="center"
+          align="center"
+          min-width="120"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="oldAddress"
+          label="所属房屋"
+          header-align="center"
+          align="center"
+          min-width="120"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="ownerName"
+          label="户主姓名"
+          header-align="center"
+          align="center"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="mobile"
+          label="手机号"
+          header-align="center"
+          align="center"
+          min-width="120"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="idCard"
+          label="证件号"
+          header-align="center"
+          align="center"
+          min-width="120"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="gender"
+          label="性别"
+          header-align="center"
+          align="center"
+          min-width="70"
+          show-overflow-tooltip
+        >
           <template slot-scope="scope">
-            {{
-            scope.row.gender == '2'
-            ? "女"
-            : scope.row.gender
-            }}
+            {{ scope.row.gender == "2" ? "女" : scope.row.gender }}
           </template>
         </el-table-column>
-        <el-table-column prop="age"
-                         label="年龄"
-                         header-align="center"
-                         align="center"
-                         min-width="90"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="outOfTime"
-                         label="迁出时间"
-                         header-align="center"
-                         align="center"
-                         min-width="120"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="reason"
-                         label="迁出原因"
-                         header-align="center"
-                         align="center"
-                         min-width="100"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column prop="address"
-                         label="迁往何地"
-                         header-align="center"
-                         align="center"
-                         min-width="120"
-                         show-overflow-tooltip></el-table-column>
-        <el-table-column fixed="right"
-                         label="操作"
-                         align="center"
-                         width="180">
+        <el-table-column
+          prop="age"
+          label="年龄"
+          header-align="center"
+          align="center"
+          min-width="90"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="outOfTime"
+          label="迁出时间"
+          header-align="center"
+          align="center"
+          min-width="120"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="reason"
+          label="迁出原因"
+          header-align="center"
+          align="center"
+          min-width="100"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column
+          prop="address"
+          label="迁往何地"
+          header-align="center"
+          align="center"
+          min-width="120"
+          show-overflow-tooltip
+        ></el-table-column>
+        <el-table-column fixed="right" label="操作" align="center" width="180">
           <template slot-scope="scope">
-            <el-button @click="handleChangeRecord(scope.row)"
-                       type="text"
-                       size="small"
-                       class="div-table-button--blue">变更记录</el-button>
-            <el-popconfirm v-if="scope.row.status !== '0'"
-                           title="确认恢复？"
-                           @onConfirm="handleRecovery(scope.row)"
-                           @confirm="handleRecovery(scope.row)">
-              <el-button slot="reference"
-                         type="text"
-                         size="small"
-                         class="div-table-button--blue">恢复</el-button>
+            <el-button
+              @click="handleLook(scope.row)"
+              type="text"
+              size="small"
+              class="btn-color-look"
+              >查看</el-button
+            >
+
+            <el-button
+              v-if="false"
+              @click="handleChangeRecord(scope.row)"
+              type="text"
+              size="small"
+              class="div-table-button--blue"
+              >变更记录</el-button
+            >
+            <el-popconfirm
+              style="margin-left: 10px"
+              v-if="scope.row.status !== '0'"
+              title="确认恢复？"
+              @onConfirm="handleRecovery(scope.row)"
+              @confirm="handleRecovery(scope.row)"
+            >
+              <el-button
+                slot="reference"
+                type="text"
+                size="small"
+                class="div-table-button--blue"
+                >恢复</el-button
+              >
             </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination :current-page="page"
-                     :page-sizes="[10, 20, 50, 100]"
-                     :page-size="limit"
-                     :total="total"
-                     layout="total, sizes, prev, pager, next, jumper"
-                     @size-change="pageSizeChangeHandle"
-                     @current-change="pageCurrentChangeHandle">
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle"
+      >
       </el-pagination>
     </div>
     <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible"
-                   ref="addOrUpdate"
-                   @refreshDataList="getDataList"></add-or-update>
-    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
-                 :userId="lookInfo.userId"
-                 :gridName="lookInfo.gridName"
-                 @close="handleCancleLook" />
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+    ></add-or-update>
+    <people-more
+      v-if="showedPeopleMoreInfo && lookInfo.userId"
+      :userId="lookInfo.userId"
+      :gridName="lookInfo.gridName"
+      @close="handleCancleLook"
+    />
     <!-- 变更记录 -->
-    <el-dialog :visible.sync="changeRecordShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'变更记录'"
-               width="1150px"
-               top="5vh"
-               @closed="diaClose">
+    <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>
   </div>
 </template>
 
 <script>
-import mixinViewModule from '@/mixins/view-module'
-import AddOrUpdate from './changerelocation-add-or-update'
+import mixinViewModule from "@/mixins/view-module";
+import AddOrUpdate from "./changerelocation-add-or-update";
 import peopleMore from "@/views/modules/shequ/cpts/people-more";
-import nextTick from 'dai-js/tools/nextTick'
-import resiChangeRecord from '../../../components/resiChangeRecord.vue'
+import nextTick from "dai-js/tools/nextTick";
+import resiChangeRecord from "../../../components/resiChangeRecord.vue";
 import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
+import { mapGetters } from "vuex";
 export default {
   mixins: [mixinViewModule],
-  data () {
+  data() {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: '/epmetuser/changeRelocation/page',
+        getDataListURL: "/actual/base/residentMoveOutRecord/page",
         getDataListIsPage: true,
-        deleteURL: '/epmetuser/changeRelocation',
+        deleteURL: "/epmetuser/changeRelocation",
         deleteIsBatch: true,
-        exportURL: '/epmetuser/changeRelocation/export'
+        exportURL: "/actual/base/residentMoveOutRecord/recovery",
       },
-      timeRange: '',
+      timeRange: "",
       optionsV: [],
       optionsB: [],
       optionsH: [],
       optionsD: [],
       optionsG: [],
       dataForm: {
-        id: '',
-        name: '',
-        mobile: '',
-        idCard: '',
-        gridId: '',
-        villageId: '',
-        buildId: '',
-        unitId: '',
-        homeId: '',
-        isWelfare: ''
+        name: "",
+        mobile: "",
+        idCard: "",
+        gridId: "",
+        deptId: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        startTime: "",
+        endTime: "",
+        // isWelfare: "",
       },
       // 显示人员详情
       showedPeopleMoreInfo: false,
       lookInfo: {
-        userId: '',
-        gridName: ''
+        userId: "",
+        gridName: "",
       },
       isWelfareArr: [
-        { dictValue: '0', dictName: '否' },
-        { dictValue: '1', dictName: '是' }
+        { dictValue: "0", dictName: "否" },
+        { dictValue: "1", dictName: "是" },
       ],
       changeRecordShow: false,
 
       searchH: 0,
       tableHeight: 0,
-    }
+    };
   },
   components: {
     AddOrUpdate,
     peopleMore,
-    resiChangeRecord
+    resiChangeRecord,
   },
   computed: {
-    ...mapGetters(['clientHeight', 'iframeHeight']),
-    changeVDisabled () {
-      return !this.dataForm.villageId
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    changeVDisabled() {
+      return !this.dataForm.villageId;
     },
-    changeBDisabled () {
-      return !this.dataForm.buildId
+    changeBDisabled() {
+      return !this.dataForm.buildId;
     },
-    changeDDisabled () {
-      return !this.dataForm.unitId
+    changeDDisabled() {
+      return !this.dataForm.unitId;
     },
-
   },
-  created () {
-    this.getGridList()
-    this.getValiheList()
-
-
+  created() {
+    this.getGridList();
+    this.getValiheList();
   },
-  mounted () {
-    this.searchH = this.$refs.searchForm.offsetHeight + 290
-    console.log('searchH----', this.$refs.searchForm.offsetHeight)
+  mounted() {
+    this.searchH = this.$refs.searchForm.offsetHeight + 290;
+    console.log("searchH----", this.$refs.searchForm.offsetHeight);
   },
   watch: {
-    timeRange (val) {
+    timeRange(val) {
       if (Array.isArray(val) && val.length == 2) {
         this.dataForm.startTime = val[0];
         this.dataForm.endTime = val[1];
       } else {
-        this.dataForm.startTime = '';
-        this.dataForm.endTime = '';
+        this.dataForm.startTime = "";
+        this.dataForm.endTime = "";
       }
     },
-    searchH () {
-      const h = this.clientHeight - this.searchH + this.iframeHeight
-      const _h = this.clientHeight - this.searchH
-      console.log('computed-searchH---_h', _h)
+    searchH() {
+      const h = this.clientHeight - this.searchH + this.iframeHeight;
+      const _h = this.clientHeight - this.searchH;
+      console.log("computed-searchH---_h", _h);
 
       this.$nextTick(() => {
-        this.tableHeight = this.$store.state.inIframe ? h : _h
-      })
-    }
+        this.tableHeight = this.$store.state.inIframe ? h : _h;
+      });
+    },
   },
   methods: {
-    async handleRecovery (rowData) {
-      console.log('11111')
-      const url = "/epmetuser/changeRelocation/recovery";
+    async handleRecovery(rowData) {
+      console.log("11111");
+      const url = "/actual/base/residentMoveOutRecord/recovery";
 
       let params = {
-        id: rowData.id
-      }
+        id: rowData.id,
+      };
       const { data, code, msg } = await requestPost(url, params);
       if (code === 0) {
         this.$message.success("恢复成功！");
@@ -424,201 +482,212 @@ export default {
         this.$message.success("操作失败！");
       }
     },
-    diaClose () {
-      this.changeRecordShow = false
+    diaClose() {
+      this.changeRecordShow = false;
     },
     //变更记录
-    async handleChangeRecord (row) {
-      this.changeRecordShow = true
+    async handleChangeRecord(row) {
+      this.changeRecordShow = true;
 
-      await nextTick(200)
+      await nextTick(200);
 
-      this.$refs.ref_changerecord.initForm(row)
+      this.$refs.ref_changerecord.initForm(row);
     },
-    exportHandle () {
-      const url = this.mixinViewModuleOptions.exportURL
+
+    exportHandle() {
+      const url = this.mixinViewModuleOptions.exportURL;
       this.$http({
-        method: 'GET',
+        method: "GET",
         url,
-        responseType: 'blob',
-        params: this.dataForm
-      }).then(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('网络错误')
+        responseType: "blob",
+        params: this.dataForm,
       })
+        .then((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("网络错误");
+        });
     },
-    async handleLook (row) {
-      if (row.agencyId !== '') {
-        const url = '/gov/org/grid/griddetail'
+    async handleLook(row) {
+      if (row.agencyId !== "") {
+        const url = "/gov/org/grid/griddetail";
         let params = {
           gridId: row.agencyId,
-        }
-        const { data, code, msg } = await requestPost(url, params)
+        };
+        const { data, code, msg } = await requestPost(url, params);
         if (code === 0) {
-          this.lookInfo.gridName = data.gridName
+          this.lookInfo.gridName = data.gridName;
         } else {
-          this.$message.error(msg)
+          this.$message.error(msg);
         }
       } else {
-        this.lookInfo.gridName = ''
+        this.lookInfo.gridName = "";
       }
-      this.lookInfo.userId = row.icUserId
-      this.showedPeopleMoreInfo = true
+      this.lookInfo.userId = row.icUserId;
+      this.showedPeopleMoreInfo = true;
     },
-    handleCancleLook () {
-      this.lookInfo.userId = ''
-      this.lookInfo.gridName = ''
-      this.showedPeopleMoreInfo = false
+    handleCancleLook() {
+      this.lookInfo.userId = "";
+      this.lookInfo.gridName = "";
+      this.showedPeopleMoreInfo = false;
     },
-    resetForm (formName) {
+    resetForm(formName) {
       for (const n in this.dataForm) {
-        this.dataForm[n] = ''
+        this.dataForm[n] = "";
       }
-      this.timeRange = ''
-      this.getDataList()
+      this.timeRange = "";
+      this.getDataList();
     },
-    handleClearVillage () {
-      this.dataForm.buildId = ''
-      this.dataForm.homeId = ''
+    handleClearVillage() {
+      this.dataForm.buildId = "";
+      this.dataForm.homeId = "";
     },
-    handleClearBuild () {
-      this.dataForm.buildId = ''
-      this.dataForm.unitId = ''
-      this.dataForm.homeId = ''
+    handleClearBuild() {
+      this.dataForm.buildId = "";
+      this.dataForm.unitId = "";
+      this.dataForm.homeId = "";
     },
-    handleClearDan () {
-      this.dataForm.unitId = ''
-      this.dataForm.homeId = ''
+    handleClearDan() {
+      this.dataForm.unitId = "";
+      this.dataForm.homeId = "";
     },
-    handleChangeGrid (val) {
-      console.log('val', val)
-      this.dataForm.villageId = ''
-      this.dataForm.buildId = ''
-      this.dataForm.unitId = ''
-      this.dataForm.homeId = ''
-      this.getValiheList()
+    handleChangeGrid(val) {
+      console.log("val", val);
+      this.dataForm.deptId = val;
+      this.dataForm.villageId = "";
+      this.dataForm.buildId = "";
+      this.dataForm.unitId = "";
+      this.dataForm.homeId = "";
+      this.getValiheList();
     },
-    getGridList () {
-      const { user } = this.$store.state
+    getGridList() {
+      const { user } = this.$store.state;
       this.$http
-        .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'query' })
+        .post("/gov/org/customergrid/gridoption", {
+          agencyId: user.agencyId,
+          purpose: "query",
+        })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsG = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsG = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    getValiheList () {
-      const { user } = this.$store.state
+    getValiheList() {
+      const { user } = this.$store.state;
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', {
+        .post("/gov/org/icneighborhood/neighborhoodoption", {
           gridId: this.dataForm.gridId,
-          agencyId: ''
+          agencyId: "",
           // agencyId: user.agencyId
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsV = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsV = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    getBuildList () {
+    getBuildList() {
       this.$http
-        .post('/gov/org/icbuilding/buildingoption', {
-          neighborHoodId: this.dataForm.villageId
+        .post("/gov/org/icbuilding/buildingoption", {
+          neighborHoodId: this.dataForm.villageId,
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsB = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsB = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    getUniList () {
+    getUniList() {
       this.$http
-        .post('/gov/org/icbuildingunit/unitoption', {
-          buildingId: this.dataForm.buildId
+        .post("/gov/org/icbuildingunit/unitoption", {
+          buildingId: this.dataForm.buildId,
         })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsD = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsD = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    getHouseList () {
+    getHouseList() {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { unitId: this.dataForm.unitId })
+        .post("/gov/org/ichouse/houseoption", { unitId: this.dataForm.unitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.msg);
           } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsH = res.data
+            console.log("获取查询详情成功", res.data);
+            this.optionsH = res.data;
           }
         })
         .catch(() => {
-          return this.$message.error('网络错误')
-        })
+          return this.$message.error("网络错误");
+        });
     },
-    handleChangeV (val) {
-      console.log('val', val)
-      this.dataForm.buildId = ''
-      this.dataForm.unitId = ''
-      this.dataForm.homeId = ''
-      this.getBuildList()
+    handleChangeV(val) {
+      console.log("val", val);
+      this.dataForm.buildId = "";
+      this.dataForm.unitId = "";
+      this.dataForm.homeId = "";
+      this.getBuildList();
     },
-    handleChangeB (val) {
-      console.log('val', val)
-      this.dataForm.unitId = ''
-      this.dataForm.homeId = ''
-      this.getUniList()
+    handleChangeB(val) {
+      console.log("val", val);
+      this.dataForm.unitId = "";
+      this.dataForm.homeId = "";
+      this.getUniList();
     },
-    handleChangeD (val) {
-      console.log('val', val)
-      this.dataForm.homeId = ''
-      this.getHouseList()
+    handleChangeD(val) {
+      console.log("val", val);
+      this.dataForm.homeId = "";
+      this.getHouseList();
     },
-  }
-}
+  },
+};
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
diff --git a/src/views/modules/plugins/change/resideathAdd.vue b/src/views/modules/plugins/change/resideathAdd.vue
index 202afb38d..91342318a 100644
--- a/src/views/modules/plugins/change/resideathAdd.vue
+++ b/src/views/modules/plugins/change/resideathAdd.vue
@@ -36,14 +36,14 @@
           <el-form-item
             label="死亡原因"
             style="display: block"
-            prop="blacklistReason"
+            prop="deathReason"
           >
             <el-input
               type="textarea"
               resize="none"
               class="u-edit-width-normal"
               placeholder="请输入死亡原因"
-              v-model="dataForm.blacklistReason"
+              v-model="dataForm.deathReason"
             >
             </el-input>
           </el-form-item>
@@ -82,7 +82,7 @@ export default {
       dataForm: {
         name: "",
         gridName: "",
-        blacklistReason: "",
+        deathReason: "",
         deathDate: "",
       },
     };
@@ -92,7 +92,7 @@ export default {
   computed: {
     dataRule() {
       return {
-        blacklistReason: [
+        deathReason: [
           { required: true, message: "死亡原因不能为空", trigger: "blur" },
         ],
         deathDate: [
@@ -113,7 +113,7 @@ export default {
       this.dataForm.mobile = row.mobile;
       this.dataForm.gender = row.gender;
       this.dataForm.type = "1";
-      this.dataForm.userId = row.resiId;
+      this.dataForm.resiId = row.resiId;
     },
 
     async handleComfirm() {
@@ -132,7 +132,7 @@ export default {
     },
 
     async saveForm() {
-      const url = "/epmetuser/rentDeath/save";
+      const url = "/actual/base/residentDeathRecord/save";
 
       const { data, code, msg } = await requestPost(url, this.dataForm);
 
@@ -153,7 +153,7 @@ export default {
       this.dataForm = {
         name: "",
         gridName: "",
-        blacklistReason: "",
+        deathReason: "",
         deathDate: "",
       };
     },

From d18ea42965d7519b8504235f3d4b8c2fc3e645ba Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 10 Jan 2023 16:03:29 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/common.scss                   |  14 +
 src/views/components/resiChangeTransfer.vue   |   9 +-
 src/views/main-navbar.vue                     |  33 +-
 .../modules/base/huji/immigration/detail.vue  |   2 +-
 .../modules/base/huji/immigration/edit.vue    |   6 +-
 .../modules/base/huji/immigration/index.vue   |  16 +-
 src/views/modules/base/resi.vue               |   2 +-
 src/views/modules/home/index.vue              |  99 ++-
 src/views/modules/shequ/chaxun.vue            | 692 +++++++++++++-----
 src/views/modules/shequ/cpts/fangwu-info.vue  |   4 +-
 10 files changed, 649 insertions(+), 228 deletions(-)

diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss
index a2ef7801d..1f4962d6c 100644
--- a/src/assets/scss/common.scss
+++ b/src/assets/scss/common.scss
@@ -420,6 +420,20 @@ img {
                 height: 24px;
                 vertical-align: middle;
                 overflow: hidden;
+                @keyframes flicker {
+                    /* 旋转沿x轴旋转-10度,再绕y轴旋转 */
+                    0% {
+                        opacity: 0.1;
+                    }
+
+                    100% {
+                        opacity: 1;
+                    }
+                }
+
+                &.z-on {
+                    animation: flicker 0.9s linear infinite;
+                }
                 img {
                     position: relative;
                     display: block;
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index da6eeaa7f..d493fc4c5 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -299,6 +299,7 @@ export default {
         this.dataForm.oldDept = "";
         this.dataForm.oldAddress = data.houseName;
         this.dataForm.ownerName = data.ownerName;
+        this.dataForm.oldHouseMergeId = data.id;
       } else {
         this.$message.error(msg);
       }
@@ -511,12 +512,16 @@ export default {
 
     async saveForm() {
       // saveOutOfInfo
-      const url = "/epmetuser/changeRelocation/moveOutHome";
+      const url = "/actual/base/residentMoveOutRecord/saveOutOfInfo";
       let noData = new Date();
       noData = util.dateFormatter(noData, "time");
       this.dataForm.transferTime = noData;
 
-      const { data, code, msg } = await requestPost(url, this.dataForm);
+      const { data, code, msg } = await requestPost(url, {
+        ...this.dataForm,
+        deptId: this.dataForm.gridId,
+        deptName: this.dataForm.gridName,
+      });
 
       if (code === 0) {
         this.$message.success("操作成功");
diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue
index b538c2282..6ddc715e2 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -76,8 +76,8 @@
             </div>
           </el-menu-item>
 
-          <el-menu-item index="2" @click="fullscreenHandle()">
-            <div class="img-nav">
+          <el-menu-item index="2" @click="toRemindPage">
+            <div class="img-nav" :class="{ 'z-on': reminding }">
               <img src="~@/assets/images/main/hint.png" />
             </div>
           </el-menu-item>
@@ -121,6 +121,9 @@ import { mapGetters } from "vuex";
 import screenfull from "screenfull";
 import UpdatePasswordWork from "./main-navbar-update-password-work";
 import { clearLoginInfo } from "@/utils";
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+
 export default {
   inject: ["refresh"],
   data() {
@@ -129,6 +132,8 @@ export default {
       i18nMessages: messages,
       updatePassowrdVisible: false,
       customerName: "",
+
+      reminding: false,
     };
   },
   components: {
@@ -145,6 +150,8 @@ export default {
     }
     this.changeCustomerName();
     console.log("=============================", this.userType);
+
+    this.pollGetRemindData();
   },
   computed: {
     userType() {
@@ -152,6 +159,10 @@ export default {
     },
   },
   methods: {
+    toRemindPage() {
+      this.$router.replace("/main/home-notice");
+    },
+
     toIndexPage() {
       this.$router.replace("/index");
     },
@@ -235,9 +246,27 @@ export default {
         })
         .catch(() => {});
     },
+
+    async pollGetRemindData() {
+      this.getRemindData();
+      await nextTick(60000);
+      this.pollGetRemindData();
+    },
+
+    // 智能提醒数据
+    async getRemindData() {
+      const url = "/actual/base/residentBaseInfo/communitySearch";
+      const { data, code, msg } = await requestPost(url, {});
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.reminding = data;
+      } else {
+      }
+    },
   },
 };
 </script>
+
 <style lang="scss" scoped>
 .main-line {
   height: 50px;
diff --git a/src/views/modules/base/huji/immigration/detail.vue b/src/views/modules/base/huji/immigration/detail.vue
index 592884d6b..11010fc07 100644
--- a/src/views/modules/base/huji/immigration/detail.vue
+++ b/src/views/modules/base/huji/immigration/detail.vue
@@ -115,7 +115,7 @@ export default {
 
     },
     async getDatail (moveInId) {
-      let url = '/epmetuser/icMoveIn/detail'
+      let url = '/actual/base/residentMoveInRecord/detail'
 
       const params = {
         moveInId: moveInId || ''
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 81806de9e..ef9ca1fd0 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -678,7 +678,7 @@ export default {
       }
     },
     async getDatail (moveInId) {
-      let url = '/epmetuser/icMoveIn/detail'
+      let url = '/actual/base/residentMoveInRecord/detail'
 
       const params = {
         moveInId: moveInId || ''
@@ -737,9 +737,9 @@ export default {
 
       let url = ''
       if (this.formType === 'add') {
-        url = '/epmetuser/icMoveIn/add'
+        url = '/actual/base/residentMoveInRecord/add'
       } else {
-        url = '/epmetuser/icMoveIn/edit'
+        url = '/actual/base/residentMoveInRecord/edit'
 
         this.fmData.orgId = this.orgId
       }
diff --git a/src/views/modules/base/huji/immigration/index.vue b/src/views/modules/base/huji/immigration/index.vue
index 03c334bd8..ce4716625 100644
--- a/src/views/modules/base/huji/immigration/index.vue
+++ b/src/views/modules/base/huji/immigration/index.vue
@@ -127,7 +127,7 @@
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item label="享受福利"
+        <!-- <el-form-item label="享受福利"
                       prop="remark">
           <el-select v-model.trim="fmData.isWeifare"
                      placeholder="享受福利"
@@ -140,7 +140,7 @@
                        :value="item.value">
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 
         <div class="u-search-btn">
           <el-button class="diy-button--white"
@@ -439,7 +439,7 @@ export default {
         name: '',
         mobile: '',
         idCard: '',
-        isWeifare: '', //福利0否，1是
+        // isWeifare: '', //福利0否，1是
         startTime: '',
         endTime: ''
       },
@@ -638,7 +638,7 @@ export default {
     },
 
     async handleExportModule () {
-      let url = '/heart/iccommunityselforganization/import-template-download'
+      let url = '/actual/base/residentMoveInRecord/export'
 
       let params = {}
       await this.$http({
@@ -790,7 +790,7 @@ export default {
 
     async handleChu () {
       const url =
-        '/epmetuser/icMoveIn/export'
+        '/actual/base/residentMoveInRecord/export'
       const { pageSize, pageNo, fmData } = this
       await this.$http({
         method: 'POST',
@@ -916,7 +916,7 @@ export default {
     async handleDel (rowData, rowIndex) {
       console.log(rowData, rowIndex)
       const url =
-        '/heart/iccommunityselforganization/delcommunityselforganization'
+        '/actual/base/residentMoveInRecord/deleteById'
       const { tableData } = this
 
       const { data, code, msg } = await requestPost(url, {
@@ -932,7 +932,7 @@ export default {
     },
 
     async handleDelNew (rowData) {
-      const url = "/epmetuser/icMoveIn/deleteById";
+      const url = "/actual/base/residentMoveInRecord/deleteById";
       let params = {
         id: rowData.moveInId
       }
@@ -946,7 +946,7 @@ export default {
     },
 
     async getTableData () {
-      const url = '/epmetuser/icMoveIn/list'
+      const url = '/actual/base/residentMoveInRecord/list'
       const { pageSize, pageNo, fmData } = this
       const { data, code, msg } = await requestPost(url, {
         pageSize,
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index e531f4252..a449422c8 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -244,7 +244,7 @@
                 >
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item
-                    v-if="btnAuths.ic_resi_change_rec"
+                    v-if="false && btnAuths.ic_resi_change_rec"
                     command="bgjl"
                     >变更记录</el-dropdown-item
                   >
diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 3a6f86b98..10f2ccd75 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -28,14 +28,14 @@
                 <input
                   type="text"
                   :placeholder="typePlaceholder[searchData.type]"
-                  v-model="searchData.keyword"
+                  v-model="searchData.searchKey"
                   @keyup.enter="handleClickSearchBtn"
                 />
 
                 <div
                   class="close-btn"
-                  v-if="searchData.keyword != ''"
-                  @click="searchData.keyword = ''"
+                  v-if="searchData.searchKey != ''"
+                  @click="searchData.searchKey = ''"
                 >
                   <img src="@/assets/img/shequ/close.png" />
                 </div>
@@ -63,7 +63,15 @@
                 <span>社区简介</span>
               </div>
               <p>
-                南宁路社区，归属青岛市市北区阜新路街道，划分为6个网格，现有居民3500户、8000人，其中常住人口7000人，流动人口1000人，各类群体分布如下：
+                {{ pandectData.communityName }}，归属{{
+                  pandectData.streetName
+                }}，划分为{{ pandectData.gridCount }}个网格，现有居民{{
+                  pandectData.homeCount
+                }}户、{{ pandectData.resiCount }}人，其中常住人口{{
+                  pandectData.permanentResiCount
+                }}人，流动人口{{
+                  pandectData.floatingResiCount
+                }}人，各类群体分布如下：
               </p>
 
               <div class="subtitle">
@@ -71,9 +79,13 @@
                 <span>分析结果</span>
               </div>
 
-              <p class="hint">
+              <p class="hint" v-if="resiCategory.list.length > 0">
                 <i>*</i> 根据数据分析结果，建议重点关注
-                <b>老年人、低保人员、残疾人</b>
+                <b
+                  >{{ resiCategory.list[0].categoryName }}、{{
+                    resiCategory.list[1].categoryName
+                  }}、{{ resiCategory.list[2].categoryName }}</b
+                >
                 三类群体，开展相关的社区服务和活动。
               </p>
             </div>
@@ -82,16 +94,16 @@
                 <div
                   class="item"
                   :key="item.code"
-                  v-for="(item, index) in warningChart.list"
+                  v-for="(item, index) in resiCategory.list"
                 >
                   <div>{{ ("0" + (index + 1)).substr(-2) }}.</div>
                   <div class="item-name">{{ item.name }}</div>
                   <div class="item-div"></div>
                   <div class="item-count">{{ item.count }}人</div>
                   <div class="item-progress">
-                    <b :style="{ width: item.count + '%' }"></b>
+                    <b :style="{ width: item.per + '%' }"></b>
                   </div>
-                  <div class="item-per">{{ item.count }} %</div>
+                  <div class="item-per">{{ item.per }} %</div>
                 </div>
               </div>
             </div>
@@ -232,7 +244,7 @@ export default {
       searchStatus: "ini", //ing over
       searchData: {
         type: "jumin",
-        keyword: "",
+        searchKey: "",
       },
 
       typePlaceholder: {
@@ -241,7 +253,7 @@ export default {
         xuqiu: "请输入需求人或需求内容或服务方",
       },
 
-      warningChart: {
+      resiCategory: {
         loading: false,
         total: "",
         list: [],
@@ -251,6 +263,16 @@ export default {
         id: "",
         level: "agency",
       },
+
+      pandectData: {
+        communityName: "",
+        streetName: "",
+        gridCount: "",
+        resiCount: "",
+        homeCount: "",
+        floatingResiCount: "",
+        permanentResiCount: "",
+      },
     };
   },
   computed: {
@@ -261,7 +283,7 @@ export default {
     ...mapGetters(["clientHeight"]),
   },
   watch: {
-    "searchData.keyword": function (val) {
+    "searchData.searchKey": function (val) {
       if (val == "") {
         this.searchStatus = "ini";
       }
@@ -281,27 +303,28 @@ export default {
       });
     },
 
-    toSearchPage(type, keyword) {
+    toSearchPage(type, searchKey) {
       this.$router.push({
         path: "/main/shequ-chaxun",
         query: {
           type,
-          keyword,
+          searchKey,
         },
       });
     },
 
     handleClickSearchBtn() {
       const {
-        searchData: { type, keyword },
+        searchData: { type, searchKey },
       } = this;
-      if (!keyword) return this.$message.error("请输入搜索条件");
-      this.toSearchPage(type, keyword);
+      if (!searchKey) return this.$message.error("请输入搜索条件");
+      this.toSearchPage(type, searchKey);
     },
 
     async getApiData() {
       await this.getOrgData();
       this.getWarningList();
+      this.getPandectData();
     },
 
     //加载组织数据
@@ -321,27 +344,43 @@ export default {
       }
     },
 
+    //加载组织数据
+    async getPandectData() {
+      const url = "/actual/base/residentHouseMerge/communityOverview";
+      let params = {
+        // orgId: "",
+        // level: "",
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0 && data) {
+        this.pandectData = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
     //加载组织数据
     async getWarningList() {
-      const url = "/epmetuser/statsresiwarn/list";
+      const url = "/actual/base/resiCategory/categoryCountList";
       let params = {
-        id: this.orgData.id,
-        level: "agency",
+        // id: this.orgData.id,
+        // level: "agency",
       };
 
+      this.resiCategory.loading = true;
       const { data, code, msg } = await requestPost(url, params);
+      this.resiCategory.loading = false;
 
-      if (code === 0) {
-        this.warningChart.loading = true;
-        this.warningChart.total = data.reduce(
-          (total, item) => total + item.count,
-          0
-        );
-        this.warningChart.list = data.map((item) => {
+      if (code === 0 && data) {
+        this.resiCategory.count = data.resiCount;
+        this.resiCategory.list = data.categoryList.map((item) => {
           return {
-            code: item.columnName,
-            name: item.label,
-            count: item.count,
+            code: item.categoryName,
+            name: item.categoryName,
+            count: item.categoryCount,
+            per: parseInt((100 * item.categoryCount) / data.resiCount),
             const: "const",
           };
         });
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index bbae7b5cc..a765fa335 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -7,12 +7,16 @@
         </div>
 
         <div class="tabs">
-          <div :class="{ 'z-on': searchData.type == 'jumin' }"
-               @click="searchData.type = 'jumin'">
+          <div
+            :class="{ 'z-on': searchData.type == 'jumin' }"
+            @click="searchData.type = 'jumin'"
+          >
             查居民
           </div>
-          <div :class="{ 'z-on': searchData.type == 'fangwu' }"
-               @click="searchData.type = 'fangwu'">
+          <div
+            :class="{ 'z-on': searchData.type == 'fangwu' }"
+            @click="searchData.type = 'fangwu'"
+          >
             查房屋
           </div>
         </div>
@@ -20,22 +24,24 @@
         <div class="search">
           <div class="search-input">
             <div class="input">
-              <input type="text"
-                     :placeholder="typePlaceholder[searchData.type]"
-                     v-model="searchData.keyword"
-                     @keyup.enter="handleClickSearchBtn" />
-
-              <div class="close-btn"
-                   v-if="searchData.keyword != ''"
-                   @click="searchData.keyword = ''">
+              <input
+                type="text"
+                :placeholder="typePlaceholder[searchData.type]"
+                v-model="searchData.searchKey"
+                @keyup.enter="handleClickSearchBtn"
+              />
+
+              <div
+                class="close-btn"
+                v-if="searchData.searchKey != ''"
+                @click="searchData.searchKey = ''"
+              >
                 <img src="@/assets/img/shequ/close.png" />
               </div>
             </div>
-            <div class="btn"
-                 @click="handleClickSearchBtn">查一下</div>
+            <div class="btn" @click="handleClickSearchBtn">查一下</div>
           </div>
-          <div class="btn2"
-               @click="handleClickSearchBtn">
+          <div class="btn2" @click="handleClickSearchBtn">
             <img src="@/assets/images/index/i-search.png" />
             智能搜索
           </div>
@@ -43,154 +49,178 @@
       </div>
     </div>
 
-    <div class="m-box"
-         v-if="searchStatus == 'ing'">
-      <div class="m-tb"
-           v-if="
+    <div class="m-box" v-if="searchStatus == 'ing'">
+      <div
+        class="m-tb"
+        v-if="
           searchData.type == 'jumin' &&
-          searchData.keyword != '' &&
+          searchData.searchKey != '' &&
           searchStatus == 'ing'
-        ">
+        "
+      >
         <div class="tb">
-          <el-table class="m-table"
-                    v-loading="searchJumin.loading"
-                    :data="searchJumin.list"
-                    border
-                    style="width: 100%"
-                    :max-height="1000">
-            <el-table-column label="序号"
-                             type="index"
-                             align="center"
-                             width="50" />
-            <el-table-column v-for="item in searchJumin.header"
-                             :key="item.columnName"
-                             :prop="item.columnName"
-                             :label="item.label"
-                             align="center"
-                             :show-overflow-tooltip="true"
-                             :width="
+          <el-table
+            class="m-table"
+            v-loading="searchJumin.loading"
+            :data="searchJumin.list"
+            border
+            style="width: 100%"
+            :max-height="1000"
+          >
+            <el-table-column
+              label="序号"
+              type="index"
+              align="center"
+              width="50"
+            />
+            <el-table-column
+              v-for="item in searchJumin.header"
+              :key="item.columnName"
+              :prop="item.columnName"
+              :label="item.label"
+              align="center"
+              :show-overflow-tooltip="true"
+              :width="
                 item.itemType === 'radio' ? computedWidth(item.label) : 180
-              ">
+              "
+            >
               <template slot-scope="scope">
                 <span>{{ handleFilterSpan(scope.row, item) }}</span>
               </template>
             </el-table-column>
-            <el-table-column fixed="right"
-                             label="操作"
-                             align="center">
+            <el-table-column fixed="right" label="操作" align="center">
               <template slot-scope="scope">
-                <el-button class="f-fc"
-                           @click="handleWatchSearchJumin(scope.$index)"
-                           type="text"
-                           size="small">查看</el-button>
+                <el-button
+                  class="f-fc"
+                  @click="handleWatchSearchJumin(scope.$index)"
+                  type="text"
+                  size="small"
+                  >查看</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
 
           <div>
-            <el-pagination @size-change="handleSizeChangeSearchJumin"
-                           @current-change="handleCurrentChangeSearchJumin"
-                           :current-page.sync="searchJumin.pageNo"
-                           :page-sizes="[20, 50, 100, 200]"
-                           :page-size="parseInt(searchJumin.pageSize)"
-                           layout="sizes, prev, pager, next, total"
-                           :total="searchJumin.total">
+            <el-pagination
+              @size-change="handleSizeChangeSearchJumin"
+              @current-change="handleCurrentChangeSearchJumin"
+              :current-page.sync="searchJumin.pageNo"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="parseInt(searchJumin.pageSize)"
+              layout="sizes, prev, pager, next, total"
+              :total="searchJumin.total"
+            >
             </el-pagination>
           </div>
         </div>
       </div>
 
-      <div class="m-tb"
-           v-if="
+      <div
+        class="m-tb"
+        v-if="
           searchData.type == 'fangwu' &&
-          searchData.keyword != '' &&
+          searchData.searchKey != '' &&
           searchStatus == 'ing'
-        ">
+        "
+      >
         <div class="tb">
-          <el-table class="m-table"
-                    :data="searchFangwu.list"
-                    v-loading="searchFangwu.loading"
-                    border
-                    :max-height="1000"
-                    style="width: 100%">
-            <el-table-column label="序号"
-                             type="index"
-                             align="center"
-                             width="50" />
-            <el-table-column prop="houseName"
-                             label="房屋名称"
-                             width="120">
+          <el-table
+            class="m-table"
+            :data="searchFangwu.list"
+            v-loading="searchFangwu.loading"
+            border
+            :max-height="1000"
+            style="width: 100%"
+          >
+            <el-table-column
+              label="序号"
+              type="index"
+              align="center"
+              width="50"
+            />
+            <el-table-column prop="houseName" label="房屋名称" width="120">
             </el-table-column>
-            <el-table-column prop="neighborHoodName"
-                             label="所属小区"
-                             width="160">
+            <el-table-column prop="quartersName" label="所属小区" width="160">
             </el-table-column>
-            <el-table-column prop="buildingName"
-                             label="所属楼栋">
+            <el-table-column prop="buildingName" label="所属楼栋">
             </el-table-column>
-            <el-table-column prop="unitNum"
-                             label="单元号"> </el-table-column>
-            <el-table-column prop="doorName"
-                             label="门牌号"> </el-table-column>
-            <el-table-column prop="houseType"
-                             label="类型"> </el-table-column>
-            <el-table-column prop="purpose"
-                             label="用途"> </el-table-column>
-            <el-table-column prop="rentFlag"
-                             label="房屋状态">
+            <el-table-column prop="buildingUnitName" label="单元号">
             </el-table-column>
-            <el-table-column prop="ownerName"
-                             label="房主姓名">
+            <el-table-column prop="doorName" label="门牌号"> </el-table-column>
+            <el-table-column prop="houseType" label="类型"> </el-table-column>
+            <el-table-column prop="purpose" label="用途"> </el-table-column>
+            <el-table-column prop="rentFlag" label="房屋状态">
             </el-table-column>
-            <el-table-column prop="ownerPhone"
-                             label="房主电话"
-                             width="110">
+            <el-table-column prop="ownerName" label="房主姓名">
             </el-table-column>
-            <el-table-column prop="ownerIdCard"
-                             label="身份证"
-                             width="170">
+            <el-table-column prop="ownerPhone" label="房主电话" width="110">
             </el-table-column>
-            <el-table-column label="操作"
-                             fixed="right"
-                             header-align="center"
-                             align="center"
-                             class="operate">
+            <el-table-column prop="ownerIdCard" label="身份证" width="170">
+            </el-table-column>
+            <el-table-column
+              label="操作"
+              fixed="right"
+              header-align="center"
+              align="center"
+              class="operate"
+            >
               <template slot-scope="scope">
-                <el-button class="f-fc"
-                           type="text"
-                           size="small"
-                           @click="handleWatchSearchFangwu(scope.row)">查看</el-button>
+                <el-button
+                  class="f-fc"
+                  type="text"
+                  size="small"
+                  @click="handleWatchSearchFangwu(scope.row)"
+                  >查看</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
           <div>
-            <el-pagination @size-change="handleSizeChangeSearchFangwu"
-                           @current-change="handleCurrentChangeSearchFangwu"
-                           :current-page.sync="searchFangwu.pageNo"
-                           :page-sizes="[20, 50, 100, 200]"
-                           :page-size="parseInt(searchFangwu.pageSize)"
-                           layout="sizes, prev, pager, next"
-                           :total="searchFangwu.total">
+            <el-pagination
+              @size-change="handleSizeChangeSearchFangwu"
+              @current-change="handleCurrentChangeSearchFangwu"
+              :current-page.sync="searchFangwu.pageNo"
+              :page-sizes="[20, 50, 100, 200]"
+              :page-size="parseInt(searchFangwu.pageSize)"
+              layout="sizes, prev, pager, next"
+              :total="searchFangwu.total"
+            >
             </el-pagination>
           </div>
         </div>
       </div>
     </div>
 
-    <people-more v-if="showedPeopleMoreInfo && currentPepeleId"
-                 :userId="currentPepeleId"
-                 :gridName="currentPepeleGridName"
-                 @close="showedPeopleMoreInfo = false" />
+    <!-- 修改弹出框 -->
+    <el-dialog
+      :visible.sync="showedResiInfo"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="居民详情"
+      width="986px"
+      @closed="showedResiInfo = false"
+    >
+      <resi-info
+        ref="resi_info"
+        :resi-id="currentResiId"
+        @dialogCancle="showedResiInfo = false"
+      ></resi-info>
+    </el-dialog>
 
     <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="showedFangwuInfo"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               title="房屋详情"
-               width="900px"
-               @closed="showedFangwuInfo = false">
-      <fangwu-info ref="fangwu_info"
-                   @dialogCancle="showedFangwuInfo = false"></fangwu-info>
+    <el-dialog
+      :visible.sync="showedFangwuInfo"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title="房屋详情"
+      width="900px"
+      @closed="showedFangwuInfo = false"
+    >
+      <fangwu-info
+        ref="fangwu_info"
+        @dialogCancle="showedFangwuInfo = false"
+      ></fangwu-info>
     </el-dialog>
   </div>
 </template>
@@ -199,13 +229,13 @@
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from "vuex";
 import nextTick from "dai-js/tools/nextTick";
-import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import fangwuInfo from "@/views/modules/shequ/cpts/fangwu-info";
 import getQueryPara from "dai-js/modules/getQueryPara";
+import resiInfo from "../../components/resiInfo.vue";
 
 export default {
   components: {
-    peopleMore,
+    resiInfo,
     fangwuInfo,
   },
 
@@ -214,18 +244,18 @@ export default {
       type: String,
       default: "",
     },
-    keyword: {
+    searchKey: {
       type: String,
       default: "",
     },
   },
 
-  data () {
+  data() {
     return {
       searchStatus: "ini", //ing over
       searchData: {
         type: "jumin",
-        keyword: "",
+        searchKey: "",
       },
 
       typePlaceholder: {
@@ -236,7 +266,306 @@ export default {
 
       searchJumin: {
         loading: false,
-        header: [],
+        header: [
+          {
+            itemId: "20220422102809_1006",
+            label: "姓名",
+            columnName: "name",
+            itemType: "input",
+            width: 80,
+            options: [],
+          },
+          {
+            itemId: "20220422102809_1001",
+            label: "所属网格",
+            columnName: "gridName",
+            itemType: "select",
+            width: 190,
+            options: [],
+          },
+          {
+            itemId: "20220422102809_1004",
+            label: "所属房屋",
+            columnName: "homeName",
+            itemType: "select",
+            width: 190,
+            options: [],
+          },
+          {
+            itemId: "20220422102809_1007",
+            label: "联系电话",
+            columnName: "mobile",
+            itemType: "input",
+            width: 120,
+            options: [],
+          },
+          {
+            itemId: "20220422102809_1009",
+            label: "证件号",
+            columnName: "idNum",
+            itemType: "input",
+            width: 180,
+            options: [],
+          },
+          {
+            itemId: "20220422102809_1008",
+            label: "性别",
+            columnName: "gender",
+            itemType: "select",
+            width: 54,
+            options: [
+              { label: "男", value: "1" },
+              { label: "女", value: "2" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1010",
+            label: "出生日期",
+            columnName: "birthday",
+            itemType: "datepicker",
+            width: 110,
+            options: [],
+          },
+          {
+            itemId: "20220422102809_1011",
+            label: "备注",
+            columnName: "remark",
+            itemType: "textarea",
+            width: 110,
+            options: [],
+          },
+          {
+            itemId: "20220422102809_1015",
+            label: "党员",
+            columnName: "partyFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1016",
+            label: "低保人员",
+            columnName: "subsistenceAllowanceFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1017",
+            label: "保障房人员",
+            columnName: "ensureHouseFlag",
+            itemType: "radio",
+            width: 100,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1018",
+            label: "失业人员",
+            columnName: "unemployedFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1019",
+            label: "育龄妇女",
+            columnName: "fertileWomanFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1020",
+            label: "退役军人",
+            columnName: "veteranFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1021",
+            label: "统战人员",
+            columnName: "unitedFrontFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1022",
+            label: "信访人员",
+            columnName: "petitionOfficerFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1023",
+            label: "志愿者",
+            columnName: "volunteerFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1024",
+            label: "老年人",
+            columnName: "oldPeopleFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1025",
+            label: "空巢",
+            columnName: "emptyNesterFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1026",
+            label: "失独人员",
+            columnName: "bereavedPersonFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1027",
+            label: "失能",
+            columnName: "disabledFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1028",
+            label: "失智",
+            columnName: "dementedFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1029",
+            label: "残疾",
+            columnName: "disabilityFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1030",
+            label: "大病",
+            columnName: "seriousIllnessFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_1031",
+            label: "慢病",
+            columnName: "chronicDiseaseFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_10310",
+            label: "特殊人群",
+            columnName: "specialCrowdFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_202204141504102",
+            label: "流动人口",
+            columnName: "floatingFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "20220422102809_202204141504101",
+            label: "租户",
+            columnName: "tenantFlag",
+            itemType: "radio",
+            width: 80,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+          {
+            itemId: "202208111008491",
+            label: "独居老人",
+            columnName: "liveAloneFlag",
+            itemType: "radio",
+            width: 100,
+            options: [
+              { label: "是", value: "1" },
+              { label: "否", value: "0" },
+            ],
+          },
+        ],
         pageNo: 1,
         pageSize: window.localStorage.getItem("pageSize") || 20,
         total: 1,
@@ -252,10 +581,9 @@ export default {
       },
 
       // 显示人员详情
-      showedPeopleMoreInfo: false,
+      showedResiInfo: false,
 
-      currentPepeleId: "",
-      currentPepeleGridName: "",
+      currentResiId: "",
 
       // 显示人员详情
       showedFangwuInfo: false,
@@ -265,50 +593,50 @@ export default {
     };
   },
   computed: {
-    maxTableHeight () {
+    maxTableHeight() {
       // return this.clientHeight - 450;
       return 420;
     },
     ...mapGetters(["clientHeight"]),
   },
   watch: {
-    "searchData.keyword": function (val) {
+    "searchData.searchKey": function (val) {
       if (val == "") {
         this.searchStatus = "ini";
       }
     },
   },
-  mounted () {
+  mounted() {
     this.getApiData();
 
     this.firstSearch();
   },
   methods: {
-    firstSearch () {
-      this.searchData.keyword = getQueryPara("keyword");
+    firstSearch() {
+      this.searchData.searchKey = getQueryPara("searchKey");
       this.searchData.type = getQueryPara("type");
       this.handleClickSearchBtn();
     },
 
-    computedWidth (label) {
+    computedWidth(label) {
       const wd = 20 * label.length;
       return wd > 80 ? wd : 80;
     },
-    handleFilterSpan (row, item) {
+    handleFilterSpan(row, item) {
       let _val = "";
       if (item.options && item.options.length > 0) {
         item.options.forEach((n) => {
-          if (n.value === row[item.columnName]) _val = n.label;
+          if (n.value == row[item.columnName]) _val = n.label;
         });
       }
       return _val || row[item.columnName];
     },
 
-    handleClickSearchBtn () {
+    handleClickSearchBtn() {
       const {
-        searchData: { type, keyword },
+        searchData: { type, searchKey },
       } = this;
-      if (!keyword) return this.$message.error("请输入搜索条件");
+      if (!searchKey) return this.$message.error("请输入搜索条件");
       if (type == "jumin") {
         this.searchJumin.pageNo = 1;
         this.searchJumin.total = 0;
@@ -325,68 +653,52 @@ export default {
       this.searchStatus = "ing";
     },
 
-    handleSizeChangeSearchJumin (val) {
+    handleSizeChangeSearchJumin(val) {
       console.log(`每页 ${val} 条`);
       this.searchJumin.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getSearchJumin();
     },
-    handleCurrentChangeSearchJumin (val) {
+    handleCurrentChangeSearchJumin(val) {
       console.log(`当前页: ${val}`);
       this.searchJumin.pageNo = val;
       this.getSearchJumin();
     },
-    async handleWatchSearchJumin (rowIndex) {
+    async handleWatchSearchJumin(rowIndex) {
       let item = this.searchJumin.list[rowIndex];
-      this.currentPepeleId = item.icResiUserId;
-      this.currentPepeleGridName = item.GRID_ID;
+      this.currentResiId = item.resiId;
       await nextTick();
-      this.showedPeopleMoreInfo = true;
+      this.showedResiInfo = true;
     },
 
-    handleSizeChangeSearchFangwu (val) {
+    handleSizeChangeSearchFangwu(val) {
       console.log(`每页 ${val} 条`);
       this.searchFangwu.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getSearchFangwu();
     },
-    handleCurrentChangeSearchFangwu (val) {
+    handleCurrentChangeSearchFangwu(val) {
       console.log(`当前页: ${val}`);
       this.searchFangwu.pageNo = val;
       this.getSearchFangwu();
     },
-    async handleWatchSearchFangwu (row) {
+    async handleWatchSearchFangwu(row) {
       this.showedFangwuInfo = true;
       await nextTick();
       this.$refs.fangwu_info.initForm("detail", row);
     },
 
-    getApiData () {
-      this.getSearchJuminHeader();
-    },
-
-    async getSearchJuminHeader () {
-      const url = "/oper/customize/icform/tableheaders";
-      const { data, code, msg } = await requestPost(url, {
-        formCode: "resi_base_info",
-      });
-      if (code === 0) {
-        console.log("居民表格header请求成功！！！！！！！！！！！！！！");
-        this.searchJumin.header = data;
-      } else {
-        return this.$message.error("网络错误");
-      }
-    },
+    getApiData() {},
 
-    async getSearchJumin () {
-      const url = "/epmetuser/icresiuser/search";
+    async getSearchJumin() {
+      const url = "/actual/base/residentBaseInfo/communitySearch";
       const {
-        searchData: { keyword },
+        searchData: { searchKey },
         searchJumin: { pageSize, pageNo },
       } = this;
       this.searchJumin.loading = true;
       const { data, code, msg } = await requestPost(url, {
-        keyword,
+        searchKey,
         pageSize,
         pageNo,
       });
@@ -396,22 +708,23 @@ export default {
         this.searchJumin.total = data.total || 0;
         this.searchJumin.list = data.list
           ? data.list.map((item) => {
-            return item;
-          })
+              item = { ...item, ...item.categoryInfo };
+              return item;
+            })
           : [];
       } else {
       }
     },
 
-    async getSearchFangwu () {
-      const url = "/gov/org/house/search";
+    async getSearchFangwu() {
+      const url = "/actual/base/communityHouse/communitySearch";
       const {
-        searchData: { keyword },
+        searchData: { searchKey },
         searchFangwu: { pageSize, pageNo },
       } = this;
       this.searchFangwu.loading = true;
       const { data, code, msg } = await requestPost(url, {
-        keyword,
+        searchKey,
         pageSize,
         pageNo,
       });
@@ -421,8 +734,29 @@ export default {
         this.searchFangwu.total = data.total || 0;
         this.searchFangwu.list = data.list
           ? data.list.map((item) => {
-            return item;
-          })
+              const { houseType, rentFlag, purpose } = item;
+              item.houseType = {
+                1: "楼房",
+                2: "平房",
+                3: "别墅",
+              }[houseType];
+              item.rentFlag = {
+                0: "自住",
+                1: "出租",
+                2: "闲置",
+                3: "未售出",
+              }[rentFlag];
+              item.purpose = {
+                1: "住宅",
+                2: "商业",
+                3: "办公",
+                4: "工业",
+                5: "存储",
+                6: "商住混用",
+                7: "其它",
+              }[purpose];
+              return item;
+            })
           : [];
       } else {
       }
diff --git a/src/views/modules/shequ/cpts/fangwu-info.vue b/src/views/modules/shequ/cpts/fangwu-info.vue
index 272489744..078ef7b1e 100644
--- a/src/views/modules/shequ/cpts/fangwu-info.vue
+++ b/src/views/modules/shequ/cpts/fangwu-info.vue
@@ -13,7 +13,7 @@
           label-width="150px"
           style="display: block"
         >
-          <span>{{ dataForm.neighborHoodName }}</span>
+          <span>{{ dataForm.quartersName }}</span>
         </el-form-item>
 
         <el-form-item
@@ -30,7 +30,7 @@
           label-width="150px"
           style="display: block"
         >
-          <span>{{ dataForm.unitNum }}</span>
+          <span>{{ dataForm.buildingUnitName }}</span>
         </el-form-item>
 
         <el-form-item

From 74afd964aa0cc084d3625624b02b4aad6cb4cc79 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 10 Jan 2023 16:06:45 +0800
Subject: [PATCH 3/7] bug

---
 src/views/components/resiForm.vue | 2644 +++++++++++++++--------------
 src/views/modules/base/resi.vue   |    3 +
 2 files changed, 1330 insertions(+), 1317 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 3fcc1186a..0e22bf00c 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -23,79 +23,83 @@
 
               </el-form-item>
               <el-form-item label="所属房屋"
-              label-width="100px">
+                            label-width="100px">
                   <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 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" >
+              <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>
+                                  :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'" >
@@ -166,24 +170,25 @@
                                 :key="item.groupId"
                                 :label="item.label"
                                 :name="'group' + item.groupId">
-                        <template v-for="itemj in footerInputList"  >
+                        <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="100px" :label="itemk.label" :class="itemk.itemType=='textarea'?'textareaDidth':''" >
+                              <el-form-item  v-for="(itemk,index) in itemj.children" 
+                                             :key="index" label-width="100px" 
+                                             :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>
+                                        <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
+                                          <el-select
                                             v-model="form[itemj.id][itemk.formName]"
                                                   :placeholder="`请选择${itemk.label}`"
                                                   size="small"
@@ -195,9 +200,8 @@
                                                     :key="items.value"
                                                     :label="items.label"
                                                     :value="items.value">
-
                                                 </el-option>
-                                            </el-select>
+                                          </el-select>
                                    </template>
                                   <template v-else-if="itemk.itemType=='textarea1'" >
                                             <el-input
@@ -223,12 +227,14 @@
                                          </el-input>
                                   </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.label != itemk.label? items.label :''"  :style="{'margin-right':items.label != itemk.label? '' :'19px'}"   :key="items.label" ></el-checkbox>
+                                      v-model="form[itemj.id][itemk.formName]">
+                                        <el-checkbox v-for="items in itemk.opction" 
+                                                     :label="items.label != itemk.label ? items.label :''"  
+                                                     :style="{'margin-right':items.label != itemk.label? '' :'19px'}"   
+                                                     :key="items.label"
+                                                     @change="val => handleChangeCheckbox1(val,items)"></el-checkbox>
                                     </el-checkbox-group>
                                   </template>
                                   <template v-else-if="itemk.itemType == 'datepicker1'">
@@ -287,680 +293,708 @@ export default {
     validateFlag:null,
     disabilityCategoryCode:[],
     // 基本信息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",
-      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",
-      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",}]
-    }
-    ],
-    // 底部input
-    footerInputList:[
-    {id:'eduInfoDto',
-    children:[{
-      label:"文化程度",
-      itemType:"select1",
-      formName:"cultureLevel",
-      opction:[
-
-      ]},
+    basicInformation: [
       {
-       label:"备注",
-      itemType:"textarea1",
-      formName:"eduRemark",
-      opction:[
-      ]}
-    ]
-    },
-    {
-      id:'hobbyInfoDto',
-      children:[{
-        label:"兴趣特长",
-        itemType:"checkbox",
-        formName:"hobbyCode",
+        label:"本地户籍",
+        itemType:"radio",
+        formName:"localResidenceFlag",
         opction:[
-          {label:'治安巡逻',formName:'hobbyCode1'},
-          {label:'人民调解',formName:'hobbyCode2'},
-          {label:'民情采集',formName:'hobbyCode3'},
-          {label:'问题辅导',formName:'hobbyCode4'},
-          {label:'结对帮扶',formName:'hobbyCode5'},
-          {label:'应急处理',formName:'hobbyCode6'},
-          {label:'义务理发',formName:'hobbyCode7'},
-          {label:'家电维修',formName:'hobbyCode8'},
-          {label:'其他',formName:'9'},
-      ]},
-      {
-        label:'兴趣',
-        itemType:"input1",
-        formName:"interestDesc",
+          {label:'是',value:'1'},
+          {label:'否',value:'0'}
+        ],
       },
       {
-        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:"input1",
-      formName:"selfPayAmount",
-      opction:[
-      ]},
-      {
-       label:"救助金额",
-      itemType:"input1",
-      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:"input1",
-      formName:"retirementAmount",
-      opction:[
-      ]},
-      {
-       label:"月收入",
-      itemType:"input1",
-      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:"input",
+        requiredFlag:true,
+        formName:"name",
+        rules:[{required:true,message:'居民姓名不能为空',trigger:'blur'}],
+        opction:[],
+      },
       {
-       label:"人户状况",
-      itemType:"select1",
-      formName:"householdSituation",
-      opction:[
-      ]},
+        label:"联系电话",
+        itemType:"input",
+        formName:"mobile",
+        opction:[],
+      },
       {
-       label:"备注",
-      itemType:"textarea1",
-      formName:"resiRemark",
-      opction:[
-      ]}
-      ]
-    },{
-      id:"familyInfoDto",
-      children:[
+        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:"select1",
-      formName:"houseHolderRel",
-      opction:[
-      ]},
+        label:"性别",
+        itemType:"radio",
+        formName:"gender",
+        opction:[
+          {label:'男',value:'1'},
+          {label:'女',value:'2'}
+        ],
+      },
       {
-       label:"居住情况",
-      itemType:"select1",
-      formName:"resideSituation",
-      opction:[
-      ]},
+        label:"民族",
+        itemType:"select",
+        formName:"nation",
+        opction:[],
+      },
       {
-       label:"婚姻状况",
-      itemType:"select1",
-      formName:"marriage",
-      opction:[
-      ]},
+        label:'生日',
+        itemType:"datepicker",
+        formName:'birthday'
+      },
       {
-       label:"配偶情况",
-      itemType:"select1",
-      formName:"spouseSituation",
-      opction:[
-      ]},
+        label:'备注',
+        itemType:"textarea",
+        formName:'remark'
+      },
       {
-       label:"该居民有无赡养人",
-      itemType:"radio1",
-      formName:"elderlyFlag",
-      opction:[
-        {label:'是',value:1},
-        {label:'否',value:0}
-      ]},
-       {
-       label:"该居民与赡养人关系",
-      itemType:"select1",
-      formName:"elderlyRelation",
-      opction:[
-      ]},
+        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"}
+        ]
+      }
+    ],
+    // 底部input
+    footerInputList:[
       {
-       label:"赡养人联系电话",
-      itemType:"input1",
-      formName:"dependantMobile",
-      opction:[
-      ]}, {
-       label:"备注",
-      itemType:"textarea1",
-      formName:"familyInfoRemark",
-      opction:[
-      ]}
-      ]
-    },{
-      id:"parymemberInfoDto",
-      children:[
+        id:'eduInfoDto',
+        children:[
+          {
+            label:"文化程度",
+            itemType:"select1",
+            formName:"cultureLevel",
+            opction:[]
+          },
+          {
+            label:"备注",
+            itemType:"textarea1",
+            formName:"eduRemark",
+            opction:[]
+          }
+        ]
+      },
       {
-       label:"入党时间",
-      itemType:"datepicker1",
-      formName:"joinTime",
-      opction:[
-      ]},
+        id:'hobbyInfoDto',
+        children:[{
+          label:"兴趣特长",
+          itemType:"checkbox",
+          formName:"hobbyCode",
+          opction:[
+            {label:'治安巡逻',formName:'hobbyCode1'},
+            {label:'人民调解',formName:'hobbyCode2'},
+            {label:'民情采集',formName:'hobbyCode3'},
+            {label:'问题辅导',formName:'hobbyCode4'},
+            {label:'结对帮扶',formName:'hobbyCode5'},
+            {label:'应急处理',formName:'hobbyCode6'},
+            {label:'义务理发',formName:'hobbyCode7'},
+            {label:'家电维修',formName:'hobbyCode8'},
+            {label:'其他',formName:'9'},
+        ]},
+        {
+          label:'兴趣',
+          itemType:"input1",
+          formName:"interestDesc",
+        },
+        {
+          label:'备注',
+          itemType:"textarea1",
+          formName:"hobbyRemark",
+        }]
+      },
       {
-       label:"转正时间",
-      itemType:"datepicker1",
-      formName:"positiveTime",
-      opction:[
-      ]},
+        id:'religionDto',
+        children:[
+          {
+            label:"宗教",
+            itemType:"input1",
+            formName:"religion",
+            opction:[]
+          },
+          {
+            label:"备注",
+            itemType:"textarea1",
+            formName:"religionRemark",
+            opction:[]
+          }
+        ]
+      },
       {
-       label:"所属支部",
-      itemType:"cascader1",
-      formName:"branchId",
-      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:"input1",
+            formName:"selfPayAmount",
+            opction:[]
+          },
+          {
+            label:"救助金额",
+            itemType:"input1",
+            formName:"deliveranceAmount",
+            opction:[]
+          },
+          {
+            label:"救助时间",
+            itemType:"datepicker1",
+            formName:"deliveranceTime",
+            opction:[]
+          },
+          {
+            label:"享受救助明细序号",
+            itemType:"input1",
+            formName:"deliveranceNum",
+            opction:[]
+          },
+          {
+            label:"备注",
+            itemType:"textarea1",
+            formName:"healthRemark",
+            opction:[]
+          }
+        ]
+      },
       {
-       label:"流动党员",
-      itemType:"radio1",
-      formName:"flowFlag",
-      opction:[
-        {label:'是',value:1},
-        {label:'否',value:0},
-      ]},
+        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:"input1",
+            formName:"retirementAmount",
+            opction:[]
+          },
+          {
+          label:"月收入",
+            itemType:"input1",
+            formName:"monthIncome",
+            opction:[]
+          },
+        ]
+      },
       {
-       label:"流动党员活动证号",
-      itemType:"input1",
-      formName:"flowActNum",
-      opction:[
-
-      ]},
-       {
-       label:"职务",
-      itemType:"select1",
-      formName:"partyJob",
-      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:[]
+          }
+        ]
+      },
       {
-       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:[
+        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:"branchId",
+        opction:[
+        ]},
+        {
+        label:"流动党员",
+        itemType:"radio1",
+        formName:"flowFlag",
+        opction:[
+          {label:'是',value:1},
+          {label:'否',value:0},
+        ]},
+        {
+        label:"流动党员活动证号",
+        itemType:"input1",
+        formName:"flowActNum",
+        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:"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:"select1",
-      formName:"housingNature",
-      opction:[
-      ]},
-      {
-       label:"保障类型",
-      itemType:"input1",
-      formName:"securityType",
-      opction:[
-      ]},{
-       label:"发证日期",
-      itemType:"datepicker1",
-      formName:"certificateDate",
-      opction:[
-      ]},
-      {
-       label:"补贴编号",
-      itemType:"input1",
-      formName:"subsidyNum",
-      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:"input1",
-      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:"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:"input1",
-      formName:"unemploymentReason",
-      opction:[
-      ]} ,{
-       label:"是否就业困难对象",
-      itemType:"radio1",
-      formName:"employmentHardFlag",
-      opction:[
-        {label:'是',value:1},
-        {label:'否',value:0}
-      ]}, {
-       label:"劳动能力就业愿望",
-      itemType:"input1",
-      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:"input1",
-      formName:"settlementAmount",
-      opction:[
+        ]},
+        {
+        label:"技术特长",
+        itemType:"input1",
+        formName:"specialSkill",
+        opction:[
+        ]},{
+        label:"失业原因",
+        itemType:"input1",
+        formName:"unemploymentReason",
+        opction:[
+        ]} ,{
+        label:"是否就业困难对象",
+        itemType:"radio1",
+        formName:"employmentHardFlag",
+        opction:[
+          {label:'是',value:1},
+          {label:'否',value:0}
+        ]}, {
+        label:"劳动能力就业愿望",
+        itemType:"input1",
+        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:"input1",
+        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:"职务",
+        ]},
+        {
+        label:"培训状况",
         itemType:"input1",
-        formName:"duty",
-      },
-      {
-        label:"探亲情况	",
+        formName:"trainDesc",
+        opction:[
+        ]},
+        {
+        label:"参战时间开始日期",
+        itemType:"datepicker1",
+        formName:"joinWarStartTime",
+        opction:[
+        ]},
+        {
+        label:"参战时间截止日期",
+        itemType:"datepicker1",
+        formName:"joinWarEndTime",
+        opction:[
+        ]} ,
+        {
+        label:"现就业情况",
         itemType:"input1",
-        formName:"visitation",
-      }]
-    },{
-      id:'volunteerDto',
-      children:[{
-        label:"志愿者类别",
-        itemType:"checkbox",
-        formName:"volunteerCategory",
+        formName:"employmentSituation",
+        opction:[
+        ]},
+        {
+        label:"是否办理公益性岗位",
+        itemType:"radio1",
+        formName:"pubWelfareJobFlag",
         opction:[
-          {label:'文化队伍',formName:'hobbyCode1'},
-          {label:'楼委会',formName:'hobbyCode2'},
-          {label:'能人达人',formName:'hobbyCode3'},
-          {label:'老友俱乐部',formName:'hobbyCode4'},
-          {label:'代办员',formName:'hobbyCode5'},
-          {label:'调解员',formName:'hobbyCode6'},
-          {label:'采集员',formName:'hobbyCode7'},
-          {label:'治安巡逻员',formName:'9'},
-      ]},
+          {label:'是',value:1},
+          {label:'否',value:0},
+        ]}
+        ]
+      },
       {
-        label:'备注',
-        itemType:"textarea1",
-        formName:"volunteerRemark",
+        id:'unitedFrontDto',
+        children:[{
+          label:"职务",
+          itemType:"input1",
+          formName:"duty",
+        },
+        {
+          label:"探亲情况	",
+          itemType:"input1",
+          formName:"visitation",
+        }]
+      },{
+        id:'volunteerDto',
+        children:[{
+          label:"志愿者类别",
+          itemType:"checkbox",
+          formName:"volunteerCategory",
+          opction:[
+            {label:'文化队伍',formName:'hobbyCode1'},
+            {label:'楼委会',formName:'hobbyCode2'},
+            {label:'能人达人',formName:'hobbyCode3'},
+            {label:'老友俱乐部',formName:'hobbyCode4'},
+            {label:'代办员',formName:'hobbyCode5'},
+            {label:'调解员',formName:'hobbyCode6'},
+            {label:'采集员',formName:'hobbyCode7'},
+            {label:'治安巡逻员',formName:'9'},
+        ]},
+        {
+          label:'备注',
+          itemType:"textarea1",
+          formName:"volunteerRemark",
+        }
+      ]
+      },{
+        id:'oldPeopleDto',
+        children:[ {
+          label:'高龄补助',
+          itemType:"input1",
+          formName:"oldSubsidy",
+        },]
+      },{
+        id:'specialDto',
+        children:[ {
+          label:'人群类别',
+          itemType:"select1",
+          formName:"specialCategoryCode",
+          opction:[]
+        },]
       }
-    ]
-    },{
-      id:'oldPeopleDto',
-      children:[ {
-        label:'高龄补助',
-        itemType:"input1",
-        formName:"oldSubsidy",
-      },]
-    },{
-      id:'specialDto',
-      children:[ {
-        label:'人群类别',
-        itemType:"select1",
-        formName:"specialCategoryCode",
-        opction:[]
-      },]
-    }
-
     ],
     newForm: {},
     form:{
@@ -1132,7 +1166,14 @@ export default {
     },
     // 底部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:'eduInfoDto',label:'教育'},
+      {groupId:'hobbyInfoDto',label:'兴趣爱好'},
+      {groupId:'religionDto',label:'宗教信仰'},
+      {groupId:'healthDto',label:'健康'},
+      {groupId:'workInfoDto',label:'工作'},
+      {groupId:'economyDto',label:'经济情况'},
+      {groupId:'resideInfoDto',label:'居住'},
+      {groupId:'familyInfoDto',label:'家庭'}
     ]
    }
   },
@@ -1155,7 +1196,6 @@ export default {
     this.setNewForm()
   },
   methods: {
-
     submit_from(){
       this.setJSON()
       var flag = false
@@ -1165,9 +1205,9 @@ export default {
 
       })
       if(flag){
-          return this.newForm
-        }
         return this.newForm
+      }
+      return false
     },
     async old_from(data) {
       this.getFormData(data)
@@ -1175,63 +1215,56 @@ export default {
       await this.getBuildList()
       await this.getUniList()
       await this.getHouseList()
-      // await this.getClassInfo()
       await this.residentEduInfo(this.form.resiId)
     },
     getAllNation(){
-         // 民族字典
-    this.getDictList()
-    // 关系字典
-    this.getRelationship()
-    // 学历信息
-    this.getEducation()
-    //残疾类别
-    this.getdisabilityNation()
-    this.getdisabilityNationClass()
-    this.getillnessNation()
-    this.getchronicNation()
-    this.getHouseholdNation()
-    this.getMarriageNation()
-    this.getResideNation()
-    this.getSpouseNation()
-    this.getBranchlist()
-    this.getPartyNation()
-    this.getResidentNation()
-    this.getHousing()
+      // 民族字典
+      this.getDictList()
+      // 关系字典
+      this.getRelationship()
+      // 学历信息
+      this.getEducation()
+      //残疾类别
+      this.getdisabilityNation()
+      this.getdisabilityNationClass()
+      this.getillnessNation()
+      this.getchronicNation()
+      this.getHouseholdNation()
+      this.getMarriageNation()
+      this.getResideNation()
+      this.getSpouseNation()
+      this.getBranchlist()
+      this.getPartyNation()
+      this.getResidentNation()
+      this.getHousing()
     },
-      getGridList () {
-        const { user } = this.$store.state
-        this.$http
-          .post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'addorupdate' })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            } else {
-              console.log('获取查询详情成功', res.data)
-              this.optionsG = res.data
-            }
-          })
-          .catch(() => {
-            return this.$message.error('网络错误')
-          })
-      },
-      getValiheList () {
-        const { user } = this.$store.state
-        this.$http
-          .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.gridId, agencyId: user.agencyId })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            } else {
-              console.log('获取查询详情成功', res.data)
-              this.optionsV = res.data
-            }
-          })
-          .catch(() => {
-            return this.$message.error('网络错误')
-          })
-      },
-      async  getdisabilityNation(){
+    getGridList () {
+      const { user } = this.$store.state
+      this.$http.post('/gov/org/customergrid/gridoption', { agencyId: user.agencyId, purpose: 'addorupdate' }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          console.log('获取查询详情成功', res.data)
+          this.optionsG = res.data
+        }
+      }).catch(() => {
+        return this.$message.error('网络错误')
+      })
+    },
+    getValiheList () {
+      const { user } = this.$store.state
+      this.$http.post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.form.gridId, agencyId: user.agencyId }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          console.log('获取查询详情成功', res.data)
+          this.optionsV = res.data
+        }
+      }).catch(() => {
+        return this.$message.error('网络错误')
+      })
+    },
+    async getdisabilityNation(){
       try {
         const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_category_code'})
         this.footerInputList.forEach(c => {
@@ -1247,8 +1280,8 @@ export default {
         console.log(error,'获取残疾字典');
       }
 
-      },
-      async  getdisabilityNationClass(){
+    },
+    async getdisabilityNationClass(){
       try {
         const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'disability_level'})
         this.footerInputList.forEach(c => {
@@ -1264,8 +1297,8 @@ export default {
         console.log(error,'获取残疾等级字典');
       }
 
-      },
-      async  getillnessNation(){
+    },
+    async getillnessNation(){
       try {
         const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'illness_code'})
         this.footerInputList.forEach(c => {
@@ -1279,428 +1312,426 @@ export default {
       } catch (error) {
         console.log(error,'获取所患大病字典');
       }
-      },
-       async  getchronicNation(){
-        try {
-          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
-                }
-            }
-          })
-
-        } catch (error) {
-          console.log(error,'获取所患慢病字典');
-        }
-      },
-      async  getHouseholdNation(){
-        try {
-          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
-                }
-            }
-          })
-
-        } catch (error) {
-          console.log(error,'获取人户状况字典');
-        }
-      },
-      async  getMarriageNation(){
-        try {
-          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
-                }
-            }
-          })
-
-        } catch (error) {
-          console.log(error,'获取婚姻状况字典');
-        }
-      },
-      async  getResideNation(){
-        try {
-          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
-                }
-            }
-          })
+    },
+    async getchronicNation(){
+      try {
+        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
+              }
+          }
+        })
 
-        } catch (error) {
-          console.log(error,'获取居住情况字典');
-        }
-      },
-      async  getSpouseNation(){
-        try {
-          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
-                }
-            }
-          })
+      } catch (error) {
+        console.log(error,'获取所患慢病字典');
+      }
+    },
+    async getHouseholdNation(){
+      try {
+        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
+              }
+          }
+        })
 
-        } catch (error) {
-          console.log(error,'获取配偶情况字典');
-        }
-      },
-      async  getResidentNation(){
-        try {
-          const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'})
-          this.footerInputList.forEach(c => {
-            for(let i of c.children){
-                if(i.formName == 'specialCategoryCode'){
-                    i.opction = data.data
-                }
-            }
-          })
+      } catch (error) {
+        console.log(error,'获取人户状况字典');
+      }
+    },
+    async getMarriageNation(){
+      try {
+        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
+              }
+          }
+        })
 
-        } catch (error) {
-          console.log(error,'获取配偶情况字典');
-        }
-      },
-      async  getPartyNation(){
-        try {
-          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
-                }
-            }
-          })
+      } catch (error) {
+        console.log(error,'获取婚姻状况字典');
+      }
+    },
+    async getResideNation(){
+      try {
+        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
+              }
+          }
+        })
 
-        } catch (error) {
-          console.log(error,'获取职务字典');
-        }
-      },
-      getBuildList () {
-        this.$http
-          .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.form.villageId })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            } else {
-              console.log('获取查询详情成功', res.data)
-              this.optionsB = res.data
-            }
-          })
-          .catch(() => {
-            return this.$message.error('网络错误')
-          })
-      },
-      getUniList () {
-        this.$http
-          .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.buildId })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            } else {
-              console.log('获取查询详情成功', res.data)
-              this.optionsD = res.data
-            }
-          })
-          .catch(() => {
-            return this.$message.error('网络错误')
-          })
-      },
-      getHouseList () {
-        this.$http
-          .post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            } else {
-              console.log('获取查询详情成功', res.data)
-              this.optionsH = res.data
-            }
-          })
-          .catch(() => {
-            return this.$message.error('网络错误')
-          })
-      },
-      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'})
+      } catch (error) {
+        console.log(error,'获取居住情况字典');
+      }
+    },
+    async getSpouseNation(){
+      try {
+        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
               }
-       }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':''
+          }
+        })
 
-           if(i != ''){
-              this.tabsList.forEach(item =>{
-                if(i != item.id){
-                  this.tabsList = this.tabsList.filter(items=>items.id!=i)
-                }
-            })
-            }
-       }
+      } catch (error) {
+        console.log(error,'获取配偶情况字典');
+      }
+    },
+    async getResidentNation(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'resident_category'})
+        this.footerInputList.forEach(c => {
+          for(let i of c.children){
+              if(i.formName == 'specialCategoryCode'){
+                  i.opction = data.data
+              }
+          }
+        })
 
-      },
-      handleChangeGrid (val) {
-        console.log('val', val)
-        for(let n of this.optionsG){
-           if(n.value == val){
-            this.form.gridName = n.label
-           }
+      } catch (error) {
+        console.log(error,'获取配偶情况字典');
+      }
+    },
+    async getPartyNation(){
+      try {
+        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
+              }
+          }
+        })
+      } catch (error) {
+        console.log(error,'获取职务字典');
+      }
+    },
+    getBuildList () {
+      this.$http.post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.form.villageId }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          console.log('获取查询详情成功', res.data)
+          this.optionsB = res.data
         }
-        this.form.villageId = ''
-        this.form.buildId = ''
-        this.form.unitId = ''
-        this.form.homeId = ''
-        this.getValiheList()
-        if (!val) {
-          this.getBuildList()
-          this.getUniList()
-          this.getHouseList()
+      }).catch(() => {
+        return this.$message.error('网络错误')
+      })
+    },
+    getUniList () {
+      this.$http.post('/gov/org/icbuildingunit/unitoption', { buildingId: this.form.buildId }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          console.log('获取查询详情成功', res.data)
+          this.optionsD = res.data
         }
-      },
-      validateIdcard (idCard, type) {
-        this.$http
-          .post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
-          .then(({ data: res }) => {
-            if (res.code !== 0) {
-              return this.$message.error(res.msg)
-            } else {
-              console.log('获取查询详情成功', res.data)
-
-              if (res.data.isVolunteer == '1') this.form.volunteerFlag = true
-              else this.form.volunteerFlag = false
-
-              if (res.data.isPartyMember == '1') {
-                this.form.partyFlag = true
-                this.isParty = true
-                this.partyInfo = res.data.detail.ic_party_member
-              } else this.form.partyFlag = false
-            }
-          })
-          .catch(() => {
-            return this.$message.error('网络错误')
+      }).catch(() => {
+        return this.$message.error('网络错误')
+      })
+    },
+    getHouseList () {
+      this.$http.post('/gov/org/ichouse/houseoption', { unitId: this.form.unitId }).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        } else {
+          console.log('获取查询详情成功', res.data)
+          this.optionsH = res.data
+        }
+      }).catch(() => {
+        return this.$message.error('网络错误')
+      })
+    },
+    handleChangeCheckbox(e,val){
+        this.handleTabShow(val,e)
+    },
+    handleChangeCheckbox1(e,val){
+      console.log(this.form.hobbyInfoDto.hobbyCode)
+    },
+    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 {
+      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':''
+      if(i != ''){
+            this.tabsList.forEach(item =>{
+              if(i != item.id){
+                this.tabsList = this.tabsList.filter(items=>items.id!=i)
+              }
           })
-      },
-      // 身份证号失去焦点事件
-      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]
-          }
-
-          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)
+        }
+      }
+    },
+    handleChangeGrid (val) {
+      console.log('val', val)
+      for(let n of this.optionsG){
+          if(n.value == val){
+          this.form.gridName = n.label
           }
-
-  },
-      handleChangeV (val) {
-        console.log('val', val)
-        this.form.buildId = ''
-        this.form.unitId = ''
-        this.form.homeId = ''
+      }
+      this.form.villageId = ''
+      this.form.buildId = ''
+      this.form.unitId = ''
+      this.form.homeId = ''
+      this.getValiheList()
+      if (!val) {
         this.getBuildList()
         this.getUniList()
         this.getHouseList()
-      },
-      handleChangeB (val) {
-        console.log('val', val)
-        this.form.unitId = ''
-        this.form.homeId = ''
-        this.getUniList()
-        this.getHouseList()
-      },
-      handleChangeD () {
-        this.form.homeId = ''
-        this.getHouseList()
-      },
-      async handleClick (tab, event) {
-        if (event.toElement.innerText == '教育') {
-          if (!this.form.resiId) {
-            this.newForm.eduInfoDto = this.form.eduInfoDto
-          } else {
-            await this.residentEduInfo(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '兴趣爱好') {
-          if (!this.form.resiId) {
-            this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
-          } else {
-            await this.residentHobbyInfo(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '宗教信仰') {
-          if (!this.form.resiId) {
-            this.newForm.religionDto = this.form.religionDto
-          } else {
-            await this.residentReligion(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '健康') {
-          if (!this.form.resiId) {
-            this.newForm.healthDto = this.form.healthDto
-          } else {
-            await this.getHealthInfoDetailById(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '工作') {
-          if (!this.form.resiId) {
-            this.newForm.workInfoDto = this.form.workInfoDto
-          } else {
-            await this.residentWorkInfo(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '经济情况') {
-          if (!this.form.resiId) {
-            this.newForm.economyDto = this.form.economyDto
-          } else {
-            await this.getEconomyDetailById(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '居住') {
-          if (!this.form.resiId) {
-            this.newForm.resideInfoDto = this.form.resideInfoDto
-          } else {
-            await this.getResideInfoDetailById(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '家庭') {
-          if (!this.form.resiId) {
-            this.newForm.familyInfoDto = this.form.familyInfoDto
-          } else {
-            await this.getFamilyInfoDetailById(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '党员信息') {
-          if (!this.form.resiId) {
-            this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
-          } else {
-            await this.residentPartyMemberInfo(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '保障房信息') {
-          if (!this.form.resiId) {
-            this.newForm.ensureHouseDto = this.form.ensureHouseDto
-          } else {
-            await this.residentEnsureHouse(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '失业') {
-          if (!this.form.resiId) {
-            this.newForm.unemployedDto = this.form.unemployedDto
-          } else {
-            await this.residentUnemployed(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '退役军人') {
-          if (!this.form.resiId) {
-            this.newForm.veteranDto = this.form.veteranDto
-          } else {
-            await this.getVeteranDetailById(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '统战') {
-          if (!this.form.resiId) {
-            this.newForm.unitedFrontDto = this.form.unitedFrontDto
-          } else {
-            await this.residentUnitedFront(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '志愿者信息') {
-          if (!this.form.resiId) {
-            this.newForm.volunteerDto = this.form.volunteerDto
-          } else {
-            await this.getVolunteerDetailById(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '特殊人群') {
-          if (!this.form.resiId) {
-            this.newForm.specialDto = this.form.specialDto
-          } else {
-            await this.residentSpecial(this.form.resiId)
-          }
-        } else if (event.toElement.innerText == '老年人') {
-          if (!this.form.resiId) {
-            this.newForm.oldPeopleDto = this.form.oldPeopleDto
+      }
+    },
+    validateIdcard (idCard, type) {
+      this.$http
+        .post('/epmetuser/icresiuser/getUserRoleByIdCard', { idCard })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
           } else {
-            await this.getOldPeopleDetailById(this.form.resiId)
+            console.log('获取查询详情成功', res.data)
+
+            if (res.data.isVolunteer == '1') this.form.volunteerFlag = true
+            else this.form.volunteerFlag = false
+
+            if (res.data.isPartyMember == '1') {
+              this.form.partyFlag = true
+              this.isParty = true
+              this.partyInfo = res.data.detail.ic_party_member
+            } else this.form.partyFlag = false
           }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    // 身份证号失去焦点事件
+    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]
         }
-      },
-      handleForm () {
-        let newForm = []
-        this.$refs[this.formId].validate((valid) => {
-          if (valid) {
-            var hash = {}
-            var i = 0
-            var res = []
-            this.tempFormList.forEach(function (item) {
-              var name = item.tableName
-              hash[name] ? res[hash[name] - 1].list.push(item) : hash[name] = ++i && res.push({
-                list: [item],
-                tableName: name
-              })
+
+        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) {
+      console.log('val', val)
+      this.form.buildId = ''
+      this.form.unitId = ''
+      this.form.homeId = ''
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeB (val) {
+      console.log('val', val)
+      this.form.unitId = ''
+      this.form.homeId = ''
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeD () {
+      this.form.homeId = ''
+      this.getHouseList()
+    },
+    async handleClick (tab, event) {
+      if (event.toElement.innerText == '教育') {
+        if (!this.form.resiId) {
+          this.newForm.eduInfoDto = this.form.eduInfoDto
+        } else {
+          await this.residentEduInfo(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '兴趣爱好') {
+        if (!this.form.resiId) {
+          this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
+        } else {
+          await this.residentHobbyInfo(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '宗教信仰') {
+        if (!this.form.resiId) {
+          this.newForm.religionDto = this.form.religionDto
+        } else {
+          await this.residentReligion(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '健康') {
+        if (!this.form.resiId) {
+          this.newForm.healthDto = this.form.healthDto
+        } else {
+          await this.getHealthInfoDetailById(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '工作') {
+        if (!this.form.resiId) {
+          this.newForm.workInfoDto = this.form.workInfoDto
+        } else {
+          await this.residentWorkInfo(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '经济情况') {
+        if (!this.form.resiId) {
+          this.newForm.economyDto = this.form.economyDto
+        } else {
+          await this.getEconomyDetailById(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '居住') {
+        if (!this.form.resiId) {
+          this.newForm.resideInfoDto = this.form.resideInfoDto
+        } else {
+          await this.getResideInfoDetailById(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '家庭') {
+        if (!this.form.resiId) {
+          this.newForm.familyInfoDto = this.form.familyInfoDto
+        } else {
+          await this.getFamilyInfoDetailById(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '党员信息') {
+        if (!this.form.resiId) {
+          this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
+        } else {
+          await this.residentPartyMemberInfo(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '保障房信息') {
+        if (!this.form.resiId) {
+          this.newForm.ensureHouseDto = this.form.ensureHouseDto
+        } else {
+          await this.residentEnsureHouse(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '失业') {
+        if (!this.form.resiId) {
+          this.newForm.unemployedDto = this.form.unemployedDto
+        } else {
+          await this.residentUnemployed(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '退役军人') {
+        if (!this.form.resiId) {
+          this.newForm.veteranDto = this.form.veteranDto
+        } else {
+          await this.getVeteranDetailById(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '统战') {
+        if (!this.form.resiId) {
+          this.newForm.unitedFrontDto = this.form.unitedFrontDto
+        } else {
+          await this.residentUnitedFront(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '志愿者信息') {
+        if (!this.form.resiId) {
+          this.newForm.volunteerDto = this.form.volunteerDto
+        } else {
+          await this.getVolunteerDetailById(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '特殊人群') {
+        if (!this.form.resiId) {
+          this.newForm.specialDto = this.form.specialDto
+        } else {
+          await this.residentSpecial(this.form.resiId)
+        }
+      } else if (event.toElement.innerText == '老年人') {
+        if (!this.form.resiId) {
+          this.newForm.oldPeopleDto = this.form.oldPeopleDto
+        } else {
+          await this.getOldPeopleDetailById(this.form.resiId)
+        }
+      }
+    },
+    handleForm () {
+      let newForm = []
+      this.$refs[this.formId].validate((valid) => {
+        if (valid) {
+          var hash = {}
+          var i = 0
+          var res = []
+          this.tempFormList.forEach(function (item) {
+            var name = item.tableName
+            hash[name] ? res[hash[name] - 1].list.push(item) : hash[name] = ++i && res.push({
+              list: [item],
+              tableName: name
+            })
+          })
+          const itemTypes = ['cascader', 'daterange', 'timerange']
+          res.forEach(item => {
+            let _form = {}
+            item.list.filter(n => n.isChange).forEach(r => {
+              _form[r.columnName] = r.multiSelect || itemTypes.includes(r.itemType) ? this.form[r.columnName].toString() : this.form[r.columnName]
+              // return _form
             })
-            const itemTypes = ['cascader', 'daterange', 'timerange']
-            res.forEach(item => {
-              let _form = {}
-              item.list.filter(n => n.isChange).forEach(r => {
-                _form[r.columnName] = r.multiSelect || itemTypes.includes(r.itemType) ? this.form[r.columnName].toString() : this.form[r.columnName]
-                // return _form
-              })
-              if (this.fixed) {
-                for (let n in this.fixedList) {
-                  _form[n] = this.fixedList[n]
-                }
+            if (this.fixed) {
+              for (let n in this.fixedList) {
+                _form[n] = this.fixedList[n]
               }
-              newForm.push({
-                tableName: item.tableName,
-                supportAdd: this.supportAdd,
-                list: Object.keys(_form).length > 0 ? [{ ..._form }] : []
-              })
-              console.log(newForm);
+            }
+            newForm.push({
+              tableName: item.tableName,
+              supportAdd: this.supportAdd,
+              list: Object.keys(_form).length > 0 ? [{ ..._form }] : []
             })
-            return newForm
-          } else {
-            console.log('error submit!!')
-            return false
-          }
-        })
-        if (this.supportAdd) newForm = this.handlerMuscForm()
-        return newForm
-      },
-      // 为了实现根据房屋类型改版是否租户的需求
-      handleChangeH (val) {
-        let item = this.optionsH.find(item => item.value === val);
-        if (item && item.type == '1') {
-          this.form.IS_TENANT = '1'
-          console.log('item-----', item)
-        } else this.form.IS_TENANT = '0'
-      },
-      //获取民族字典
-    async  getDictList(){
+            console.log(newForm);
+          })
+          return newForm
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+      if (this.supportAdd) newForm = this.handlerMuscForm()
+      return newForm
+    },
+    // 为了实现根据房屋类型改版是否租户的需求
+    handleChangeH (val) {
+      let item = this.optionsH.find(item => item.value === val);
+      if (item && item.type == '1') {
+        this.form.IS_TENANT = '1'
+        console.log('item-----', item)
+      } else this.form.IS_TENANT = '0'
+    },
+    //获取民族字典
+    async getDictList(){
       try {
         const { data } = await this.$http.post('sys/dict/data/nation',{formCode: "resi_base_info"})
         this.dictList = data
@@ -1710,14 +1741,12 @@ export default {
             console.log(c.opction);
           }
         })
-
       } catch (error) {
         console.log(error,'获取民族字典');
       }
-
-      },
-      // 获取人物关系字典
-      async  getRelationship(){
+    },
+    // 获取人物关系字典
+    async getRelationship(){
       try {
         const { data } = await this.$http.post('sys/dict/data/relationship',{formCode: "resi_base_info"})
         this.footerInputList.forEach(c => {
@@ -1727,13 +1756,11 @@ export default {
               }
           }
         })
-
         } catch (error) {
           console.log(error,'获取民族字典');
         }
-
-      },
-      async  getBranchlist(){
+    },
+    async getBranchlist(){
       try {
         const { data } = await this.$http.post('resi/partymember/icPartyOrg/branchlist',{formCode: "resi_base_info"})
         this.footerInputList.forEach(c => {
@@ -1743,12 +1770,11 @@ export default {
               }
           }
         })
-
         } catch (error) {
           console.log(error,'获取支部字典');
         }
-      },
-      getTreeData (data) {
+    },
+    getTreeData (data) {
       if (!Array.isArray(data)) return [];
       let arr = data.map((item) => {
         let _item = {};
@@ -1763,8 +1789,7 @@ export default {
       });
       return arr;
     },
-
-      async  getEducation(){
+    async getEducation(){
       try {
         let { data } = await this.$http.post('sys/dict/data/education',{formCode: "resi_base_info"})
         data.data = this.getTreeData(data.data)
@@ -1779,9 +1804,8 @@ export default {
         } catch (error) {
           console.log(error,'获取民族字典');
         }
-
-      },
-      async  getHousing(){
+    },
+    async getHousing(){
       try {
         let { data } = await this.$http.post('sys/dict/data/house',{formCode: "resi_base_info"})
         data.data = this.getTreeData(data.data)
@@ -1792,96 +1816,98 @@ export default {
               }
           }
         })
-
-        } catch (error) {
-          console.log(error,'获取住房性质字典');
-        }
-
-      },
-      getFormData(data) {
-      this.form.categoryId = '111222333',// 临时写死
-      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.toString()
-      this.form.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.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()
-      }
-      let old_Form = {
-        categoryId: '111222333',// 临时写死
-        resiId: data.resiId,
-        buildId: data.houseInfo.buildId,
-        gridId: data.houseInfo.gridId,
-        gridName: data.houseInfo.gridName,
-        homeId: data.houseInfo.homeId,
-        homeName: data.houseInfo.homeName,
-        houseMergeId: data.houseInfo.mergeId,
-        unitId: data.houseInfo.unitId,
-        villageId: data.houseInfo.villageId,
-        birthday: data.birthday,
-        gender: data.gender,
-        idNum: data.idNum,
-        localResidenceFlag: data.localResidenceFlag.toString(),
-        mobile: data.mobile,
-        name: data.name,
-        nation: data.nation ? data.nation : '',
-        remark: data.remark ? data.remark : '',
-        partyFlag: data.categoryInfo.partyFlag.toString(),
-        subsistenceAllowanceFlag: data.categoryInfo.subsistenceAllowanceFlag.toString(),
-        ensureHouseFlag: data.categoryInfo.ensureHouseFlag.toString(),
-        unemployedFlag: data.categoryInfo.unemployedFlag.toString(),
-        fertileWomanFlag: data.categoryInfo.fertileWomanFlag.toString(),
-        veteranFlag: data.categoryInfo.veteranFlag.toString(),
-        unitedFrontFlag: data.categoryInfo.unitedFrontFlag.toString(),
-        petitionOfficerFlag: data.categoryInfo.petitionOfficerFlag.toString(),
-        volunteerFlag: data.categoryInfo.volunteerFlag.toString(),
-        oldPeopleFlag: data.categoryInfo.oldPeopleFlag.toString(),
-        emptyNesterFlag: data.categoryInfo.emptyNesterFlag.toString(),
-        bereavedPersonFlag: data.categoryInfo.bereavedPersonFlag.toString(),
-        disabledFlag: data.categoryInfo.disabledFlag.toString(),
-        dementedFlag: data.categoryInfo.dementedFlag.toString(),
-        disabilityFlag: data.categoryInfo.disabilityFlag.toString(),
-        seriousIllnessFlag: data.categoryInfo.seriousIllnessFlag.toString(),
-        chronicDiseaseFlag: data.categoryInfo.chronicDiseaseFlag.toString(),
-        specialCrowdFlag: data.categoryInfo.specialCrowdFlag.toString(),
-        tenantFlag: data.categoryInfo.tenantFlag.toString(),
-        floatingFlag: data.categoryInfo.floatingFlag.toString(),
-        liveAloneFlag: data.categoryInfo.liveAloneFlag.toString(),
+      } catch (error) {
+        console.log(error,'获取住房性质字典');
       }
-      this.newForm = old_Form
+    },
+    getFormData(data) {
+        this.form.categoryId = '111222333',// 临时写死
+        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.toString()
+        this.form.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.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()
+        }
+        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} = 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,
+        }
     },
     // 教育信息详情
     residentEduInfo(id) {
@@ -1893,7 +1919,6 @@ export default {
             cultureLevel:'',
             eduRemark:''
           }
-          this.newForm.eduInfoDto = this.form.eduInfoDto
         }
       })
     },
@@ -1908,7 +1933,6 @@ export default {
             interestDesc:'',//兴趣
             hobbyRemark:''//备注
           }
-          this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
         }
       })
     },
@@ -1922,7 +1946,6 @@ export default {
               religion:'',
               religionRemark:''
             }
-            this.newForm.religionDto = this.form.religionDto
           }
         })
     },
@@ -1952,7 +1975,6 @@ export default {
               deliveranceNum:'',//享受救助明细序号
               healthRemark:''//备注
             }
-            this.newForm.healthDto = this.form.healthDto
           }
         })
     },
@@ -1968,7 +1990,6 @@ export default {
               retireTime:'',//离退休时间		
               workRemark:'',//备注		
             }
-            this.newForm.workInfoDto = this.form.workInfoDto
           }
         })
     },
@@ -1982,7 +2003,6 @@ export default {
               retirementAmount:'',//退休金额	
               monthIncome:'',//月收入
             }
-            this.newForm.economyDto = this.form.economyDto
           }
         })
     },
@@ -1999,7 +2019,6 @@ export default {
               householdSituation:'',//人户情况，字典code
               resiRemark:'',//备注
             }
-            this.newForm.resideInfoDto = this.form.resideInfoDto
           }
         })
     },
@@ -2019,7 +2038,6 @@ export default {
               dependantMobile:'',//赡养人联系电话			
               familyInfoRemark:'',//备注		
             }
-            this.newForm.familyInfoDto = this.form.familyInfoDto
           }
         })
     },
@@ -2042,7 +2060,6 @@ export default {
               joinCommunityTime:'',//组织关系转入社区时间yyyy-MM-dd
               longHolidayFlag:null,//是否请长假：1是，0否
             }
-            this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
           }
         })
     },
@@ -2059,7 +2076,6 @@ export default {
               subsidyNum:'',//补贴编号	
               subsidyAmount:'',//补贴金额	
             }
-            this.newForm.ensureHouseDto = this.form.ensureHouseDto
           }
         })
     },
@@ -2079,7 +2095,6 @@ export default {
               employmentHardFlag:null,//是否就业困难对象；1是0不是	
               employmentWish:'',//劳动能力就业愿望	
             }
-            this.newForm.unemployedDto = this.form.unemployedDto
           }
         })
     },
@@ -2101,7 +2116,6 @@ export default {
               joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd	
               pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
             }
-            this.newForm.veteranDto = this.form.veteranDto
           }
         })
     },
@@ -2115,7 +2129,6 @@ export default {
               duty:'',//职务
               visitation:'',//探亲情况	
             }
-            this.newForm.unitedFrontDto = this.form.unitedFrontDto
           }
         })
     },
@@ -2129,7 +2142,6 @@ export default {
               volunteerCategory:[],//志愿者类别
               volunteerRemark:''//备注
             }
-            this.newForm.volunteerDto = this.form.volunteerDto
           }
         })
     },
@@ -2142,7 +2154,6 @@ export default {
             this.form.oldPeopleDto = res.data ? res.data : {
               oldSubsidy:''//高龄补助	
             }
-            this.newForm.oldPeopleDto = this.form.oldPeopleDto
           }
         })
     },
@@ -2155,7 +2166,6 @@ export default {
             this.form.specialDto = res.data ? res.data : {//特殊人群
               specialCategoryCode:[]//人群类别【字典表】,可多选，以英文逗号隔开；	
             }
-            this.newForm.specialDto = this.form.specialDto
           }
         })
     },
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index a449422c8..820d7fb88 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1226,6 +1226,9 @@ export default {
 
     async handleSUbmit() {
       const _baseForm = this.$refs.baseForm.submit_from();
+      if (!_baseForm) {
+        return
+      }
       (_baseForm.partyFlag = parseInt(_baseForm.partyFlag)), //党员
         (_baseForm.subsistenceAllowanceFlag = parseInt(
           _baseForm.subsistenceAllowanceFlag

From c13c1ffbd187eaa324dd20663f0fad865d3833ee Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 10 Jan 2023 17:02:13 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=A32?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiSearch.vue |  2 +-
 src/views/modules/base/resi.vue     | 64 -----------------------------
 src/views/modules/shequ/chaxun.vue  | 44 +++++++++++++++++---
 3 files changed, 40 insertions(+), 70 deletions(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 6c5e20478..aca11fa54 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -890,7 +890,7 @@ export default {
 }
 </script>
 
-<style lang="scss" scope>
+<style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
 
 .header_form_box {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 820d7fb88..82f0c4ddd 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -385,68 +385,6 @@
       </div>
     </el-dialog>
 
-    <el-dialog
-      :title="formName"
-      :visible.sync="dialogEditVisible"
-      width="986px"
-      top="5vh"
-      height="750px"
-      append-to-body
-      class="dialog-h"
-      :close-on-click-modal="false"
-      :before-close="handlerEditCancle"
-    >
-      <div class="dialog-h-content scroll-h">
-        <edit-resi
-          v-if="dialogEditVisible"
-          ref="baseForm"
-          :disabled="disabled"
-          :editUserId="editUserId"
-          :form-info="editForm"
-          :fixed="true"
-          :form-list="formList"
-          :agency-id="editAgencyId"
-          @changegroup="handleChangeGroup"
-        />
-        <div v-if="dialogEditVisible" class="resi-other">
-          <div class="resi-other-title">其他</div>
-          <div class="tabs-other-info">
-            <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"
-              >
-                <edit-resi
-                  :ref="'group' + item.groupId"
-                  :columns="3"
-                  :support-add="item.supportAdd"
-                  :form-id="item.columnName"
-                  :muti-list="item.mutiList"
-                  :form-list="item.itemList"
-                  :disabled="disabled"
-                  :label-width="'140px'"
-                  :agency-id="editAgencyId"
-                />
-              </el-tab-pane>
-            </el-tabs>
-          </div>
-        </div>
-      </div>
-      <div class="resi-btns">
-        <el-button size="small" @click="handlerEditCancle">取消</el-button>
-        <el-button
-          v-if="!disabled"
-          type="primary"
-          size="small"
-          :loading="btnLoading"
-          @click="handleEditSUbmit"
-          >提交</el-button
-        >
-      </div>
-    </el-dialog>
-
     <!-- 变更记录 -->
     <el-dialog
       :visible.sync="changeRecordShow"
@@ -522,7 +460,6 @@ import nextTick from "dai-js/tools/nextTick";
 import resiSearch from "../../components/resiSearch.vue";
 import resiForm from "../../components/resiForm.vue";
 import resiInfo from "../../components/resiInfo.vue";
-import editResi from "../../components/editResi.vue";
 import axios from "axios";
 import { mapGetters } from "vuex";
 import resiTransfer from "../../components/resiTransfer.vue";
@@ -541,7 +478,6 @@ export default {
     resiSearch,
     resiForm,
     resiInfo,
-    editResi,
     resiTransfer,
     resiChangeRecord,
     diyInfo,
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index a765fa335..58ac89ced 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -199,13 +199,25 @@
       :close-on-press-escape="false"
       title="居民详情"
       width="986px"
+      top="5vh"
+      class="m-dialog"
       @closed="showedResiInfo = false"
     >
-      <resi-info
-        ref="resi_info"
-        :resi-id="currentResiId"
-        @dialogCancle="showedResiInfo = false"
-      ></resi-info>
+      <div class="dialog-h-content scroll-h">
+        <resi-info
+          ref="resi_info"
+          :resi-id="currentResiId"
+          @dialogCancle="showedResiInfo = false"
+        ></resi-info>
+      </div>
+      <div class="resi-btns">
+        <el-button
+          size="small"
+          @click="showedResiInfo = false"
+          class="diy-button--common"
+          >关闭</el-button
+        >
+      </div>
     </el-dialog>
 
     <!-- 修改弹出框 -->
@@ -777,6 +789,28 @@ export default {
   border-radius: 2px;
 }
 
+.m-dialog {
+  .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 80px;
+      overflow: auto;
+    }
+  }
+
+  .resi-btns {
+    margin-top: 20px;
+    text-align: center;
+    text-align: right;
+    margin-right: 16px;
+  }
+}
+
 .m-search {
   box-sizing: border-box;
   padding: 40px 80px;

From a5560d03b28333a03ec31453093f3fc179ff2263 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 10 Jan 2023 17:11:29 +0800
Subject: [PATCH 5/7] bug

---
 src/views/components/resiForm.vue |  12 ++--
 src/views/modules/base/resi.vue   | 111 +++++++++++++++---------------
 2 files changed, 60 insertions(+), 63 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 0e22bf00c..50a88a3de 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -233,8 +233,7 @@
                                         <el-checkbox v-for="items in itemk.opction" 
                                                      :label="items.label != itemk.label ? items.label :''"  
                                                      :style="{'margin-right':items.label != itemk.label? '' :'19px'}"   
-                                                     :key="items.label"
-                                                     @change="val => handleChangeCheckbox1(val,items)"></el-checkbox>
+                                                     :key="items.label"></el-checkbox>
                                     </el-checkbox-group>
                                   </template>
                                   <template v-else-if="itemk.itemType == 'datepicker1'">
@@ -1205,7 +1204,7 @@ export default {
 
       })
       if(flag){
-        return this.newForm
+        return JSON.stringify(this.newForm)
       }
       return false
     },
@@ -1456,9 +1455,6 @@ export default {
     handleChangeCheckbox(e,val){
         this.handleTabShow(val,e)
     },
-    handleChangeCheckbox1(e,val){
-      console.log(this.form.hobbyInfoDto.hobbyCode)
-    },
     handleTabShow(val,e){
       if(e == 1){
       if(val.formName == 'partyFlag'){
@@ -1834,8 +1830,8 @@ export default {
         this.form.birthday = data.birthday
         this.form.gender = data.gender
         this.form.idNum = data.idNum
-        this.form.localResidenceFlag = data.localResidenceFlag.toString()
-        this.form.mobile = data.mobile
+        this.form.localResidenceFlag = data.localResidenceFlag ? 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 : ''
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 82f0c4ddd..b6215dbcc 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1161,66 +1161,67 @@ export default {
     },
 
     async handleSUbmit() {
-      const _baseForm = this.$refs.baseForm.submit_from();
-      if (!_baseForm) {
+      if (!this.$refs.baseForm.submit_from()) {
         return
       }
-      (_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.petitionOfficerFlag = parseInt(
-          _baseForm.petitionOfficerFlag
-        )), //信访人员
-        (_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)); //慢病
-        if (_baseForm.hobbyInfoDto) {
-          if ((_baseForm.hobbyInfoDto.hobbyCode = [])) {
-            _baseForm.hobbyInfoDto.hobbyCode = "";
-          } else {
-            _baseForm.hobbyInfoDto.hobbyCode.forEach((element) => {
-              _baseForm.hobbyInfoDto.hobbyCode =
-                _baseForm.hobbyInfoDto.hobbyCode ? _baseForm.hobbyInfoDto.hobbyCode + "," + element : _baseForm.hobbyInfoDto.hobbyCode;
-            });
-          }
+      const _baseForm = JSON.parse(this.$refs.baseForm.submit_from())
+      _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.petitionOfficerFlag = parseInt(_baseForm.petitionOfficerFlag) //信访人员
+      _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 = "";
+        } else {
+          _baseForm.hobbyInfoDto.hobbyCode.forEach((element,index) => {
+            hobbyCode = index === 0 ? element : hobbyCode + "," + element
+          });
+          _baseForm.hobbyInfoDto.hobbyCode = hobbyCode
         }
-        if (_baseForm.volunteerDto) {
-          if ((_baseForm.volunteerDto.volunteerCategory = [])) {
-            _baseForm.volunteerDto.volunteerCategory = "";
-          } else {
-            _baseForm.volunteerDto.volunteerCategory.forEach((element) => {
-              _baseForm.volunteerDto.volunteerCategory =
-                _baseForm.volunteerDto.volunteerCategory ? _baseForm.volunteerDto.volunteerCategory  + "," + element : _baseForm.volunteerDto.volunteerCategory;
-            });
-          }
+      }
+
+      var volunteerCategory = ''
+      if (_baseForm.volunteerDto) {
+        if (_baseForm.volunteerDto.volunteerCategory.length === 0) {
+          volunteerCategory = "";
+        } else {
+          _baseForm.volunteerDto.volunteerCategory.forEach((element,index) => {
+            volunteerCategory = index === 0 ? element : volunteerCategory + "," + element
+          });
+          _baseForm.volunteerDto.volunteerCategory = volunteerCategory
         }
-        if (_baseForm.specialDto) {
-          if ((_baseForm.specialDto.specialCategoryCode = [])) {
-            _baseForm.specialDto.specialCategoryCode = "";
-          } else {
-            _baseForm.specialDto.specialCategoryCode.forEach((element) => {
-              _baseForm.specialDto.specialCategoryCode =
-                _baseForm.specialDto.specialCategoryCode ? _baseForm.specialDto.specialCategoryCode + "," + element : _baseForm.specialDto.specialCategoryCode;
-            });
-          }
+      }
+
+      var specialCategoryCode = ''
+      if (_baseForm.specialDto) {
+        if (_baseForm.specialDto.specialCategoryCode.length === 0) {
+          specialCategoryCode = "";
+        } else {
+          _baseForm.specialDto.specialCategoryCode.forEach((element,index) => {
+            specialCategoryCode = index === 0 ? element : specialCategoryCode + "," + element
+          });
+          _baseForm.specialDto.specialCategoryCode = specialCategoryCode
         }
-        this.submitAdd(_baseForm);
+      }
+      this.submitAdd(_baseForm);
     },
     handleDel(row) {
       let params = {

From 3661f4e38491bcd5e0b81b4d39d4c96cf1c51c68 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Tue, 10 Jan 2023 17:35:48 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiForm.vue | 32 ++++++++++++++++++++++++++++++-
 src/views/modules/base/resi.vue   |  3 +++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 50a88a3de..f031fb5f4 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -1817,7 +1817,7 @@ export default {
       }
     },
     getFormData(data) {
-        this.form.categoryId = '111222333',// 临时写死
+        this.form.categoryId = data.categoryInfo.id,// 临时写死
         this.form.resiId = data.resiId
         this.form.buildId = data.houseInfo.buildId
         this.form.gridId = data.houseInfo.gridId
@@ -1915,6 +1915,7 @@ export default {
             cultureLevel:'',
             eduRemark:''
           }
+          this.newForm.eduInfoDto = this.form.eduInfoDto
         }
       })
     },
@@ -1924,11 +1925,15 @@ export default {
         if (res.code !== 0) {
           return this.$message.error(res.msg);
         } else {
+          if (res.data) {
+            res.data.hobbyCode = res.data.hobbyCode.split(',')
+          }
           this.form.hobbyInfoDto = res.data ? res.data : { //兴趣爱好
             hobbyCode:[],//兴趣特长
             interestDesc:'',//兴趣
             hobbyRemark:''//备注
           }
+          this.newForm.hobbyInfoDto = this.form.hobbyInfoDto
         }
       })
     },
@@ -1942,6 +1947,8 @@ export default {
               religion:'',
               religionRemark:''
             }
+
+            this.newForm.religionDto = this.form.religionDto
           }
         })
     },
@@ -1971,6 +1978,7 @@ export default {
               deliveranceNum:'',//享受救助明细序号
               healthRemark:''//备注
             }
+            this.newForm.healthDto = this.form.healthDto
           }
         })
     },
@@ -1986,6 +1994,8 @@ export default {
               retireTime:'',//离退休时间		
               workRemark:'',//备注		
             }
+
+            this.newForm.workInfoDto = this.form.workInfoDto
           }
         })
     },
@@ -1999,6 +2009,7 @@ export default {
               retirementAmount:'',//退休金额	
               monthIncome:'',//月收入
             }
+            this.newForm.economyDto = this.form.economyDto
           }
         })
     },
@@ -2015,6 +2026,7 @@ export default {
               householdSituation:'',//人户情况，字典code
               resiRemark:'',//备注
             }
+            this.newForm.resideInfoDto = this.form.resideInfoDto
           }
         })
     },
@@ -2034,6 +2046,7 @@ export default {
               dependantMobile:'',//赡养人联系电话			
               familyInfoRemark:'',//备注		
             }
+            this.newForm.familyInfoDto = this.form.familyInfoDto
           }
         })
     },
@@ -2056,6 +2069,7 @@ export default {
               joinCommunityTime:'',//组织关系转入社区时间yyyy-MM-dd
               longHolidayFlag:null,//是否请长假：1是，0否
             }
+            this.newForm.parymemberInfoDto = this.form.parymemberInfoDto
           }
         })
     },
@@ -2072,6 +2086,7 @@ export default {
               subsidyNum:'',//补贴编号	
               subsidyAmount:'',//补贴金额	
             }
+            this.newForm.ensureHouseDto = this.form.ensureHouseDto
           }
         })
     },
@@ -2091,6 +2106,7 @@ export default {
               employmentHardFlag:null,//是否就业困难对象；1是0不是	
               employmentWish:'',//劳动能力就业愿望	
             }
+            this.newForm.unemployedDto = this.form.unemployedDto
           }
         })
     },
@@ -2112,6 +2128,7 @@ export default {
               joinWarEndTime:'',//参战时间截止日期yyyy-MM-dd	
               pubWelfareJobFlag:null,//是否办理公益性岗位;1是0否
             }
+            this.newForm.veteranDto = this.form.veteranDto
           }
         })
     },
@@ -2125,6 +2142,7 @@ export default {
               duty:'',//职务
               visitation:'',//探亲情况	
             }
+            this.newForm.unitedFrontDto = this.form.unitedFrontDto
           }
         })
     },
@@ -2134,10 +2152,15 @@ export default {
           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
           }
         })
     },
@@ -2150,6 +2173,8 @@ export default {
             this.form.oldPeopleDto = res.data ? res.data : {
               oldSubsidy:''//高龄补助	
             }
+
+            this.newForm.oldPeopleDto = this.form.oldPeopleDto
           }
         })
     },
@@ -2159,9 +2184,14 @@ export default {
           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
           }
         })
     },
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index b6215dbcc..e20cabdf6 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1190,6 +1190,7 @@ export default {
       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
@@ -1202,6 +1203,7 @@ export default {
       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
@@ -1214,6 +1216,7 @@ export default {
       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

From e411c0888040bcdfc43139a941dd98cecf4efce8 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 10 Jan 2023 17:48:32 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=A33?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/home/index.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 10f2ccd75..ce01051e5 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -63,11 +63,13 @@
                 <span>社区简介</span>
               </div>
               <p>
-                {{ pandectData.communityName }}，归属{{
-                  pandectData.streetName
-                }}，划分为{{ pandectData.gridCount }}个网格，现有居民{{
-                  pandectData.homeCount
-                }}户、{{ pandectData.resiCount }}人，其中常住人口{{
+                {{ deptName }}，<span v-if="pandectData.gridCount"
+                  >划分为{{ pandectData.underCount }}个{{
+                    pandectData.underName
+                  }}，</span
+                >现有居民{{ pandectData.homeCount }}户、{{
+                  pandectData.resiCount
+                }}人，其中常住人口{{
                   pandectData.permanentResiCount
                 }}人，流动人口{{
                   pandectData.floatingResiCount