diff --git a/src/App.vue b/src/App.vue
index dbd953b1..4b5a899c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -120,4 +120,52 @@ export default {
     z-index: 200000;
   }
 }
+.search-card {
+  .el-card__body {
+    padding: 20px 20px 0 20px;
+  }
+}
+.dialog-h {
+  .el-dialog__body {
+    position: relative;
+    height: 72vh;
+    box-sizing: border-box;
+    padding: 0 10px 20px !important;
+    .dialog-h-content {
+      height: calc(72vh - 80px);
+      box-sizing: border-box;
+      overflow: auto;
+    }
+  }
+}
+.scroll-h {
+  &::-webkit-scrollbar {
+    // display: none;
+    width: 8px;
+    height: 8px;
+    // background: linear-gradient(270deg, #0063FE, #0095FF);
+  }
+
+  &::-webkit-scrollbar-corner,
+    /* 滚动条角落 */
+  &::-webkit-scrollbar-thumb,
+  &::-webkit-scrollbar-track {      /*滚动条的轨道*/
+    border-radius: 4px;
+  }
+
+  &::-webkit-scrollbar-corner,
+  &::-webkit-scrollbar-track {
+    /* 滚动条轨道 */
+    
+    // background: rgba(12, 129, 254, .24);
+    box-shadow: inset 0 0 1px rgba(180, 160, 120, 0.5);
+  }
+
+  &::-webkit-scrollbar-thumb {
+    /* 滚动条手柄 */
+
+    background:rgba(0,0,0,0.3);
+    // background: linear-gradient(270deg, #0063FE, #0095FF);
+  }
+}
 </style>
diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index ed807fd9..d7afc877 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -38,7 +38,7 @@
                   <div class="resi-cell-col">
                     <el-form-item prop="VILLAGE_ID">
                       <el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small"
-                      clearable class="resi-cell-select" @change="handleChangeV"
+                      clearable class="resi-cell-select" :disabled="disabled" @change="handleChangeV"
                       >
                         <el-option
                           v-for="item in optionsV"
@@ -50,7 +50,7 @@
                     </el-form-item>
                     <el-form-item prop="BUILD_ID">
                       <el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small"
-                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
+                      clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle" @change="handleChangeB"
                       >
                         <el-option
                           v-for="item in optionsB"
@@ -62,7 +62,7 @@
                     </el-form-item>
                     <el-form-item prop="UNIT_ID">
                       <el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small"
-                      clearable class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
+                      clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle" @change="handleChangeD"
                       >
                         <el-option
                           v-for="item in optionsD"
@@ -74,7 +74,7 @@
                     </el-form-item>
                     <el-form-item prop="HOME_ID">
                       <el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small"
-                      clearable class="resi-cell-select resi-cell-select-middle"
+                      clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle"
                       >
                         <el-option
                           v-for="item in optionsH"
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index dcdb3760..e89989a9 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -37,12 +37,16 @@
                 border
                 style="width: 100%"
                 class="resi-table"
+                :height="tableHeight"
                 @select-all="selectAll"
                 @selection-change="selectionChange">
         <el-table-column type="selection"
+                          fixed="left"
+                          :selectable="checkSelect"
                          width="55" />
         <el-table-column label="序号"
                          type="index"
+                         fixed="left"
                          align="center"
                          width="50">
         </el-table-column>
@@ -54,7 +58,10 @@
                          :show-overflow-tooltip="true"
                          :width="item.itemType === 'radio' ? computedWidth(item.label) : 180">
           <template slot-scope="scope">
-            <span>{{ handleFilterSpan(scope.row, item) }}</span>
+            <a v-if="item.columnName == 'NAME'" class="name-a" @click="handleLook(scope.row)">
+              {{ handleFilterSpan(scope.row, item) }}
+            </a>
+            <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
           </template>
         </el-table-column>
         <el-table-column fixed="right"
@@ -62,10 +69,10 @@
                          align="center"
                          width="150">
           <template slot-scope="scope">
-            <el-button @click="handleLook(scope.row)"
+            <!-- <el-button @click="handleLook(scope.row)"
                        type="text"
                        size="small"
