From a0c2b2ce9c85e0d3fbcd3efb0f982cde7cab10b4 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 10 May 2022 09:02:38 +0800
Subject: [PATCH 1/3] 1

---
 .../base/houseChange/houseChangeList.vue      | 570 ++++++++++++++++++
 1 file changed, 570 insertions(+)
 create mode 100644 src/views/modules/base/houseChange/houseChangeList.vue

diff --git a/src/views/modules/base/houseChange/houseChangeList.vue b/src/views/modules/base/houseChange/houseChangeList.vue
new file mode 100644
index 00000000..b37d403a
--- /dev/null
+++ b/src/views/modules/base/houseChange/houseChangeList.vue
@@ -0,0 +1,570 @@
+<template>
+  <div class="div_main">
+    <div class="div_search">
+      <el-form :inline="true"
+               :model="formData"
+               ref="ref_searchform"
+               :label-width="'90px'">
+        <div>
+
+          <el-form-item label="所属网格"
+                        prop="gridId">
+            <el-select class="item_width_1"
+                       v-model="formData.gridId"
+                       placeholder="全部"
+                       size="small"
+                       @change="handleChangeG"
+                       clearable>
+              <el-option v-for="item in gridList"
+                         :key="item.value"
+                         :label="item.label"
+                         :value="item.value">
+              </el-option>
+            </el-select>
+
+          </el-form-item>
+
+          <el-form-item label="所属房屋">
+            <div class="resi-cell-value">
+              <div class="resi-cell-col">
+                <el-form-item prop="villageId">
+                  <el-select v-model.trim="formData.villageId"
+                             :disabled="!this.formData.gridId"
+                             placeholder="小区"
+                             size="small"
+                             clearable
+                             class="resi-cell-select"
+                             @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">
+                  <el-select v-model.trim="formData.buildId"
+                             placeholder="楼号"
+                             :disabled="!this.formData.villageId"
+                             size="small"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             @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">
+                  <el-select v-model.trim="formData.unitId"
+                             placeholder="单元"
+                             size="small"
+                             :disabled="!this.formData.buildId"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1"
+                             @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">
+                  <el-select v-model.trim="formData.homeId"
+                             placeholder="房号"
+                             :disabled="!this.formData.unitId"
+                             size="small"
+                             clearable
+                             class="resi-cell-select resi-cell-select-middle list_item_width_1">
+                    <el-option v-for="item in optionsH"
+                               :key="item.value"
+                               :label="item.label"
+                               :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </div>
+
+            </div>
+          </el-form-item>
+
+        </div>
+
+        <div>
+          <el-form-item label="变更时间"
+                        prop="startTime">
+            <el-date-picker v-model="timeRange"
+                            size="small"
+                            type="daterange"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            @change="handleTimeChange"
+                            range-separator="至"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间">
+            </el-date-picker>
+
+          </el-form-item>
+          <el-button style="margin-left:30px"
+                     size="small"
+                     class="diy-button--search"
+                     @click="handleSearch">查询</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--reset"
+                     @click="resetSearch">重置</el-button>
+        </div>
+      </el-form>
+    </div>
+    <div class="div_table">
+
+      <el-table ref="ref_table"
+                class="table"
+                :data="tableData"
+                border
+                :height="tableHeight"
+                v-loading="tableLoading"
+                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                style="width: 100%">
+
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="50"></el-table-column>
+
+        <el-table-column prop="name"
+                         header-align="center"
+                         align="center"
+                         label="姓名"
+                         width="90">
+        </el-table-column>
+        <el-table-column prop="mobile"
+                         header-align="center"
+                         align="center"
+                         label="手机号"
+                         width="110">
+        </el-table-column>
+        <el-table-column prop="idCard"
+                         header-align="center"
+                         align="center"
+                         label="身份证"
+                         width="170">
+        </el-table-column>
+        <el-table-column prop="allName"
+                         header-align="center"
+                         align="center"
+                         label="所属房屋"
+                         min-width="200">
+        </el-table-column>
+        <el-table-column prop="reason"
+                         header-align="center"
+                         align="center"
+                         label="关注原因"
+                         width="180">
+        </el-table-column>
+        <el-table-column prop="remark"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="备注"
+                         min-width="180">
+        </el-table-column>
+        <el-table-column prop="lastInformTime"
+                         header-align="center"
+                         align="center"
+                         show-overflow-tooltip
+                         label="最后一次通知时间"
+                         width="170">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         width="140"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+
+            <el-button type="text"
+                       class="div-table-button--detail"
+                       size="small"
+                       @click="handleDetail(scope.row)">查看</el-button>
+            <el-button type="text"
+                       class="div-table-button--edit"
+                       size="small"
+                       @click="handleEdit(scope.row)">修改</el-button>
+
+            <el-popover popper-class="btn-popper"
+                        placement="bottom"
+                        style="margin-left:10px"
+                        width="20"
+                        trigger="hover">
+              <div class="table-more-btn">
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleNoticeList(scope.row)">通知记录</el-button>
+              </div>
+
+              <div class="table-more-btn">
+                <el-button type="text"
+                           class="div-table-button--detail--noline"
+                           size="small"
+                           @click="handleVisiteList(scope.row) ">随访记录</el-button>
+              </div>
+
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--more"
+                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
+            </el-popover>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
+      </div>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+
+
+
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      loading: false,
+      total: 0,
+      pageSize: 20,
+      pageNo: 1,
+      tableLoading: false,
+
+      // formData: {
+      //   attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
+      //   name: '',
+      //   mobile: '',
+      //   idCard: '',
+      //   remark: '',
+      //   reason: '',
+
+      // },
+      optionsV: [],
+      optionsB: [],
+      optionsH: [],
+      optionsD: [],
+
+
+      tableData: [],
+
+      agencyId: '',
+      gridList: [],//所属网格list--场所区域
+      timeRange: [],
+      formData: {
+        gridId: '',//所属网格【网格Id】
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        startTime: '',
+        endTime: '',
+      }
+
+
+    }
+  },
+  components: {
+
+  },
+  async created () {
+
+  },
+  activated () {
+    this.$refs['ref_table'].doLayout()
+  },
+  async mounted () {
+
+    const { user } = this.$store.state
+    this.agencyId = user.agencyId
+    //获取网格下拉框数据
+    await this.loadGrid()
+
+    await this.loadTable()
+  },
+
+  methods: {
+    handleSearch () {
+
+      this.loadTable()
+    },
+
+    async loadGrid () {
+      const url = "/gov/org/customergrid/gridoption"
+
+      let params = {
+        agencyId: this.agencyId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.gridList = data
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+
+    async loadTable () {
+      this.tableLoading = true
+
+      const url = "/epmetuser/icEpidemicSpecialAttention/list"
+      // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.total = data.total
+        this.tableData = data.list
+
+        this.analysisTableSelection()
+        this.tableData.forEach(item => {
+          if (!item.allName) {
+            item.allName = '--'
+          }
+          item.roomShow = ''
+          if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) {
+            item.roomShow = '--'
+          } else {
+            if (item.villageName) {
+              item.roomShow = item.roomShow + item.villageName
+            }
+            if (item.buildName) {
+              item.roomShow = item.roomShow + item.buildName
+            }
+            if (item.unitName) {
+              item.roomShow = item.roomShow + item.unitName
+            }
+            if (item.villageName) {
+              item.roomShow = item.roomShow + item.homeName
+            }
+          }
+
+
+        });
+      } else {
+        this.$message.error(msg)
+      }
+      this.tableLoading = false
+    },
+
+
+    handleChangeG (val) {
+      console.log('val', val)
+      this.formData.villageId = ''
+      this.formData.buildId = ''
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+      this.getValiheList()
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeV (val) {
+      console.log('val', val)
+      this.formData.buildId = ''
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+      this.getBuildList()
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeB (val) {
+      console.log('val', val)
+      this.formData.unitId = ''
+      this.formData.homeId = ''
+      this.getUniList()
+      this.getHouseList()
+    },
+    handleChangeD () {
+      this.formData.homeId = ''
+      this.getHouseList()
+    },
+
+    getValiheList () {
+      const { user } = this.$store.state
+      this.$http
+        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.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('网络错误')
+        })
+    },
+
+    getBuildList () {
+      this.$http
+        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsB = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getUniList () {
+      this.$http
+        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsD = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getHouseList () {
+      this.$http
+        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId })
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            this.optionsH = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+
+    handleTimeChange (time) {
+      if (time) {
+        const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
+        const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
+
+        this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
+        this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+
+        // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
+        // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
+      } else {
+        this.formData.startTime = ''
+        this.formData.endTime = ''
+        // this.startTimeShow = ''
+        // this.endTimeShow = ''
+      }
+
+    },
+
+
+
+
+    //重置搜索条件
+    resetSearch () {
+      this.timeRange = []
+      this.formData = {
+        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
+        name: '',
+        mobile: '',
+        idCard: '',
+        vaccinationCount: '',
+      }
+
+      this.pageNo = 1
+      // this.loadTable()
+    },
+
+
+    handleSizeChange (val) {
+      this.pageSize = val
+      this.pageNo = 1
+      this.loadTable()
+    },
+    handleCurrentChange (val) {
+      this.pageNo = val
+      this.loadTable()
+    },
+
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  computed: {
+    tableHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
+
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  watch: {
+
+  },
+  props: {
+
+  }
+}
+</script>
+
+<style lang="scss" scoped >
+@import "@/assets/scss/modules/management/epidemic.scss";
+</style>
+
+
+

From 57609aec88871ef4eed226993c60dacade32c701 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Tue, 10 May 2022 10:34:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/huji/chusheng/cpts/edit.vue  | 63 +++++++++----------
 .../modules/base/huji/chusheng/index.vue      | 13 ++--
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index 9471fecd..96c2ecdc 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -136,7 +136,7 @@
             >享受福利</el-checkbox
           >
           <el-checkbox
-            v-model="fmData.isResiUser"
+            v-model="fmData.isCheck"
             true-label="1"
             false-label="0"
             @change="checkResiAvailable"
@@ -292,7 +292,7 @@
 
         <el-form-item
           label="户主姓名"
-          prop="houseHolderName"
+          prop="householderName"
           label-width="150px"
           style="display: block"
         >
@@ -302,19 +302,19 @@
             show-word-limit
             placeholder="请输入户主姓名"
             :disabled="fmData.alreadyHaveMaster"
-            v-model="fmData.houseHolderName"
+            v-model="fmData.householderName"
           >
           </el-input>
         </el-form-item>
 
         <el-form-item
           label="与户主关系"
-          prop="houseHolderRelation"
+          prop="householderRelation"
           label-width="150px"
           style="display: block"
         >
           <el-select
-            v-model.trim="fmData.houseHolderRelation"
+            v-model.trim="fmData.householderRelation"
             placeholder="与户主关系"
             size="small"
             clearable
@@ -365,21 +365,17 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
 import { Loading } from "element-ui"; // 引入Loading服务
 import { requestPost } from "@/js/dai/request";
 import formVltHelper from "dai-js/tools/formVltHelper";
 import { computedCard } from "@/utils/index";
-import { isCard, isMobile } from "@/utils/validate";
+import { isCard } from "@/utils/validate";
 
-var map;
-var search;
-var markers;
-var infoWindowList;
 let loading; // 加载动画
 
 function iniFmData() {
   return {
+    id: "",
     gridId: "",
     villageId: "",
     buildId: "",
@@ -389,15 +385,15 @@ function iniFmData() {
     mobile: "",
     idCard: "",
     isWelfare: "0", //福利0否，1是
-    isResiUser: "0",
+    isCheck: "0",
     gender: "",
     birthplace: "",
     father: "",
     mother: "",
     count: "",
     reportDate: "",
-    houseHolderName: "",
-    houseHolderRelation: "",
+    householderName: "",
+    householderRelation: "",
     alreadyHaveMaster: false,
   };
 }
@@ -483,9 +479,9 @@ export default {
   methods: {
     async checkResiAvailable() {
       const {
-        fmData: { idCard, isResiUser },
+        fmData: { idCard, isCheck },
       } = this;
-      if (isResiUser == "1" && isCard(idCard)) {
+      if (isCheck == "1" && isCard(idCard)) {
         const { data, code, msg } = await requestPost(
           "/epmetuser/icresiuser/checkuser",
           {
@@ -680,7 +676,7 @@ export default {
             console.log("获取户主信息成功", res.data);
             const { name } = res.data;
             if (name) {
-              this.fmData.houseHolderName = name;
+              this.fmData.householderName = name;
               this.alreadyHaveMaster = true;
             } else {
               this.alreadyHaveMaster = false;
@@ -692,25 +688,28 @@ export default {
         });
     },
 
-    handleAddStaff() {
-      this.fmData.organizationPersonnel = [
-        ...this.fmData.organizationPersonnel,
-        { personName: "", personPhone: "" },
-      ];
-    },
-    handleDelStaff(index) {
-      const { organizationPersonnel } = this.fmData;
-      organizationPersonnel.splice(index, 1);
-      this.fmData.organizationPersonnel = organizationPersonnel;
-    },
-
     async initForm(type, row) {
       this.$refs.ref_form.resetFields();
 
       this.formType = type;
       console.log(row);
       if (row) {
-        this.fmData = { ...this.fmData, ...row };
+        // this.fmData = { ...this.fmData, ...row };
+        this.getInfo(row.id);
+      }
+    },
+
+    async getInfo(id) {
+      const { data, code, msg } = await requestPost(
+        "/epmetuser/icBirthRecord",
+        {
+          id,
+        }
+      );
+      if (code === 0) {
+        this.fmData = { ...this.fmData, ...data };
+      } else {
+        this.$message.error(msg);
       }
     },
 
@@ -738,9 +737,9 @@ export default {
     async submit() {
       let url = "";
       if (this.formType === "add") {
-        url = "/epmetuser/birth/save";
+        url = "/epmetuser/icBirthRecord/save";
       } else {
-        url = "/epmetuser/birth/edit";
+        url = "/epmetuser/icBirthRecord/update";
 
         this.fmData.orgId = this.orgId;
       }
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index aa54ff43..bdf9db96 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -159,7 +159,7 @@
 
         <el-form-item label="享受福利" prop="remark">
           <el-select
-            v-model.trim="fmData.welfare"
+            v-model.trim="fmData.isWelfare"
             placeholder="享受福利"
             size="small"
             clearable
@@ -303,11 +303,11 @@
         <el-table-column prop="reportDate" align="center" label="申报户口日期">
         </el-table-column>
 
-        <el-table-column prop="houseHolderName" align="center" label="户主姓名">
+        <el-table-column prop="householderName" align="center" label="户主姓名">
         </el-table-column>
 
         <el-table-column
-          prop="houseHolderRelation"
+          prop="householderRelation"
           align="center"
           label="与户主关系"
         >
@@ -435,7 +435,7 @@ export default {
         name: "",
         mobile: "",
         idCard: "",
-        welfare: "", //福利0否，1是
+        isWelfare: "", //福利0否，1是
         birthdayStart: "",
         birthdayEnd: "",
         birthdayTime: ["", ""],
@@ -764,8 +764,7 @@ export default {
     },
 
     async handleChu() {
-      const url =
-        "/heart/iccommunityselforganization/exportcommunityselforganization";
+      const url = "/epmetuser/icBirthRecord/export";
       const { pageSize, pageNo, fmData } = this;
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
@@ -834,7 +833,7 @@ export default {
     },
 
     async getTableData() {
-      const url = "/epmetuser/birth/page";
+      const url = "/epmetuser/icBirthRecord/page";
       const { pageSize, pageNo, fmData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,

From 32825910272f023a65431580c54b429e606b880f Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 10 May 2022 15:42:54 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../houseChange/houseChangeList.vue           | 211 ++++++------------
 1 file changed, 63 insertions(+), 148 deletions(-)
 rename src/views/modules/base/{ => huji}/houseChange/houseChangeList.vue (66%)

diff --git a/src/views/modules/base/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue
similarity index 66%
rename from src/views/modules/base/houseChange/houseChangeList.vue
rename to src/views/modules/base/huji/houseChange/houseChangeList.vue
index b37d403a..32ac7815 100644
--- a/src/views/modules/base/houseChange/houseChangeList.vue
+++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue
@@ -27,8 +27,8 @@
           <el-form-item label="所属房屋">
             <div class="resi-cell-value">
               <div class="resi-cell-col">
-                <el-form-item prop="villageId">
-                  <el-select v-model.trim="formData.villageId"
+                <el-form-item prop="neighborHoodId">
+                  <el-select v-model.trim="formData.neighborHoodId"
                              :disabled="!this.formData.gridId"
                              placeholder="小区"
                              size="small"
@@ -42,10 +42,10 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item prop="buildId">
-                  <el-select v-model.trim="formData.buildId"
+                <el-form-item prop="buildingId">
+                  <el-select v-model.trim="formData.buildingId"
                              placeholder="楼号"
-                             :disabled="!this.formData.villageId"
+                             :disabled="!this.formData.neighborHoodId"
                              size="small"
                              clearable
                              class="resi-cell-select resi-cell-select-middle list_item_width_1"
@@ -57,11 +57,11 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item prop="unitId">
-                  <el-select v-model.trim="formData.unitId"
+                <el-form-item prop="buildingUnitId">
+                  <el-select v-model.trim="formData.buildingUnitId"
                              placeholder="单元"
                              size="small"
-                             :disabled="!this.formData.buildId"
+                             :disabled="!this.formData.buildingId"
                              clearable
                              class="resi-cell-select resi-cell-select-middle list_item_width_1"
                              @change="handleChangeD">
@@ -72,10 +72,10 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item prop="homeId">
-                  <el-select v-model.trim="formData.homeId"
+                <el-form-item prop="houseId">
+                  <el-select v-model.trim="formData.houseId"
                              placeholder="房号"
-                             :disabled="!this.formData.unitId"
+                             :disabled="!this.formData.buildingUnitId"
                              size="small"
                              clearable
                              class="resi-cell-select resi-cell-select-middle list_item_width_1">
@@ -95,11 +95,11 @@
 
         <div>
           <el-form-item label="变更时间"
-                        prop="startTime">
+                        prop="startDate">
             <el-date-picker v-model="timeRange"
                             size="small"
                             type="daterange"
-                            value-format="yyyy-MM-dd HH:mm:ss"
+                            value-format="yyyy-MM-dd"
                             @change="handleTimeChange"
                             range-separator="至"
                             start-placeholder="开始时间"
@@ -135,95 +135,41 @@
                          type="index"
                          width="50"></el-table-column>
 
-        <el-table-column prop="name"
+        <el-table-column prop="gridName"
                          header-align="center"
                          align="center"
-                         label="姓名"
-                         width="90">
-        </el-table-column>
-        <el-table-column prop="mobile"
-                         header-align="center"
-                         align="center"
-                         label="手机号"
-                         width="110">
-        </el-table-column>
-        <el-table-column prop="idCard"
-                         header-align="center"
-                         align="center"
-                         label="身份证"
-                         width="170">
+                         show-overflow-tooltip
+                         label="所属网格"
+                         min-width="150">
         </el-table-column>
-        <el-table-column prop="allName"
+        <el-table-column prop="houseName"
                          header-align="center"
                          align="center"
+                         show-overflow-tooltip
                          label="所属房屋"
-                         min-width="200">
-        </el-table-column>
-        <el-table-column prop="reason"
-                         header-align="center"
-                         align="center"
-                         label="关注原因"
-                         width="180">
+                         min-width="150">
         </el-table-column>
-        <el-table-column prop="remark"
+        <el-table-column prop="changeBefore"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="备注"
-                         min-width="180">
+                         label="变更前"
+                         min-width="250">
         </el-table-column>
-        <el-table-column prop="lastInformTime"
+        <el-table-column prop="changeAfter"
                          header-align="center"
                          align="center"
                          show-overflow-tooltip
-                         label="最后一次通知时间"
-                         width="170">
+                         label="变更后"
+                         min-width="250">
         </el-table-column>
-
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="140"
+        <el-table-column prop="changeTime"
                          header-align="center"
                          align="center"
-                         class="operate">
-          <template slot-scope="scope">
-
-            <el-button type="text"
-                       class="div-table-button--detail"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <el-button type="text"
-                       class="div-table-button--edit"
-                       size="small"
-                       @click="handleEdit(scope.row)">修改</el-button>
-
-            <el-popover popper-class="btn-popper"
-                        placement="bottom"
-                        style="margin-left:10px"
-                        width="20"
-                        trigger="hover">
-              <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail--noline"
-                           size="small"
-                           @click="handleNoticeList(scope.row)">通知记录</el-button>
-              </div>
-
-              <div class="table-more-btn">
-                <el-button type="text"
-                           class="div-table-button--detail--noline"
-                           size="small"
-                           @click="handleVisiteList(scope.row) ">随访记录</el-button>
-              </div>
-
-              <el-button type="text"
-                         size="small"
-                         class="div-table-button--more"
-                         slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
-            </el-popover>
-
-          </template>
+                         label="变更时间"
+                         width="130">
         </el-table-column>
+
       </el-table>
       <div>
         <el-pagination @size-change="handleSizeChange"
@@ -244,7 +190,7 @@
 <script>
 
 
-
+import util from '@js/util.js';
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
@@ -259,15 +205,6 @@ export default {
       pageNo: 1,
       tableLoading: false,
 
-      // formData: {
-      //   attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
-      //   name: '',
-      //   mobile: '',
-      //   idCard: '',
-      //   remark: '',
-      //   reason: '',
-
-      // },
       optionsV: [],
       optionsB: [],
       optionsH: [],
@@ -281,12 +218,12 @@ export default {
       timeRange: [],
       formData: {
         gridId: '',//所属网格【网格Id】
-        villageId: '',
-        buildId: '',
-        unitId: '',
-        homeId: '',
-        startTime: '',
-        endTime: '',
+        neighborHoodId: '',//小区ID	
+        buildingId: '',//楼栋ID	
+        buildingUnitId: '',//楼栋单元ID	
+        houseId: '',//房屋ID	
+        startDate: '',//开始日期，eg：20220510	
+        endDate: '',//结束日期，eg：20220510	
       }
 
 
@@ -339,7 +276,7 @@ export default {
     async loadTable () {
       this.tableLoading = true
 
-      const url = "/epmetuser/icEpidemicSpecialAttention/list"
+      const url = "/gov/org/icHouseChangeRecord/list"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icEpidemicSpecialAttention/list"
       let params = {
         pageSize: this.pageSize,
@@ -353,31 +290,7 @@ export default {
         this.total = data.total
         this.tableData = data.list
 
-        this.analysisTableSelection()
-        this.tableData.forEach(item => {
-          if (!item.allName) {
-            item.allName = '--'
-          }
-          item.roomShow = ''
-          if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) {
-            item.roomShow = '--'
-          } else {
-            if (item.villageName) {
-              item.roomShow = item.roomShow + item.villageName
-            }
-            if (item.buildName) {
-              item.roomShow = item.roomShow + item.buildName
-            }
-            if (item.unitName) {
-              item.roomShow = item.roomShow + item.unitName
-            }
-            if (item.villageName) {
-              item.roomShow = item.roomShow + item.homeName
-            }
-          }
-
 
-        });
       } else {
         this.$message.error(msg)
       }
@@ -387,10 +300,10 @@ export default {
 
     handleChangeG (val) {
       console.log('val', val)
-      this.formData.villageId = ''
-      this.formData.buildId = ''
-      this.formData.unitId = ''
-      this.formData.homeId = ''
+      this.formData.neighborHoodId = ''
+      this.formData.buildingId = ''
+      this.formData.buildingUnitId = ''
+      this.formData.houseId = ''
       this.getValiheList()
       this.getBuildList()
       this.getUniList()
@@ -398,29 +311,29 @@ export default {
     },
     handleChangeV (val) {
       console.log('val', val)
-      this.formData.buildId = ''
-      this.formData.unitId = ''
-      this.formData.homeId = ''
+      this.formData.buildingId = ''
+      this.formData.buildingUnitId = ''
+      this.formData.houseId = ''
       this.getBuildList()
       this.getUniList()
       this.getHouseList()
     },
     handleChangeB (val) {
       console.log('val', val)
-      this.formData.unitId = ''
-      this.formData.homeId = ''
+      this.formData.buildingUnitId = ''
+      this.formData.houseId = ''
       this.getUniList()
       this.getHouseList()
     },
     handleChangeD () {
-      this.formData.homeId = ''
+      this.formData.houseId = ''
       this.getHouseList()
     },
 
     getValiheList () {
       const { user } = this.$store.state
       this.$http
-        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId, agencyId: user.agencyId })
+        .post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.gridId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -436,7 +349,7 @@ export default {
 
     getBuildList () {
       this.$http
-        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId })
+        .post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.neighborHoodId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -451,7 +364,7 @@ export default {
     },
     getUniList () {
       this.$http
-        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId })
+        .post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildingId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -466,7 +379,7 @@ export default {
     },
     getHouseList () {
       this.$http
-        .post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId })
+        .post('/gov/org/ichouse/houseoption', { buildingUnitId: this.formData.buildingUnitId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
@@ -485,14 +398,14 @@ export default {
         const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
         const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
 
-        this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
-        this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
+        this.formData.startDate = startTimeArray[0] + startTimeArray[1] + startTimeArray[2]
+        this.formData.endDate = endTimeArray[0] + endTimeArray[1] + endTimeArray[2]
 
         // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日'
         // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日'
       } else {
-        this.formData.startTime = ''
-        this.formData.endTime = ''
+        this.formData.startDate = ''
+        this.formData.endDate = ''
         // this.startTimeShow = ''
         // this.endTimeShow = ''
       }
@@ -506,11 +419,13 @@ export default {
     resetSearch () {
       this.timeRange = []
       this.formData = {
-        attentionType: 2,//关注类型，核酸检测：2，疫苗接种：1		
-        name: '',
-        mobile: '',
-        idCard: '',
-        vaccinationCount: '',
+        gridId: '',//所属网格【网格Id】
+        neighborHoodId: '',//小区ID	
+        buildingId: '',//楼栋ID	
+        buildingUnitId: '',//楼栋单元ID	
+        houseId: '',//房屋ID	
+        startDate: '',//开始日期，eg：20220510	
+        endDate: '',//结束日期，eg：20220510	
       }
 
       this.pageNo = 1