From 16dbeb19e132984c14d708b51ae925d97b8cb794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E9=AD=81?= <2403457699@qq.com>
Date: Thu, 8 Dec 2022 20:16:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=85=E6=B0=91,?=
 =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E7=99=BB=E8=AE=B0,=E8=BF=81=E5=87=BA?=
 =?UTF-8?q?=E7=99=BB=E8=AE=B0=E5=8E=BB=E9=99=A4=E7=A6=8F=E5=88=A9=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/list-main.css     |    6 +-
 .../scss/modules/management/list-main.min.css |    2 +-
 .../scss/modules/management/list-main.scss    |    6 +-
 src/views/components/resiChangeTransfer.vue   |    4 +-
 src/views/components/resiForm.vue             |    4 +-
 src/views/components/resiSearch.vue           |    8 +-
 .../modules/base/community/community.vue      |    1 +
 src/views/modules/base/resi.vue               |   18 +-
 .../modules/plugins/change/resideathAdd.vue   |   50 +-
 src/views/modules/shequ/cpts/peopleDetail.vue | 1293 ++++++++---------
 10 files changed, 704 insertions(+), 688 deletions(-)

diff --git a/src/assets/scss/modules/management/list-main.css b/src/assets/scss/modules/management/list-main.css
index 3ce4cf916..3cd03235e 100644
--- a/src/assets/scss/modules/management/list-main.css
+++ b/src/assets/scss/modules/management/list-main.css
@@ -228,9 +228,9 @@
 .div_main .title-small {
   border-left: solid 4px #0056d6;
   height: 12px;
-  line-height: 20px;
-  margin-left: -36px;
-  padding-left: 30px;
+  line-height: 16px;
+  margin-left: 70px;
+  padding-left: 3px;
   font-size: 16px;
   font-weight: bold;
 }
