diff --git a/src/assets/images/index/house.png b/src/assets/images/index/house.png
new file mode 100644
index 000000000..9087667a3
Binary files /dev/null and b/src/assets/images/index/house.png differ
diff --git a/src/assets/images/index/i-more.png b/src/assets/images/index/i-more.png
new file mode 100644
index 000000000..30aa16ca8
Binary files /dev/null and b/src/assets/images/index/i-more.png differ
diff --git a/src/assets/images/index/nan.png b/src/assets/images/index/nan.png
new file mode 100644
index 000000000..25cab56eb
Binary files /dev/null and b/src/assets/images/index/nan.png differ
diff --git a/src/assets/images/index/nv.png b/src/assets/images/index/nv.png
new file mode 100644
index 000000000..7cbc554fa
Binary files /dev/null and b/src/assets/images/index/nv.png differ
diff --git a/src/assets/images/index/resi.png b/src/assets/images/index/resi.png
new file mode 100644
index 000000000..14d664f0b
Binary files /dev/null and b/src/assets/images/index/resi.png differ
diff --git a/src/assets/images/index/title-icon-jfjl.png b/src/assets/images/index/title-icon-jfjl.png
new file mode 100644
index 000000000..910ee6295
Binary files /dev/null and b/src/assets/images/index/title-icon-jfjl.png differ
diff --git a/src/assets/images/index/title-icon-jtgx.png b/src/assets/images/index/title-icon-jtgx.png
new file mode 100644
index 000000000..600bb0f5c
Binary files /dev/null and b/src/assets/images/index/title-icon-jtgx.png differ
diff --git a/src/assets/images/index/title-icon-xsfw.png b/src/assets/images/index/title-icon-xsfw.png
new file mode 100644
index 000000000..f14ee3179
Binary files /dev/null and b/src/assets/images/index/title-icon-xsfw.png differ
diff --git a/src/assets/images/index/title-icon-ywjl.png b/src/assets/images/index/title-icon-ywjl.png
new file mode 100644
index 000000000..d397e2875
Binary files /dev/null and b/src/assets/images/index/title-icon-ywjl.png differ
diff --git a/src/assets/scss/pages/huaxiang.scss b/src/assets/scss/pages/huaxiang.scss
new file mode 100644
index 000000000..ea06beea6
--- /dev/null
+++ b/src/assets/scss/pages/huaxiang.scss
@@ -0,0 +1,86 @@
+.g-main{
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    padding:25px 16px;
+    box-sizing: border-box;
+   .top{
+    display: flex;
+    height: calc(50vh - 104px);
+    .left{
+      width: 320px;
+      height: 100%;  
+      margin-right:16px;
+      overflow-y: scroll;
+    }
+    .right{
+        flex: 1;
+        overflow-y: scroll;
+
+    }
+   }
+   .bottom{
+    height: calc(50vh - 104px);
+    margin-top: 16px;
+    display: flex;
+        .left{
+            width: 320px;
+            height: 100%;  
+            margin-right:16px;
+            overflow-y: scroll;
+
+        }
+        .right{
+            flex: 1;
+            overflow-y: scroll;
+
+        }
+   }
+   
+}
+.card{
+    background-color: #fff; 
+    padding: 10px 16px 16px;
+    overflow: hidden;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    .title{
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #333333; 
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        img{
+            width: 24px;
+            height: 24px;
+        }
+    }
+    .bgC{
+        flex: 1;
+        background-color: #f5f7fa;
+        border-radius: 2px;
+        overflow-y: scroll;
+        display: flex;
+        flex-direction: column;
+        padding: 0 16px;
+        .item{
+            margin-top: 19px;
+            .value{
+                color: #333333;
+                font-family: PingFang SC;
+                font-weight: 400;
+            }
+        }
+    }
+}
+.gray{
+    color: #000000;
+    opacity: 0.65;
+}
+.bgf{
+    background-color: #fff ;
+    margin-top: 0 !important;
+}
\ No newline at end of file
diff --git a/src/js/store/index.js b/src/js/store/index.js
index b873782ca..cfd03b33e 100644
--- a/src/js/store/index.js
+++ b/src/js/store/index.js
@@ -5,6 +5,7 @@ import user from "./modules/user";
 import app from "./modules/app";
 import tagsView from "./modules/tagsView";
 import chooseArea from "./modules/chooseArea";
+import huaXiang from "./modules/huaXiang";
 import categoryStr from "./modules/categoryStr";
 import { requestPost } from "@/js/dai/request";
 import { dateFormats } from "@/utils/index";
@@ -49,6 +50,7 @@ export default new Vuex.Store({
     tagsView,
     categoryStr,
     chooseArea,
+    huaXiang
   },
   mutations: {
     // 重置vuex本地储存状态
diff --git a/src/js/store/modules/huaXiang.js b/src/js/store/modules/huaXiang.js
new file mode 100644
index 000000000..aa4cbc5e1
--- /dev/null
+++ b/src/js/store/modules/huaXiang.js
@@ -0,0 +1,20 @@
+
+const huaXiang ={
+  state: {
+    userInfo:null || JSON.parse(localStorage.getItem('huaX')) 
+  },
+  mutations: {
+    setData(state, payload) {
+      state.userInfo = payload;
+    }
+  },
+  actions: {
+    saveData({ commit }, payload) {
+        console.log(payload,'vueX接参');
+      commit('setData', payload);
+      localStorage.setItem('huaX', JSON.stringify(payload));
+    }
+  }
+};
+
+export default huaXiang;
diff --git a/src/router/index.js b/src/router/index.js
index 61058313f..6a1db845a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -108,6 +108,16 @@ export const moduleRoutes = {
         title: "社区查询",
       },
     },
+    {
+      path: "jumin-huaxiang",
+      props: true,
+      name: "jumin-huaxiang",
+      component: () => import("@/views/modules/jumin/huaxiang"),
+        meta: {
+          isTab: true,
+          title: "",
+        },
+      }
   ],
 };
 // pc端菜单的 如果没有配置 默认的 或者配置了默认的 但没有权限 默认选中第一