-                       class="btn-color-look">查看</el-button>
+                       class="btn-color-look">查看</el-button> -->
             <el-button @click="handleTransfer(scope.row)"
                        type="text"
                        size="small"
@@ -81,10 +88,10 @@
                          class="btn-color-edit">编辑</el-button>
               <el-popconfirm title="删除之后无法回复，确认删除？"
                              @onConfirm="handleDel(scope.row)">
-                <el-button slot="reference"
+                <!-- <el-button slot="reference"
                            type="text"
                            size="small"
-                           class="btn-color-del">删除</el-button>
+                           class="btn-color-del">删除</el-button> -->
               </el-popconfirm>
             </template>
           </template>
@@ -119,32 +126,36 @@
                :visible.sync="dialogVisible"
                width="80%"
                append-to-body
+               class="dialog-h"
                :close-on-click-modal="false"
                :before-close="handlerCancle">
-      <resi-form v-if="dialogVisible"
+      <div class="dialog-h-content scroll-h">
+        <resi-form v-if="dialogVisible"
                  ref="baseForm"
                  :fixed="true"
                  :form-list="formList"
                  @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">
-            <el-tab-pane v-for="item in tabsList"
-                         :key="item.columnName"
-                         :label="item.label"
-                         :name="'group' + item.groupId">
-              <resi-form :ref="'group' + item.groupId"
-                         :columns="3"
-                         :support-add="item.supportAdd"
-                         :form-id="item.columnName"
-                         :form-list="item.itemList" />
-            </el-tab-pane>
-          </el-tabs>
+        <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">
+              <el-tab-pane v-for="item in tabsList"
+                          :key="item.columnName"
+                          :label="item.label"
+                          :name="'group' + item.groupId">
+                <resi-form :ref="'group' + item.groupId"
+                          :columns="3"
+                          :support-add="item.supportAdd"
+                          :form-id="item.columnName"
+                          :form-list="item.itemList" />
+              </el-tab-pane>
+            </el-tabs>
+          </div>
         </div>
       </div>
+      
       <div class="resi-btns">
         <el-button size="small"
                    @click="handlerCancle">取消</el-button>
@@ -159,9 +170,11 @@
                :visible.sync="dialogEditVisible"
                width="80%"
                append-to-body
+               class="dialog-h"
                :close-on-click-modal="false"
                :before-close="handlerEditCancle">
-      <edit-resi v-if="dialogEditVisible"
+      <div class="dialog-h-content scroll-h">
+        <edit-resi v-if="dialogEditVisible"
                  ref="baseForm"
                  :disabled="disabled"
                  :form-info="editForm"
@@ -169,27 +182,28 @@
                  :form-list="formList"
                  :agency-id="editAgencyId"
                  @changegroup="handleChangeGroup" />
-      <div v-if="dialogEditVisible"
-           class="resi-other">
-        <div class="resi-other-title">其他</div>
-        <div class="tabs-other-info">
-          <el-tabs v-model="activeName"
-                   @tab-click="handleClick">
-            <el-tab-pane v-for="item in tabsList"
-                         :key="item.columnName"
-                         :label="item.label"
-                         :name="'group' + item.groupId">
-              <edit-resi :ref="'group' + item.groupId"
-                         :columns="3"
-                         :support-add="item.supportAdd"
-                         :form-id="item.columnName"
-                         :muti-list="item.mutiList"
-                         :form-list="item.itemList"
-                         :disabled="disabled"
-                         :label-width="'140px'"
-                         :agency-id="editAgencyId" />
-            </el-tab-pane>
-          </el-tabs>
+        <div v-if="dialogEditVisible"
+            class="resi-other">
+          <div class="resi-other-title">其他</div>
+          <div class="tabs-other-info">
+            <el-tabs v-model="activeName"
+                    @tab-click="handleClick">
+              <el-tab-pane v-for="item in tabsList"
+                          :key="item.columnName"
+                          :label="item.label"
+                          :name="'group' + item.groupId">
+                <edit-resi :ref="'group' + item.groupId"
+                          :columns="3"
+                          :support-add="item.supportAdd"
+                          :form-id="item.columnName"
+                          :muti-list="item.mutiList"
+                          :form-list="item.itemList"
+                          :disabled="disabled"
+                          :label-width="'140px'"
+                          :agency-id="editAgencyId" />
+              </el-tab-pane>
+            </el-tabs>
+          </div>
         </div>
       </div>
       <div class="resi-btns">