diff --git a/src/assets/scss/modules/management/list-main.min.css b/src/assets/scss/modules/management/list-main.min.css
index d2ddb7042..08b0c7662 100644
--- a/src/assets/scss/modules/management/list-main.min.css
+++ b/src/assets/scss/modules/management/list-main.min.css
@@ -1 +1 @@
-.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-right:10px;margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .setFormBoxHeight{max-height:153px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.div_main .flex{display:flex;flex-wrap:nowrap}.div_main .hflex{display:flex;flex-flow:column;overflow:hidden;height:100%}.div_main .flex1{flex:1}.div_main .mean{justify-content:space-around}.div_main .endpoint{justify-content:space-between}.div_main .align_item{align-items:center}.div_main .font12{font-size:12px}.div_main .font14{font-size:14px !important}.div_main .font16{font-size:16px !important}.div_main .font18{font-size:18px !important}.div_main .p0{padding:0 !important}.div_main .p10{padding:10px}.div_main .p50{padding:50px}.div_main .p30{padding:30px}.div_main .right5{margin-right:5px}.div_main .right24{margin-right:24px}.div_main .bottom8{margin-bottom:8px}.div_main .bottom16{margin-bottom:16px}.div_main .top2{margin-top:2px}.div_main .top12{margin-top:12px}.div_main .top24{margin-top:24px !important}.div_main .top32{margin-top:32px !important}.div_main .top40{margin-top:40px !important}.div_main .top48{margin-top:48px !important}.div_main .top8{margin-top:8px !important}.div_main .bot8{margin-bottom:8px}.div_main .bot24{margin-bottom:24px !important}.div_main .top16{margin-top:16px !important}.div_main .bot16{margin-bottom:16px !important}.div_main .right8{margin-right:8px !important}.div_main .margin30{margin:30px}.div_main .m0{margin:0 !important}.div_main .title-small{border-left:solid 4px #0056d6;height:12px;line-height:20px;margin-left:-36px;padding-left:30px;font-size:16px;font-weight:bold}@media only screen and (min-width: 2013px){.div_main .showUnfold{display:none}}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}
+.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-right:10px;margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .setFormBoxHeight{max-height:153px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.div_main .flex{display:flex;flex-wrap:nowrap}.div_main .hflex{display:flex;flex-flow:column;overflow:hidden;height:100%}.div_main .flex1{flex:1}.div_main .mean{justify-content:space-around}.div_main .endpoint{justify-content:space-between}.div_main .align_item{align-items:center}.div_main .font12{font-size:12px}.div_main .font14{font-size:14px !important}.div_main .font16{font-size:16px !important}.div_main .font18{font-size:18px !important}.div_main .p0{padding:0 !important}.div_main .p10{padding:10px}.div_main .p50{padding:50px}.div_main .p30{padding:30px}.div_main .right5{margin-right:5px}.div_main .right24{margin-right:24px}.div_main .bottom8{margin-bottom:8px}.div_main .bottom16{margin-bottom:16px}.div_main .top2{margin-top:2px}.div_main .top12{margin-top:12px}.div_main .top24{margin-top:24px !important}.div_main .top32{margin-top:32px !important}.div_main .top40{margin-top:40px !important}.div_main .top48{margin-top:48px !important}.div_main .top8{margin-top:8px !important}.div_main .bot8{margin-bottom:8px}.div_main .bot24{margin-bottom:24px !important}.div_main .top16{margin-top:16px !important}.div_main .bot16{margin-bottom:16px !important}.div_main .right8{margin-right:8px !important}.div_main .margin30{margin:30px}.div_main .m0{margin:0 !important}.div_main .title-small{border-left:solid 4px #0056d6;height:12px;line-height:16px;margin-left:70px;padding-left:3px;font-size:16px;font-weight:bold}@media only screen and (min-width: 2013px){.div_main .showUnfold{display:none}}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 69f60a47a..cfd95a0bf 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -236,9 +236,9 @@
 .title-small {
   border-left: solid 4px rgba(0, 86, 214, 1);
   height: 12px;
-  line-height: 20px;
-  margin-left: -36px;
-  padding-left: 30px;
+  line-height: 16px;
+  margin-left: 70px;
+  padding-left: 3px;
   font-size: 16px;
   font-weight: bold;
 }
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index a940c9648..fbecaf644 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -139,10 +139,10 @@
                     v-model="dataForm.reason">
           </el-input>
         </el-form-item>
-        <el-form-item label=""
+        <!-- <el-form-item label=""
                       prop="welfareFlag">
           <el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
 
     </div>
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index c25ba42d2..4e1f89b02 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -226,7 +226,7 @@
                              class="resi-cell-select">
                 </el-cascader>
                 <template v-else-if="n.itemType === 'radio'">
-                  <el-radio v-for="ns in n.options"
+                  <el-radio  v-for="ns in n.options"
                             :key="ns.value"
                             v-model.trim="form[n.columnName]"
                             :label="ns.value"
@@ -291,7 +291,7 @@ export default {
     // 渲染一行几列
     columns: {
       type: Number,
-      default: 4
+      default: 3
     },
     supportAdd: { // 单表多条数据
       type: Boolean,
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index a5e8ce76d..016f3bc1b 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -7,7 +7,7 @@
         :class="boxHeight ? 'setFormBoxHeightAuto' : 'setFormBoxHeight'" :key="index">
         <el-form-item v-for="n in item" :key="n.id">
           <div class="resi-cell">
-            <div style="width:100px;text-align: right;">{{ n.label }}:</div>
+            <div style="width:100px;text-align: right;padding-right:14px ;">{{ n.label }}:</div>
             <div class="resi-cell-value" :class="n.itemType === 'radio' && 'resi-cell-value-radio'">
               <el-input v-if="n.itemType === 'input' || n.itemType === 'textarea'" v-model.trim="form[n.columnName]"
                 class="item_width_normal" size="small" clearable placeholder="请输入内容">
@@ -53,14 +53,16 @@
           </div>
         </el-form-item>
 
-        <el-form-item label="所属组织" prop="agencyIdArray" :label-width="'100px'" >
+        <el-form-item  prop="agencyIdArray">
+          <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属组织:</span>
           <el-cascader class="item_width_normal" ref="myCascader" v-model="agencyIdArray" :options="orgOptions"
             :props="orgOptionProps" :show-all-levels="false" @change="handleChangeAgency"></el-cascader>
         </el-form-item>
 
-        <el-form-item label="所属房屋" prop="VILLAGE_ID" :label-width="'100px'" >
+        <el-form-item prop="VILLAGE_ID"  >
           <div class="resi-cell">
             <div class="resi-cell-value">
+              <span style="width:100px;text-align: right;padding-right:14px;display: inline-block; " >所属房屋:</span>
               <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small" filterable clearable
                 class="resi-cell-select" @clear="handleClearVillage" @change="handleChangeV">
                 <el-option v-for="item in optionsV" :key="item.value" :label="item.label" :value="item.value">
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 80a6960f4..ab7830150 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -38,6 +38,7 @@
       <div class="div_search">
 
         <el-form :inline="true"
+                  class="communityHeight"
                  ref="ref_searchform"
                  :class="boxHeight ? 'setFormBoxHeightAuto' : 'setFormBoxHeight'"
                  :label-width="'100px'">
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 02ff8be80..3f4ffbb26 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -54,7 +54,7 @@
                      size="small"
                      @click="handleAdd"
                      class="diy-button--blue"
-                     icon="el-icon-plus"> 新增小区</el-button>
+                     icon="el-icon-plus"> 新增</el-button>
           <el-button v-if="btnAuths.ic_resi_export"
                      style="margin-left:10px"
                      size="small"
@@ -359,12 +359,13 @@
     <el-dialog :visible.sync="deathShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
+            
                :title="'死亡登记'"
                width="950px"
                top="5vh"
                class="dialog-h"
                @closed="diaClose">
-      <resideath-add ref="ref_death"
+      <resideath-add ref="ref_death"    :resideathAddObj="resideathAddObj1"
                      @dialogCancle="deathClose"></resideath-add>
     </el-dialog>
   </div>
@@ -430,6 +431,7 @@ export default {
       pageSize: 20,
       total: null,
       searchH: 0,
+      resideathAddObj1:{}, // 死亡登记子组件
       conditions: [],
       activeName: "",
       tableData: [],
@@ -575,6 +577,7 @@ export default {
       this.deathShow = true;
       await nextTick(200);
       this.$refs.ref_death.initForm(row)
+      this.resideathAddObj1 = {name:row.NAME,GRID_ID:row.GRID_ID}
     },
 
     //变更记录
@@ -1474,19 +1477,17 @@ export default {
     // width: 50px;
     height: 24px;
     box-sizing: border-box;
-    margin-right: 7px;
     padding: 0 10px !important;
     font-size: 16px;
     font-weight: 400;
     color: #666666;
     line-height: 24px;
-    background: #ebecf1;
     border-radius: 2px;
   }
 
-  ::v-deep .el-tabs__nav-wrap::after,
-  ::v-deep .el-tabs__active-bar {
-    display: none;
+  // ::v-deep .el-tabs__nav-wrap::after,
+  ::v-deep .el-tabs__active-bar_active {
+    background-color: #0055d7;
   }
   ::v-deep .el-tabs__nav-next,
   ::v-deep .el-tabs__nav-prev {
@@ -1498,8 +1499,7 @@ export default {
     // border-radius: 50%;
   }
   ::v-deep .el-tabs__item.is-active {
-    color: #fff;
-    background: linear-gradient(90deg, #1a5afd, #26c4ff);
+    color: #17b3a3;
   }
 }
 .resi-container .resi-card {
diff --git a/src/views/modules/plugins/change/resideathAdd.vue b/src/views/modules/plugins/change/resideathAdd.vue
index 388066d6c..3e56bae82 100644
--- a/src/views/modules/plugins/change/resideathAdd.vue
+++ b/src/views/modules/plugins/change/resideathAdd.vue
@@ -7,24 +7,26 @@
                label-width="90px"
                :rules="dataRule"
                class="m-form">
-
-        <div class="item-textarea">
-          <el-form-item label="死亡原因"
+        <template >
+          <el-form-item class="top24" label="当前组织"
                         style="display: block"
-                        prop="blacklistReason">
-            <el-input type="textarea"
-                      resize="none"
-                      class="edit_item_width_1"
-                      placeholder='请输入迁出原因'
-                      v-model="dataForm.blacklistReason">
-            </el-input>
+                       >
+                       {{resideathAddObj.GRID_ID}}
           </el-form-item>
-        </div>
+        </template>
+        <template>
+          <el-form-item label="姓名"
+                        style="display: block"
+                       >
+                       {{resideathAddObj.name}}
+          </el-form-item>
+        </template>
+       
         <el-form-item label="死亡日期"
                       style="display: block"
                       prop="deathDate">
           <el-date-picker v-model="dataForm.deathDate"
-                          class="edit_item_width_1"
+                          class="item_width_daterange"
                           type="date"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           format="yyyy-MM-dd"
@@ -32,7 +34,18 @@
                           :clearable="false">
           </el-date-picker>
         </el-form-item>
-
+        <div class="item-textarea">
+          <el-form-item label="死亡原因"
+                        style="display: block"
+                        prop="blacklistReason">
+            <el-input type="textarea"
+                      resize="none"
+                      class="item_width_daterange"
+                      placeholder='请输入死亡原因'
+                      v-model="dataForm.blacklistReason">
+            </el-input>
+          </el-form-item>
+        </div>
         <!-- <el-form-item label="享受福利"
                       style="display: block"
                       prop="welfareFlag">
@@ -43,7 +56,7 @@
     </div>
     <div class="div_btn">
       <el-button size="small"
-                 class="diy-button--gray"
+                 class=""
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
                  class="diy-button--blue"
@@ -98,7 +111,6 @@ export default {
   },
   methods: {
     async initForm (row) {
-
       this.customerId = localStorage.getItem("customerId");
 
       this.$refs.ref_form.resetFields();
@@ -189,11 +201,17 @@ export default {
       }
     }
   },
-  props: {}
+  props: {
+    resideathAddObj:{
+      type:Object,
+      default: ()=>{ return {} }
+    }
+  }
 }
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/edit-main.scss";
+@import "@/assets/scss/modules/management/list-main.scss";
 
 .resi-cell-col {
   width: 750px;
diff --git a/src/views/modules/shequ/cpts/peopleDetail.vue b/src/views/modules/shequ/cpts/peopleDetail.vue
index 1e97d1bca..0a0dc5fa7 100644
--- a/src/views/modules/shequ/cpts/peopleDetail.vue
+++ b/src/views/modules/shequ/cpts/peopleDetail.vue
@@ -1,253 +1,106 @@
 <template>
-    <div class="m-pop">
-      <div class="wrap">
-        <div class="wrap2 p0">
-          <div class="flex endpoint">
-                 <span class="font16">居民详情</span>
-                <el-button size="small" type="text" @click="handleClose">
-                    <i class="el-icon-close font16"></i>
-                </el-button>
-          </div>
-          <hr/>
-          <div v-if="view_real_data"
-               class="div_tuomin">
-            <el-button size="mini"
-                       class="diy-button--search"
-                       @click="handleTuomin">显示脱敏信息</el-button>
-          </div>
-  
-          <div :key="'fieldSubList' + index"
-               v-for="(fieldSubList, index) in fieldList">
-            <div class="list">
-              <div class="item"
-                   v-if="index == 0">
-                <span class="item-field">所属网格：</span>
-                <span>{{ gridName }}</span>
-              </div>
-              <div class="item"
-                   v-if="index == 0">
-                <span class="item-field">所属小区：</span>
-                <span>{{ xiaoquName }}</span>
-              </div>
-              <div class="item"
-                   v-if="index == 0">
-                <span class="item-field">所属楼栋：</span>
-                <span>{{ louName }}-{{ danyuanName }}</span>
-              </div>
-              <div class="item"
-                   v-if="index == 0">
-                <span class="item-field">所属家庭：</span>
-                <span>{{ homeName }}</span>
-              </div>
-              <div class="item"
-                   :key="field.itemId"
-                   v-for="field in fieldSubList">
-                <span class="item-field">{{ field.label }}：</span>
-                <span v-if="field.columnName==='MOBILE'||field.columnName==='ID_CARD'">{{ info[field.columnName]||'--'}}</span>
-                <span v-else-if="
-                    field.itemType == 'select' ||
-                    field.itemType == 'radio' ||
-                    field.itemType == 'checkbox' ||
-                    field.itemType == 'cascader'
-                  ">{{
-                    info[field.columnName] == null
-                      ? "--"
-                      : getOptionLabel(
-                          field.options,
-                          info[field.columnName],
-                          field.itemType
-                        )
-                  }}</span>
-  
-                <span v-else>{{
-                  info[field.columnName] == null ? "--" : info[field.columnName]
-                }}</span>
-              </div>
-            </div>
-  
-            <div class="line"></div>
-          </div>
-  
-          <div class="tabs">
-            <div class="tab-btn"
-                 @click="subStartGroupIndex"
-                 v-if="groupList.length > 9">
-              <img src="@/assets/img/shuju/people/arrow-double-left.png" />
-            </div>
-            <div v-show="index >= startGroupIndex && index < startGroupIndex + 9"
-                 class="tab"
-                 :class="groupIndex % groupList.length == index ? 'z-on' : ''"
-                 :key="'tab' + index"
-                 @click="groupIndex = index"
-                 v-for="(item, index) in groupList">
-              {{ item.label }}
+  <div class="m-pop">
+    <div class="wrap">
+      <div class="btn-close"
+           @click="handleClose">
+        <img src="@/assets/img/shuju/people/close.png" />
+      </div>
+      <div class="wrap2">
+        <div class="title">
+          <span>居民详情</span>
+        </div>
+        <div v-if="view_real_data"
+             class="div_tuomin">
+          <el-button size="mini"
+                     class="diy-button--search"
+                     @click="handleTuomin">显示脱敏信息</el-button>
+        </div>
+
+        <div :key="'fieldSubList' + index"
+             v-for="(fieldSubList, index) in fieldList">
+          <div class="list">
+            <div class="item"
+                 v-if="index == 0">
+              <span class="item-field">所属网格：</span>
+              <span>{{ gridName }}</span>
             </div>
-            <div class="tab-btn"
-                 @click="addStartGroupIndex"
-                 v-if="groupList.length > 9">
-              <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+            <div class="item"
+                 v-if="index == 0">
+              <span class="item-field">所属小区：</span>
+              <span>{{ xiaoquName }}</span>
             </div>
-          </div>
-  
-          <div :key="'group' + index"
-               v-show="groupIndex % groupList.length == index"
-               v-for="(group, index) in groupList">
-            <div v-if="
-                group.tableName == 'ic_resi_demand' &&
-                Array.isArray(allInfo.ic_resi_demand) &&
-                allInfo.ic_resi_demand.length > 0
-              ">
-              <div class="list"
-                   :key="'ic_resi_demand' + infoIndex"
-                   v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand">
-                <div class="item"
-                     :key="field.itemId"
-                     v-for="field in group.itemList">
-                  <span class="item-field">{{ field.label }}：</span>
-                  <span v-if="
-                      field.itemType == 'select' ||
-                      field.itemType == 'radio' ||
-                      field.itemType == 'checkbox' ||
-                      field.itemType == 'cascader'
-                    ">{{
-                      infoItem[field.columnName] == null
-                        ? "--"
-                        : getOptionLabel(
-                            field.options,
-                            infoItem[field.columnName],
-                            field.itemType
-                          )
-                    }}</span>
-  
-                  <span v-else>{{
-                    infoItem[field.columnName] == null
-                      ? "--"
-                      : infoItem[field.columnName]
-                  }}</span>
-                </div>
-              </div>
+            <div class="item"
+                 v-if="index == 0">
+              <span class="item-field">所属楼栋：</span>
+              <span>{{ louName }}-{{ danyuanName }}</span>
             </div>
-            <div v-else-if="group.tableName == 'ic_hs'"
-                 style="margin-top: 10px; padding: 0 20px">
-              <el-table class="table"
-                        :data="natList"
-                        border
-                        height="400"
-                        :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="testTime"
-                                 header-align="center"
-                                 align="center"
-                                 label="检测时间"
-                                 width="150">
-                </el-table-column>
-                <el-table-column prop="address"
-                                 header-align="center"
-                                 align="center"
-                                 label="检测机构"
-                                 show-overflow-tooltip
-                                 min-width="180">
-                </el-table-column>
-                <el-table-column prop="result"
-                                 header-align="center"
-                                 align="center"
-                                 label="检测结果"
-                                 width="240">
-                </el-table-column>
-              </el-table>
+            <div class="item"
+                 v-if="index == 0">
+              <span class="item-field">所属家庭：</span>
+              <span>{{ homeName }}</span>
             </div>
-            <div v-else-if="group.tableName == 'ic_xc'"
-                 style="margin-top: 10px; padding: 0 20px">
-              <el-table class="table"
-                        :data="tripList"
-                        border
-                        height="400"
-                        :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="fromRegion"
-                                 header-align="center"
-                                 align="center"
-                                 label="来自地区"
-                                 show-overflow-tooltip
-                                 min-width="100">
-                </el-table-column>
-                <el-table-column prop="arrivalTime"
-                                 header-align="center"
-                                 align="center"
-                                 label="来到本地时间"
-                                 width="140">
-                </el-table-column>
-                <el-table-column prop="leaveTime"
-                                 header-align="center"
-                                 align="center"
-                                 label="离开本地时间"
-                                 width="140">
-                </el-table-column>
-                <el-table-column prop="noticeTime"
-                                 header-align="center"
-                                 align="center"
-                                 label="最近一次通知时间"
-                                 width="140">
-                </el-table-column>
-                <el-table-column prop="remark"
-                                 header-align="center"
-                                 align="center"
-                                 label="备注"
-                                 show-overflow-tooltip
-                                 width="120">
-                </el-table-column>
-              </el-table>
-            </div>
-            <div v-else-if="group.tableName == 'ic_ym'"
-                 style="margin-top: 10px; padding: 0 20px">
-              <el-table v-if="vaccineList"
-                        class="table"
-                        :data="vaccineList"
-                        border
-                        height="400"
-                        :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="vaccinateTime"
-                                 header-align="center"
-                                 align="center"
-                                 label="接种时间"
-                                 show-overflow-tooltip
-                                 min-width="100">
-                </el-table-column>
-                <el-table-column prop="address"
-                                 header-align="center"
-                                 align="center"
-                                 label="接种地点">
-                </el-table-column>
-                <el-table-column prop="manufactor"
-                                 header-align="center"
-                                 align="center"
-                                 label="疫苗厂家">
-                </el-table-column>
-              </el-table>
+            <div class="item"
+                 :key="field.itemId"
+                 v-for="field in fieldSubList">
+              <span class="item-field">{{ field.label }}：</span>
+              <span v-if="field.columnName==='MOBILE'||field.columnName==='ID_CARD'">{{ info[field.columnName]||'--'}}</span>
+              <span v-else-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                ">{{
+                  info[field.columnName] == null
+                    ? "--"
+                    : getOptionLabel(
+                        field.options,
+                        info[field.columnName],
+                        field.itemType
+                      )
+                }}</span>
+
+              <span v-else>{{
+                info[field.columnName] == null ? "--" : info[field.columnName]
+              }}</span>
             </div>
+          </div>
+
+          <div class="line"></div>
+        </div>
+
+        <div class="tabs">
+          <div class="tab-btn"
+               @click="subStartGroupIndex"
+               v-if="groupList.length > 9">
+            <img src="@/assets/img/shuju/people/arrow-double-left.png" />
+          </div>
+          <div v-show="index >= startGroupIndex && index < startGroupIndex + 9"
+               class="tab"
+               :class="groupIndex % groupList.length == index ? 'z-on' : ''"
+               :key="'tab' + index"
+               @click="groupIndex = index"
+               v-for="(item, index) in groupList">
+            {{ item.label }}
+          </div>
+          <div class="tab-btn"
+               @click="addStartGroupIndex"
+               v-if="groupList.length > 9">
+            <img src="@/assets/img/shuju/people/arrow-double-right.png" />
+          </div>
+        </div>
+
+        <div :key="'group' + index"
+             v-show="groupIndex % groupList.length == index"
+             v-for="(group, index) in groupList">
+          <div v-if="
+              group.tableName == 'ic_resi_demand' &&
+              Array.isArray(allInfo.ic_resi_demand) &&
+              allInfo.ic_resi_demand.length > 0
+            ">
             <div class="list"
-                 v-else>
+                 :key="'ic_resi_demand' + infoIndex"
+                 v-for="(infoItem, infoIndex) in allInfo.ic_resi_demand">
               <div class="item"
-                   :class="{ 'z-long': group.itemList.length == 1 }"
                    :key="field.itemId"
                    v-for="field in group.itemList">
                 <span class="item-field">{{ field.label }}：</span>
@@ -257,457 +110,599 @@
                     field.itemType == 'checkbox' ||
                     field.itemType == 'cascader'
                   ">{{
-                    !allInfo[group.tableName] ||
-                    allInfo[group.tableName][0][field.columnName] == null
+                    infoItem[field.columnName] == null
                       ? "--"
                       : getOptionLabel(
                           field.options,
-                          allInfo[group.tableName][0][field.columnName],
+                          infoItem[field.columnName],
                           field.itemType
                         )
                   }}</span>
-  
+
                 <span v-else>{{
+                  infoItem[field.columnName] == null
+                    ? "--"
+                    : infoItem[field.columnName]
+                }}</span>
+              </div>
+            </div>
+          </div>
+          <div v-else-if="group.tableName == 'ic_hs'"
+               style="margin-top: 10px; padding: 0 20px">
+            <el-table class="table"
+                      :data="natList"
+                      border
+                      height="400"
+                      :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="testTime"
+                               header-align="center"
+                               align="center"
+                               label="检测时间"
+                               width="150">
+              </el-table-column>
+              <el-table-column prop="address"
+                               header-align="center"
+                               align="center"
+                               label="检测机构"
+                               show-overflow-tooltip
+                               min-width="180">
+              </el-table-column>
+              <el-table-column prop="result"
+                               header-align="center"
+                               align="center"
+                               label="检测结果"
+                               width="240">
+              </el-table-column>
+            </el-table>
+          </div>
+          <div v-else-if="group.tableName == 'ic_xc'"
+               style="margin-top: 10px; padding: 0 20px">
+            <el-table class="table"
+                      :data="tripList"
+                      border
+                      height="400"
+                      :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="fromRegion"
+                               header-align="center"
+                               align="center"
+                               label="来自地区"
+                               show-overflow-tooltip
+                               min-width="100">
+              </el-table-column>
+              <el-table-column prop="arrivalTime"
+                               header-align="center"
+                               align="center"
+                               label="来到本地时间"
+                               width="140">
+              </el-table-column>
+              <el-table-column prop="leaveTime"
+                               header-align="center"
+                               align="center"
+                               label="离开本地时间"
+                               width="140">
+              </el-table-column>
+              <el-table-column prop="noticeTime"
+                               header-align="center"
+                               align="center"
+                               label="最近一次通知时间"
+                               width="140">
+              </el-table-column>
+              <el-table-column prop="remark"
+                               header-align="center"
+                               align="center"
+                               label="备注"
+                               show-overflow-tooltip
+                               width="120">
+              </el-table-column>
+            </el-table>
+          </div>
+          <div v-else-if="group.tableName == 'ic_ym'"
+               style="margin-top: 10px; padding: 0 20px">
+            <el-table v-if="vaccineList"
+                      class="table"
+                      :data="vaccineList"
+                      border
+                      height="400"
+                      :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="vaccinateTime"
+                               header-align="center"
+                               align="center"
+                               label="接种时间"
+                               show-overflow-tooltip
+                               min-width="100">
+              </el-table-column>
+              <el-table-column prop="address"
+                               header-align="center"
+                               align="center"
+                               label="接种地点">
+              </el-table-column>
+              <el-table-column prop="manufactor"
+                               header-align="center"
+                               align="center"
+                               label="疫苗厂家">
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="list"
+               v-else>
+            <div class="item"
+                 :class="{ 'z-long': group.itemList.length == 1 }"
+                 :key="field.itemId"
+                 v-for="field in group.itemList">
+              <span class="item-field">{{ field.label }}：</span>
+              <span v-if="
+                  field.itemType == 'select' ||
+                  field.itemType == 'radio' ||
+                  field.itemType == 'checkbox' ||
+                  field.itemType == 'cascader'
+                ">{{
                   !allInfo[group.tableName] ||
                   allInfo[group.tableName][0][field.columnName] == null
                     ? "--"
-                    : allInfo[group.tableName][0][field.columnName]
+                    : getOptionLabel(
+                        field.options,
+                        allInfo[group.tableName][0][field.columnName],
+                        field.itemType
+                      )
                 }}</span>