@@ -696,6 +706,10 @@ router.beforeEach((to, from, next) => {
   if (to.name === "caiji") {
     return next();
   }
+  if(to.name === 'jumin-huaxiang'){
+    to.meta.title = store.state.huaXiang.userInfo.name
+    return next();
+  }
   if (window.SITE_CONFIG["dynamicMenuRoutesHasAdded"] || fnCurrentRouteIsPageRoute(to, pageRoutes)) {
     return next();
   }
diff --git a/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue b/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue
index 96280f4d5..6e0503b79 100644
--- a/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue
+++ b/src/views/dataBoard/cpts/personnel/modules/MatterDetails.vue
@@ -1,3 +1,4 @@
+
 <template>
   <div class="matter-details">
     <div class="user-img">
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 89efb44f5..10164324a 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -1,267 +1,139 @@
 <template>
-  <div>
-    <div class="dialog-h-content scroll-h">
-      <el-form ref="ref_form"
-               :inline="true"
-               :model="fmData"
-               :rules="dataRule"
-               label-width="150px"
-               class="g-edit-form">
-        <el-form-item label="所属网格	"
-                      prop="gridId"
-                      style="display: block">
-          <el-select v-model.trim="fmData.gridId"
-                     placeholder="请选择"
-                     size="small"
-                     clearable
-                     class="u-edit-width-normal"
-                     :disabled="formType === 'edit'"
-                     @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="所属房屋	"
-                      prop="homeId"
-                      style="display: block">
-
-          <div>
-            <el-select v-model.trim="fmData.villageId"
-                       placeholder="请选择小区"
-                       size="small"
-                       clearable
-                       class="u-edit-width-normal"
-                       @clear="handleClearVillage"
-                       @change="handleChangeV"
-                       :disabled="formType === 'edit'">
-              <el-option v-for="item in optionsV"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-          <div>
-            <el-select v-model.trim="fmData.buildId"
-                       placeholder="楼号"
-                       size="small"
-                       clearable
-                       class="u-edit-width-build"
-                       :disabled="changeVDisabled || formType === 'edit'"
-                       @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="fmData.unitId"
-                       :disabled="changeBDisabled || formType === 'edit'"
-                       placeholder="单元"
-                       size="small"
-                       clearable
-                       style="margin-left: 10px;"
-                       class="u-edit-width-build"
-                       @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="fmData.homeId"
-                       :disabled="changeDDisabled || formType === 'edit'"
-                       placeholder="房号"
-                       size="small"
-                       clearable
-                       @change="handleChangeH"
-                       style="margin-left: 10px;"
-                       class="u-edit-width-build">
-              <el-option v-for="item in optionsH"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-
-        </el-form-item>
-
-        <el-form-item label="姓名"
-                      prop="name"
-                      style="display: block">
-          <el-input class="u-edit-width-normal"
-                    style="margin-right: 20px"
-                    placeholder="请输入姓名	"
-                    v-model="fmData.name"
-                    :disabled="formType === 'edit'"
-                    maxlength="30">
-          </el-input>
-          <div>
-            <!-- <el-checkbox v-model="fmData.isWelfare"
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :model="fmData" :rules="dataRule" label-width="150px"
+                class="g-edit-form">
+                <el-form-item label="所属网格	" prop="gridId" style="display: block">
+                    <el-select v-model.trim="fmData.gridId" placeholder="请选择" size="small" clearable
+                        class="u-edit-width-normal" :disabled="formType === 'edit'" @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="所属房屋	" prop="homeId" style="display: block">
+
+                    <div>
+                        <el-select v-model.trim="fmData.villageId" placeholder="请选择小区" size="small" clearable
+                            class="u-edit-width-normal" @clear="handleClearVillage" @change="handleChangeV"
+                            :disabled="formType === 'edit'">
+                            <el-option v-for="item in optionsV" :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+                    <div>
+                        <el-select v-model.trim="fmData.buildId" placeholder="楼号" size="small" clearable
+                            class="u-edit-width-build" :disabled="changeVDisabled || formType === 'edit'"
+                            @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="fmData.unitId" :disabled="changeBDisabled || formType === 'edit'"
+                            placeholder="单元" size="small" clearable style="margin-left: 10px;" class="u-edit-width-build"
+                            @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="fmData.homeId" :disabled="changeDDisabled || formType === 'edit'"
+                            placeholder="房号" size="small" clearable @change="handleChangeH" style="margin-left: 10px;"
+                            class="u-edit-width-build">
+                            <el-option v-for="item in optionsH" :key="item.value" :label="item.label" :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </div>
+
+                </el-form-item>
+
+                <el-form-item label="姓名" prop="name" style="display: block">
+                    <el-input class="u-edit-width-normal" style="margin-right: 20px" placeholder="请输入姓名	"
+                        v-model="fmData.name" :disabled="formType === 'edit'" maxlength="30">
+                    </el-input>
+                    <div>
+                        <!-- <el-checkbox v-model="fmData.isWelfare"
                          true-label="1"
                          false-label="0">享受福利</el-checkbox> -->
 
-            <template v-if="formType === 'edit'">
-              <el-checkbox v-model="fmData.isCheck"
-                           true-label="1"
-                           false-label="0"
-                           :disabled="initCheck == 1"
-                           @change="checkResiAvailable">补充居民信息</el-checkbox>
-            </template>
-
-            <el-checkbox v-else
-                         v-model="fmData.isCheck"
-                         true-label="1"
-                         false-label="0"
-                         @change="checkResiAvailable">补充居民信息</el-checkbox>
-          </div>
-        </el-form-item>
-
-        <el-form-item label="联系电话"
-                      prop="mobile"
-                      style="display: block">
-          <el-input class="u-edit-width-normal"
-                    type="number"
-                    maxlength="11"
-                    show-word-limit
-                    placeholder="请输入联系电话	"
-                    :disabled="formType === 'edit'"
-                    v-model="fmData.mobile">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="证件号"
-                      prop="idCard"
-                      style="display: block">
-          <el-input class="u-edit-width-normal"
-                    placeholder="请输入证件号或护照号"
-                    v-model="fmData.idCard"
-                    :disabled="formType === 'edit'"
-                    @blur="handleBlurId"></el-input>
-        </el-form-item>
-
-        <el-form-item label="性别"
-                      prop="principalName"
-                      style="display: block">
-          <el-select v-model.trim="fmData.gender"
-                     placeholder="性别"
-                     size="small"
-                     clearable
-                     class="u-edit-width-normal"
-                     :disabled="true">
-            <el-option v-for="item in optionsGender"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="年龄"
-                      prop="age"
-                      style="display: block">
-          <el-input class="u-edit-width-normal"
-                    type="number"
-                    show-word-limit
-                    placeholder="请输入"
-                    v-model="fmData.age"
-                    :disabled="true">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="迁入日期"
-                      prop="inTime"
-                      style="display: block">
-          <el-date-picker v-model="fmData.inTime"
-                          type="date"
-                          placeholder="迁入时间"
-                          value-format="yyyy-MM-dd"
-                          class="u-edit-width-normal"
-                          :disabled="formType === 'edit'">
-          </el-date-picker>
-        </el-form-item>
-
-        <el-form-item label="迁入原因"
-                      prop="inReason"
-                      style="display: block">
-          <el-input type="textarea"
-                    class="u-edit-width-normal"
-                    placeholder="请输入迁入原因"
-                    v-model="fmData.inReason">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="来源地"
-                      prop="sourceAddress"
-                      style="display: block">
-
-          <el-cascader ref="nowArea"
-                       class="u-edit-width-normal"
-                       :props="areaProps"
-                       v-model="nowAllCode"
-                       clearable
-                       @change="handleNowArea"></el-cascader>
-
-        </el-form-item>
-        <el-form-item label="详细地址"
-                      prop="address"
-                      style="display: block">
-          <el-input class="u-edit-width-normal"
-                    placeholder="请输入详细地址"
-                    v-model="fmData.address">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="迁移证号码"
-                      prop="moveNumber"
-                      style="display: block">
-          <el-input class="u-edit-width-normal"
-                    placeholder="请输入迁移证号码"
-                    v-model="fmData.moveNumber">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="户主姓名"
-                      prop="householderName"
-                      style="display: block">
-          <el-input class="u-edit-width-normal"
-                    placeholder="请输入户主姓名"
-                    v-model="fmData.householderName">
-          </el-input>
-        </el-form-item>
-
-        <el-form-item label="与户主关系"
-                      prop="householderRelation"
-                      style="display: block">
-          <el-select v-model.trim="fmData.householderRelation"
-                     placeholder="与户主关系"
-                     size="small"
-                     clearable
-                     class="u-edit-width-normal">
-            <el-option v-for="item in optionsRelation"
-                       :key="item.value"
-                       :label="item.label"
-                       :value="item.value">
-            </el-option>
-          </el-select>
-        </el-form-item>
-      </el-form>
-    </div>
-    <div class="m-edit-btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button type="primary"
-                 size="small"
-                 class="diy-button--blue"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">保 存</el-button>
+                        <template v-if="formType === 'edit'">
+                            <el-checkbox v-model="fmData.isCheck" true-label="1" false-label="0" :disabled="initCheck == 1"
+                                @change="checkResiAvailable">补充居民信息</el-checkbox>
+                        </template>
+
+                        <el-checkbox v-else v-model="fmData.isCheck" true-label="1" false-label="0"
+                            @change="checkResiAvailable">补充居民信息</el-checkbox>
+                    </div>
+                </el-form-item>
+
+                <el-form-item label="联系电话" prop="mobile" style="display: block">
+                    <el-input class="u-edit-width-normal" type="number" maxlength="11" show-word-limit
+                        placeholder="请输入联系电话	" :disabled="formType === 'edit'" v-model="fmData.mobile">
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="证件号" prop="idCard" style="display: block">
+                    <el-input class="u-edit-width-normal" placeholder="请输入证件号或护照号" v-model="fmData.idCard"
+                        :disabled="formType === 'edit'" @blur="handleBlurId"></el-input>
+                </el-form-item>
+
+                <el-form-item label="性别" prop="principalName" style="display: block">
+                    <el-select v-model.trim="fmData.gender" placeholder="性别" size="small" clearable
+                        class="u-edit-width-normal" :disabled="true">
+                        <el-option v-for="item in optionsGender" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="年龄" prop="age" style="display: block">
+                    <el-input class="u-edit-width-normal" type="number" show-word-limit placeholder="请输入"
+                        v-model="fmData.age" :disabled="true">
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="迁入日期" prop="inTime" style="display: block">
+                    <el-date-picker v-model="fmData.inTime" type="date" placeholder="迁入时间" value-format="yyyy-MM-dd"
+                        class="u-edit-width-normal" :disabled="formType === 'edit'">
+                    </el-date-picker>
+                </el-form-item>
+
+                <el-form-item label="迁入原因" prop="inReason" style="display: block">
+                    <el-input type="textarea" class="u-edit-width-normal" placeholder="请输入迁入原因" v-model="fmData.inReason">
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="来源地" prop="sourceAddress" style="display: block">
+
+                    <el-cascader ref="nowArea" class="u-edit-width-normal" :props="areaProps" v-model="nowAllCode" clearable
+                        @change="handleNowArea"></el-cascader>
+
+                </el-form-item>
+                <el-form-item label="详细地址" prop="address" style="display: block">
+                    <el-input class="u-edit-width-normal" placeholder="请输入详细地址" v-model="fmData.address">
+                    </el-input>
+                </el-form-item>
+                <el-form-item label="迁移证号码" prop="moveNumber" style="display: block">
+                    <el-input class="u-edit-width-normal" placeholder="请输入迁移证号码" v-model="fmData.moveNumber">
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="户主姓名" prop="householderName" style="display: block">
+                    <el-input class="u-edit-width-normal" placeholder="请输入户主姓名" v-model="fmData.householderName">
+                    </el-input>
+                </el-form-item>
+
+                <el-form-item label="与户主关系" prop="householderRelation" style="display: block">
+                    <el-select v-model.trim="fmData.householderRelation" placeholder="与户主关系" size="small" clearable
+                        class="u-edit-width-normal">
+                        <el-option v-for="item in optionsRelation" :key="item.value" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div class="m-edit-btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button type="primary" size="small" class="diy-button--blue" :disabled="btnDisable" @click="handleComfirm">保
+                存</el-button>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
@@ -270,508 +142,509 @@ import formVltHelper from 'dai-js/tools/formVltHelper'
 import { computedCard } from '@/utils/index'
 import { isCard, isMobile } from '@/utils/validate'
 
-function iniFmData () {
-  return {
-    gridId: '',
-    villageId: '',
-    buildId: '',
-    unitId: '',
-    homeId: '',
-    name: '',
-    mobile: '',
-    idCard: '',
-    isWelfare: '0', //福利0否，1是
-    isCheck: '0',
-    gender: '',
-    age: '',
-    inTime: '',
-    inReason: '',
-    sourceAddress: '',
-    address: '',
-    sourceAddressPathCode: '',
-    sourceAddressCode: '',
-    householderName: '',
-    moveNumber: '',
-    householderRelation: '',
-    alreadyHaveMaster: false,
-    isReplace: '0'
-  }
+function iniFmData() {
+    return {
+        gridId: '',
+        villageId: '',
+        buildId: '',
+        unitId: '',
+        homeId: '',
+        name: '',
+        mobile: '',
+        idCard: '',
+        isWelfare: '0', //福利0否，1是
+        isCheck: '0',
+        gender: '',
+        age: '',
+        inTime: '',
+        inReason: '',
+        sourceAddress: '',
+        address: '',
+        sourceAddressPathCode: '',
+        sourceAddressCode: '',
+        householderName: '',
+        moveNumber: '',
+        householderRelation: '',
+        alreadyHaveMaster: false,
+        isReplace: '0'
+    }
 }
 
 export default {
-  data () {
-    return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-
-      btnDisable: false,
-
-      optionsV: [],
-      optionsB: [],
-      optionsH: [],
-      optionsD: [],
-      optionsG: [],
-      nowAllCode: [],
-      optionsGender: [
-        {
-          value: '1',
-          label: '男'
-        },
-        {
-          value: '2',
-          label: '女'
-        }
-      ],
-      optionsRelation: [],
-
-      fmData: iniFmData(),
-      areaProps: {
-        // checkStrictly: true,
-        lazy: true,
-        lazyLoad: this.lzayLoadArea
-      },
-      userInfo: {},
-      initCheck: null
-    }
-  },
-  components: {},
-  computed: {
-    dataRule () {
-      let checkIdCard = (rule, value, callback) => {
-        if (value === '') {
-          callback(new Error('请输入证件号'))
-        } else {
-          if (!isCard(value)) {
-            callback(new Error('请输入正确的证件号或护照号'))
-          }
-          callback()
+    data() {
+        return {
+            formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+
+            btnDisable: false,
+
+            optionsV: [],
+            optionsB: [],
+            optionsH: [],
+            optionsD: [],
+            optionsG: [],
+            nowAllCode: [],
+            optionsGender: [
+                {
+                    value: '1',
+                    label: '男'
+                },
+                {
+                    value: '2',
+                    label: '女'
+                }
+            ],
+            optionsRelation: [],
+
+            fmData: iniFmData(),
+            areaProps: {
+                // checkStrictly: true,
+                lazy: true,
+                lazyLoad: this.lzayLoadArea
+            },
+            userInfo: {},
+            initCheck: null
         }
-      }
-
-      return {
-        gridId: [
-          { required: true, message: '所属网格不能为空', trigger: 'blur' }
-        ],
-        homeId: [
-          { required: true, message: '所属房屋不能为空', trigger: 'blur' }
-        ],
-        name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
-        idCard: [
-          { required: true, message: '证件号不能为空', trigger: 'blur' },
-          { required: true, validator: checkIdCard, trigger: 'blur' }
-        ],
-        inTime: [
-          { required: true, message: '迁入时间不能为空', trigger: 'blur' }
-        ],
-        inReason: [
-          { required: true, message: '迁入原因不能为空', trigger: 'blur' }
-        ],
-        sourceAddress: [
-          { required: true, message: '来源地不能为空', trigger: 'blur' }
-        ],
-        // address: [
-        //   { required: true, message: '详细地址不能为空', trigger: 'blur' }
-        // ]
-      }
     },
+    components: {},
+    computed: {
+        dataRule() {
+            let checkIdCard = (rule, value, callback) => {
+                if (value === '') {
+                    callback(new Error('请输入证件号'))
+                } else {
+                    if (!isCard(value)) {
+                        callback(new Error('请输入正确的证件号或护照号'))
+                    }
+                    callback()
+                }
+            }
 
-    changeVDisabled () {
-      return !this.fmData.villageId
-    },
-    changeBDisabled () {
-      return !this.fmData.buildId
-    },
-    changeDDisabled () {
-      return !this.fmData.unitId
-    }
-  },
-  props: {},
-  watch: {},
-
-  async mounted () {
-    console.log('mounted-----我执行了')
-    await this.getGridList()
-
-    this.getRelationList()
-  },
-
-  methods: {
-    lzayLoadArea (node, resolve) {
-      // this.getArea(node, resolve)
-      setTimeout(() => {
-        this.getArea(node, resolve)
-      }, 200)
-    },
-    async checkResiAvailable () {
-      const {
-        fmData: { idCard, isResiUser }
-      } = this
-      if (isCard(idCard)) {
-        const { data, code, msg } = await requestPost(
-          '/epmetuser/icresiuser/checkuser',
-          {
-            idCard,
-            agencyId: this.$store.state.user.agencyId
-          }
-        )
-        if (code === 0) {
-          if (!data.moveInstatus) {
-            this.$message({
-              type: 'error',
-              message: `请联系${data.resiAgencyName}迁出该居民后操作`
-            })
-            this.btnDisable = true
-          } else this.btnDisable = false
-          this.userInfo = { ...data }
-        } else {
-          this.$message.error(msg)
+            return {
+                gridId: [
+                    { required: true, message: '所属网格不能为空', trigger: 'blur' }
+                ],
+                homeId: [
+                    { required: true, message: '所属房屋不能为空', trigger: 'blur' }
+                ],
+                name: [{ required: true, message: '姓名不能为空', trigger: 'blur' }],
+                idCard: [
+                    { required: true, message: '证件号不能为空', trigger: 'blur' },
+                    { required: true, validator: checkIdCard, trigger: 'blur' }
+                ],
+                inTime: [
+                    { required: true, message: '迁入时间不能为空', trigger: 'blur' }
+                ],
+                inReason: [
+                    { required: true, message: '迁入原因不能为空', trigger: 'blur' }
+                ],
+                sourceAddress: [
+                    { required: true, message: '来源地不能为空', trigger: 'blur' }
+                ],
+                // address: [
+                //   { required: true, message: '详细地址不能为空', trigger: 'blur' }
+                // ]
+            }
+        },
+
+        changeVDisabled() {
+            return !this.fmData.villageId
+        },
+        changeBDisabled() {
+            return !this.fmData.buildId
+        },
+        changeDDisabled() {
+            return !this.fmData.unitId
         }
-      }
-    },
-    handleNowArea (val) {
-      console.log('val-----', val)
-      console.log('label-----', this.$refs.nowArea.getCheckedNodes())
-      if (val.length > 0) {
-        const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
-        this.fmData.sourceAddressCode = val[val.length - 1]
-        this.fmData.sourceAddress = labels.join('-')
-        this.fmData.sourceAddressPathCode = val.join(',')
-        console.log('sourceAddress', this.fmData.sourceAddressPathCode)
-        this.$refs.ref_form.clearValidate('sourceAddress')
-      } else {
-        this.fmData.sourceAddressCode = ''
-        this.fmData.sourceAddress = ''
-        this.fmData.sourceAddressPathCode = ''
-      }
-    },
-    handleBlurId (val) {
-      const { sex, age } = computedCard(this.fmData.idCard)
-      if (val) {
-        this.fmData.age = age
-        this.fmData.gender = sex == 1 ? '1' : '2'
-        this.checkResiAvailable()
-      }
     },
+    props: {},
+    watch: {},
 
-    handleClearVillage () {
-      this.fmData.buildId = ''
-      this.fmData.homeId = ''
-    },
-    handleClearBuild () {
-      this.fmData.buildId = ''
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-    },
-    handleClearDan () {
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-    },
-    handleChangeGrid (val) {
-      console.log('val', val)
-      this.fmData.villageId = ''
-      this.fmData.buildId = ''
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-      this.fmData.householderName = ''
-      this.fmData.householderRelation = ''
-      this.getValiheList()
-    },
-    handleChangeV (val) {
-      console.log('val', val)
-      this.fmData.buildId = ''
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-      this.fmData.householderName = ''
-      this.fmData.householderRelation = ''
-      this.getBuildList()
-    },
-    handleChangeB (val) {
-      console.log('val', val)
-      this.fmData.unitId = ''
-      this.fmData.homeId = ''
-      this.fmData.householderName = ''
-      this.fmData.householderRelation = ''
-      this.getUniList()
-    },
-    handleChangeD (val) {
-      console.log('val', val)
-      this.fmData.homeId = ''
-      this.fmData.householderName = ''
-      this.fmData.householderRelation = ''
-      this.getHouseList()
-    },
-    handleChangeH (val) {
-      console.log('val', val)
-      this.getHouseMaster()
-    },
-    async getArea (node, resolve) {
-
-      const url = "/commonservice/areacode/nextarea"
-      let params = {
-        parentLevel: node.data ? node.data.level : '',
-        parentAreaCode: node.data ? node.data.code : ''
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        const nodes = data.map(item => ({
-          value: item.areaCode, //
-          label: item.areaName,
-          code: item.areaCode,
-          level: item.level,
-          leaf: node.level >= 4 // 5层级
-        }))
-        resolve(nodes)
-
-      } else {
-        this.$message.error(msg)
-      }
+    async mounted() {
+        console.log('mounted-----我执行了')
+        await this.getGridList()
 
-    },
-    getRelationList () {
-      const { user } = this.$store.state
-      this.$http
-        .post('/sys/dict/data/relationship', {
-          formCode: 'resi_base_info'
-        })
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            this.optionsRelation = res.data
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
+        this.getRelationList()
     },
 
-    getGridList () {
-      const { user } = this.$store.state
-      this.$http
-        .post('/gov/org/customergrid/gridoption', {
-          agencyId: user.agencyId,
-          purpose: 'query'
-        })
-        .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('/actual/base/communityQuarters/listQuartersOptions', {
-          gridId: this.fmData.gridId,
-          agencyId: ''
-          // 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('/actual/base/communityBuilding/buildingoption', {
-          quartersId: this.fmData.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('/actual/base/communityBuildingUnit/unitoption', {
-          buildingId: this.fmData.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('/actual/base/communityHouse/houseoption', { unitId: this.fmData.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('网络错误')
-        })
-    },
+    methods: {
+        lzayLoadArea(node, resolve) {
+            // this.getArea(node, resolve)
+            setTimeout(() => {
+                this.getArea(node, resolve)
+            }, 200)
+        },
+        async checkResiAvailable() {
+            const {
+                fmData: { idCard, isResiUser }
+            } = this
+            if (isCard(idCard)) {
+                const { data, code, msg } = await requestPost(
+                    '/actual/base/residentBaseInfo/getresicount',
+                    {
+                        idNum: idCard,
+                        agencyId: this.$store.state.user.agencyId
+                    }
+                )
+                if (code === 0) {
+                    if (!data.moveInstatus) {
+                        this.$message({
+                            type: 'error',
+                            message: `请联系${data.resiAgencyName}迁出该居民后操作`
+                        })
+                        this.btnDisable = true
+                    } else this.btnDisable = false
+                    this.userInfo = { ...data }
+                } else {
+                    this.$message.error(msg)
+                }
+            }
+        },
+        handleNowArea(val) {
+            console.log('val-----', val)
+            console.log('label-----', this.$refs.nowArea.getCheckedNodes())
+            if (val.length > 0) {
+                const labels = this.$refs.nowArea.getCheckedNodes()[0].pathLabels
+                this.fmData.sourceAddressCode = val[val.length - 1]
+                this.fmData.sourceAddress = labels.join('-')
+                this.fmData.sourceAddressPathCode = val.join(',')
+                console.log('sourceAddress', this.fmData.sourceAddressPathCode)
+                this.$refs.ref_form.clearValidate('sourceAddress')
+            } else {
+                this.fmData.sourceAddressCode = ''
+                this.fmData.sourceAddress = ''
+                this.fmData.sourceAddressPathCode = ''
+            }
+        },
+        handleBlurId(val) {
+            const { sex, age } = computedCard(this.fmData.idCard)
+            if (val) {
+                this.fmData.age = age
+                this.fmData.gender = sex == 1 ? '1' : '2'
+                this.checkResiAvailable()
+            }
+        },
+
+        handleClearVillage() {
+            this.fmData.buildId = ''
+            this.fmData.homeId = ''
+        },
+        handleClearBuild() {
+            this.fmData.buildId = ''
+            this.fmData.unitId = ''
+            this.fmData.homeId = ''
+        },
+        handleClearDan() {
+            this.fmData.unitId = ''
+            this.fmData.homeId = ''
+        },
+        handleChangeGrid(val) {
+            console.log('val', val)
+            this.fmData.villageId = ''
+            this.fmData.buildId = ''
+            this.fmData.unitId = ''
+            this.fmData.homeId = ''
+            this.fmData.householderName = ''
+            this.fmData.householderRelation = ''
+            this.getValiheList()
+        },
+        handleChangeV(val) {
+            console.log('val', val)
+            this.fmData.buildId = ''
+            this.fmData.unitId = ''
+            this.fmData.homeId = ''
+            this.fmData.householderName = ''
+            this.fmData.householderRelation = ''
+            this.getBuildList()
+        },
+        handleChangeB(val) {
+            console.log('val', val)
+            this.fmData.unitId = ''
+            this.fmData.homeId = ''
+            this.fmData.householderName = ''
+            this.fmData.householderRelation = ''
+            this.getUniList()
+        },
+        handleChangeD(val) {
+            console.log('val', val)
+            this.fmData.homeId = ''
+            this.fmData.householderName = ''
+            this.fmData.householderRelation = ''
+            this.getHouseList()
+        },
+        handleChangeH(val) {
+            console.log('val', val)
+            this.getHouseMaster()
+        },
+        async getArea(node, resolve) {
+
+            const url = "/commonservice/areacode/nextarea"
+            let params = {
+                parentLevel: node.data ? node.data.level : '',
+                parentAreaCode: node.data ? node.data.code : ''
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                const nodes = data.map(item => ({
+                    value: item.areaCode, //
+                    label: item.areaName,
+                    code: item.areaCode,
+                    level: item.level,
+                    leaf: node.level >= 4 // 5层级
+                }))
+                resolve(nodes)
 
-    getHouseMaster () {
-      const { homeId } = this.fmData
-      if (!homeId) return (this.alreadyHaveMaster = false)
-
-      this.$http
-        .post('/epmetuser/icresiuser/queryhousehold/' + homeId, {})
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取户主信息成功', res.data)
-
-            if (res.data) {
-              const { name } = res.data
-              this.fmData.householderName = name
-              this.alreadyHaveMaster = true
             } else {
-              this.alreadyHaveMaster = false
+                this.$message.error(msg)
             }
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
 
-    async initForm (type, id) {
-      this.$refs.ref_form.resetFields()
+        },
+        getRelationList() {
+            const { user } = this.$store.state
+            this.$http
+                .post('/sys/dict/data/relationship', {
+                    formCode: 'resi_base_info'
+                })
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取查询详情成功', res.data)
+                        this.optionsRelation = res.data
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
+
+        getGridList() {
+            const { user } = this.$store.state
+            this.$http
+                .post('/gov/org/customergrid/gridoption', {
+                    agencyId: user.agencyId,
+                    purpose: 'query'
+                })
+                .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('/actual/base/communityQuarters/listQuartersOptions', {
+                    gridId: this.fmData.gridId,
+                    agencyId: ''
+                    // 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('/actual/base/communityBuilding/buildingoption', {
+                    quartersId: this.fmData.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('/actual/base/communityBuildingUnit/unitoption', {
+                    buildingId: this.fmData.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('/actual/base/communityHouse/houseoption', { unitId: this.fmData.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('网络错误')
+                })
+        },
 
-      this.formType = type
+        //咨询了文蕾，这个位置好像不需要查询居民
+        getHouseMaster() {
+            const { homeId } = this.fmData
+            if (!homeId) return (this.alreadyHaveMaster = false)
+            const params = this.fmData
+            this.$http
+                .post('/actual/base/residentBaseInfo/getResiUserInfoListByHouseInfo' , params)
+                .then(({ data: res }) => {
+                    if (res.code !== 0) {
+                        return this.$message.error(res.msg)
+                    } else {
+                        console.log('获取户主信息成功', res.data)
+
+                        if (res.data) {
+                            const { name } = res.data
+                            this.fmData.householderName = name
+                            this.alreadyHaveMaster = true
+                        } else {
+                            this.alreadyHaveMaster = false
+                        }
+                    }
+                })
+                .catch(() => {
+                    return this.$message.error('网络错误')
+                })
+        },
 
-      if (id) {
-        await this.getDatail(id)
-      }
-      if (this.formType != 'add') {
-        this.getValiheList()
-        this.getBuildList()
-        this.getUniList()
-        this.getHouseList()
-      }
-    },
-    async getDatail (moveInId) {
-      let url = '/actual/base/residentMoveInRecord/detail'
-
-      const params = {
-        moveInId: moveInId || ''
-      }
-      const { data, code, msg } = await requestPost(url, params)
-      if (code === 0) {
-        this.fmData = { ...data }
-        this.initCheck = data.isCheck
-        this.nowAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
-      } else this.$message.error(msg)
-    },
+        async initForm(type, id) {
+            this.$refs.ref_form.resetFields()
 
-    async handleComfirm () {
-
-      // setTimeout(() => {
-      //   this.btnDisable = false
-      // }, 10000)
-      this.$refs['ref_form'].validate((valid, messageObj) => {
-        if (!valid) {
-          // app.util.validateRule(messageObj)
-          this.btnDisable = false
-        } else {
-          if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
-            return this.$message({
-              type: 'error',
-              message: '联系电话格式有误'
+            this.formType = type
+
+            if (id) {
+                await this.getDatail(id)
+            }
+            if (this.formType != 'add') {
+                this.getValiheList()
+                this.getBuildList()
+                this.getUniList()
+                this.getHouseList()
+            }
+        },
+        async getDatail(moveInId) {
+            let url = '/actual/base/residentMoveInRecord/detail'
+
+            const params = {
+                moveInId: moveInId || ''
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.fmData = { ...data }
+                this.initCheck = data.isCheck
+                this.nowAllCode = data.sourceAddressPathCode && data.sourceAddressPathCode.split(',')
+            } else this.$message.error(msg)
+        },
+
+        async handleComfirm() {
+
+            // setTimeout(() => {
+            //   this.btnDisable = false
+            // }, 10000)
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                if (!valid) {
+                    // app.util.validateRule(messageObj)
+                    this.btnDisable = false
+                } else {
+                    if (!formVltHelper.userOrMobile(this.fmData.mobile)) {
+                        return this.$message({
+                            type: 'error',
+                            message: '联系电话格式有误'
+                        })
+                    }
+                    this.btnDisable = true
+                    if (this.fmData.isCheck == '1' && this.userInfo && this.userInfo.resiHomeId) {
+                        const { user } = this.$store.state
+                        if (user.agencyId == this.userInfo.resiAgencyId) {
+                            if (this.userInfo.resiHomeId !== this.fmData.homeId) {
+                                this.$confirm('居民信息中房屋信息与当前选择房屋不一致，是否更新？', '提示', {
+                                    confirmButtonText: '更新',
+                                    cancelButtonText: '取消',
+                                    type: 'warning'
+                                }).then(() => {
+                                    this.fmData.isReplace = '1'
+                                    this.submit()
+                                }).catch(() => {
+                                    this.fmData.isReplace = '0'
+                                    this.submit()
+                                });
+                                return
+                            }
+                        }
+                    }
+                    this.submit()
+
+                }
             })
-          }
-          this.btnDisable = true
-          if (this.fmData.isCheck == '1' && this.userInfo && this.userInfo.resiHomeId) {
-            const { user } = this.$store.state
-            if (user.agencyId == this.userInfo.resiAgencyId) {
-              if (this.userInfo.resiHomeId !== this.fmData.homeId) {
-                this.$confirm('居民信息中房屋信息与当前选择房屋不一致，是否更新？', '提示', {
-                  confirmButtonText: '更新',
-                  cancelButtonText: '取消',
-                  type: 'warning'
-                }).then(() => {
-                  this.fmData.isReplace = '1'
-                  this.submit()
-                }).catch(() => {
-                  this.fmData.isReplace = '0'
-                  this.submit()
-                });
-                return
-              }
+        },
+
+        async submit() {
+
+            let url = ''
+            if (this.formType === 'add') {
+                url = '/actual/base/residentMoveInRecord/add'
+            } else {
+                url = '/actual/base/residentMoveInRecord/edit'
+
+                this.fmData.orgId = this.orgId
             }
-          }
-          this.submit()
 
-        }
-      })
-    },
+            const { data, code, msg } = await requestPost(url, this.fmData)
 
-    async submit () {
-
-      let url = ''
-      if (this.formType === 'add') {
-        url = '/actual/base/residentMoveInRecord/add'
-      } else {
-        url = '/actual/base/residentMoveInRecord/edit'
-
-        this.fmData.orgId = this.orgId
-      }
-
-      const { data, code, msg } = await requestPost(url, this.fmData)
-
-      if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
-      } else {
-        this.btnDisable = false
-        this.$message.error(msg)
-      }
-    },
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                })
+                this.resetData()
+                this.$emit('dialogOk')
+                this.btnDisable = false
+            } else {
+                this.btnDisable = false
+                this.$message.error(msg)
+            }
+        },
 
-    handleCancle () {
-      this.resetData()
-      this.$emit('dialogCancle')
-    },
-    resetData () {
-      this.orgId = ''
-      this.nowAllCode = []
-      this.btnDisable = false
-      this.userInfo = {}
-      this.fmData = iniFmData()
+        handleCancle() {
+            this.resetData()
+            this.$emit('dialogCancle')
+        },
+        resetData() {
+            this.orgId = ''
+            this.nowAllCode = []
+            this.btnDisable = false
+            this.userInfo = {}
+            this.fmData = iniFmData()
+        }
     }
-  }
 }
 </script>
 
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 682c571a8..2ff7c01e0 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -365,7 +365,7 @@ export default {
     },
 
     async loadUnit () {
-      const url = "/heart/icpartyunit/option"
+      const url = "/actual/base/icpartyunit/option"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option"
 
       let params = {
diff --git a/src/views/modules/jumin/cpts/leftBto.vue b/src/views/modules/jumin/cpts/leftBto.vue
new file mode 100644
index 000000000..2e142c976
--- /dev/null
+++ b/src/views/modules/jumin/cpts/leftBto.vue
@@ -0,0 +1,99 @@
+<template>
+    <div class="">
+        <div v-for="(item, index) in familyList" :key="index" class="familylist">
+            <div :class="['item', {'bgf':index== 0 }] ">
+                <div>
+                    <img v-if="index == 0 && userInfo.gender == '1'" src="../../../../assets/images/index/nan.png" alt=""
+                        width="56px">
+                    <img v-if="index == 0 && userInfo.gender == '2'" src="../../../../assets/images/index/nv.png" alt=""
+                        width="56px">
+                    <span class="name">{{ item.name }}</span>（{{ item.houseHolderRel == "本人" ? "户主" : item.houseHolderRel ? item.houseHolderRel : '--'
+                    }}）
+                </div>
+                <div>
+                    <span>人户状况：</span>{{item.householdSituation||'--'}}
+                </div>
+                <div>
+                    <span>居民分类：</span>{{item.resiCategory||'--'}}
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request'
+export default {
+    //数据
+    data() {
+        return {
+            familyList: []
+        };
+    },
+    //创建前
+    created() {
+    },
+    mounted() {
+        console.log(this.userInfo);
+        this.getFamilyRelationshipList()
+    },
+    props: {
+        userInfo: {
+            type: Object,
+            default: () => { }
+        }
+    },
+    //方法
+    methods: {
+        async getFamilyRelationshipList() {
+            let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId
+            let { code, data, msg } = await requestPost(url)
+            if (code == 0) {
+                // 找到符合条件的对象的索引
+                const index = data.findIndex(item => item.name == this.userInfo.name);
+                // 如果找到符合条件的对象
+                if (index !== -1) {
+                    // 移除这个对象并将其放到数组的第一个位置
+                    const [item] = data.splice(index, 1);
+                    data.unshift(item);
+                }
+               for(let i in data){
+                if(data[i].classificationOfInhabitantsList){
+                    data[i].resiCategory = data[i].classificationOfInhabitantsList.join(',')
+                }
+               }
+                this.familyList = data
+            } else {
+                this.$message.error(msg)
+            }
+        }
+    },
+    //子组件注册
+    components: {},
+    //计算
+    computed: {},
+    //监听
+    watch: {},
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/pages/huaxiang";
+@import "@/assets/scss/modules/management/list-main.scss";
+.item{
+    padding: 0 15px;
+    &>div{
+        margin-top: 18px;
+        .name{
+        font-family: PingFang SC;
+        font-weight: bold;
+        color: #000000;
+    }
+    }
+}
+.bgf>:nth-child(1){
+    margin: 0!important;
+    padding-top: 16px;
+    box-sizing: border-box;
+}
+</style>
diff --git a/src/views/modules/jumin/cpts/leftTop.vue b/src/views/modules/jumin/cpts/leftTop.vue
new file mode 100644
index 000000000..854f8d32a
--- /dev/null
+++ b/src/views/modules/jumin/cpts/leftTop.vue
@@ -0,0 +1,71 @@
+<template>
+    <div class=''>
+        <div class="item f-font14">
+            <span class="label gray">居住地址：</span><span class="value">{{ resiInfo.fullName||"--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">联系电话：</span><span class="value">{{ resiInfo.mobile||"--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">所属网格：</span><span class="value">{{ resiInfo.gridName||"--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">入户状况：</span><span class="value">{{ resiInfo.householdSituation||"--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <!-- 居住类型,与子女同住,空巢,独居,其他 字段没有返回-->
+            <span class="label gray">居住类型：</span><span class="value">{{ resiInfo.resideSituation || "--" }}</span>
+        </div>
+        <div class="item f-font14">
+            <span class="label gray">家庭预警：</span>
+            <span class="value">{{resiInfo.riskyFlag === '1' ? '满意度风险家庭' : '--'}}</span>
+        </div>
+    </div>
+</template>
+
+<script>
+import { requestPost, requestGet } from '@/js/dai/request'
+export default {
+    //数据
+    data() {
+        return {
+            resiInfo: {}
+        };
+    },
+    //创建前
+    created() {
+    },
+    mounted() {
+        this.getPersonalFile()
+    },
+    props: {
+        resiId: {
+            type: String,
+            default: ''
+        },
+    },
+    //方法
+    methods: {
+        async getPersonalFile() {
+            let url = `/actual/base/peopleRoomOverview/getPersonalFile?resid=` + this.resiId
+            let { code, data, msg } = await requestPost(url)
+            if (code == 0) {
+                this.resiInfo = data
+            } else {
+                this.$message.error(msg)
+            }
+        }
+    },
+    //子组件注册
+    components: {},
+    //计算
+    computed: {},
+    //监听
+    watch: {},
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/pages/huaxiang";
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
diff --git a/src/views/modules/jumin/huaxiang.vue b/src/views/modules/jumin/huaxiang.vue
new file mode 100644
index 000000000..a24f3f5e3
--- /dev/null
+++ b/src/views/modules/jumin/huaxiang.vue
@@ -0,0 +1,96 @@
+<template>
+    <div class='g-main'>
+        <div class="top">
+            <div class="left">
+                <div class="card">
+                    <div class="title">
+                        <div><img src="../../../assets/images/index/title-icon-sqzl.png" alt="">居民档案</div>
+                        <span class="title f-font14 gray" style="cursor: pointer;" @click="handlerUserInfo">详情 ></span>
+                    </div>
+                    <div class="f-top12">
+                        <img src="../../../assets/images/index/resi.png" alt="" width="56px"> {{userInfo.name}}
+                    </div>
+                    <section class="bgC">
+                       <left-top :resiId="userInfo.resiId"></left-top>
+                    </section>
+                </div>
+            </div>
+            <div class="right">
+                <div class="card">
+                    <div class="title"></div>
+                </div>
+            </div>
+        </div>
+        <div class="bottom">
+            <div class="left">
+                <div class="card">
+                    <div class="title">
+                        <div><img src="../../../assets/images/index/title-icon-jtgx.png" alt="">家庭关系</div>
+                    </div>
+                    <section class="bgC" style="padding: 0;">
+                        <left-bto :userInfo="userInfo" ></left-bto>
+                    </section>
+                </div>
+            </div>
+            <div class="right">
+                <div class="card">
+                    <div class="title"></div>
+                </div>
+            </div>
+        </div>
+        <resi-info
+      v-if="showedResiInfo && userInfo.resiId"
+      :resi-id="userInfo.resiId"
+      @close="showedResiInfo = false"
+    />
+    </div>
+</template>
+<script>
+import { requestPost, requestGet } from '@/js/dai/request'
+import leftTop from "./cpts/leftTop";
+import leftBto from "./cpts/leftBto";
+import resiInfo from "@/views/modules/cpts/resi/info";
+import nextTick from "dai-js/tools/nextTick";
+export default {
+    //数据
+    data() {
+        return {
+            userInfo:{},
+            showedResiInfo: false,
+        };
+    },
+    //创建前
+    created() {
+        this.getFamilyRelationshipList()
+        this.userInfo = this.$store.state.huaXiang.userInfo
+    },
+    //方法
+    methods: {
+        async getFamilyRelationshipList() {
+            let url = `/actual/base/peopleRoomOverview/getFamilyRelationshipList?type=0&resid=` + this.userInfo.resiId
+            let {code,data,msg} = await requestPost(url)
+            if(code == 0){
+                this.familyList = data
+            }else{
+                this.$message.error(msg)
+            }
+        },
+       async handlerUserInfo(){
+           await nextTick();
+      this.showedResiInfo = true;
+        },
+
+    },
+    //子组件注册
+    components: {leftTop,leftBto,resiInfo},
+    //计算
+    computed: {},
+    //监听
+    watch: {},
+}
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/pages/huaxiang";
+@import "@/assets/scss/modules/management/list-main.scss";
+</style>
diff --git a/src/views/modules/satisfaction/satisfactionProvince/index.vue b/src/views/modules/satisfaction/satisfactionProvince/index.vue
index c703863eb..487cea591 100644
--- a/src/views/modules/satisfaction/satisfactionProvince/index.vue
+++ b/src/views/modules/satisfaction/satisfactionProvince/index.vue
@@ -31,8 +31,8 @@
                 </div>
                 <el-radio-group v-model="formData.orgCategoryCode" @change="handelChangeCategory" style="margin: 20px 0 0;">
                     <el-radio-button label="province">省满意度调查</el-radio-button>
-                    <el-radio-button label="city">区满意度调查</el-radio-button>
-                    <el-radio-button label="district">市满意度调查</el-radio-button>
+                    <el-radio-button label="city">市满意度调查</el-radio-button>
+                    <el-radio-button label="district">区满意度调查</el-radio-button>
                 </el-radio-group>
                 <div class="m-table-item" :style="{ height: maxTableHeight + 'px', width: '100%' }">
                     <div id="myCharts"></div>
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index 418839b52..bef494a3f 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -339,6 +339,8 @@ import resiInfo from "@/views/modules/cpts/resi/info";
 import houseInfo from "@/views/modules/cpts/house/info";
 import smatrRules from "./cpts/smatr-rules.vue";
 import { requestGet } from "../../../js/dai/request";
+import { addDynamicRoute } from '@/router'
+
 export default {
   components: {
     resiInfo,
@@ -572,10 +574,20 @@ export default {
       this.getSearchJumin();
     },
     async handleWatchSearchJumin(rowIndex) {
-      let item = this.searchJumin.list[rowIndex];
-      this.currentResiId = item.resiId;
-      await nextTick();
-      this.showedResiInfo = true;
+      // let item = this.searchJumin.list[rowIndex];
+      // this.currentResiId = item.resiId;
+      // await nextTick();
+      // this.showedResiInfo = true;
+      let { agencyId, gridId, gridName, gender, homeId, homeName, name, resiId } = this.searchJumin.list[rowIndex]
+      console.log(this.searchJumin.list[rowIndex]);
+      this.$store.dispatch('saveData', { agencyId, gridId, gridName, gender, homeId, homeName, name, resiId });
+      this.$router.push({ name: 'jumin-huaxiang' });
+      this.$store.state.contentTabs = this.$store.state.contentTabs.map(item => {
+        if (item.name === "jumin-huaxiang") {
+          return {...item, title: name };
+        }
+        return item;
+      });
     },
 
     handleSizeChangeSearchFangwu(val) {
@@ -591,10 +603,11 @@ export default {
     },
 
     async handleWatchSearchFangwu(rowIndex) {
-      let item = this.searchFangwu.list[rowIndex];
-      this.currentHouseId = item.id;
-      await nextTick();
-      this.showedHouseInfo = true;
+      // let item = this.searchFangwu.list[rowIndex];
+      // this.currentHouseId = item.id;
+      // await nextTick();
+      // this.showedHouseInfo = true;
+      console.log(this.searchFangwu.list[rowIndex]);
     },
 
     getApiData() {},
diff --git a/src/views/modules/shequzhili/event/cpts/add.vue b/src/views/modules/shequzhili/event/cpts/add.vue
index 4e063fd7a..1a07f8af0 100644
--- a/src/views/modules/shequzhili/event/cpts/add.vue
+++ b/src/views/modules/shequzhili/event/cpts/add.vue
@@ -18,7 +18,7 @@
                         </el-select>
                     </el-form-item>
                     <el-form-item label="工单号" prop="workOrderNum" label-width="150px" style="display: block">
-                        <el-input class="cell-width-1" maxlength="10" placeholder="请输入工单号" v-model="formData.workOrderNum" />
+                        <el-input class="cell-width-1" maxlength="30" placeholder="请输入工单号" v-model="formData.workOrderNum" />
                     </el-form-item>
                     <el-form-item label="接收时间" prop="happenTime" label-width="150px" style="display: block">
                         <el-date-picker v-model="formData.happenTime" class="cell-width-1" type="datetime"
diff --git a/src/views/modules/shequzhili/event/cpts/event-detail.vue b/src/views/modules/shequzhili/event/cpts/event-detail.vue
index 773f769f5..7fe3ef1ec 100644
--- a/src/views/modules/shequzhili/event/cpts/event-detail.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-detail.vue
@@ -85,7 +85,7 @@
                         <el-radio-group :class="{ 'form-item': source === 'visiual' }" v-model="satisfyLevel"
                             @change="clickSatisfy">
                             <el-radio label="good">满意</el-radio>
-                            <el-radio label="perfect">基本满意</el-radio>
+                            <el-radio label="perfect">非常满意</el-radio>
                             <el-radio label="bad">不满意</el-radio>
                         </el-radio-group>
                     </div>
diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue
index 3b0283f1b..018af9492 100644
--- a/src/views/modules/shequzhili/event/cpts/event-info.vue
+++ b/src/views/modules/shequzhili/event/cpts/event-info.vue
@@ -372,37 +372,32 @@ export default {
             } else {
                 return false;
             }
+            this.project = {};
+            this.demand = {};
             this.$refs.ref_processinfo_add.getProcessInfo();
             this.formData.operationType = this.$refs.ref_processinfo_add.operationType;
             this.eventInfoData.operationType = this.$refs.ref_processinfo_add.operationType;
             if (this.formData.operationType === '0' || this.formData.operationType === '6') {
-                this.project = {};
-                this.demand = {};
                 this.replayInfo = this.$refs.ref_processinfo_add.replayInfo;
-                console.log(this.replayInfo);
                 //回复属性赋值
                 this.eventInfoData.content = this.replayInfo.content;
                 this.eventInfoData.status = this.replayInfo.status;
+                this.eventInfoData.timeLimit = this.replayInfo.timeLimit;
                 if (this.replayInfo.categoryId) {
                     this.eventInfoData.categoryList = [];
                     this.eventInfoData.categoryList.push(this.replayInfo.categoryId);
                 }
             } else if (this.formData.operationType === '5') {
-                this.project = {};
-                this.demand = {};
-                console.log(this.$refs.ref_process_form_designate.replayInfo);
                 this.replayInfo = this.$refs.ref_process_form_designate.replayInfo;
-                console.log(this.replayInfo);
                 //回复属性赋值
                 this.eventInfoData.content = this.replayInfo.content;
                 this.eventInfoData.status = this.replayInfo.status;
+                this.eventInfoData.timeLimit = this.replayInfo.timeLimit;
                 if (this.replayInfo.categoryId) {
                     this.eventInfoData.categoryList = [];
                     this.eventInfoData.categoryList.push(this.replayInfo.categoryId);
                 }
             } else if (this.formData.operationType === '4') {
-                this.project = {};
-                this.demand = {};
                 this.replayInfo = {};
             }
             this.formData = {
diff --git a/src/views/modules/shequzhili/event/cpts/myCascader.vue b/src/views/modules/shequzhili/event/cpts/myCascader.vue
index 278d6a138..6a4a75c29 100644
--- a/src/views/modules/shequzhili/event/cpts/myCascader.vue
+++ b/src/views/modules/shequzhili/event/cpts/myCascader.vue
@@ -18,8 +18,9 @@ export default {
                 selCategoryArray: {}
             },
             selCateObj: {},
-            iscascaderShow: 0
+            iscascaderShow: 0,
         };
+        
     },
     props: {
         casOptions: {
@@ -39,7 +40,6 @@ export default {
             } else {
                 this.selCateObj = {}
             }
-
             this.$emit('handleChangeCate', this.selCateObj)
         }
     },
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-designate.vue b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue
index f1ebf59f9..fdd39d220 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-designate.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-designate.vue
@@ -102,6 +102,9 @@ export default {
                 ],
                 timeLimit: [
                     { required: true, message: "办结时限不能为空", trigger: "blur" },
+                ],
+                categoryList: [
+                    { required: true, message: '事件分类不能为空', trigger: 'blur' },
                 ]
             },
             selCateObj: {
@@ -140,9 +143,9 @@ export default {
             this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
             // 这一步接收到eventDetailCopy在这里回填
             if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
-                this.selCateObj.id = this.eventDetailCopy.categoryId
-                this.formData.categoryId = this.eventDetailCopy.categoryId
-                this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId)
+                this.selCategoryArray = this.eventDetailCopy.parentCategoryId.split(",");
+                this.selCategoryArray.push(this.eventDetailCopy.categoryId);
+                this.handleChangeCate(this.selCategoryArray)
             }
         }
     },
@@ -189,8 +192,8 @@ export default {
         handleChangeCate() {
             if (this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0]) {
                 this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
+                this.formData.categoryList = this.selCateObj
                 this.formData.categoryId = this.selCateObj.id
-                console.log(this.formData.categoryId, 'this.formData.categoryId');
             } else {
                 this.selCateObj = {}
             }
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
index 9cad30838..570051c5a 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay-end.vue
@@ -73,7 +73,7 @@ export default {
                     { required: true, message: '回复内容不能为空', trigger: 'blur' },
                 ],
                 categoryList: [
-                    //   { required: true, message: '事件分类不能为空', trigger: 'blur' },
+                    { required: true, message: '事件分类不能为空', trigger: 'blur' },
                 ]
             }
         };
@@ -107,8 +107,9 @@ export default {
             this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
             // 这一步接收到eventDetailCopy在这里回填
             if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
-                this.formData.categoryId = this.eventDetailCopy.categoryId
-                this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId, this.eventDetailCopy.categoryId)
+                this.selCategoryArray = this.eventDetailCopy.parentCategoryId.split(",");
+                this.selCategoryArray.push(this.eventDetailCopy.categoryId);
+                this.handleChangeCate(this.selCategoryArray)
             }
         }
     },
@@ -128,9 +129,19 @@ export default {
                 this.$message.error(msg);
             }
         },
+        buildTree(nodes, treeId) {
+            nodes.forEach(item => {
+                if (treeId === item.id) {
+                    return item;
+                } else {
+                    this.buildTree(item.children, treeId)
+                }
+            })
+        },
         handleChangeCate() {
             if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) {
                 this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data
+                this.formData.categoryList = this.selCateObj
             } else {
                 this.selCateObj = {}
             }
@@ -165,7 +176,7 @@ export default {
                     if (!this.formData.categoryId) {
                         this.formData.categoryId = this.selCateObj.id;
                     }
-                    if(this.fileList){
+                    if (this.fileList) {
                         this.formData.files = this.fileList
                     }
                     this.formData.categoryList = [];
diff --git a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
index 2cc36e807..e0b84438c 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form-replay.vue
@@ -62,7 +62,7 @@ export default {
                     { required: true, message: '回复内容不能为空', trigger: 'blur' },
                 ],
                 categoryList: [
-                    //   { required: true, message: '事件分类不能为空', trigger: 'blur' },
+                    { required: true, message: '事件分类不能为空', trigger: 'blur' },
                 ],
                 timeLimit: [
                     { required: true, message: "办结时限不能为空", trigger: "blur" },
@@ -101,7 +101,6 @@ export default {
         this.getCategoryList();
         if (this.eventId) {
             this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
-            console.log('this.eventDetailCopy', this.eventDetailCopy);
             let value = this.eventDetailCopy.parentCategoryId.split(",");
             value.push(this.eventDetailCopy.categoryId);
             this.handleChangeCate(value)
@@ -131,7 +130,6 @@ export default {
                 });
                 let node = this.buildTree(this.casOptions, this.eventDetailCopy.categoryId);
                 this.selCategoryArray.push(node);
-                console.log(this.selCategoryArray);
             }
         },
         buildTree(nodes, treeId) {
@@ -146,6 +144,7 @@ export default {
         handleChangeCate(value) {
             if (this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0]) {
                 this.selCateObj = this.$refs['myCascader'].getCheckedNodes()[0].data
+                this.formData.categoryList = this.selCateObj
             } else {
                 this.selCateObj = {}
             }
@@ -181,6 +180,7 @@ export default {
                     }
                     this.formData.categoryList = [];
                     this.formData.categoryList.push(this.selCateObj);
+                    this.formData.categoryId = this.selCateObj.id
                     this.okflag = true;
                 }
             });
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index 90aa9c7b3..1e4960e90 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -270,26 +270,10 @@ export default {
                 },
             ],
             qudaoArray: [
-                // {
-                //     value: "0",
-                //     label: "随手拍/随时讲",
-                // },
-                // {
-                //     value: "1",
-                //     label: "多媒体反应",
-                // },
-                // {
-                //     value: "2",
-                //     label: "社区电话",
-                // },
                 {
                     value: "3",
                     label: "12345",
-                },
-                // {
-                //     value: "4",
-                //     label: "网络员手持终端",
-                // },
+                }
             ],
 
             formData: {
@@ -538,7 +522,7 @@ export default {
             }
         },
         handleProgress(event, file, fileList) {
-            
+
         },
         beforeExcelUpload(file) {
             const isType = file.type === 'application/vnd.ms-excel';
@@ -654,6 +638,9 @@ export default {
         },
         async getTableData() {
             const url = "/governance/icEvent/list";
+            if (this.eventTypeCheck) {
+                this.formData.secondIdList = this.eventTypeCheck
+            }
             const { pageSize, pageNo, formData } = this;
             const { data, code, msg } = await requestPost(url, {
                 pageSize,