@@ -235,6 +249,7 @@ import resiSearch from '../../components/resiSearch.vue'
 import resiForm from '../../components/resiForm.vue'
 import editResi from '../../components/editResi.vue'
 import axios from 'axios'
+import { mapGetters } from 'vuex'
 import resiTransfer from '../../components/resiTransfer.vue'
 import resiChangeRecord from '../../components/resiChangeRecord.vue'
 
@@ -265,6 +280,7 @@ export default {
       currentPage: 1,
       pageSize: 20,
       total: null,
+      tableHeight: 0,
       conditions: [],
       activeName: '',
       tableData: [],
@@ -315,13 +331,23 @@ export default {
     await this.getTableHeader()
     // console.log('this.$refs.resiSearch', this)
     this.$refs.resiSearch.handleSearch()
+
     // this.handleSearch()
     // this.getTableData()
     this.pageLoading = true
     console.log('storeoooo----0000', this.$store)
+    console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight)
+    this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
+  },
+  mounted() {
+    
+    console.log('document.documentElement.clientWidth', document.documentElement.clientHeight)
   },
   methods: {
-
+    checkSelect (row, index) {
+      
+      return row.isChecked
+    },
     //调动
     async handleTransfer (row) {
       this.tranferShow = true
@@ -378,7 +404,10 @@ export default {
       this.$refs.ref_table.clearSelection();
       if (selectAllFlag) {
         this.tableData.forEach(row => {
-          this.$refs.ref_table.toggleRowSelection(row);
+          // this.$refs.ref_table.toggleRowSelection(row);
+          if (row.isChecked) {
+            this.$refs.ref_table.toggleRowSelection(row);
+          }
         });
       }
     },
@@ -820,7 +849,12 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.tableData = res.data.list
+            this.tableData = res.data.list.map(item => {
+              return {
+                ...item,
+                isChecked: this.filterEdit(item.ORG_ID)
+              }
+            })
             this.total = res.data.total
           }
         })
@@ -1084,6 +1118,9 @@ export default {
     color: rgba(0, 167, 169, 1);
   }
 }