-              </div>
+
+              <span v-else>{{
+                !allInfo[group.tableName] ||
+                allInfo[group.tableName][0][field.columnName] == null
+                  ? "--"
+                  : allInfo[group.tableName][0][field.columnName]
+              }}</span>
             </div>
           </div>
         </div>
       </div>
     </div>
-  </template>
-  
-  <script>
-  import cptCard from "@/views/modules/visual/cpts/card";
-  import { requestPost } from "@/js/dai/request";
-  
-  export default {
-    name: "peopleMore",
-    props: {
-      userId: {
-        type: String,
-        default: "",
-      },
-      gridName: {
-        type: String,
-        default: "",
-      },
-      view_real_data: {//显示【显示脱敏信息】按钮
-        type: Boolean,
-        default: false,
-      }
+  </div>
+</template>
+
+<script>
+import cptCard from "@/views/modules/visual/cpts/card";
+import { requestPost } from "@/js/dai/request";
+
+export default {
+  name: "peopleMore",
+  props: {
+    userId: {
+      type: String,
+      default: "",
     },
-  
-    components: {
-      cptCard,
+    gridName: {
+      type: String,
+      default: "",
     },
-  
-    data () {
-      return {
-        fieldList: [],
-        groupList: [],
-        groupIndex: 0,
-        startGroupIndex: 0,
-        info: {},
-        allInfo: {},
-  
-        xiaoquList: [],
-        louList: [],
-        danyuanList: [],
-        homeList: [],
-        natList: [], // 核酸检测
-        tripList: [], // 行程信息
-  
-        vaccineList: [],
-      };
+    view_real_data: {//显示【显示脱敏信息】按钮
+      type: Boolean,
+      default: false,
+    }
+  },
+
+  components: {
+    cptCard,
+  },
+
+  data () {
+    return {
+      fieldList: [],
+      groupList: [],
+      groupIndex: 0,
+      startGroupIndex: 0,
+      info: {},
+      allInfo: {},
+
+      xiaoquList: [],
+      louList: [],
+      danyuanList: [],
+      homeList: [],
+      natList: [], // 核酸检测
+      tripList: [], // 行程信息
+
+      vaccineList: [],
+    };
+  },
+
+  computed: {
+    isShundeju () {
+      return this.$store.state.user.customerId == "1550309684576591874";
     },
-  
-    computed: {
-      isShundeju () {
-        return this.$store.state.user.customerId == "1550309684576591874";
-      },
-  
-      xiaoquName () {
-        const {
-          xiaoquList,
-          info: { VILLAGE_ID },
-        } = this;
-        if (Array.isArray(xiaoquList) && xiaoquList.length > 0 && VILLAGE_ID) {
-          let item = xiaoquList.find((item) => item.value == VILLAGE_ID);
-          if (item) {
-            return item.label;
-          }
-        }
-        return "";
-      },
-      louName () {
-        const {
-          louList,
-          info: { BUILD_ID },
-        } = this;
-        if (Array.isArray(louList) && louList.length > 0 && BUILD_ID) {
-          let item = louList.find((item) => item.value == BUILD_ID);
-          if (item) {
-            return item.label;
-          }
+
+    xiaoquName () {
+      const {
+        xiaoquList,
+        info: { VILLAGE_ID },
+      } = this;
+      if (Array.isArray(xiaoquList) && xiaoquList.length > 0 && VILLAGE_ID) {
+        let item = xiaoquList.find((item) => item.value == VILLAGE_ID);
+        if (item) {
+          return item.label;
         }
-        return "";
-      },
-      danyuanName () {
-        const {
-          danyuanList,
-          info: { UNIT_ID },
-        } = this;
-        if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
-          let item = danyuanList.find((item) => item.value == UNIT_ID);
-          if (item) {
-            return item.label;
-          }
+      }
+      return "";
+    },
+    louName () {
+      const {
+        louList,
+        info: { BUILD_ID },
+      } = this;
+      if (Array.isArray(louList) && louList.length > 0 && BUILD_ID) {
+        let item = louList.find((item) => item.value == BUILD_ID);
+        if (item) {
+          return item.label;
         }
-        return "";
-      },
-      danyuanName () {
-        const {
-          danyuanList,
-          info: { UNIT_ID },
-        } = this;
-        if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
-          let item = danyuanList.find((item) => item.value == UNIT_ID);
-          if (item) {
-            return item.label;
-          }
+      }
+      return "";
+    },
+    danyuanName () {
+      const {
+        danyuanList,
+        info: { UNIT_ID },
+      } = this;
+      if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
+        let item = danyuanList.find((item) => item.value == UNIT_ID);
+        if (item) {
+          return item.label;
         }
-        return "";
-      },
-      homeName () {
-        const {
-          homeList,
-          info: { HOME_ID },
-        } = this;
-        if (Array.isArray(homeList) && homeList.length > 0 && HOME_ID) {
-          let item = homeList.find((item) => item.value == HOME_ID);
-          if (item) {
-            return item.label;
-          }
+      }
+      return "";
+    },
+    danyuanName () {
+      const {
+        danyuanList,
+        info: { UNIT_ID },
+      } = this;
+      if (Array.isArray(danyuanList) && danyuanList.length > 0 && UNIT_ID) {
+        let item = danyuanList.find((item) => item.value == UNIT_ID);
+        if (item) {
+          return item.label;
         }
-        return "";
-      },
+      }
+      return "";
     },
-  
-    watch: {
-      userId () {
-        this.getApiData();
-      },
+    homeName () {
+      const {
+        homeList,
+        info: { HOME_ID },
+      } = this;
+      if (Array.isArray(homeList) && homeList.length > 0 && HOME_ID) {
+        let item = homeList.find((item) => item.value == HOME_ID);
+        if (item) {
+          return item.label;
+        }
+      }
+      return "";
     },
-  
-    mounted () {
+  },
+
+  watch: {
+    userId () {
       this.getApiData();
     },
-  
-    methods: {
-      async handleTuomin () {
-        const url = "/data/aggregator/epmetuser/detailByType";
-  
-        const { data, code, msg } = await requestPost(url, {
-          id: this.userId,
-          type: "checkIcResiUser",
-        });
-  
-        if (code === 0) {
-          this.$set(this.info, 'MOBILE', data.mobile)
-          this.$set(this.info, 'ID_CARD', data.idCard)
-        } else {
-          this.$message.error(msg);
-        }
-  
-  
-      },
-      addStartGroupIndex () {
-        const { startGroupIndex, groupList } = this;
-        if (startGroupIndex < groupList.length - 9) {
-          this.startGroupIndex = startGroupIndex + 1;
-        } else {
-          this.startGroupIndex = groupList.length - 9;
-        }
-      },
-      subStartGroupIndex () {
-        const { startGroupIndex, groupList } = this;
-        if (startGroupIndex > 0) {
-          this.startGroupIndex = startGroupIndex - 1;
+  },
+
+  mounted () {
+    this.getApiData();
+  },
+
+  methods: {
+    async handleTuomin () {
+      const url = "/data/aggregator/epmetuser/detailByType";
+
+      const { data, code, msg } = await requestPost(url, {
+        id: this.userId,
+        type: "checkIcResiUser",
+      });
+
+      if (code === 0) {
+        this.$set(this.info, 'MOBILE', data.mobile)
+        this.$set(this.info, 'ID_CARD', data.idCard)
+      } else {
+        this.$message.error(msg);
+      }
+
+
+    },
+    addStartGroupIndex () {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex < groupList.length - 9) {
+        this.startGroupIndex = startGroupIndex + 1;
+      } else {
+        this.startGroupIndex = groupList.length - 9;
+      }
+    },
+    subStartGroupIndex () {
+      const { startGroupIndex, groupList } = this;
+      if (startGroupIndex > 0) {
+        this.startGroupIndex = startGroupIndex - 1;
+      } else {
+        this.startGroupIndex = 0;
+      }
+    },
+    handleClose () {
+      this.$emit("close");
+    },
+
+    async getApiData () {
+      await this.getField();
+      await this.getInfo();
+      this.getDetailList();
+      this.getXiaoquList();
+      this.getLouList();
+      this.getDanyuanList();
+      this.getHomeList();
+    },
+
+    getOptionLabel (options, value, type = "") {
+      if (Array.isArray(options)) {
+        let valueArr = value.split(",");
+        if (type == "cascader") {
+          let finalValue = [];
+          this.getNodePath(options, value, finalValue);
+          return finalValue.join("-");
         } else {
-          this.startGroupIndex = 0;
+          return valueArr
+            .map((val) => {
+              let item = options.find((item) => item.value == val);
+              if (item && item.label) {
+                return item.label;
+              }
+              return "--";
+            })
+            .join("、");
         }
-      },
-      handleClose () {
-        this.$emit("close");
-      },
-  
-      async getApiData () {
-        await this.getField();
-        await this.getInfo();
-        this.getDetailList();
-        this.getXiaoquList();
-        this.getLouList();
-        this.getDanyuanList();
-        this.getHomeList();
-      },
-  
-      getOptionLabel (options, value, type = "") {
-        if (Array.isArray(options)) {
-          let valueArr = value.split(",");
-          if (type == "cascader") {
-            let finalValue = [];
-            this.getNodePath(options, value, finalValue);
-            return finalValue.join("-");
+      }
+      return "--";
+    },
+
+    getNodePath (node, val, path) {
+      // node:所有数据，val:后台返回的id, path:要渲染的数组id
+      for (let i = 0; i < node.length; i++) {
+        const ele = node[i];
+        if (ele.value === val) {
+          path.push(ele.label);
+          return path;
+        } else if (ele.children && ele.children.length > 0) {
+          if (ele.children.some((row) => row.value === val)) {
+            path.unshift(ele.label);
+            this.getNodePath(ele.children, val, path);
           } else {
-            return valueArr
-              .map((val) => {
-                let item = options.find((item) => item.value == val);
-                if (item && item.label) {
-                  return item.label;
-                }
-                return "--";
-              })
-              .join("、");
+            this.getNodePath(ele.children, val, path);
           }
         }
-        return "--";
-      },
-  
-      getNodePath (node, val, path) {
-        // node:所有数据，val:后台返回的id, path:要渲染的数组id
-        for (let i = 0; i < node.length; i++) {
-          const ele = node[i];
-          if (ele.value === val) {
-            path.push(ele.label);
-            return path;
-          } else if (ele.children && ele.children.length > 0) {
-            if (ele.children.some((row) => row.value === val)) {
-              path.unshift(ele.label);
-              this.getNodePath(ele.children, val, path);
+      }
+      return path;
+    },
+
+    //加载组织数据
+    async getField () {
+      const url = "/oper/customize/icform/getcustomerform";
+
+      const { data, code, msg } = await requestPost(url, {
+        dynamic: true,
+        formCode: "resi_base_info",
+      });
+
+      if (code === 0) {
+        this.groupList = data.groupList;
+        this.fieldList = (function (arr) {
+          let col = [];
+          let ele = [];
+          for (let i = 0; i < arr.length; i++) {
+            let item = arr[i];
+            if (item.itemType == "divider" || i == arr.length - 1) {
+              col.push([...ele]);
+              ele = [];
             } else {
-              this.getNodePath(ele.children, val, path);
+              ele.push(item);
             }
           }
-        }
-        return path;
-      },
-  
-      //加载组织数据
-      async getField () {
-        const url = "/oper/customize/icform/getcustomerform";
-  
-        const { data, code, msg } = await requestPost(url, {
-          dynamic: true,
-          formCode: "resi_base_info",
-        });
-  
-        if (code === 0) {
-          this.groupList = data.groupList;
-          this.fieldList = (function (arr) {
-            let col = [];
-            let ele = [];
-            for (let i = 0; i < arr.length; i++) {
-              let item = arr[i];
-              if (item.itemType == "divider" || i == arr.length - 1) {
-                col.push([...ele]);
-                ele = [];
-              } else {
-                ele.push(item);
-              }
+          return col;
+        })(data.itemList);
+
+        this.fieldList.forEach((subList, index) => {
+          subList.forEach(async (item, subIndex) => {
+            if (item.optionSourceType == "remote" && item.optionSourceValue) {
+              this.fieldList[index][subIndex].options = await this.getOptions(
+                item.optionSourceValue
+              );
             }
-            return col;
-          })(data.itemList);
-  
-          this.fieldList.forEach((subList, index) => {
-            subList.forEach(async (item, subIndex) => {
-              if (item.optionSourceType == "remote" && item.optionSourceValue) {
-                this.fieldList[index][subIndex].options = await this.getOptions(
-                  item.optionSourceValue
-                );
-              }
-            });
           });
-        } else {
-          this.$message.error(msg);
-        }
-      },
-  
-      //加载组织数据
-      async getInfo () {
-        const url = "/epmetuser/icresiuser/detail";
-  
-        const { data, code, msg } = await requestPost(url, {
-          icResiUserId: this.userId,
-          formCode: "resi_base_info",
         });
-  
-        if (code === 0) {
-          this.info = data.ic_resi_user[0];
-          this.allInfo = data;
-  
-          this.fieldList.forEach((subList, index) => {
-            subList.forEach((item, subIndex) => {
-              if (
-                item.itemType == "radio" &&
-                item.childGroup &&
-                this.allInfo[item.tableName] &&
-                this.allInfo[item.tableName][0][item.columnName] == "1"
-              ) {
-                this.groupList = [...this.groupList, item.childGroup];
-              }
-            });
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getInfo () {
+      const url = "/epmetuser/icresiuser/detail";
+
+      const { data, code, msg } = await requestPost(url, {
+        icResiUserId: this.userId,
+        formCode: "resi_base_info",
+      });
+
+      if (code === 0) {
+        this.info = data.ic_resi_user[0];
+        this.allInfo = data;
+
+        this.fieldList.forEach((subList, index) => {
+          subList.forEach((item, subIndex) => {
+            if (
+              item.itemType == "radio" &&
+              item.childGroup &&
+              this.allInfo[item.tableName] &&
+              this.allInfo[item.tableName][0][item.columnName] == "1"
+            ) {
+              this.groupList = [...this.groupList, item.childGroup];
+            }
           });
-  
-          await Promise.all(
-            this.groupList.map((subList, index) => {
-              return Promise.all(
-                subList.itemList.map(async (item, subIndex) => {
-                  if (
-                    item.optionSourceType == "remote" &&
-                    item.optionSourceValue
-                  ) {
-                    this.groupList[index].itemList[subIndex].options =
-                      await this.getOptions(item.optionSourceValue);
-                  }
-                })
-              );
-            })
-          );
-          console.log("44444444", this.groupList);
-          let arr = [
+        });
+
+        await Promise.all(
+          this.groupList.map((subList, index) => {
+            return Promise.all(
+              subList.itemList.map(async (item, subIndex) => {
+                if (
+                  item.optionSourceType == "remote" &&
+                  item.optionSourceValue
+                ) {
+                  this.groupList[index].itemList[subIndex].options =
+                    await this.getOptions(item.optionSourceValue);
+                }
+              })
+            );
+          })
+        );
+        console.log("44444444", this.groupList);
+        let arr = [
+          {
+            groupId: "hs123",
+            itemList: [],
+            label: "核酸检测信息",
+            sort: 998,
+            supportAdd: false,
+            tableName: "ic_hs",
+          },
+        ];
+        if (!this.isShundeju) {
+          arr = [
+            ...arr,
+            {
+              groupId: "hs124",
+              itemList: [],
+              label: "行程信息",
+              sort: 999,
+              supportAdd: false,
+              tableName: "ic_xc",
+            },
             {
-              groupId: "hs123",
+              groupId: "hs125",
               itemList: [],
-              label: "核酸检测信息",
-              sort: 998,
+              label: "疫苗信息",
+              sort: 999,
               supportAdd: false,
-              tableName: "ic_hs",
+              tableName: "ic_ym",
             },
           ];
-          if (!this.isShundeju) {
-            arr = [
-              ...arr,
-              {
-                groupId: "hs124",
-                itemList: [],
-                label: "行程信息",
-                sort: 999,
-                supportAdd: false,
-                tableName: "ic_xc",
-              },
-              {
-                groupId: "hs125",
-                itemList: [],
-                label: "疫苗信息",
-                sort: 999,
-                supportAdd: false,
-                tableName: "ic_ym",
-              },
-            ];
-            this.groupList = [...this.groupList, ...arr];
-          } else {
-            this.groupList = [...arr, ...this.groupList];
-          }
-        } else {
-          this.$message.error(msg);
-        }
-      },
-  
-      //加载组织数据
-      async getOptions (url) {
-        if (!url) return [];
-  
-        const { data, code, msg } = await requestPost(url, {});
-  
-        if (code === 0) {
-          return data;
-        } else {
-          return [];
-        }
-      },
-  
-      async getXiaoquList () {
-        const url = "/gov/org/icneighborhood/neighborhoodoption";
-  
-        const { data, code, msg } = await requestPost(url, {
-          agencyId: this.info.AGENCY_ID,
-          gridId: this.info.GRID_ID,
-        });
-  
-        if (code === 0) {
-          this.xiaoquList = data;
-        } else {
-          this.$message.error(msg);
-        }
-      },
-      async getLouList () {
-        const url = "/gov/org/icbuilding/buildingoption";
-  
-        const { data, code, msg } = await requestPost(url, {
-          neighborHoodId: this.info.VILLAGE_ID,
-        });
-  
-        if (code === 0) {
-          this.louList = data;
+          this.groupList = [...this.groupList, ...arr];
         } else {
-          this.$message.error(msg);
+          this.groupList = [...arr, ...this.groupList];
         }
-      },
-      async getDanyuanList () {
-        const url = "/gov/org/icbuildingunit/unitoption";
-  
-        const { data, code, msg } = await requestPost(url, {
-          buildingId: this.info.BUILD_ID,
-        });
-  
-        if (code === 0) {
-          this.danyuanList = data;
-        } else {
-          this.$message.error(msg);
-        }
-      },
-      async getHomeList () {
-        const url = "/gov/org/ichouse/houseoption";
-  
-        const { data, code, msg } = await requestPost(url, {
-          unitId: this.info.UNIT_ID,
-        });
-  
-        if (code === 0) {
-          this.homeList = data;
-        } else {
-          this.$message.error(msg);
-        }
-      },
-      async getDetailList () {
-        const url = "/epmetuser/epidemicPrevention/info";
-        let params = {
-          id: this.userId,
-        };
-  
-        const { data, code, msg } = await requestPost(url, params);
-  
-        if (code === 0) {
-          const { vaccineList, natList, tripList } = data;
-          this.vaccineList = vaccineList;
-          this.natList = natList;
-          this.tripList = tripList;
-        } else {
-          this.$message.error(msg);
-        }
-      },
+      } else {
+        this.$message.error(msg);
+      }
+    },
+
+    //加载组织数据
+    async getOptions (url) {
+      if (!url) return [];
+
+      const { data, code, msg } = await requestPost(url, {});
+
+      if (code === 0) {
+        return data;
+      } else {
+        return [];
+      }
+    },
+
+    async getXiaoquList () {
+      const url = "/gov/org/icneighborhood/neighborhoodoption";
+
+      const { data, code, msg } = await requestPost(url, {
+        agencyId: this.info.AGENCY_ID,
+        gridId: this.info.GRID_ID,
+      });
+
+      if (code === 0) {
+        this.xiaoquList = data;
+      } else {
+        this.$message.error(msg);
+      }
     },
-  };
-  </script>
-  
-  <style lang="scss"  scoped>
-    @import "@/assets/scss/modules/management/list-main.scss";
-    @import '@/assets/scss/people-info.scss'
-
-</style>
-  
\ No newline at end of file
+    async getLouList () {
+      const url = "/gov/org/icbuilding/buildingoption";
+
+      const { data, code, msg } = await requestPost(url, {
+        neighborHoodId: this.info.VILLAGE_ID,
+      });
+
+      if (code === 0) {
+        this.louList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getDanyuanList () {
+      const url = "/gov/org/icbuildingunit/unitoption";
+
+      const { data, code, msg } = await requestPost(url, {
+        buildingId: this.info.BUILD_ID,
+      });
+
+      if (code === 0) {
+        this.danyuanList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getHomeList () {
+      const url = "/gov/org/ichouse/houseoption";
+
+      const { data, code, msg } = await requestPost(url, {
+        unitId: this.info.UNIT_ID,
+      });
+
+      if (code === 0) {
+        this.homeList = data;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    async getDetailList () {
+      const url = "/epmetuser/epidemicPrevention/info";
+      let params = {
+        id: this.userId,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        const { vaccineList, natList, tripList } = data;
+        this.vaccineList = vaccineList;
+        this.natList = natList;
+        this.tripList = tripList;
+      } else {
+        this.$message.error(msg);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>

From 06fbb5874ffbe3506497d3c7fc3dcb3cc4060f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E9=AD=81?= <2403457699@qq.com>
Date: Thu, 8 Dec 2022 20:31:52 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E8=B6=85=E5=87=BA=E6=90=9C=E7=B4=A2=E6=A0=8F=E4=B8=89=E8=A1=8C?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=B1=95=E5=BC=80=E6=98=BE=E7=A4=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/modules/management/list-main.css  |  7 ++++++-
 .../scss/modules/management/list-main.min.css     |  2 +-
 src/assets/scss/modules/management/list-main.scss |  6 +++++-
 src/views/modules/base/community/community.vue    | 15 ++++++++++-----
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/assets/scss/modules/management/list-main.css b/src/assets/scss/modules/management/list-main.css
index 3cd03235e..148d2cf9c 100644
--- a/src/assets/scss/modules/management/list-main.css
+++ b/src/assets/scss/modules/management/list-main.css
@@ -102,7 +102,6 @@
   display: flex;
   flex-flow: column;
   overflow: hidden;
-  height: 100%;
 }
 
 .div_main .flex1 {
@@ -241,6 +240,12 @@
   }
 }
 
+@media only screen and (min-width: 1481px) {
+  .div_main .communityUnfold {
+    display: none;
+  }
+}
+
 .div_main .item_width_2 {
   width: 138px;
 }
diff --git a/src/assets/scss/modules/management/list-main.min.css b/src/assets/scss/modules/management/list-main.min.css
index 08b0c7662..da1ed8579 100644
--- a/src/assets/scss/modules/management/list-main.min.css
+++ b/src/assets/scss/modules/management/list-main.min.css
@@ -1 +1 @@
-.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-right:10px;margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .setFormBoxHeight{max-height:153px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.div_main .flex{display:flex;flex-wrap:nowrap}.div_main .hflex{display:flex;flex-flow:column;overflow:hidden;height:100%}.div_main .flex1{flex:1}.div_main .mean{justify-content:space-around}.div_main .endpoint{justify-content:space-between}.div_main .align_item{align-items:center}.div_main .font12{font-size:12px}.div_main .font14{font-size:14px !important}.div_main .font16{font-size:16px !important}.div_main .font18{font-size:18px !important}.div_main .p0{padding:0 !important}.div_main .p10{padding:10px}.div_main .p50{padding:50px}.div_main .p30{padding:30px}.div_main .right5{margin-right:5px}.div_main .right24{margin-right:24px}.div_main .bottom8{margin-bottom:8px}.div_main .bottom16{margin-bottom:16px}.div_main .top2{margin-top:2px}.div_main .top12{margin-top:12px}.div_main .top24{margin-top:24px !important}.div_main .top32{margin-top:32px !important}.div_main .top40{margin-top:40px !important}.div_main .top48{margin-top:48px !important}.div_main .top8{margin-top:8px !important}.div_main .bot8{margin-bottom:8px}.div_main .bot24{margin-bottom:24px !important}.div_main .top16{margin-top:16px !important}.div_main .bot16{margin-bottom:16px !important}.div_main .right8{margin-right:8px !important}.div_main .margin30{margin:30px}.div_main .m0{margin:0 !important}.div_main .title-small{border-left:solid 4px #0056d6;height:12px;line-height:16px;margin-left:70px;padding-left:3px;font-size:16px;font-weight:bold}@media only screen and (min-width: 2013px){.div_main .showUnfold{display:none}}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}
+.div_main{width:100%}.div_main .marginl-20{margin-left:16px}.div_main .div_search{padding:10px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);margin:7px 7px}.div_main .div_search /deep/ .el-form-item{margin-bottom:14px}.div_main .div_search .div_search_btn{margin-right:10px;margin-top:5px;float:right}.div_main .div_search .div_search_label{line-height:36px;margin-left:24px;margin-right:6px;font-size:14px;color:#606266;vertical-align:middle}.div_main .data-tag{margin-left:10px}.div_main .item_width_normal{width:168px}.div_main .item_width_daterange{width:206px}.div_main .item_width_daterange2{width:445px}.div_main .item_width_communitycascader{width:141px}.div_main .item_width_buildcascader{width:96px}.div_main .div_table{margin:16px 7px 7px;background:#FFFFFF;box-shadow:0px 6px 16px 0px rgba(0,0,0,0.08),0px 3px 6px -4px rgba(0,0,0,0.12);position:relative;padding:24px 16px 10px}.div_main .div_table .div_btn{display:flex;justify-content:space-between}.div_main .div_table .div_btn .div_btn_left{display:flex}.div_main .div_table .div_btn .div_btn_left .btn_upload{margin-left:10px;display:flex;text-align:center}.div_main .div_table .div_table_item{margin-top:16px;position:relative}.div_main .setFormBoxHeight{max-height:153px;overflow:hidden}.div_main .setFormBoxHeightAuto{height:auto}.div_main .flex{display:flex;flex-wrap:nowrap}.div_main .hflex{display:flex;flex-flow:column;overflow:hidden}.div_main .flex1{flex:1}.div_main .mean{justify-content:space-around}.div_main .endpoint{justify-content:space-between}.div_main .align_item{align-items:center}.div_main .font12{font-size:12px}.div_main .font14{font-size:14px !important}.div_main .font16{font-size:16px !important}.div_main .font18{font-size:18px !important}.div_main .p0{padding:0 !important}.div_main .p10{padding:10px}.div_main .p50{padding:50px}.div_main .p30{padding:30px}.div_main .right5{margin-right:5px}.div_main .right24{margin-right:24px}.div_main .bottom8{margin-bottom:8px}.div_main .bottom16{margin-bottom:16px}.div_main .top2{margin-top:2px}.div_main .top12{margin-top:12px}.div_main .top24{margin-top:24px !important}.div_main .top32{margin-top:32px !important}.div_main .top40{margin-top:40px !important}.div_main .top48{margin-top:48px !important}.div_main .top8{margin-top:8px !important}.div_main .bot8{margin-bottom:8px}.div_main .bot24{margin-bottom:24px !important}.div_main .top16{margin-top:16px !important}.div_main .bot16{margin-bottom:16px !important}.div_main .right8{margin-right:8px !important}.div_main .margin30{margin:30px}.div_main .m0{margin:0 !important}.div_main .title-small{border-left:solid 4px #0056d6;height:12px;line-height:16px;margin-left:70px;padding-left:3px;font-size:16px;font-weight:bold}@media only screen and (min-width: 2013px){.div_main .showUnfold{display:none}}@media only screen and (min-width: 1481px){.div_main .communityUnfold{display:none}}.div_main .item_width_2{width:138px}.div_main .item_width_1{width:260px}.div_main .item_width_3{width:200px}.div_main .list_item_width_1{width:165px}.div_main .list_item_width_2{width:135px}.div-mult-form{margin-top:20px}.div-mult-form .div_person{display:flex;font-size:14px;padding-bottom:20px}.div-mult-form .div_person .person_title{text-align:right;flex:0 0 100px;line-height:36px;padding:0 12px 0 0}.div-mult-form .div_person .tag_item{margin-right:10px;margin-top:10px}.div-mult-form .div_person .tag_tip{margin-top:10px;color:#9c9c9c}.div-mult-table{position:relative;padding:0 20px}.div-mult-table .div_selcount{position:absolute;bottom:10px;left:30px}.div_dialog_table{padding:10px}.div_dialog_table .table{margin-top:20px}.twoline{display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2;overflow:hidden}
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index cfd95a0bf..747ec9b0b 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -114,7 +114,6 @@
   display: flex;
   flex-flow: column;
   overflow: hidden;
-  height: 100%;
 }
 
 .flex1 {
@@ -246,6 +245,11 @@
   .showUnfold {
     display: none;
   }
+}
+@media only screen and (min-width: 1481px){
+  .communityUnfold {
+    display: none;
+  }
 }
   //---------旧版
 
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index ab7830150..a0674ad92 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -35,7 +35,7 @@
     <div :style="{height:rowHeight}"
          class=div_left>
 
-      <div class="div_search">
+      <div class="div_search hflex">
 
         <el-form :inline="true"
                   class="communityHeight"
@@ -186,7 +186,12 @@
           </el-form-item>
 
           <!-- </div> -->
-          <div class="div_search_btn">
+         
+        </el-form>
+        <el-row class="flex endpoint">
+            <el-col :span="24">
+              <span></span>
+            <div class="div_search_btn">
             <el-button size="small"
                        class="diy-button--white"
                        @click="resetSearch">重置</el-button>
@@ -196,13 +201,13 @@
                        @click="handleSearch">查询</el-button>
             <el-button style="margin-left:15px"
                        size="small"
-                       class="div-table-button--blue"
+                       class="div-table-button--blue communityUnfold"
                        type="text"
                        @click="boxHeight = !boxHeight">{{ boxHeight ? '收起' : '展开' }}<i :class="boxHeight ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i></el-button>
 
           </div>
-        </el-form>
-
+            </el-col>
+          </el-row>
       </div>
 
       <div class="">