diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index f181050a6..1e11def0d 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -41,7 +41,7 @@
 }
 
 
-.div_btn {
+.div_edit_btn {
   display: flex;
   margin-top: 20px;
   margin-right:16px;
diff --git a/src/assets/scss/modules/management/list-main.css b/src/assets/scss/modules/management/list-main.css
index 148d2cf9c..1521b3e99 100644
--- a/src/assets/scss/modules/management/list-main.css
+++ b/src/assets/scss/modules/management/list-main.css
@@ -144,6 +144,10 @@
   padding: 10px;
 }
 
+.div_main .p16 {
+  padding: 16px;
+}
+
 .div_main .p50 {
   padding: 50px;
 }
@@ -229,7 +233,7 @@
   height: 12px;
   line-height: 16px;
   margin-left: 70px;
-  padding-left: 3px;
+  padding-left: 6px;
   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 da1ed8579..28b03fbe9 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}.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}
+.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 .p16{padding:16px}.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:6px;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 747ec9b0b..0bdd9689e 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -5,6 +5,7 @@
   .marginl-20{
     margin-left: 16px;
   }
+ 
 
   .div_search {
     padding: 10px;
@@ -13,6 +14,8 @@
     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;
 
+    overflow:hidden;
+
     /deep/ .el-form-item{
       margin-bottom:14px;
     }
@@ -68,6 +71,18 @@
     position: relative;
     padding:24px 16px 10px;
 
+    // /deep/ .el-table th>.cell{
+    //   margin-left:24px;
+    // }
+
+    // /deep/ .el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell{
+    //   margin-left:24px;
+    // }
+
+    /deep/ .el-table th, .el-table tr{
+      height:54px;
+    }
+
     .div_btn {
       display: flex;
       // margin-top: 10px;
@@ -154,6 +169,9 @@
 .p10 {
   padding: 10px;
 }
+.p16 {
+  padding: 16px;
+}
 
 .p50 {
   padding: 50px;
@@ -237,7 +255,7 @@
   height: 12px;
   line-height: 16px;
   margin-left: 70px;
-  padding-left: 3px;
+  padding-left: 6px;
   font-size: 16px;
   font-weight: bold;
 }
diff --git a/src/assets/scss/people-info.scss b/src/assets/scss/people-info.scss
index b0aca9ec0..b0aa3714b 100644
--- a/src/assets/scss/people-info.scss
+++ b/src/assets/scss/people-info.scss
@@ -51,7 +51,7 @@
         .list {
             display: flex;
             flex-wrap: wrap;
-            padding: 10px 30px;
+            padding: 10px 97px;
 
             .item {
                 position: relative;
@@ -70,17 +70,17 @@
                     width: 100%;
                 }
 
-                &::before {
-                    position: absolute;
-                    left: 0;
-                    top: 9px;
-                    content: "";
-                    display: block;
-                    width: 7px;
-                    height: 7px;
-                    background: #ddd;
-                    border-radius: 3px;
-                }
+                // &::before {
+                //     position: absolute;
+                //     left: 0;
+                //     top: 9px;
+                //     content: "";
+                //     display: block;
+                //     width: 7px;
+                //     height: 7px;
+                //     background: #ddd;
+                //     border-radius: 3px;
+                // }
             }
         }
 
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index fbecaf644..655050a24 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -146,7 +146,7 @@
       </el-form>
 
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button type="primary"
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 4e1f89b02..cb2288b88 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -134,8 +134,10 @@
                   :key="n.itemId"
                   :span="item.length === 1 ? 24 : (24/columns)"
                   :style="n.itemType === 'divider' && 'display: none;'">
-            <el-form-item :prop="n.columnName"
-                          :label="n.label">
+            <el-form-item :prop="n.columnName">
+                          <template slot="label" style="padding-right:14px">
+                            <span >{{n.label}}</span>
+                          </template>
               <!-- <div class="resi-cell"> -->
               <!-- <div class="resi-cell-label">{{n.label}}</div> -->
               <div class="resi-cell-value">
@@ -200,6 +202,16 @@
                                 end-placeholder="结束时间"
                                 placeholder="选择时间范围">
                 </el-time-picker>
+                 <!-- 本地户籍更改为单选按钮 -->
+                <template  v-else-if="n.itemType === 'select' && n.label === '本地户籍' || n.label === '性别'" >
+                      <el-radio v-for="ns in n.options"
+                            :key="ns.value"
+                            v-model.trim="form[n.columnName]"
+                            :label="ns.value"
+                            @change="hanldeChangeRadio(n)">
+                    {{ ns.label }}
+                  </el-radio>
+               </template>
                 <el-select v-else-if="n.itemType === 'select'"
                            v-model.trim="form[n.columnName]"
                            :multiple="n.multiSelect"
@@ -213,6 +225,7 @@
                              :value="item.value">
                   </el-option>
                 </el-select>
+               
                 <!-- <el-cascader
                       :options="options"
                       :props="{ checkStrictly: true }"
@@ -226,13 +239,20 @@
                              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"
                             @change="hanldeChangeRadio(n)">
                     {{ ns.label }}
-                  </el-radio>
+                  </el-radio> -->
+                  <el-checkbox
+                            :key=" n.options[0].label"
+                            v-model.trim="form[n.columnName]"
+                         >
+                    <!-- {{  n.options[0].label }} -->
+                  </el-checkbox> 
                   <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
                 </template>
                 <template v-else-if="n.itemType === 'checkbox'">
@@ -252,6 +272,7 @@
             </el-form-item>
           </el-col>
         </el-row>
+          
       </template>
     </el-form>
   </div>
@@ -851,12 +872,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.resi-form {
-  :deep .el-date-editor.el-input,
-  .el-date-editor.el-input__inner {
-    width: 100% !important;
-  }
-}
+
 .resi-cell-value .resi-cell-input {
   width: 190px;
 }
diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index 016f3bc1b..9d19c1847 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -91,9 +91,8 @@
       </el-form>
     </div>
 
-    <el-row v-if="showSmartSearchForm" class="resi-row-more">
+    <el-row v-if="showSmartSearchForm" class="resi-row-more m0">
       <el-col :span="24">
-
         <el-button v-for="btnItem in btnList" :key="btnItem.index" size="small"
           :class="selBtnIndex === btnItem.index ? 'diy-button--blue' : 'diy-button--gray'"
           @click="handelSelSmartBtn(btnItem.index)">{{ btnItem.name }}</el-button>
@@ -798,6 +797,7 @@ export default {
 @import "@/assets/scss/modules/visual/communityManage.scss";
 
 
+
 .header_form_box {
   display: flex;
   flex-wrap: wrap;
diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 3baad809d..050b88466 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -1,13 +1,12 @@
 <template>
-  <div class="resi-container">
-    <el-card ref="searchCard" class="search-card">
-      <el-form
-        ref="searchForm"
-        :inline="true"
-        :model="fmData"
-        class="demo-form-inline"
-      >
-        <!-- <el-form-item
+  <div>
+    <div class="div_main">
+      <div ref="searchDiv"
+           class="div_search">
+        <el-form ref="searchForm"
+                 :inline="true"
+                 :model="fmData">
+          <!-- <el-form-item
           v-if="communityList.length > 0"
           label="所在社区"
           prop="orgId"
@@ -17,7 +16,7 @@
             placeholder="所在社区"
             size="small"
             clearable
-            class="resi-cell-input"
+            class="item_width_normal"
           >
             <el-option
               v-for="item in communityList"
@@ -28,296 +27,251 @@
             </el-option>
           </el-select>
         </el-form-item> -->
-        <el-form-item label="居住地址" prop="address">
-          <el-input
-            v-model="fmData.address"
-            class="resi-cell-input"
-            size="small"
-            clearable
-            placeholder="请输入"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item label="户籍地址" prop="domicilePlace">
-          <el-input
-            v-model="fmData.domicilePlace"
-            class="resi-cell-input"
-            size="small"
-            clearable
-            placeholder="请输入"
-          >
-          </el-input>
-        </el-form-item>
-        <el-form-item label="填写时间" prop="startTime">
-          <el-date-picker
-            v-model="timeRange"
-            type="daterange"
-            clearable
-            size="small"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item>
-          <el-button
-            class="diy-button--search"
-            size="small"
-            @click="handleSearch"
-            >查询</el-button
-          >
-          <el-button
-            class="diy-button--reset"
-            size="small"
-            @click="resetForm('searchForm')"
-            >重置</el-button
-          >
-        </el-form-item>
-      </el-form>
-    </el-card>
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <el-button @click="handleChu" class="diy-button--reset" size="small"
-          >导出</el-button
-        >
+          <el-form-item label="居住地址"
+                        prop="address">
+            <el-input v-model="fmData.address"
+                      class="item_width_normal"
+                      size="small"
+                      clearable
+                      placeholder="请输入">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="户籍地址"
+                        prop="domicilePlace">
+            <el-input v-model="fmData.domicilePlace"
+                      class="item_width_normal"
+                      size="small"
+                      clearable
+                      placeholder="请输入">
+            </el-input>
+          </el-form-item>
+          <el-form-item label="填写时间"
+                        prop="startTime">
+            <el-date-picker v-model="timeRange"
+                            type="daterange"
+                            clearable
+                            size="small"
+                            class="item_width_daterange2"
+                            range-separator="至"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"
+                            value-format="yyyy-MM-dd">
+            </el-date-picker>
+          </el-form-item>
+
+          <div class="div_search_btn">
+            <el-button class="diy-button--white"
+                       size="small"
+                       @click="resetForm('searchForm')">重置</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--blue"
+                       @click="handleSearch">查询</el-button>
+
+          </div>
+
+        </el-form>
       </div>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        class="resi-table"
-        :height="tableHeight"
-        :span-method="arraySpanMethod"
-      >
-        <el-table-column label="序号" prop="desc" align="center" width="50"/>
-        <el-table-column
-          prop="houseHolderName"
-          width="100"
-          label="户主姓名"
-          align="center"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          prop="address"
-          align="center"
-          min-width="140"
-          label="居住地址"
-          :show-overflow-tooltip="true"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.homeId == 'other'" class="badge">房屋缺失</span>
-            <span>{{scope.row.address}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="houseType"
-          align="center"
-          width="100"
-          label="房屋状态"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.houseType == 1">出租</span>
-            <span v-if="scope.row.houseType == 2">闲置</span>
-            <span v-if="scope.row.houseType == 3">未售出</span>
-            <span v-if="scope.row.houseType == 0">自住</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="totalResi"
-          width="80"
-          align="center"
-          label="居住人数"
-        />
-        <el-table-column
-          prop="memberName"
-          width="100"
-          label="成员姓名"
-          align="center"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          prop="memberIdNum"
-          width="180"
-          align="center"
-          label="成员证件号"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          prop="memberMobile"
-          width="140"
-          align="center"
-          label="成员手机号"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          prop="relationship"
-          min-width="120"
-          align="center"
-          label="与户主关系"
-          :show-overflow-tooltip="true"
-        >
-        <template slot-scope="scope">
-          <span>{{getRelationshipName(scope.row.relationship)}}</span>
-        </template>
-        </el-table-column>
-        <el-table-column
-          prop="heSuanCount"
-          width="120"
-          align="center"
-          label="核酸检测次数"
-        />
+      <div class="div_table">
+        <div class="div_btn">
+          <div class="div_btn_left">
+            <el-button @click="handleChu"
+                       class="diy-button--white"
+                       size="small">导出</el-button>
+          </div>
+        </div>
+        <el-table :data="tableData"
+                  border
+                  style="width: 100%"
+                  class="div_table_item"
+                  :height="tableHeight"
+                  :span-method="arraySpanMethod">
+          <el-table-column label="序号"
+                           prop="desc"
+                           align="center"
+                           width="50" />
+          <el-table-column prop="houseHolderName"
+                           width="100"
+                           label="户主姓名"
+                           align="center"
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="address"
+                           align="center"
+                           min-width="140"
+                           label="居住地址"
+                           :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span v-if="scope.row.homeId == 'other'"
+                    class="badge">房屋缺失</span>
+              <span>{{scope.row.address}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="houseType"
+                           align="center"
+                           width="100"
+                           label="房屋状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.houseType == 1">出租</span>
+              <span v-if="scope.row.houseType == 2">闲置</span>
+              <span v-if="scope.row.houseType == 3">未售出</span>
+              <span v-if="scope.row.houseType == 0">自住</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="totalResi"
+                           width="80"
+                           align="center"
+                           label="居住人数" />
+          <el-table-column prop="memberName"
+                           width="100"
+                           label="成员姓名"
+                           align="center"
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="memberIdNum"
+                           width="180"
+                           align="center"
+                           label="成员证件号"
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="memberMobile"
+                           width="140"
+                           align="center"
+                           label="成员手机号"
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="relationship"
+                           min-width="120"
+                           align="center"
+                           label="与户主关系"
+                           :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <span>{{getRelationshipName(scope.row.relationship)}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="heSuanCount"
+                           width="120"
+                           align="center"
+                           label="核酸检测次数" />
 
-        <el-table-column
-          prop="ymjz"
-          width="140"
-          align="center"
-          label="疫苗接种情况"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.ymjz == 1">全程接种</span>
-            <span v-if="scope.row.ymjz == 2">未全程接种</span>
-            <span v-if="scope.row.ymjz == 0">未接种</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="domicilePlace"
-          min-width="140"
-          align="center"
-          label="户籍地址"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          prop="workPlace"
-          min-width="120"
-          align="center"
-          label="单位名称"
-          :show-overflow-tooltip="true"
-        />
-        <el-table-column
-          prop="remark"
-          align="center"
-          label="备注"
-          :show-overflow-tooltip="true"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="faceImg"
-          min-width="120"
-          align="center"
-          label="人脸"
-        >
-        <template slot-scope="scope">
-          <el-image
-            style="max-height: 50px; max-width: 50px;"
-            :src="scope.row.faceImg"
-            :preview-src-list="[scope.row.faceImg]">
-            <div slot="error" class="image-slot">
-              <!-- <i class="el-icon-picture-outline"></i> -->
-            </div>
-          </el-image>
-        </template>
-        </el-table-column>
-        <el-table-column
-          prop="checkState"
-          min-width="120"
-          align="center"
-          label="状态"
-          :show-overflow-tooltip="true"
-          fixed="right"
-        >
-        <template slot-scope="scope">
-          <span v-if="scope.row.checkState === '0'">未审核</span>
-          <span v-else-if="scope.row.checkState === '1'">未通过</span>
-          <span v-else-if="scope.row.checkState === '2'">已通过</span>
-          <span v-else></span>
-        </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="100" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              type="text"
-              class="div-table-button--detail"
-              size="small"
-              @click="handleWatch('look', scope.row)"
-              >查看</el-button
-            >
-            <el-button
-              type="text"
-              class="div-table-button--detail"
-              size="small"
-              v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'"
-              @click="handleWatch('check', scope.row)"
-              >审核</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page.sync="pageNo"
-          :page-sizes="[20, 50, 100, 200]"
-          :page-size="parseInt(pageSize)"
-          layout="sizes, prev, pager, next, total"
-          :total="total"
-        >
-        </el-pagination>
+          <el-table-column prop="ymjz"
+                           width="140"
+                           align="center"
+                           label="疫苗接种情况">
+            <template slot-scope="scope">
+              <span v-if="scope.row.ymjz == 1">全程接种</span>
+              <span v-if="scope.row.ymjz == 2">未全程接种</span>
+              <span v-if="scope.row.ymjz == 0">未接种</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="domicilePlace"
+                           min-width="140"
+                           align="center"
+                           label="户籍地址"
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="workPlace"
+                           min-width="120"
+                           align="center"
+                           label="单位名称"
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="remark"
+                           align="center"
+                           label="备注"
+                           :show-overflow-tooltip="true">
+          </el-table-column>
+          <el-table-column prop="faceImg"
+                           min-width="120"
+                           align="center"
+                           label="人脸">
+            <template slot-scope="scope">
+              <el-image style="max-height: 50px; max-width: 50px;"
+                        :src="scope.row.faceImg"
+                        :preview-src-list="[scope.row.faceImg]">
+                <div slot="error"
+                     class="image-slot">
+                  <!-- <i class="el-icon-picture-outline"></i> -->
+                </div>
+              </el-image>
+            </template>
+          </el-table-column>
+          <el-table-column prop="checkState"
+                           min-width="120"
+                           align="center"
+                           label="状态"
+                           :show-overflow-tooltip="true"
+                           fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.checkState === '0'">未审核</span>
+              <span v-else-if="scope.row.checkState === '1'">未通过</span>
+              <span v-else-if="scope.row.checkState === '2'">已通过</span>
+              <span v-else></span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作"
+                           align="center"
+                           width="100"
+                           fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text"
+                         class="div-table-button--blue"
+                         size="small"
+                         @click="handleWatch('look', scope.row)">查看</el-button>
+              <el-button type="text"
+                         class="div-table-button--blue"
+                         size="small"
+                         v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'"
+                         @click="handleWatch('check', scope.row)">审核</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div>
+          <el-pagination @size-change="handleSizeChange"
+                         @current-change="handleCurrentChange"
+                         :current-page.sync="pageNo"
+                         :page-sizes="[20, 50, 100, 200]"
+                         :page-size="parseInt(pageSize)"
+                         layout="sizes, prev, pager, next, total"
+                         :total="total">
+          </el-pagination>
+        </div>
       </div>
-    </el-card>
+    </div>
 
     <!-- 修改弹出框 -->
-    <el-dialog
-      :visible.sync="formShow"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title="信息详情"
-      width="1100px"
-      top="5vh"
-      class="dialog-h"
-      @closed="handleClose"
-    >
-      <div class="scroll-h">
-        <el-form
-          ref="ref_form"
-          :inline="true"
-          :model="dataForm"
-          :disabled="true"
-          class="form"
-        >
-          <el-form-item
-            label="户主姓名:"
-            prop="houseHolderName"
-            label-width="150px"
-          >
+    <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               title="信息详情"
+               width="1100px"
+               top="5vh"
+               class="dialog-h"
+               @closed="handleClose">
+      <div class="dialog-h-content scroll-h">
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="dataForm"
+                 :disabled="true"
+                 label-width="150px"
+                 class="edit_form">
+          <el-form-item label="户主姓名"
+                        prop="houseHolderName">
             <!-- <el-input class="item_width_1"
                         v-model="dataForm.houseHolderName">
               </el-input> -->
             <div class="wd50">{{ dataForm.houseHolderName }}</div>
           </el-form-item>
-          <el-form-item label="居住地址:" prop="address" label-width="150px">
+          <el-form-item label="居住地址"
+                        prop="address">
             <!-- <el-input class="wd50" v-model="dataForm.address">
               </el-input> -->
             <div class="wd50">{{ dataForm.address }}</div>
           </el-form-item>
           <div>
-            <el-form-item
-              label="房屋状态:"
-              prop="houseType"
-              label-width="150px"
-            >
+            <el-form-item label="房屋状态"
+                          prop="houseType">
               <!-- <el-input class="item_width_1"
                           v-model="dataForm.houseType">
                 </el-input> -->
               <div class="wd50">{{ dataForm.houseType }}</div>
             </el-form-item>
-            <el-form-item
-              label="居住人数:"
-              prop="totalResi"
-              label-width="150px"
-            >
+            <el-form-item label="居住人数"
+                          prop="totalResi">
               <!-- <el-input class="item_width_1"
                           v-model="dataForm.totalResi">
                 </el-input> -->
@@ -325,102 +279,84 @@
             </el-form-item>
           </div>
         </el-form>
-        <el-table
-          :data="dataForm.list"
-          border
-          style="width: 1060px; margin: 20px"
-          class="resi-table"
-          :height="dialogTableHeight"
-        >
-          <el-table-column
-            label="序号"
-            type="index"
-            align="center"
-            width="50"
-          />
-          <el-table-column
-            prop="memberName"
-            width="100"
-            label="成员姓名"
-            align="center"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            prop="memberIdNum"
-            width="180"
-            align="center"
-            label="成员证件号"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            prop="memberMobile"
-            width="140"
-            align="center"
-            label="成员手机号"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            prop="heSuanCount"
-            width="120"
-            align="center"
-            label="核酸检测次数"
-          />
+        <el-table :data="dataForm.list"
+                  border
+                  style="width: 1010px; margin: 20px"
+                  :height="dialogTableHeight">
+          <el-table-column label="序号"
+                           type="index"
+                           align="center"
+                           width="50" />
+          <el-table-column prop="memberName"
+                           width="100"
+                           label="成员姓名"
+                           align="center"
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="memberIdNum"
+                           width="180"
+                           align="center"
+                           label="成员证件号"
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="memberMobile"
+                           width="140"
+                           align="center"
+                           label="成员手机号"
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="heSuanCount"
+                           width="120"
+                           align="center"
+                           label="核酸检测次数" />
 
-          <el-table-column
-            prop="ymjz"
-            width="140"
-            align="center"
-            label="疫苗接种情况"
-          >
+          <el-table-column prop="ymjz"
+                           width="140"
+                           align="center"
+                           label="疫苗接种情况">
             <template slot-scope="scope">
               <span v-if="scope.row.ymjz == 1">全程接种</span>
               <span v-if="scope.row.ymjz == 2">未全程接种</span>
               <span v-if="scope.row.ymjz == 0">未接种</span>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="domicilePlace"
-            min-width="140"
-            align="center"
-            label="户籍所在地 "
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            prop="workPlace"
-            min-width="120"
-            align="center"
-            label="单位或学校 "
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            prop="remark"
-            align="center"
-            label="备注"
-            :show-overflow-tooltip="true"
-          >
+          <el-table-column prop="domicilePlace"
+                           min-width="140"
+                           align="center"
+                           label="户籍所在地 "
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="workPlace"
+                           min-width="120"
+                           align="center"
+                           label="单位或学校 "
+                           :show-overflow-tooltip="true" />
+          <el-table-column prop="remark"
+                           align="center"
+                           label="备注"
+                           :show-overflow-tooltip="true">
           </el-table-column>
-          <el-table-column
-            prop="faceImg"
-            min-width="120"
-            align="center"
-            label="人脸"
-          >
-          <template slot-scope="scope">
-            <el-image
-              style="max-height: 50px; max-width: 50px;"
-              :src="scope.row.faceImg"
-              :preview-src-list="[scope.row.faceImg]">
-              <div slot="error" class="image-slot">
-                <!-- <i class="el-icon-picture-outline"></i> -->
-              </div>
-            </el-image>
-          </template>
+          <el-table-column prop="faceImg"
+                           min-width="120"
+                           align="center"
+                           label="人脸">
+            <template slot-scope="scope">
+              <el-image style="max-height: 50px; max-width: 50px;"
+                        :src="scope.row.faceImg"
+                        :preview-src-list="[scope.row.faceImg]">
+                <div slot="error"
+                     class="image-slot">
+                  <!-- <i class="el-icon-picture-outline"></i> -->
+                </div>
+              </el-image>
+            </template>
           </el-table-column>
         </el-table>
-        <div class="resi-btns">
+
+        <div class="div_btn">
           <el-button @click="formShow = false">{{ $t('cancel') }}</el-button>
-          <el-button v-if="dialogType == 'check'" type="danger" @click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button>
-          <el-button v-if="dialogType == 'check'" type="danger" @click="showAddHouse">{{ $t('checkTGBtn') }}</el-button>
+          <el-button v-if="dialogType == 'check'"
+                     class="diy-button--blue"
+                     @click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button>
+          <el-button v-if="dialogType == 'check'"
+                     class="diy-button--blue"
+                     @click="showAddHouse">{{ $t('checkTGBtn') }}</el-button>
         </div>
       </div>
     </el-dialog>
@@ -448,7 +384,7 @@ import axios from "axios";
 import roomForm from './roomForm'
 
 export default {
-  data() {
+  data () {
     return {
       agencyId: '',
       openSearch: false,
@@ -484,19 +420,19 @@ export default {
   },
   computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
-    tableHeight() {
+    tableHeight () {
       const h = this.clientHeight - 360 + this.iframeHeigh;
       const _h = this.clientHeight - 360;
       return this.$store.state.inIframe ? h : _h;
     },
-    dialogTableHeight() {
+    dialogTableHeight () {
       const h = this.clientHeight - 460 + this.iframeHeigh;
       const _h = this.clientHeight - 460;
       return this.$store.state.inIframe ? h : _h;
     },
   },
   watch: {
-    timeRange(val) {
+    timeRange (val) {
       if (Array.isArray(val) && val.length == 2) {
         this.fmData.startTime = val[0];
         this.fmData.endTime = val[1];
@@ -515,12 +451,12 @@ export default {
     this.getTableData()
   },
   methods: {
-    async getDictList() {
+    async getDictList () {
       const url = "/sys/dict/data/relationship"
       const { data, code, msg } = await requestPost(url, { formCode: "resi_base_info" })
 
       if (code === 0) {
-        this.relationshipOptions = [ ...data ]
+        this.relationshipOptions = [...data]
       } else {
         this.$message.success("操作失败！")
       }
@@ -534,7 +470,7 @@ export default {
       })
       return label
     },
-    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+    arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
       // console.log('row-----r', row)
       // console.log('column-----c', column)
       if (
@@ -562,7 +498,7 @@ export default {
         }
       }
     },
-    async handleChu() {
+    async handleChu () {
       const url = "/epmetuser/icresicollect/export";
       const { pageSize, pageNo, fmData } = this;
       axios({
@@ -596,33 +532,33 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    handleSizeChange(val) {
+    handleSizeChange (val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
       window.localStorage.setItem("pageSize", val);
       this.getTableData();
     },
-    handleCurrentChange(val) {
+    handleCurrentChange (val) {
       console.log(`当前页: ${val}`);
       this.pageNo = val;
       this.getTableData();
     },
 
-    handleClose() {
+    handleClose () {
       this.formShow = false;
     },
-    handleSearch(val) {
+    handleSearch (val) {
       console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
-    resetForm(formName) {
+    resetForm (formName) {
       this.$refs[formName].resetFields();
       this.timeRange = "";
       this.handleSearch();
     },
 
-    async handleWatch(type, row) {
+    async handleWatch (type, row) {
       this.dialogType = type
       // this.formShow = true;
       await nextTick();
@@ -645,17 +581,17 @@ export default {
       }
     },
 
-    async handleEdit(rowIndex) {
+    async handleEdit (rowIndex) {
       this.formShow = true;
       await nextTick();
       this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
     },
-    handleEditSuccess() {
+    handleEditSuccess () {
       this.handleClose();
       this.getTableData();
     },
 
-    async handleDel(rowData, rowIndex) {
+    async handleDel (rowData, rowIndex) {
       console.log(rowData, rowIndex);
       const url =
         "/heart/iccommunityselforganization/delcommunityselforganization";
@@ -672,7 +608,7 @@ export default {
         this.$message.success("操作失败！");
       }
     },
-    async getcommunityList() {
+    async getcommunityList () {
       const url = "/gov/org/agency/community-list";
       const { data, code, msg } = await requestPost(url);
       if (code === 0) {
@@ -681,7 +617,7 @@ export default {
       } else {
       }
     },
-    async getTableData() {
+    async getTableData () {
       const url = "/epmetuser/icresicollect/list"
       const { pageSize, pageNo, fmData } = this
       const { data, code, msg } = await requestPost(url, {
@@ -713,7 +649,7 @@ export default {
       }
     },
     // 数组扁平化
-    formatArr(arr) {
+    formatArr (arr) {
       let res = [];
       let arr1 = arr.map((n, index) => {
         return {
@@ -721,13 +657,13 @@ export default {
           list:
             n.list.length > 0
               ? n.list.map((i) => {
-                  return {
-                    ...n,
-                    ...i,
-                    desc: index + 1,
-                    list: [],
-                  };
-                })
+                return {
+                  ...n,
+                  ...i,
+                  desc: index + 1,
+                  list: [],
+                };
+              })
               : [],
         };
       });
@@ -771,7 +707,7 @@ export default {
             this.getTableData()
             // 调用文件下发权限接口
             // this.fileJurisdiction(params)
-          }).catch(() => {})
+          }).catch(() => { })
         }).catch(() => {
           // 取消输入原因
         })
@@ -785,7 +721,7 @@ export default {
           this.getTableData()
           // 调用文件下发权限接口
           // this.fileJurisdiction(params)
-        }).catch(() => {})
+        }).catch(() => { })
       }
     },
     // 文件下发权限接口
@@ -795,17 +731,17 @@ export default {
           return this.$message.error(res.msg)
         }
         this.$message({
-            message: this.$t('prompt.success'),
-            type: 'success',
-            duration: 500,
-            onClose: () => {
-              this.disabledBtn = false
-              this.checkVisible = false
-              this.visible = false
-              this.$emit('refreshDataList')
-            }
+          message: this.$t('prompt.success'),
+          type: 'success',
+          duration: 500,
+          onClose: () => {
+            this.disabledBtn = false
+            this.checkVisible = false
+            this.visible = false
+            this.$emit('refreshDataList')
+          }
         })
-      }).catch(() => {})
+      }).catch(() => { })
     },
     roomFormOk (e) {
       this.dataForm.buildingUnitId = e.buildingUnitId
@@ -817,48 +753,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "@/assets/scss/buttonstyle.scss";
-
-.resi-container .resi-card-table {
-  ::v-deep .el-table th {
-    color: #fff;
-    background-color: rgba(33, 149, 254, 1);
-    // border-right: 1px solid rgba(33, 149, 254, 1);
-  }
-}
-.resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-}
-.resi-card-table {
-  margin-top: 20px;
-}
-.resi-row-btn {
-  margin-bottom: 13px;
-  .upload-btn {
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
-
-.resi-btns {
-  margin-top: 20px;
-  text-align: center;
-}
-
-.resi-container .resi-card {
-  position: relative;
-  overflow: visible;
-}
-.wd50 {
-  min-width: 200px;
-}
-.badge {
-  display: block;
-  color: #F1F2E5;
-  background-color: #D7000F;
-  border-radius: 12px;
-  width: 70px;
-}
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/management/edit-main.scss";
 </style>
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index c3dd653d5..b226dda75 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -146,7 +146,7 @@
       </el-form>
 
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index a0674ad92..6b644805f 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -785,6 +785,9 @@ export default {
 </style>
 
 <style lang="scss" scoped >
+.div_search ::v-deep .el-row {
+  margin-right: 0;
+}
 .div_main {
   display: flex;
 }
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 816936a39..b3f7759df 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -177,7 +177,7 @@
         </el-form>
       </div>
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 9e3b8470e..58e131037 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -177,7 +177,7 @@
       </el-form>
 
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index d1c07dc94..1e2692a0e 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -1,377 +1,275 @@
 <template>
   <div>
     <div class="dialog-h-content scroll-h">
-      <el-form
-        ref="ref_form"
-        :inline="true"
-        :model="fmData"
-        :rules="dataRule"
-        :disabled="formType === 'detail'"
-        class="form"
-      >
-        <el-form-item
-          label="所属网格	"
-          prop="gridId"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.gridId"
-            placeholder="请选择"
-            size="small"
-            clearable
-            class="resi-cell-select"
-            @change="handleChangeGrid"
-            :disabled="formType === 'edit'"
-            style="width: 250px"
-          >
-            <el-option
-              v-for="item in optionsG"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+      <el-form ref="ref_form"
+               :inline="true"
+               :model="fmData"
+               :rules="dataRule"
+               label-width="150px"
+               class="edit_form">
+        <el-form-item label="所属网格	"
+                      prop="gridId"
+                      style="display: block">
+          <el-select v-model.trim="fmData.gridId"
+                     placeholder="请选择"
+                     size="small"
+                     clearable
+                     class="edit_item_width_normal"
+                     @change="handleChangeGrid"
+                     :disabled="formType === 'edit'">
+            <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"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.villageId"
-            placeholder="请选择小区"
-            size="small"
-            clearable
-            class="resi-cell-select"
-            @clear="handleClearVillage"
-            @change="handleChangeV"
-            :disabled="formType === 'edit'"
-            style="margin-right: 8px; width: 120px"
-          >
-            <el-option
-              v-for="item in optionsV"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
-          <el-select
-            v-model.trim="fmData.buildId"
-            placeholder="楼号"
-            size="small"
-            clearable
-            style="margin-right: 8px; width: 120px"
-            class="resi-cell-select"
-            :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-right: 8px; width: 120px"
-            class="resi-cell-select"
-            @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="width: 120px"
-            class="resi-cell-select"
-          >
-            <el-option
-              v-for="item in optionsH"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </el-select>
+        <el-form-item label="所属房屋	"
+                      prop="homeId"
+                      style="display: block">
+          <div>
+            <el-select v-model.trim="fmData.villageId"
+                       placeholder="请选择小区"
+                       size="small"
+                       clearable
+                       class="edit_item_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="edit_item_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="edit_item_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="edit_item_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"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            maxlength="30"
-            show-word-limit
-            style="width: 200px; margin-right: 20px"
-            placeholder="请输入姓名	"
-            :disabled="formType === 'edit'"
-            v-model="fmData.name"
-          >
+        <el-form-item label="姓名"
+                      prop="name"
+                      style="display: block">
+          <el-input maxlength="30"
+                    show-word-limit
+                    class="edit_item_width_normal"
+                    placeholder="请输入姓名	"
+                    :disabled="formType === 'edit'"
+                    v-model="fmData.name">
           </el-input>
-
-          <el-checkbox
-            v-model="fmData.isWelfare"
-            :disabled="formType === 'edit'"
-            true-label="1"
-            false-label="0"
-            >享受福利</el-checkbox
-          >
-          <el-checkbox
-            v-model="fmData.isCheck"
-            true-label="1"
-            false-label="0"
-            :disabled="formType === 'edit'"
-            @change="checkResiAvailable"
-            >补充居民信息</el-checkbox
-          >
+          <div>
+            <el-checkbox v-model="fmData.isWelfare"
+                         :disabled="formType === 'edit'"
+                         true-label="1"
+                         false-label="0">享受福利</el-checkbox>
+            <el-checkbox v-model="fmData.isCheck"
+                         true-label="1"
+                         false-label="0"
+                         :disabled="formType === 'edit'"
+                         @change="checkResiAvailable">补充居民信息</el-checkbox>
+          </div>
         </el-form-item>
 
-        <el-form-item
-          label="手机号"
-          prop="mobile"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            maxlength="30"
-            show-word-limit
-            placeholder="请输入手机号	"
-            v-model="fmData.mobile"
-            :disabled="formType === 'edit'"
-          >
+        <el-form-item label="手机号"
+                      prop="mobile"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    maxlength="30"
+                    show-word-limit
+                    placeholder="请输入手机号	"
+                    v-model="fmData.mobile"
+                    :disabled="formType === 'edit'">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="证件号"
-          prop="idCard"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            maxlength="30"
-            placeholder="请输入身份证号或护照号"
-            v-model="fmData.idCard"
-            @blur="handleBlurId"
-            :disabled="formType === 'edit'"
-          ></el-input>
+        <el-form-item label="证件号"
+                      prop="idCard"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    maxlength="30"
+                    placeholder="请输入身份证号或护照号"
+                    v-model="fmData.idCard"
+                    @blur="handleBlurId"
+                    :disabled="formType === 'edit'"></el-input>
         </el-form-item>
 
-        <el-form-item
-          label="性别"
-          prop="principalName"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.gender"
-            placeholder="性别"
-            size="small"
-            clearable
-            style="width: 120px"
-            class="resi-cell-select"
-            :disabled="formType === 'edit'"
-          >
-            <el-option
-              v-for="item in optionsGender"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="性别"
+                      prop="principalName"
+                      style="display: block">
+          <el-select v-model.trim="fmData.gender"
+                     placeholder="性别"
+                     size="small"
+                     clearable
+                     class="edit_item_width_normal"
+                     :disabled="formType === 'edit'">
+            <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="birthday"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-date-picker
-            v-model="fmData.birthday"
-            type="date"
-            placeholder="出生日期"
-            value-format="yyyy-MM-dd"
-            :disabled="formType === 'edit'"
-          >
+        <el-form-item label="出生日期"
+                      prop="birthday"
+                      style="display: block">
+          <el-date-picker v-model="fmData.birthday"
+                          type="date"
+                          class="edit_item_width_normal"
+                          placeholder="出生日期"
+                          value-format="yyyy-MM-dd"
+                          :disabled="formType === 'edit'">
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item
-          label="出生地"
-          prop="birthplace"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            maxlength="50"
-            show-word-limit
-            placeholder="请输入出生地"
-            v-model="fmData.birthplace"
-          >
+        <el-form-item label="出生地"
+                      prop="birthplace"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入出生地"
+                    v-model="fmData.birthplace">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="出生人父亲姓名"
-          prop="father"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            maxlength="30"
-            show-word-limit
-            placeholder="请输入出生人父亲姓名"
-            v-model="fmData.father"
-          >
+        <el-form-item label="出生人父亲姓名"
+                      prop="father"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    maxlength="30"
+                    show-word-limit
+                    placeholder="请输入出生人父亲姓名"
+                    v-model="fmData.father">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="出生人母亲姓名"
-          prop="mother"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            maxlength="30"
-            show-word-limit
-            placeholder="请输入出生人母亲姓名"
-            v-model="fmData.mother"
-          >
+        <el-form-item label="出生人母亲姓名"
+                      prop="mother"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    maxlength="30"
+                    show-word-limit
+                    placeholder="请输入出生人母亲姓名"
+                    v-model="fmData.mother">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="胎次"
-          prop="count"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input-number
-            v-model="fmData.count"
-            :min="1"
-            :max="50"
-            label="请输入胎次"
-          ></el-input-number>
+        <el-form-item label="胎次"
+                      prop="count"
+                      style="display: block">
+          <el-input-number v-model="fmData.count"
+                           class="edit_item_width_normal"
+                           :min="1"
+                           :max="50"
+                           label="请输入胎次"></el-input-number>
         </el-form-item>
 
-        <el-form-item
-          label="申报户口日期"
-          prop="reportDate"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-date-picker
-            v-model="fmData.reportDate"
-            placeholder="申报户口日期"
-            value-format="yyyy-MM-dd"
-          >
+        <el-form-item label="申报户口日期"
+                      prop="reportDate"
+                      style="display: block">
+          <el-date-picker v-model="fmData.reportDate"
+                          class="edit_item_width_normal"
+                          placeholder="申报户口日期"
+                          value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
 
-        <el-form-item
-          label="户主姓名"
-          prop="householderName"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            maxlength="50"
-            show-word-limit
-            placeholder="请输入户主姓名"
-            :disabled="fmData.alreadyHaveMaster"
-            v-model="fmData.householderName"
-          >
+        <el-form-item label="户主姓名"
+                      prop="householderName"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    maxlength="50"
+                    show-word-limit
+                    placeholder="请输入户主姓名"
+                    :disabled="fmData.alreadyHaveMaster"
+                    v-model="fmData.householderName">
           </el-input>
         </el-form-item>
 
-        <el-form-item
-          label="与户主关系"
-          prop="householderRelation"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-select
-            v-model.trim="fmData.householderRelation"
-            placeholder="与户主关系"
-            size="small"
-            clearable
-            style="width: 120px"
-            class="resi-cell-select"
-          >
-            <el-option
-              v-for="item in optionsRelation"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
+        <el-form-item label="与户主关系"
+                      prop="householderRelation"
+                      style="display: block">
+          <el-select v-model.trim="fmData.householderRelation"
+                     placeholder="与户主关系"
+                     size="small"
+                     clearable
+                     class="edit_item_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-item
-          v-if="false"
-          label="备注"
-          prop="remark"
-          label-width="150px"
-          style="display: block"
-        >
-          <el-input
-            class="item_width_1"
-            type="textarea"
-            maxlength="500"
-            show-word-limit
-            :rows="3"
-            placeholder="请输入备注，不超过500字"
-            v-model="fmData.remark"
-          ></el-input>
+        <el-form-item v-if="false"
+                      label="备注"
+                      prop="remark"
+                      style="display: block">
+          <el-input class="edit_item_width_normal"
+                    type="textarea"
+                    maxlength="500"
+                    show-word-limit
+                    :rows="3"
+                    placeholder="请输入备注，不超过500字"
+                    v-model="fmData.remark"></el-input>
         </el-form-item>
       </el-form>
     </div>
-    <div class="div_btn resi-btns">
-      <el-button size="small" @click="handleCancle">取 消</el-button>
-      <el-button
-        v-if="formType != 'detail'"
-        type="primary"
-        size="small"
-        :disabled="btnDisable"
-        @click="handleComfirm"
-        >确 定</el-button
-      >
+
+    <div class="div_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>
 </template>
@@ -385,7 +283,7 @@ import { isCard } from "@/utils/validate";
 
 let loading; // 加载动画
 
-function iniFmData() {
+function iniFmData () {
   return {
     id: "",
     gridId: "",
@@ -412,7 +310,7 @@ function iniFmData() {
 }
 
 export default {
-  data() {
+  data () {
     return {
       formType: "add", //表单操作类型 add新增，edit编辑，detail详情
 
@@ -441,7 +339,7 @@ export default {
   },
   components: {},
   computed: {
-    dataRule() {
+    dataRule () {
       let checkIdCard = (rule, value, callback) => {
         if (value === "") {
           callback(new Error("请输入证件号"));
@@ -471,27 +369,27 @@ export default {
       };
     },
 
-    changeVDisabled() {
+    changeVDisabled () {
       return !this.fmData.villageId;
     },
-    changeBDisabled() {
+    changeBDisabled () {
       return !this.fmData.buildId;
     },
-    changeDDisabled() {
+    changeDDisabled () {
       return !this.fmData.unitId;
     },
   },
   props: {},
   watch: {},
 
-  async mounted() {
+  async mounted () {
     this.getGridList();
     this.getValiheList();
     this.getRelationList();
   },
 
   methods: {
-    async checkResiAvailable() {
+    async checkResiAvailable () {
       const {
         fmData: { idCard, isCheck },
       } = this;
@@ -517,7 +415,7 @@ export default {
       }
     },
 
-    handleBlurId() {
+    handleBlurId () {
       const { sex, birth, age } = computedCard(this.fmData.idCard);
       if (birth) {
         this.fmData.birthday = birth;
@@ -526,20 +424,20 @@ export default {
       }
     },
 
-    handleClearVillage() {
+    handleClearVillage () {
       this.fmData.buildId = "";
       this.fmData.homeId = "";
     },
-    handleClearBuild() {
+    handleClearBuild () {
       this.fmData.buildId = "";
       this.fmData.unitId = "";
       this.fmData.homeId = "";
     },
-    handleClearDan() {
+    handleClearDan () {
       this.fmData.unitId = "";
       this.fmData.homeId = "";
     },
-    handleChangeGrid(val) {
+    handleChangeGrid (val) {
       console.log("val", val);
       this.fmData.villageId = "";
       this.fmData.buildId = "";
@@ -547,30 +445,30 @@ export default {
       this.fmData.homeId = "";
       this.getValiheList();
     },
-    handleChangeV(val) {
+    handleChangeV (val) {
       console.log("val", val);
       this.fmData.buildId = "";
       this.fmData.unitId = "";
       this.fmData.homeId = "";
       this.getBuildList();
     },
-    handleChangeB(val) {
+    handleChangeB (val) {
       console.log("val", val);
       this.fmData.unitId = "";
       this.fmData.homeId = "";
       this.getUniList();
     },
-    handleChangeD(val) {
+    handleChangeD (val) {
       console.log("val", val);
       this.fmData.homeId = "";
       this.getHouseList();
     },
-    handleChangeH(val) {
+    handleChangeH (val) {
       console.log("val", val);
       this.getHouseMaster();
     },
 
-    getRelationList() {
+    getRelationList () {
       const { user } = this.$store.state;
       this.$http
         .post("/sys/dict/data/relationship", {
@@ -588,7 +486,7 @@ export default {
         });
     },
 
-    getGridList() {
+    getGridList () {
       const { user } = this.$store.state;
       this.$http
         .post("/gov/org/customergrid/gridoption", {
@@ -607,7 +505,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getValiheList() {
+    getValiheList () {
       const { user } = this.$store.state;
       this.$http
         .post("/gov/org/icneighborhood/neighborhoodoption", {
@@ -627,7 +525,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getBuildList() {
+    getBuildList () {
       this.$http
         .post("/gov/org/icbuilding/buildingoption", {
           neighborHoodId: this.fmData.villageId,
@@ -644,7 +542,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getUniList() {
+    getUniList () {
       this.$http
         .post("/gov/org/icbuildingunit/unitoption", {
           buildingId: this.fmData.buildId,
@@ -661,7 +559,7 @@ export default {
           return this.$message.error("网络错误");
         });
     },
-    getHouseList() {
+    getHouseList () {
       this.$http
         .post("/gov/org/ichouse/houseoption", { unitId: this.fmData.unitId })
         .then(({ data: res }) => {
@@ -677,7 +575,7 @@ export default {
         });
     },
 
-    getHouseMaster() {
+    getHouseMaster () {
       const { homeId } = this.fmData;
       if (!homeId) return (this.alreadyHaveMaster = false);
 
@@ -699,7 +597,7 @@ export default {
         });
     },
 
-    async initForm(type, row) {
+    async initForm (type, row) {
       this.$refs.ref_form.resetFields();
 
       this.formType = type;
@@ -714,7 +612,7 @@ export default {
       }
     },
 
-    async getInfo(id) {
+    async getInfo (id) {
       const { data, code, msg } = await requestPost(
         "/epmetuser/icBirthRecord/" + id,
         {
@@ -728,7 +626,7 @@ export default {
       }
     },
 
-    async handleComfirm() {
+    async handleComfirm () {
       this.btnDisable = true;
       setTimeout(() => {
         this.btnDisable = false;
@@ -749,7 +647,7 @@ export default {
       });
     },
 
-    async submit() {
+    async submit () {
       let url = "";
       if (this.formType === "add") {
         url = "/epmetuser/icBirthRecord/save";
@@ -799,11 +697,11 @@ export default {
       }
     },
 
-    handleCancle() {
+    handleCancle () {
       this.resetData();
       this.$emit("dialogCancle");
     },
-    resetData() {
+    resetData () {
       this.checkResult = {};
       this.optionsB = [];
       this.optionsH = [];
@@ -811,7 +709,7 @@ export default {
       this.fmData = iniFmData();
     },
     // 开启加载动画
-    startLoading() {
+    startLoading () {
       loading = Loading.service({
         lock: true, // 是否锁定
         text: "正在加载……", // 加载中需要显示的文字
@@ -819,7 +717,7 @@ export default {
       });
     },
     // 结束加载动画
-    endLoading() {
+    endLoading () {
       // clearTimeout(timer);
       if (loading) {
         loading.close();
@@ -830,53 +728,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.item_width_1 {
-  width: 500px;
-}
-.item_width_2 {
-  width: 400px;
-}
-.item_width_3 {
-  margin-left: 10px;
-  width: 200px;
-}
-.item_width_4 {
-  width: 200px;
-}
-
-.div_map {
-  margin-top: 10px;
-}
-
-.div_btn {
-  // display: flex;
-  // justify-content: flex-end;
-}
-.el-tabs {
-  margin: 0 20px;
-}
-.el-upload__tip {
-  color: rgb(155, 155, 155);
-  margin: 0;
-}
-.form {
-  margin-top: 30px;
-}
-
-.m-staffs {
-  width: 468px;
-  .item {
-    display: flex;
-    justify-content: space-around;
-    margin-bottom: 7px;
-  }
-  .item-add {
-  }
-}
-</style>
-
-<style>
-.el-dialog__body {
-  padding: 0 10px 20px !important;
-}
+@import "@/assets/scss/modules/management/edit-main.scss";
 </style>
diff --git a/src/views/modules/base/huji/chusheng/index.vue b/src/views/modules/base/huji/chusheng/index.vue
index 049b937ca..70d5cc71b 100644
--- a/src/views/modules/base/huji/chusheng/index.vue
+++ b/src/views/modules/base/huji/chusheng/index.vue
@@ -1,201 +1,200 @@
 <template>
-  <div class="resi-container">
-    <el-card ref="searchCard"
-             class="search-card">
+  <div class="div_main">
+    <div ref="searchDiv"
+         class="div_search">
       <el-form ref="searchForm"
                :inline="true"
                :model="fmData"
-               :label-width="'100px'"
-               class="demo-form-inline">
-        <div>
-          <el-form-item prop="gridId"
-                        label="所属网格">
-            <div class="resi-cell-value">
-              <el-select v-model.trim="fmData.gridId"
-                         placeholder="请选择"
-                         size="small"
-                         clearable
-                         class="resi-cell-select"
-                         @change="handleChangeGrid">
-                <el-option v-for="item in optionsG"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </div>
-          </el-form-item>
-
-          <el-form-item label="所属房屋">
-            <div class="resi-cell-value">
-              <el-select v-model.trim="fmData.villageId"
-                         placeholder="请选择小区"
-                         size="small"
-                         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">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="fmData.buildId"
-                         placeholder="楼号"
-                         size="small"
-                         clearable
-                         style="width: 120px"
-                         class="resi-cell-select"
-                         :disabled="changeVDisabled"
-                         @clear="handleClearBuild"
-                         @change="handleChangeB">
-                <el-option v-for="item in optionsB"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <el-select v-model.trim="fmData.unitId"
-                         :disabled="changeBDisabled"
-                         placeholder="单元"
-                         size="small"
-                         clearable
-                         style="width: 120px"
-                         class="resi-cell-select"
-                         @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"
-                         placeholder="房号"
-                         size="small"
-                         clearable
-                         style="width: 120px"
-                         class="resi-cell-select">
-                <el-option v-for="item in optionsH"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </div>
-          </el-form-item>
-        </div>
+               :label-width="'100px'">
+
+        <el-form-item prop="gridId"
+                      label="所属网格">
+
+          <el-select v-model.trim="fmData.gridId"
+                     placeholder="请选择"
+                     size="small"
+                     clearable
+                     class="item_width_normal"
+                     @change="handleChangeGrid">
+            <el-option v-for="item in optionsG"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="所属房屋">
+
+          <el-select v-model.trim="fmData.villageId"
+                     placeholder="请选择小区"
+                     size="small"
+                     clearable
+                     class="item_width_communitycascader"
+                     @clear="handleClearVillage"
+                     @change="handleChangeV">
+            <el-option v-for="item in optionsV"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+          <el-select v-model.trim="fmData.buildId"
+                     placeholder="楼号"
+                     size="small"
+                     clearable
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     :disabled="changeVDisabled"
+                     @clear="handleClearBuild"
+                     @change="handleChangeB">
+            <el-option v-for="item in optionsB"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+          <el-select v-model.trim="fmData.unitId"
+                     :disabled="changeBDisabled"
+                     placeholder="单元"
+                     size="small"
+                     clearable
+                     class="item_width_buildcascader"
+                     style="margin-left:5px"
+                     @click="handleClearDan"
+                     @change="handleChangeD">
+            <el-option v-for="item in optionsD"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+          <el-select v-model.trim="fmData.homeId"
+                     :disabled="changeDDisabled"
+                     placeholder="房号"
+                     size="small"
+                     clearable
+                     class="item_width_buildcascader"
+                     style="margin-left:5px">
+            <el-option v-for="item in optionsH"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+
+        <el-form-item label="姓名"
+                      prop="name">
+          <el-input v-model="fmData.name"
+                    class="item_width_normal"
+                    size="small"
+                    clearable
+                    placeholder="请输入">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="手机号"
+                      prop="mobile">
+          <el-input v-model="fmData.mobile"
+                    class="item_width_normal"
+                    size="small"
+                    clearable
+                    placeholder="请输入">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="证件号"
+                      prop="idCard">
+          <el-input v-model="fmData.idCard"
+                    class="item_width_normal"
+                    size="small"
+                    clearable
+                    placeholder="请输入证件号">
+          </el-input>
+        </el-form-item>
+
+        <el-form-item label="出生日期"
+                      prop="birthdayTime">
+          <el-date-picker v-model="fmData.birthdayTime"
+                          type="daterange"
+                          class="item_width_daterange2"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="享受福利"
+                      prop="remark">
+          <el-select v-model.trim="fmData.isWelfare"
+                     placeholder="请选择"
+                     size="small"
+                     clearable
+                     class="item_width_normal">
+            <el-option v-for="item in optionsWelfare"
+                       :key="item.value"
+                       :label="item.label"
+                       :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <div class="div_search_btn">
+          <el-button class="diy-button--white"
+                     size="small"
+                     @click="resetForm('searchForm')">重置</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--blue"
+                     @click="handleSearch">查询</el-button>
 
-        <div>
-          <el-form-item label="姓名"
-                        prop="name">
-            <el-input v-model="fmData.name"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="手机号"
-                        prop="mobile">
-            <el-input v-model="fmData.mobile"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="证件号"
-                        prop="idCard">
-            <el-input v-model="fmData.idCard"
-                      class="resi-cell-input"
-                      size="small"
-                      clearable
-                      placeholder="请输入身份证号或证件号">
-            </el-input>
-          </el-form-item>
         </div>
+      </el-form>
 
-        <div>
-          <el-form-item label="出生日期"
-                        prop="birthdayTime">
-            <el-date-picker v-model="fmData.birthdayTime"
-                            type="daterange"
-                            range-separator="至"
-                            start-placeholder="开始日期"
-                            end-placeholder="结束日期"
-                            value-format="yyyy-MM-dd">
-            </el-date-picker>
-          </el-form-item>
-
-          <el-form-item label="享受福利"
-                        prop="remark">
-            <el-select v-model.trim="fmData.isWelfare"
-                       placeholder="请选择"
-                       size="small"
-                       clearable
-                       style="width: 120px"
-                       class="resi-cell-select">
-              <el-option v-for="item in optionsWelfare"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button class="diy-button--search"
-                       size="small"
-                       @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset"
-                       size="small"
-                       @click="resetForm('searchForm')">重置</el-button>
-          </el-form-item>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <div class="div_btn_left">
+          <el-button class="diy-button--blue"
+                     icon="el-icon-plus"
+                     size="small"
+                     @click="handleAdd">出生登记</el-button>
+          <el-button v-if="false"
+                     class="diy-button--white"
+                     size="small"
+                     @click="handleExportModule('room')">下载模板</el-button>
+          <el-upload :headers="$getElUploadHeaders()"
+                     v-if="false"
+                     ref="upload"
+                     class="upload-btn"
+                     action="uploadUlr"
+                     :limit="1"
+                     :accept="'.xls,.xlsx'"
+                     :with-credentials="true"
+                     :show-file-list="false"
+                     :auto-upload="true"
+                     :on-progress="handleProgress"
+                     :on-success="handleExcelSuccess"
+                     :before-upload="beforeExcelUpload"
+                     :http-request="uploadHttpRequest">
+            <el-button size="small"
+                       class="diy-button--white"
+                       :loading="importLoading">{{ importBtnTitle }}</el-button>
+          </el-upload>
+
+          <el-button @click="handleChu"
+                     class="diy-button--white"
+                     size="small">导出</el-button>
         </div>
-      </el-form>
-    </el-card>
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
-        <el-button class="diy-button--add"
-                   size="small"
-                   @click="handleAdd">出生登记</el-button>
-        <el-button v-if="false"
-                   class="diy-button--export"
-                   size="small"
-                   @click="handleExportModule('room')">下载模板</el-button>
-        <el-upload :headers="$getElUploadHeaders()"
-                   v-if="false"
-                   ref="upload"
-                   class="upload-btn"
-                   action="uploadUlr"
-                   :limit="1"
-                   :accept="'.xls,.xlsx'"
-                   :with-credentials="true"
-                   :show-file-list="false"
-                   :auto-upload="true"
-                   :on-progress="handleProgress"
-                   :on-success="handleExcelSuccess"
-                   :before-upload="beforeExcelUpload"
-                   :http-request="uploadHttpRequest">
-          <el-button size="small"
-                     class="diy-button--delete"
-                     :loading="importLoading">{{ importBtnTitle }}</el-button>
-        </el-upload>
-
-        <el-button @click="handleChu"
-                   class="diy-button--reset"
-                   size="small">导出</el-button>
       </div>
       <el-table :data="tableData"
                 border
-                style="width: 100%"
-                class="resi-table"
-                :height="maxTableHeight">
+                class="div_table_item"
+                :height="tableHeight">
         <el-table-column label="序号"
                          fixed="left"
                          type="index"
@@ -288,7 +287,7 @@
         <el-table-column fixed="right"
                          label="操作"
                          align="center"
-                         width="160">
+                         width="180">
           <template slot-scope="scope">
             <!-- <el-button
               @click="handleWatch(scope.$index)"
@@ -300,12 +299,12 @@
             <el-button @click="handleEdit(scope.$index)"
                        type="text"
                        size="small"
-                       class="div-table-button--edit">修改</el-button>
+                       class="div-table-button--blue">修改</el-button>
 
             <el-button @click="handleChangeRecord(scope.row)"
                        type="text"
                        size="small"
-                       class="div-table-button--detail">变更记录</el-button>
+                       class="div-table-button--blue">变更记录</el-button>
 
             <el-popconfirm v-if="false"
                            title="删除之后无法回复，确认删除？"
@@ -314,7 +313,7 @@
               <el-button slot="reference"
                          type="text"
                          size="small"
-                         class="div-table-button--delete"
+                         class="div-table-button--blue"
                          style="margin-left: 10px">删除</el-button>
             </el-popconfirm>
             <el-popconfirm v-if="true"
@@ -324,7 +323,7 @@
               <el-button slot="reference"
                          type="text"
                          size="small"
-                         class="div-table-button--delete"
+                         class="div-table-button--blue"
                          style="margin-left: 10px">删除</el-button>
             </el-popconfirm>
           </template>
@@ -341,14 +340,14 @@
                        :total="total">
         </el-pagination>
       </div>
-    </el-card>
+    </div>
 
     <!-- 修改弹出框 -->
     <el-dialog :visible.sync="formShow"
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="formTitle"
-               width="850px"
+               width="670px"
                top="5vh"
                class="dialog-h"
                @closed="handleClose">
@@ -362,7 +361,7 @@
                :close-on-click-modal="false"
                :close-on-press-escape="false"
                :title="'出生详情'"
-               width="850px"
+               width="670px"
                top="5vh"
                class="dialog-h"
                @closed="detailFormCancle">
@@ -393,7 +392,7 @@ import detailForm from "./cpts/detail";
 import axios from "axios";
 
 export default {
-  components: { editForm, detailForm, resiChangeRecord},
+  components: { editForm, detailForm, resiChangeRecord },
   data () {
     return {
       openSearch: false,
@@ -450,7 +449,10 @@ export default {
       //积分记录
       scoreDiaTitle: "积分记录",
       scoreDiaShow: false,
-        changeRecordShow: false,
+      changeRecordShow: false,
+
+      searchH: 0,
+      tableHeight: 0,
     };
   },
   computed: {
@@ -480,24 +482,37 @@ export default {
         this.fmData.birthdayEnd = "";
       }
     },
+
+    searchH () {
+      const h = this.clientHeight - this.searchH + this.iframeHeight
+      const _h = this.clientHeight - this.searchH
+      console.log('computed-searchH---_h', _h)
+
+      this.$nextTick(() => {
+        this.tableHeight = this.$store.state.inIframe ? h : _h
+      })
+    }
   },
   mounted () {
     this.getGridList();
     this.getValiheList();
     this.getTableData();
+
+    this.searchH = this.$refs.searchDiv.offsetHeight + 290
+    console.log('searchH----', this.$refs.searchDiv.offsetHeight)
   },
   methods: {
-      diaClose () {
-          this.changeRecordShow = false
-      },
-      //变更记录
-      async handleChangeRecord (row) {
-          this.changeRecordShow = true
+    diaClose () {
+      this.changeRecordShow = false
+    },
+    //变更记录
+    async handleChangeRecord (row) {
+      this.changeRecordShow = true
 
-          await nextTick(200)
+      await nextTick(200)
 
-          this.$refs.ref_changerecord.initForm(row)
-      },
+      this.$refs.ref_changerecord.initForm(row)
+    },
     handleClearVillage () {
       this.fmData.buildId = "";
       this.fmData.homeId = "";
@@ -768,7 +783,20 @@ export default {
       this.getTableData();
     },
     resetForm (formName) {
-      this.$refs[formName].resetFields();
+      this.fmData = {
+        gridId: "",
+        villageId: "",
+        buildId: "",
+        unitId: "",
+        homeId: "",
+        name: "",
+        mobile: "",
+        idCard: "",
+        isWelfare: "", //福利0否，1是
+        birthdayStart: "",
+        birthdayEnd: "",
+        birthdayTime: ["", ""],
+      }
       this.handleSearch();
     },
     async handleAdd () {
@@ -857,20 +885,20 @@ export default {
       }
     },
 
-      async handleDelNew (rowData) {
-          const url = "/epmetuser/icBirthRecord/deleteById";
+    async handleDelNew (rowData) {
+      const url = "/epmetuser/icBirthRecord/deleteById";
 
-          let params = {
-              id: rowData.id
-          }
-          const { data, code, msg } = await requestPost(url,params);
-          if (code === 0) {
-              this.$message.success("删除成功！");
-              this.getTableData();
-          } else {
-              this.$message.success("操作失败！");
-          }
-      },
+      let params = {
+        id: rowData.id
+      }
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
 
     async getTableData () {
       const url = "/epmetuser/icBirthRecord/page";
@@ -895,85 +923,5 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-@import "@/assets/scss/buttonstyle.scss";
-
-.resi-container .resi-card-table {
-  ::v-deep .el-table th {
-    color: #fff;
-    background-color: rgba(33, 149, 254, 1);
-    // border-right: 1px solid rgba(33, 149, 254, 1);
-  }
-}
-.resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-}
-.resi-card-table {
-  margin-top: 20px;
-}
-.resi-row-btn {
-  margin-bottom: 13px;
-  .upload-btn {
-    display: inline-block;
-    margin: 0 10px;
-  }
-}
-
-.resi-btns {
-  margin-top: 20px;
-  text-align: center;
-}
-
-.resi-container .resi-card {
-  position: relative;
-  overflow: visible;
-}
-
-.demo-form-inline {
-  // display: flex;
-  // align-items: center;
-  // margin-bottom: 20px;
-
-  .resi-cell-label {
-    flex-shrink: 0;
-    min-width: 0;
-    box-sizing: border-box;
-    margin-right: 15px;
-    // text-align: right;
-    // line-height: 32;
-  }
-  .resi-cell-label1 {
-    width: max-content;
-  }
-  .resi-cell-value-radio {
-    display: flex;
-    align-items: center;
-    min-height: 32px;
-  }
-  .resi-cell-input {
-    width: 200px;
-  }
-  .resi-cell--daterange {
-    max-width: 260px;
-  }
-  .resi-cell-select {
-    width: 200px;
-    box-sizing: border-box;
-    margin-right: 10px;
-    &-middle {
-      width: 130px;
-    }
-    &-small {
-      width: 88px;
-    }
-  }
-  .resi-cell-select:last-child {
-    margin-right: 0;
-  }
-}
-
-.mt10 {
-  margin-top: 10px;
-}
+@import "@/assets/scss/modules/management/list-main.scss";
 </style>
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 815168082..aac6b060c 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -252,7 +252,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button type="primary"
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 3f4ffbb26..6168a068f 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -210,7 +210,7 @@
       </div>
     </div>
 
-    <el-dialog :title="formName"
+    <el-dialog :title="formName === '社区居民基本信息录入表'?'新增居民':formName"
                :visible.sync="dialogVisible"
                width="80%"
                top="5vh"
@@ -226,7 +226,6 @@
                    @changegroup="handleChangeGroup" />
         <div v-if="dialogVisible"
              class="resi-other">
-          <div class="resi-other-title">其他</div>
           <div class="tabs-other-info">
             <el-tabs v-model="activeName"
                      @tab-click="handleClick">
@@ -247,12 +246,14 @@
       </div>
 
       <div class="resi-btns">
+        <el-button size="small"
+                   @click="handlerCancle">重置</el-button>
         <el-button size="small"
                    @click="handlerCancle">取消</el-button>
         <el-button type="primary"
                    size="small"
                    :loading="btnLoading"
-                   @click="handleSUbmit">提交</el-button>
+                   @click="handleSUbmit">保存</el-button>
       </div>
     </el-dialog>
 
@@ -337,6 +338,7 @@
                 @close="handleDiyClose"></diy-info>
     </el-dialog>
     <people-detail v-if="showedPeopleMoreInfo && lookInfo.userId"
+            
                  :view_real_data="btnAuths.ic_resi_view_real_data"
                  :userId="lookInfo.userId"
                  :gridName="lookInfo.gridName"
@@ -1472,6 +1474,9 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
 
+.resi-container ::v-deep .el-row {
+  margin-right: 0;
+}
 .tabs-other-info {
   ::v-deep .el-tabs__item {
     // width: 50px;
@@ -1499,7 +1504,7 @@ export default {
     // border-radius: 50%;
   }
   ::v-deep .el-tabs__item.is-active {
-    color: #17b3a3;
+    color: #3e8ef7;
   }
 }
 .resi-container .resi-card {
@@ -1606,12 +1611,12 @@ export default {
     width: calc(100% - 100px);
   }
 }
-::v-deep  .el-form-item--medium .el-form-item__label {
-  padding: 0px;
-}
+
 .resi-btns {
   margin-top: 20px;
   text-align: center;
+  text-align: right;
+    margin-right: 16px;
 }
 .div-flex {
   display: flex;
diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index 467a7957f..4f3be8530 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -1,12 +1,16 @@
 <template>
-    <div class="mod-rent__rentDeath} resi-container">
-      <el-card ref="searchCard" class="search-card">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()" label-width="70px">
+  <div class="div_main">
+    <div ref="searchDiv"
+         class="div_search">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()"
+               label-width="100px">
         <el-form-item label="姓名"
                       prop="name">
           <el-input v-model="dataForm.name"
                     size="small"
-                    class="list_item_width_1"
+                    class="item_width_normal"
                     clearable
                     placeholder="请输入姓名">
           </el-input>
@@ -15,7 +19,7 @@
                       prop="idCard">
           <el-input v-model="dataForm.idCard"
                     size="small"
-                    class="list_item_width_1"
+                    class="item_width_normal"
                     clearable
                     placeholder="请输入证件号">
           </el-input>
@@ -24,17 +28,17 @@
                       prop="mobile">
           <el-input v-model="dataForm.mobile"
                     size="small"
-                    class="list_item_width_1"
+                    class="item_width_normal"
                     clearable
                     placeholder="请输入手机">
           </el-input>
         </el-form-item>
-        <br/>
+
         <el-form-item label="死亡时间"
                       prop="startTime">
           <el-date-picker v-model="timeRange"
                           type="daterange"
-                          clearable
+                          class="item_width_daterange2"
                           size="small"
                           range-separator="至"
                           start-placeholder="选择日期"
@@ -42,31 +46,46 @@
                           value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="享受福利" prop="isWelfare">
-          <el-select v-model="dataForm.isWelfare" placeholder="请选择" clearable>
-            <el-option v-for="item in isWelfareArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+        <el-form-item label="享受福利"
+                      prop="isWelfare">
+          <el-select v-model="dataForm.isWelfare"
+                     size="small"
+                     class="item_width_normal"
+                     placeholder="请选择"
+                     clearable>
+            <el-option v-for="item in isWelfareArr"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
-        </el-form-item>
-        <el-form-item>
-          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
-        </el-form-item>
-        <!--<el-form-item>-->
-          <!--<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item>-->
-          <!--<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
-        <!--</el-form-item>-->
+
+        <div class="div_search_btn">
+          <el-button class="diy-button--white"
+                     size="small"
+                     @click="resetForm">重置</el-button>
+          <el-button style="margin-left:10px"
+                     size="small"
+                     class="diy-button--blue"
+                     @click="getDataList">查询</el-button>
+
+        </div>
       </el-form>
-      </el-card>
-      <el-card class="resi-card-table">
-        <div class="resi-row-btn">
-          <el-button type="warning" size="small" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
+    </div>
+    <div class="div_table">
+      <div class="div_btn">
+        <div class="div_btn_left">
+          <el-button size="small"
+                     class="diy-button--white"
+                     @click="exportHandle()">{{ $t('export') }}</el-button>
         </div>
-      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
+      </div>
+      <el-table class="div_table_item"
+                v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle">
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
         <el-table-column label="序号"
                          type="index"
@@ -76,14 +95,29 @@
         </el-table-column>
         <!--<el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="userId" label="epmet用户主键" header-align="center" align="center"></el-table-column>-->
-        <el-table-column prop="name" label="姓名" header-align="center" align="center">
+        <el-table-column prop="name"
+                         label="姓名"
+                         header-align="center"
+                         align="center">
           <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">{{scope.row.name}}</el-button>
+            <el-button @click="handleLook(scope.row)"
+                       type="text"
+                       size="small"
+                       class="btn-color-look">{{scope.row.name}}</el-button>
           </template>
         </el-table-column>
-        <el-table-column prop="idCard" label="证件号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="mobile" label="手机号" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="gender" label="性别" header-align="center" align="center">
+        <el-table-column prop="idCard"
+                         label="证件号"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="mobile"
+                         label="手机号"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="gender"
+                         label="性别"
+                         header-align="center"
+                         align="center">
           <template slot-scope="scope">
             {{
             scope.row.gender == '2'
@@ -93,29 +127,39 @@
           </template>
         </el-table-column>
         <!--<el-table-column prop="type" label="类型" header-align="center" align="center">-->
-          <!--<template slot-scope="scope">-->
-            <!--{{-->
-            <!--scope.row.type == '0'-->
-            <!--? "租客"-->
-            <!--: scope.row.type == '1'-->
-            <!--? "房东"-->
-            <!--: ""-->
-            <!--}}-->
-          <!--</template>-->
+        <!--<template slot-scope="scope">-->
+        <!--{{-->
+        <!--scope.row.type == '0'-->
+        <!--? "租客"-->
+        <!--: scope.row.type == '1'-->
+        <!--? "房东"-->
+        <!--: ""-->
+        <!--}}-->
+        <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column prop="deathDate" label="死亡时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deathDate"
+                         label="死亡时间"
+                         header-align="center"
+                         align="center"></el-table-column>
         <!--<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="removeDate" label="移除时间" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="removeReason" label="移除原因" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>-->
         <!--<el-table-column prop="customerId" label="客户ID" header-align="center" align="center"></el-table-column>-->
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+        <el-table-column :label="$t('handle')"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="170">
           <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">查看</el-button>
+            <el-button @click="handleLook(scope.row)"
+                       type="text"
+                       size="small"
+                       class="div-table-button--blue">查看</el-button>
             <el-button @click="handleChangeRecord(scope.row)"
                        type="text"
                        size="small"
-                       class="div-table-button--detail">变更记录</el-button>
+                       class="div-table-button--blue">变更记录</el-button>
             <!--<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
             <!--<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
             <el-popconfirm v-if="scope.row.status !== '0'"
@@ -125,39 +169,40 @@
               <el-button slot="reference"
                          type="text"
                          size="small"
-                         class="div-table-button--delete"
+                         class="div-table-button--blue"
                          style="margin-left: 10px">恢复</el-button>
             </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
       </el-pagination>
-      </el-card>
-      <!-- 弹窗, 新增 / 修改 -->
-      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-      <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
-                   :userId="lookInfo.userId"
-                   :gridName="lookInfo.gridName"
-                   @close="handleCancleLook" />
-      <!-- 变更记录 -->
-      <el-dialog :visible.sync="changeRecordShow"
-                 :close-on-click-modal="false"
-                 :close-on-press-escape="false"
-                 :title="'变更记录'"
-                 width="1150px"
-                 top="5vh"
-                 @closed="diaClose">
-        <resi-change-record ref="ref_changerecord"></resi-change-record>
-      </el-dialog>
     </div>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible"
+                   ref="addOrUpdate"
+                   @refreshDataList="getDataList"></add-or-update>
+    <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
+                 :userId="lookInfo.userId"
+                 :gridName="lookInfo.gridName"
+                 @close="handleCancleLook" />
+    <!-- 变更记录 -->
+    <el-dialog :visible.sync="changeRecordShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="'变更记录'"
+               width="1150px"
+               top="5vh"
+               @closed="diaClose">
+      <resi-change-record ref="ref_changerecord"></resi-change-record>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -178,200 +223,200 @@ export default {
         deleteIsBatch: true,
         exportURL: '/epmetuser/rentDeath/export'
       },
-        timeRange: '',
+      timeRange: '',
       dataForm: {
         id: '',
         name: '',
         isWelfare: ''
       },
-        // 显示人员详情
-        showedPeopleMoreInfo: false,
-        lookInfo: {
-            userId: '',
-            gridName: ''
-        },
-        isWelfareArr: [
-            { dictValue: '0', dictName: '否' },
-            { dictValue: '1', dictName: '是' }
-        ],
-        changeRecordShow: false
+      // 显示人员详情
+      showedPeopleMoreInfo: false,
+      lookInfo: {
+        userId: '',
+        gridName: ''
+      },
+      isWelfareArr: [
+        { dictValue: '0', dictName: '否' },
+        { dictValue: '1', dictName: '是' }
+      ],
+      changeRecordShow: false
+    }
+  },
+  watch: {
+    timeRange (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.dataForm.startTime = val[0];
+        this.dataForm.endTime = val[1];
+      } else {
+        this.dataForm.startTime = "";
+        this.dataForm.endTime = "";
+      }
     }
   },
-    watch: {
-        timeRange (val) {
-            if (Array.isArray(val) && val.length == 2) {
-                this.dataForm.startTime = val[0];
-                this.dataForm.endTime = val[1];
-            } else {
-                this.dataForm.startTime = "";
-                this.dataForm.endTime = "";
-            }
-        }
-    },
   components: {
     AddOrUpdate,
-      peopleMore,
-      resiChangeRecord
+    peopleMore,
+    resiChangeRecord
   },
-    methods: {
-        async handleRecovery (rowData) {
-            console.log('11111')
-            const url = "/epmetuser/rentDeath/recovery";
+  methods: {
+    async handleRecovery (rowData) {
+      console.log('11111')
+      const url = "/epmetuser/rentDeath/recovery";
 
-            let params = {
-                id: rowData.id
-            }
-            const { data, code, msg } = await requestPost(url,params);
-            if (code === 0) {
-                this.$message.success("恢复成功！");
-                this.getDataList();
-            } else {
-                this.$message.success("操作失败！");
-            }
-        },
-        diaClose () {
-            this.changeRecordShow = false
-        },
-        //变更记录
-        async handleChangeRecord (row) {
-            this.changeRecordShow = true
+      let params = {
+        id: rowData.id
+      }
+      const { data, code, msg } = await requestPost(url, params);
+      if (code === 0) {
+        this.$message.success("恢复成功！");
+        this.getDataList();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
+    diaClose () {
+      this.changeRecordShow = false
+    },
+    //变更记录
+    async handleChangeRecord (row) {
+      this.changeRecordShow = true
 
-            await nextTick(200)
+      await nextTick(200)
 
-            this.$refs.ref_changerecord.initForm(row)
-        },
-      exportHandle () {
-        const url = this.mixinViewModuleOptions.exportURL
-        this.$http({
-          method: 'GET',
-          url,
-          responseType: 'blob',
-          params: this.dataForm
-        }).then(res => {
-          // this.download(res.data, title + '.xls')
-          if (res.headers["content-disposition"]) {
-            let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-            console.log('filename', fileName)
-            let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-            var url = window.URL.createObjectURL(blob)
-            var aLink = document.createElement('a')
-            aLink.style.display = 'none'
-            aLink.href = url
-            aLink.setAttribute('download', fileName)
-            document.body.appendChild(aLink)
-            aLink.click()
-            document.body.removeChild(aLink) //下载完成移除元素
-            window.URL.revokeObjectURL(url) //释放掉blob对象
-          } else this.$message.error('下载失败')
-        }).catch(err => {
-          console.log('err', err)
-          return this.$message.error('网络错误')
-        })
-      },
-        resetForm(formName) {
-            for(const n in this.dataForm) {
-                this.dataForm[n] = ''
-            }
-            this.timeRange = ''
-            this.getDataList()
-        },
-        async handleLook (row) {
-            if(row.gridId !== ''){
-                const url = '/gov/org/grid/griddetail'
-                let params = {
-                    gridId : row.gridId,
-                }
-                const { data, code, msg } = await requestPost(url, params)
-                if(code === 0){
-                    this.lookInfo.gridName = data.gridName
-                } else {
-                    this.$message.error(msg)
-                }
-            }else{
-                this.lookInfo.gridName = ''
-            }
-            this.lookInfo.userId = row.userId
-            this.showedPeopleMoreInfo = true
-        },
-        handleCancleLook() {
-            this.lookInfo.userId = ''
-            this.lookInfo.gridName = ''
-            this.showedPeopleMoreInfo = false
+      this.$refs.ref_changerecord.initForm(row)
+    },
+    exportHandle () {
+      const url = this.mixinViewModuleOptions.exportURL
+      this.$http({
+        method: 'GET',
+        url,
+        responseType: 'blob',
+        params: this.dataForm
+      }).then(res => {
+        // this.download(res.data, title + '.xls')
+        if (res.headers["content-disposition"]) {
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        } else this.$message.error('下载失败')
+      }).catch(err => {
+        console.log('err', err)
+        return this.$message.error('网络错误')
+      })
+    },
+    resetForm (formName) {
+      for (const n in this.dataForm) {
+        this.dataForm[n] = ''
+      }
+      this.timeRange = ''
+      this.getDataList()
+    },
+    async handleLook (row) {
+      if (row.gridId !== '') {
+        const url = '/gov/org/grid/griddetail'
+        let params = {
+          gridId: row.gridId,
+        }
+        const { data, code, msg } = await requestPost(url, params)
+        if (code === 0) {
+          this.lookInfo.gridName = data.gridName
+        } else {
+          this.$message.error(msg)
         }
+      } else {
+        this.lookInfo.gridName = ''
+      }
+      this.lookInfo.userId = row.userId
+      this.showedPeopleMoreInfo = true
+    },
+    handleCancleLook () {
+      this.lookInfo.userId = ''
+      this.lookInfo.gridName = ''
+      this.showedPeopleMoreInfo = false
+    }
   }
 }
 </script>
 <style lang="scss" scoped>
-  @import "@/assets/scss/buttonstyle.scss";
-  /deep/.el-form-item__label {
-    width: 80px !important;
+@import "@/assets/scss/modules/management/list-main.scss";
+
+/deep/.el-form-item__label {
+  width: 80px !important;
+}
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
   }
-  .resi-container .resi-card-table {
-    ::v-deep .el-table th {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-      // border-right: 1px solid rgba(33, 149, 254, 1);
-    }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
   }
-  .resi-table {
-    ::v-deep .el-button--text {
-      text-decoration: underline;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
+  ::v-deep .btn-color-del {
+    margin-left: 10px;
+    color: rgba(213, 16, 16, 1);
   }
-  .form-wr {
-    .input-width {
-      width: 260px;
-
-    }
-    .input-width-textarea {
-      width: 500px;
-    }
-    .imsg-list {
-      display: flex;
-      align-items: center;
-      .imgs-item {
-        position: relative;
-        margin-right: 10px;
-        .el-icon-delete {
-          position: absolute;
-          top: 0;
-          right: 0;
-          font-size: 18px;
-          color: red;
-          z-index: 3;
-          cursor: pointer;
-        }
-      }
-    }
+  ::v-deep .btn-color-edit {
+    color: rgba(0, 167, 169, 1);
+  }
+}
+.form-wr {
+  .input-width {
+    width: 260px;
   }
-  .div-content {
-    width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  .input-width-textarea {
+    width: 500px;
   }
-  .resi-row-btn {
+  .imsg-list {
     display: flex;
-    margin-bottom: 13px;
-    .el-button {
-      margin-left: 10px;
-      border: 0;
+    align-items: center;
+    .imgs-item {
+      position: relative;
+      margin-right: 10px;
+      .el-icon-delete {
+        position: absolute;
+        top: 0;
+        right: 0;
+        font-size: 18px;
+        color: red;
+        z-index: 3;
+        cursor: pointer;
+      }
     }
-    // .el-button--success {
-    //   background: rgba(34, 193, 195, 1);
-    // }
-    // .el-button--warning {
-    //   background: rgba(254, 179, 73, 1);
-    // }
-    // .el-button--danger {
-    //   background: rgba(254, 98, 82, 1);
-    // }
   }
+}
+.div-content {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.resi-row-btn {
+  display: flex;
+  margin-bottom: 13px;
+  .el-button {
+    margin-left: 10px;
+    border: 0;
+  }
+  // .el-button--success {
+  //   background: rgba(34, 193, 195, 1);
+  // }
+  // .el-button--warning {
+  //   background: rgba(254, 179, 73, 1);
+  // }
+  // .el-button--danger {
+  //   background: rgba(254, 98, 82, 1);
+  // }
+}
 </style>
diff --git a/src/views/modules/plugins/change/resichange.vue b/src/views/modules/plugins/change/resichange.vue
index 5e9cf21c3..9f6bfe8cd 100644
--- a/src/views/modules/plugins/change/resichange.vue
+++ b/src/views/modules/plugins/change/resichange.vue
@@ -5,7 +5,7 @@
                   :form-list="searchList"
                   :column-name="defaultCategotyKey"
                   @search="handleSearch" />
-    <el-card class="resi-card-table">
+    <div class="div_table">
       <!-- <div class="resi-row-btn">
         <el-button size="small"
                    class="diy-button--add"
@@ -44,8 +44,7 @@
                 :data="tableData"
                 v-loading="tableLoading"
                 border
-                style="width: 100%"
-                class="resi-table"
+                class="div_table_item"
                 :height="tableHeight"
                 @select-all="selectAll"
                 @selection-change="selectionChange">
@@ -85,7 +84,7 @@
             <el-button @click="handleTransfer(scope.row)"
                        type="text"
                        size="small"
-                       class="div-table-button--detail">迁出</el-button>
+                       class="div-table-button--blue">迁出</el-button>
             <!--<el-button @click="joinBlacklist(scope.row)"-->
             <!--type="text"-->
             <!--size="small"-->
@@ -138,7 +137,7 @@
         </div>
 
       </div>
-    </el-card>
+    </div>
 
     <el-dialog :title="formName"
                :visible.sync="dialogVisible"
@@ -371,8 +370,8 @@ export default {
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
     tableHeight () {
-      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
-      const _h = this.clientHeight - 280 - this.searchH
+      const h = this.clientHeight - this.searchH - 240 + this.iframeHeigh
+      const _h = this.clientHeight - 240 - this.searchH
       return this.$store.state.inIframe ? h : _h
     }
   },
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index 22aa93043..575ea6c1a 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -1,11 +1,11 @@
 <template>
-  <div class="resi-container">
+  <div class="div_main">
     <death-search v-if="searchList.length > 0"
                   ref="deathSearch"
                   :form-list="searchList"
                   :column-name="defaultCategotyKey"
                   @search="handleSearch" />
-    <el-card class="resi-card-table">
+    <div class="div_table">
       <!-- <div class="resi-row-btn">
         <el-button size="small"
                    class="diy-button--add"
@@ -44,8 +44,7 @@
                 :data="tableData"
                 v-loading="tableLoading"
                 border
-                style="width: 100%"
-                class="resi-table"
+                class="div_table_item"
                 :height="tableHeight"
                 @select-all="selectAll"
                 @selection-change="selectionChange">
@@ -85,7 +84,7 @@
             <el-button @click="joinBlacklist(scope.row)"
                        type="text"
                        size="small"
-                       class="div-table-button--detail">新增死亡人口</el-button>
+                       class="div-table-button--blue">新增死亡人口</el-button>
             <!-- <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
@@ -134,7 +133,7 @@
         </div>
 
       </div>
-    </el-card>
+    </div>
 
     <el-dialog :title="formName"
                :visible.sync="dialogVisible"
@@ -262,33 +261,62 @@
                  :gridName="lookInfo.gridName"
                  @close="handleCancleLook" />
 
-    <el-dialog title="新增死亡人口的原因"
+    <el-dialog title="新增死亡人口"
                :visible.sync="blacklistVisible"
                width="40%">
-      <textarea v-model="blacklistReason"
-                placeholder="请输入新增死亡人口的原因"
-                class="blacklist-reason"></textarea>
-      <div>
-        <br />
-      </div>
-      <el-checkbox v-model="welfareFlag">享受福利</el-checkbox>
-      <div>
-        <br />
+      <div class="dialog-h-content scroll-h">
+        <el-form ref="ref_form"
+                 :inline="true"
+                 :model="fmData"
+                 label-width="150px"
+                 class="edit_form">
+          <el-form-item label="死亡原因"
+                        prop="gridId"
+                        style="display: block">
+            <el-input class="edit_item_width_normal"
+                      type="textarea"
+                      :rows="3"
+                      placeholder="请输入死亡原因"
+                      v-model="blacklistReason"></el-input>
+
+          </el-form-item>
+
+          <el-form-item label="享受福利"
+                        prop="gridId"
+                        style="display: block">
+            <el-checkbox v-model="welfareFlag"></el-checkbox>
+          </el-form-item>
+          <el-form-item label="死亡日期"
+                        prop="gridId"
+                        style="display: block">
+            <el-date-picker v-model="deathDate"
+                            type="date"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            format="yyyy-MM-dd"
+                            placeholder="请选择死亡日期"
+                            class="edit_item_width_normal"
+                            :clearable="false">
+            </el-date-picker>
+          </el-form-item>
+
+        </el-form>
+
+        <div class="div_btn">
+          <el-button size="small"
+                     @click="blacklistVisible = false">取 消</el-button>
+          <el-button type="primary"
+                     size="small"
+                     class="diy-button--blue"
+                     @click="confirmJoinDeathlist">保 存</el-button>
+        </div>
+
+        <!-- <span slot="footer"
+              class="dialog-footer">
+          <el-button @click="blacklistVisible = false">取 消</el-button>
+          <el-button type="primary"
+                     @click="confirmJoinDeathlist">确 定</el-button>
+        </span> -->
       </div>
-      <el-date-picker v-model="deathDate"
-                      type="date"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      format="yyyy-MM-dd"
-                      placeholder="请选择死亡日期"
-                      style="width:200px"
-                      :clearable="false">
-      </el-date-picker>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button @click="blacklistVisible = false">取 消</el-button>
-        <el-button type="primary"
-                   @click="confirmJoinDeathlist">确 定</el-button>
-      </span>
     </el-dialog>
   </div>
 </template>
@@ -366,7 +394,10 @@ export default {
       blacklistReason: '', // 加入黑名单原因
       welfareFlag: false,
       rowData: {}, // 加入黑名单的人员信息
-      deathDate: ''
+      deathDate: '',
+      fmData: {
+
+      }
     }
   },
   props: {
@@ -386,8 +417,8 @@ export default {
   computed: {
     ...mapGetters(['clientHeight', 'iframeHeight']),
     tableHeight () {
-      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
-      const _h = this.clientHeight - 280 - this.searchH
+      const h = this.clientHeight - this.searchH - 240 + this.iframeHeigh
+      const _h = this.clientHeight - 240 - this.searchH
       return this.$store.state.inIframe ? h : _h
     }
   },
@@ -1260,6 +1291,9 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/modules/management/edit-main.scss";
+
 .tabs-other-info {
   ::v-deep .el-tabs__item {
     // width: 50px;
diff --git a/src/views/modules/plugins/rent/resi.vue b/src/views/modules/plugins/rent/resi.vue
index c54a15474..be7128075 100644
--- a/src/views/modules/plugins/rent/resi.vue
+++ b/src/views/modules/plugins/rent/resi.vue
@@ -867,7 +867,7 @@ export default {
           })
         }
       })
-      console.log('finalArr', finalArr)
+      console.log('finalArr111', finalArr)
       return finalArr
     },
     async handleEditSUbmit () {
diff --git a/src/views/modules/shequ/cpts/peopleDetail.vue b/src/views/modules/shequ/cpts/peopleDetail.vue
index 0a0dc5fa7..9a36e8e4f 100644
--- a/src/views/modules/shequ/cpts/peopleDetail.vue
+++ b/src/views/modules/shequ/cpts/peopleDetail.vue
@@ -1,21 +1,19 @@
 <template>
   <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">
+        <div class="title flex endpoint font16 p10" style="border-bottom: 1px #DCDEE0 solid;">
           <span>居民详情</span>
+         
+          <el-button type="text"> <i class="el-icon-close" @click="handleClose"></i></el-button>
         </div>
-        <div v-if="view_real_data"
+        <!-- <div v-if="view_real_data"
              class="div_tuomin">
           <el-button size="mini"
                      class="diy-button--search"
                      @click="handleTuomin">显示脱敏信息</el-button>
-        </div>
-
+        </div> -->
+        <div class="title-small top40">基本信息</div>
         <div :key="'fieldSubList' + index"
              v-for="(fieldSubList, index) in fieldList">
           <div class="list">
@@ -42,13 +40,13 @@
             <div class="item"
                  :key="field.itemId"
                  v-for="field in fieldSubList">
-              <span class="item-field">{{ field.label }}：</span>
+              <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'
+                  field.itemType == 'cascader' 
                 ">{{
                   info[field.columnName] == null
                     ? "--"
@@ -65,29 +63,34 @@
             </div>
           </div>
 
-          <div class="line"></div>
+          <div class="title-small top40"> {{index==0? '分类信息':'其他信息'}}</div>
         </div>
-
-        <div class="tabs">
-          <div class="tab-btn"
+        <!-- 详情下方tab -->
+        <el-tabs class="top32"  @tab-click="handlTabs">
+          <!-- <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"
+          </div> -->
+          <el-button
+          type="text"
+            size="small"
+            @click="addTab(editableTabsValue)"
+          >
+          <i class="el-icon-more"></i>
+          </el-button>
+          <el-tab-pane 
+          v-for="(item, index) in groupList" 
                :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"
+               :label="item.label">
+          </el-tab-pane>
+          <!-- <div class="tab-btn"
                @click="addStartGroupIndex"
                v-if="groupList.length > 9">
             <img src="@/assets/img/shuju/people/arrow-double-right.png" />
-          </div>
-        </div>
+          </div> -->
+        </el-tabs >
 
         <div :key="'group' + index"
              v-show="groupIndex % groupList.length == index"
@@ -409,6 +412,9 @@ export default {
   },
 
   methods: {
+    handlTabs(i){
+    this.groupIndex = i.index
+    },
     async handleTuomin () {
       const url = "/data/aggregator/epmetuser/detailByType";
 
@@ -705,4 +711,22 @@ export default {
 };
 </script>
 
-<style lang="scss" src="@/assets/scss/people-info.scss" scoped></style>
+<style lang="scss" scoped>
+@import "@/assets/scss/people-info.scss";
+.el-tabs ::v-deep .el-tabs__header {
+  width: 88%;
+  margin: 0 auto;
+}
+.wrap2{
+  padding: 0 !important;
+}
+.wrap2 ::v-deep .el-tabs{
+  position: relative;
+}
+.el-tabs ::v-deep .el-tabs__content {
+  position: absolute;
+  right: 35px;
+  top: 5px;
+}
+
+</style>
diff --git a/src/views/modules/workSys/dataOpenConfig.vue b/src/views/modules/workSys/dataOpenConfig.vue
index 54bcfba5a..a5e979db5 100644
--- a/src/views/modules/workSys/dataOpenConfig.vue
+++ b/src/views/modules/workSys/dataOpenConfig.vue
@@ -1,66 +1,65 @@
 <template>
-  <div class="resi-container">
-    <el-card class="resi-card-table">
-      <div class="mod-sys__menu">
-        <el-table class="table"
-                  ref="ref_table"
-                  :data="dataList"
-                  border
-                  :height="tableHeight"
-                  v-loading="dataListLoading"
-                  :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="deptName"
-                           header-align="center"
-                           align="center"
-                           label="部门"
-                           min-width="100">
-          </el-table-column>
-          <el-table-column prop="dataName"
-                           header-align="center"
-                           align="center"
-                           label="数据名称"
-                           min-width="110">
-          </el-table-column>
-
-          <el-table-column label="操作"
-                           fixed="right"
-                           header-align="center"
-                           align="center"
-                           width="350">
-            <template slot-scope="scope">
-              <el-switch v-model="scope.row.stateShow"
-                         @change="disableCategory(scope.row,scope.$index)">
-              </el-switch>
-
-              <el-button type="text"
-                         size="small"
-                         class="div-table-button--edit"
-                         style="margin-left:20px"
-                         @click="editShow(scope.row)">配置</el-button>
-
-            </template>
-          </el-table-column>
-        </el-table>
-        <div>
-          <el-pagination @size-change="handleSizeChange"
-                         @current-change="handleCurrentChange"
-                         :current-page.sync="pageNo"
-                         :page-sizes="[20, 50, 100, 200]"
-                         :page-size="pageSize"
-                         layout="sizes, prev, pager, next, total"
-                         :total="total">
-          </el-pagination>
-        </div>
-
+  <div class="div_main">
+    <div class="div_table">
+
+      <el-table ref="ref_table"
+                :data="dataList"
+                border
+                :height="tableHeight"
+                class="div_table_item"
+                v-loading="dataListLoading"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="100"></el-table-column>
+
+        <el-table-column prop="deptName"
+                         header-align="center"
+                         align="center"
+                         label="部门"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="dataName"
+                         header-align="center"
+                         align="center"
+                         label="数据名称"
+                         min-width="110">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="350">
+          <template slot-scope="scope">
+            <el-switch style="margin-left:20px"
+                       v-model="scope.row.stateShow"
+                       @change="disableCategory(scope.row,scope.$index)">
+            </el-switch>
+
+            <el-button size="small"
+                       type="text"
+                       class="div-table-button--blue"
+                       style="margin-left:20px"
+                       @click="editShow(scope.row)">配置</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
       </div>
-    </el-card>
+
+    </div>
 
     <!-- 修改弹出框 -->
     <el-dialog :visible.sync="formShow"
@@ -349,28 +348,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.div_form {
-  height: 300px;
-  padding-top: 50px;
-}
-.item_width_1 {
-  width: 500px;
-}
-.div-btn {
-  margin-top: 50px;
-  // margin-bottom:20px;
-  display: flex;
-  justify-content: center;
-
-  .item_btn {
-    font-size: 14px;
-    padding: 8px 16px;
-    cursor: pointer;
-    color: #fff;
-
-    border: 1px dashed #0c81fe;
-    border-radius: 6px;
-    background-color: #0c81fe;
-  }
-}
+@import "@/assets/scss/modules/management/list-main.scss";
 </style>