+.name-a {
+  cursor: pointer;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 5095431e..5322757a 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageLoading" class="resi-container">
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
+    <el-card ref="searchCard" class="search-card">
+      <div class="">
         <el-form ref="searchForm" :inline="true" :model="searchForm" class="demo-form-inline">
           <el-form-item label="所属网格" prop="gridId">
             <el-select v-model="searchForm.gridId" filterable placeholder="请选择" clearable>
@@ -34,7 +34,7 @@
             </el-select> -->
             <el-input v-model="searchForm.name" placeholder="请输入" class="input-width" clearable></el-input>
           </el-form-item>
-          <el-form-item label="主要事迹" prop="mainDeed">
+          <el-form-item label="主要事迹" prop="mainDeed" >
             <el-input v-model="searchForm.mainDeed" placeholder="请输入" class="input-width" clearable></el-input>
           </el-form-item>
           <el-form-item>
@@ -43,6 +43,9 @@
           </el-form-item>
         </el-form>
       </div>
+    </el-card>
+    <el-card class="resi-card-table">
+      
       <div class="resi-row-btn">
         <el-button type="success" @click="handleAdd">新增</el-button>
         <el-button type="warning" size="small" :loading="exportBtn" @click="handleExport">{{ exportBtnTitle }}</el-button>
@@ -64,10 +67,10 @@
       
       <el-table
         :data="tableData"
-        row-key="categoryId"
+        row-key="id"
         v-loading="tableLoading"
         border
-        max-height="800"
+        :height="tableHeight"
         style="width: 100%"
         class="resi-table"
       >
@@ -82,7 +85,7 @@
           :width="item.width"
         >
           <template slot-scope="scope">
-            <span>{{ handleFilterSpan(scope.row, item) }}</span>
+            <div class="div-content">{{ handleFilterSpan(scope.row, item) }}</div>
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="200">
@@ -123,7 +126,7 @@
           :current-page.sync="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="pageSize"
-          layout="sizes, prev, pager, next"
+          layout="sizes, prev, pager, next, total"
           :total="total"
         >
         </el-pagination>
@@ -133,12 +136,14 @@
     <el-dialog
       title="党员风采"
       :visible.sync="dialogVisible"
-      width="40%"
+      width="50%"
+      class="dialog-h"
       append-to-body
       :close-on-click-modal="false"
       :before-close="handlerCancle"
     >
-      <el-form v-if="dialogVisible" label-width="100px" :model="form" :rules="rules" ref="ruleForm" class="form-wr">
+      <el-form v-if="dialogVisible" label-width="100px" :model="form" :rules="rules" ref="ruleForm" 
+      class="form-wr dialog-h-content scroll-h">
         <el-form-item label="所属网格" prop="gridId">
           <el-select v-model="form.gridId" filterable
           :disabled="disabled" placeholder="请选择" class="input-width" clearable>
@@ -240,6 +245,7 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
+      tableHeight: 400,
       unloadPencent: 0,
       addLevel: '1',
       addType: 'add',
@@ -269,13 +275,13 @@ export default {
           label: '所属网格',
           align: 'center',
           columnName: 'gridName',
-          width: '300',
+          width: '200',
           options: []
         }, {
           label: '分类类别',
           align: 'center',
           columnName: 'categoryName',
-          width: '200',
+          width: '160',
           options: []
         }, {
           label: '主要事迹',
@@ -310,16 +316,29 @@ export default {
   },
   async created() {
     this.customerId = localStorage.getItem('customerId')
-    setTimeout(() => {
-      this.getTableData()
+    // setTimeout(() => {
+    //   this.getTableData()
+    //   this.getGridList('query')
+    //   this.getGridList('addorupdate')
+    //   this.getCateList('query')
+    //   this.getCateList('addorupdate')
+    // }, 200)
+    this.getTableData()
       this.getGridList('query')
       this.getGridList('addorupdate')
       this.getCateList('query')
       this.getCateList('addorupdate')
-    }, 200)
     this.pageLoading = true
+    
+    // this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
   },
   mounted() {
+    
+    this.$nextTick(() => {
+      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      console.log('tableHeight', this.tableHeight)
+    })
+    
   },
   methods: {
     handleSizeChange(val) {
@@ -726,6 +745,12 @@ export default {
     }
   }
 }
+.div-content {
+  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 65d05927..98130e82 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageLoading" class="resi-container">
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
+    <el-card ref="searchCard" class="search-card">
+      <div>
         <el-form
           ref="searchForm"
           :inline="true"
@@ -141,6 +141,9 @@
           </div>
         </el-form>
       </div>
+    </el-card>
+    <el-card class="resi-card-table">
+     
       <div class="resi-row-btn">
         <el-button type="success" @click="handleAdd('add')">新增需求</el-button>
       </div>
@@ -150,7 +153,7 @@
         row-key="categoryId"
         v-loading="tableLoading"
         border
-        max-height="800"
+        :height="tableHeight"
         style="width: 100%"
         class="resi-table"
       >
@@ -257,7 +260,7 @@
           :current-page.sync="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="pageSize"
-          layout="sizes, prev, pager, next"
+          layout="sizes, prev, pager, next, total"
           :total="total"
         >
         </el-pagination>
@@ -267,8 +270,9 @@
     <el-dialog
       title="需求信息"
       :visible.sync="dialogVisible"
-      width="40%"
+      width="50%"
       append-to-body
+      class="dialog-h"
       :close-on-click-modal="false"
       :before-close="handlerCancle"
     >
@@ -278,7 +282,7 @@
         :model="form"
         :rules="rules"
         ref="ruleForm"
-        class="form-wr"
+        class="form-wr dialog-h-content scroll-h"
       >
         <el-form-item label="所属网格" prop="gridId">
           <el-input
@@ -598,6 +602,7 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
+      tableHeight: 400,
       addLevel: "1",
       addType: "add",
       value: "",
@@ -854,7 +859,12 @@ export default {
     }, 200);
     this.pageLoading = true;
   },
-  mounted() {},
+  mounted() {
+    this.$nextTick(() => {
+      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      console.log('tableHeight', this.tableHeight)
+    })
+  },
   methods: {
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);