diff --git a/src/assets/img/shuju/measure/hong@2x.png b/src/assets/img/shuju/measure/hong@2x.png
new file mode 100644
index 000000000..15a949688
Binary files /dev/null and b/src/assets/img/shuju/measure/hong@2x.png differ
diff --git a/src/assets/scss/modules/visual/houseStatic.scss b/src/assets/scss/modules/visual/houseStatic.scss
index 339245a08..fb6f31ae6 100644
--- a/src/assets/scss/modules/visual/houseStatic.scss
+++ b/src/assets/scss/modules/visual/houseStatic.scss
@@ -170,7 +170,7 @@
             margin-top:1px;
             width: 18px;
             height: 8px;
-            background: #ff7800;
+            background: #3dda83;
             border-radius: 4px;
           } 
 
@@ -189,7 +189,7 @@
             margin-top:1px;
             width: 18px;
             height: 8px;
-            background: #00E5ED;
+            background: #e43c26;
             border-radius: 4px;
           }
           >span{
@@ -299,21 +299,21 @@
     font-size: 35px;
     font-family: PingFang SC;
     font-weight: bold;
-    color: #FAC126;
+    color: #3dda83;
   }
 
   .cz{
     font-size: 35px;
     font-family: PingFang SC;
     font-weight: bold;
-    color: #45D97F;
+    color: #e43c26;
   }
 
   .xz{
     font-size: 35px;
     font-family: PingFang SC;
     font-weight: bold;
-    color: #2865FA;
+    color: #fac126;
   }
 
   .colorwhite{
diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 615d860c1..1f138a545 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -205,14 +205,18 @@
                     </el-cascader>
                     <template v-else-if="n.itemType === 'radio'">
                       <el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]"
-                      :label="ns.value">
+                      :label="ns.value" @change="hanldeChangeRadio(n)">
                         {{ ns.label }}
                       </el-radio>
                       <!-- <el-radio v-model.trim="form[n.columnName]" label="1">备选项</el-radio> -->
                     </template>
                     <template v-else-if="n.itemType === 'checkbox'">
                       <el-checkbox-group v-model.trim="form[n.columnName]">
-                        <el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value">{{ns.label}}</el-checkbox>
+                        <template v-for="ns in n.options">
+                          <el-checkbox v-if="ns.value != 'dangyuanzhongxinhu'" :key="ns.value" :label="ns.value">
+                            {{ns.label}}
+                          </el-checkbox>
+                        </template>
                         <!-- <el-checkbox label="n.la"></el-checkbox> -->
                       </el-checkbox-group>
                     </template>
@@ -487,6 +491,9 @@ export default {
         // }
       })
     },
+    hanldeChangeRadio(n) {
+      this.$emit('changeradio', n)
+    },
     handleValidBlur(n) {
       console.log('n---', n)
       if (n.columnName !== 'ID_CARD') return
diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index e89875332..35cc07a35 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -79,8 +79,13 @@
           <div class="resi-cell-label">房屋用途</div>
           <div class="resi-cell-value">
 
-            <el-select v-model="purpose" placeholder="房屋用途" clearable>
-              <el-option v-for="item in purposeArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            <el-select v-model="purpose"
+                       placeholder="房屋用途"
+                       clearable>
+              <el-option v-for="item in purposeArr"
+                         :key="item.dictValue"
+                         :label="item.dictName"
+                         :value="item.dictValue">
               </el-option>
             </el-select>
 
@@ -99,7 +104,6 @@
 
           </div>
         </div>
-
         <el-button style="margin-left:10px"
                    class="diy-button--search"
                    size="small"
@@ -120,6 +124,8 @@
                    :ownerName="ownerName"
                    :ownerPhone="ownerPhone"
                    :rentFlag="rentFlag"
+                   :purpose="purpose"
+                   :remark="remark"
                    @toNextLevel="toNextLevel"
                    @refreshTree="refreshTree"></build-table>
 
@@ -129,6 +135,8 @@
                   :ownerName="ownerName"
                   :ownerPhone="ownerPhone"
                   :rentFlag="rentFlag"
+                  :purpose="purpose"
+                  :remark="remark"
                   ref="ref_buildingTable"
                   @refreshTree="refreshTree"></room-table>
 
@@ -138,6 +146,8 @@
                        :ownerName="ownerName"
                        :ownerPhone="ownerPhone"
                        :rentFlag="rentFlag"
+                       :purpose="purpose"
+                       :remark="remark"
                        ref="ref_communityTable"
                        @refreshTree="refreshTree"></community-table>
 
@@ -147,391 +157,391 @@
 </template>
 
 <script>
-    import CDialog from '@c/CDialog'
-    import communityTable from './communityTable'
-    import buildTable from './buildTable'
-    import roomTable from './roomTable'
-    import { requestPost } from "@/js/dai/request";
-    import { mapGetters } from 'vuex'
-    import { Loading } from 'element-ui' // 引入Loading服务
-
-    let loading // 加载动画
-    export default {
-        data () {
-            return {
-                filterText: '',
-                treeLoading: true,
-                treeData: [],
-                openNodes: [],
-                defaultProps: {
-                    children: 'children',
-                    label: 'showName'
-                },
-
-                selTreeObj: {},
-
-                centerPoint: [],
-                staffAgencyId: localStorage.getItem("agencyId"),
-                showImportBtn: false,
-
-                rentList: [
-                    {
-                        value: '1',
-                        label: '出租'
-                    },
-                    {
-                        value: '2',
-                        label: '闲置'
-                    },
-                    {
-                        value: '0',
-                        label: '自住'
-                    },
-                ],
-                ownerName: '',
-                ownerPhone: '',
-                rentFlag: '',
-                purpose: '',
-                remark: '',
-                showRoomTable: false,
-                selObj: {},
-                purposeArr: [
-                    { dictValue: '1', dictName: '住宅' },
-                    { dictValue: '2', dictName: '商业' },
-                    { dictValue: '3', dictName: '办公' },
-                    { dictValue: '4', dictName: '工业' },
-                    { dictValue: '5', dictName: '仓储' },
-                    { dictValue: '6', dictName: '商住混用' },
-                    { dictValue: '7', dictName: '其他' }
-                ]
-            }
+import CDialog from '@c/CDialog'
+import communityTable from './communityTable'
+import buildTable from './buildTable'
+import roomTable from './roomTable'
+import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      filterText: '',
+      treeLoading: true,
+      treeData: [],
+      openNodes: [],
+      defaultProps: {
+        children: 'children',
+        label: 'showName'
+      },
+
+      selTreeObj: {},
+
+      centerPoint: [],
+      staffAgencyId: localStorage.getItem("agencyId"),
+      showImportBtn: false,
+
+      rentList: [
+        {
+          value: '1',
+          label: '出租'
         },
-        components: {
-            CDialog
+        {
+          value: '2',
+          label: '闲置'
         },
-        async mounted () {
-            this.treeLoading = true
-
-            await this.loadOrgData()
-            await this.loadTree()
-            await this.loadOpenNode()
-
-            await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
-            if (this.treeData.length > 0) {
-                this.$nextTick(() => {
-                    // ref_tree 元素的ref   value 绑定的node-key
-                    this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
-                });
-            }
-            this.treeLoading = false
-
+        {
+          value: '0',
+          label: '自住'
         },
-        computed: {
-            rowHeight () {
+      ],
+      ownerName: '',
+      ownerPhone: '',
+      rentFlag: '',
+      purpose: '',
+      remark: '',
+      showRoomTable: false,
+      selObj: {},
+      purposeArr: [
+        { dictValue: '1', dictName: '住宅' },
+        { dictValue: '2', dictName: '商业' },
+        { dictValue: '3', dictName: '办公' },
+        { dictValue: '4', dictName: '工业' },
+        { dictValue: '5', dictName: '仓储' },
+        { dictValue: '6', dictName: '商住混用' },
+        { dictValue: '7', dictName: '其他' }
+      ]
+    }
+  },
+  components: {
+    CDialog
+  },
+  async mounted () {
+    this.treeLoading = true
+
+    await this.loadOrgData()
+    await this.loadTree()
+    await this.loadOpenNode()
+
+    await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
+    if (this.treeData.length > 0) {
+      this.$nextTick(() => {
+        // ref_tree 元素的ref   value 绑定的node-key
+        this.$refs.ref_tree.setCurrentKey(this.treeData[0].id);
+      });
+    }
+    this.treeLoading = false
 
-                return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px'
+  },
+  computed: {
+    rowHeight () {
 
-            },
-            treeHeight () {
-                return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
+      return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px'
 
-            },
+    },
+    treeHeight () {
+      return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
 
-            ...mapGetters(['clientHeight', 'iframeHeight'])
-        },
-        methods: {
+    },
 
-            handleSearch () {
-                if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
-                    this.showRoomTable = true
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
+  methods: {
 
-                    this.$nextTick(() => {
-                        this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
-                    })
-                } else {
-                    this.$message.warning('请输入查询条件')
-                }
+    handleSearch () {
+      if (this.ownerName || this.ownerPhone || this.rentFlag || this.purpose || this.remark) {
+        this.showRoomTable = true
 
+        this.$nextTick(() => {
+          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj)
+        })
+      } else {
+        this.$message.warning('请输入查询条件')
+      }
 
-            },
 
-            //重置搜索条件
-            resetSearch () {
-                this.ownerName = ''
-                this.ownerPhone = ''
-                this.rentFlag = ''
-                this.purpose = ''
-                this.remark = ''
-
-                this.pageSize = 10
-                this.pageNo = 1
-                this.handleNodeClick(this.selObj)
-                // this.loadTable()
-            },
+    },
 
-            async loadOpenNode () {
-                const url = "/gov/org/building/tree-ids"
-                let params = {}
-
-                const { data, code, msg } = await requestPost(url, params)
-
-                if (code === 0) {
-                    this.openNodes = data
+    //重置搜索条件
+    resetSearch () {
+      this.ownerName = ''
+      this.ownerPhone = ''
+      this.rentFlag = ''
+      this.purpose = ''
+      this.remark = ''
 
+      this.pageSize = 10
+      this.pageNo = 1
+      this.handleNodeClick(this.selObj)
+      // this.loadTable()
+    },
 
-                } else {
-                    this.$message.error(msg)
-                }
-            },
-            async loadTree (isRefresh) {
-                const url = "/gov/org/building/treelist"
-                let params = {}
-
-                const { data, code, msg } = await requestPost(url, params)
-
-                if (code === 0) {
-
-                    this.treeData = data
-                    if (!isRefresh && data.length > 0) {
-
-                        this.selTreeObj = data[0]
-                        if (!this.selTreeObj.latitude) {
-                            this.selTreeObj.latitude = this.centerPoint[0]
-                        }
-
-                        if (!this.selTreeObj.longitude) {
-                            this.selTreeObj.longitude = this.centerPoint[1]
-                        }
-                    }
-
-                } else {
-                    this.$message.error(msg)
-                }
-            },
-
-            //加载组织数据
-            async loadOrgData () {
-                const url = "/gov/org/agency/maporg"
-                // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
-                let params = {}
-
-                const { data, code, msg } = await requestPost(url, params)
-
-                if (code === 0) {
-                    this.centerPoint = []
-
-                    this.centerPoint.push(data.latitude)
-                    this.centerPoint.push(data.longitude)
-
-                } else {
-                    this.$message.error(msg)
-                }
-
-            },
-
-            handleNodeClick (obj) {
-                this.ownerName = ''
-                this.ownerPhone = ''
-                this.rentFlag = ''
-                this.purpose = ''
-                this.remark = ''
-                this.showRoomTable = false
-
-                this.selObj = JSON.parse(JSON.stringify(obj))
-                this.getTreeObj(obj)
-
-                this.$nextTick(() => {
-                    if (obj.level === 'building') {//点击楼栋
-                        this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
-
-                    } else if (obj.level === 'neighborHood') {//点击小区
-                        this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
-
-                    } else {
-                        this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
-                    }
-                })
-
-            },
-
-            //添加小区结束
-            async refreshTree () {
-                this.treeLoading = true
-                await this.loadTree(this.selTreeObj.id)
-                this.$nextTick(() => {
-                    // ref_tree 元素的ref   value 绑定的node-key
-                    this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
-                });
-                this.treeLoading = false
-            },
-
-            //进入下一级
-            toNextLevel (row, level) {
-
-                if (level === 'community') {
-                    this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data
-                    this.openNodes.push(this.selTreeObj.id)
-                } else {
-                    this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
-                }
-
-
-                this.handleNodeClick(this.selTreeObj)
-                this.$nextTick(() => {
-                    // ref_tree 元素的ref   value 绑定的node-key
-                    this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
-                });
-
-                const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素
-                setTimeout(() => {
-                    if (node) {
-                        this.$nextTick(() => {
-                            node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示
-                        })
-                    }
-                }, 100)
-
-
-            },
-
-            //解析树数据
-            getTreeObj (obj) {
-                // 树接口：
-                // 组织：组织id、组织名称、type、经度、纬度
-                // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
-                // 楼：楼id、楼名称、type、所属小区id、所属小区名称
-                if (obj.level === 'building') {//点击楼栋
-                    let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
-
-                    let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
-                    let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
-                    obj.agencyId = agencyNode.data.id
-                    obj.agencyName = agencyNode.data.label
-                    obj.gridId = gridNode.data.id
-                    obj.gridName = gridNode.data.label
-                    obj.neighborHoodId = neighborHoodNode.data.id
-                    obj.neighborHoodName = neighborHoodNode.data.label
-                    if (obj.agencyId === this.staffAgencyId) {
-                        this.showImportBtn = true
-                    } else {
-                        this.showImportBtn = false
-                    }
-
-                } else if (obj.level === 'neighborHood') {//点击小区
-                    let gridNode = this.$refs.ref_tree.getNode(obj.pid)
-                    let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
-                    obj.gridId = gridNode.data.id
-                    obj.gridName = gridNode.data.label
-                    obj.agencyId = agencyNode.data.id
-                    obj.agencyName = agencyNode.data.label
-                    if (obj.agencyId === this.staffAgencyId) {
-                        this.showImportBtn = true
-                    } else {
-                        this.showImportBtn = false
-                    }
-
-                } else {
-
-                }
-
-                if (!obj.latitude) {
-                    obj.latitude = this.centerPoint[0]
-                }
-
-                if (!obj.longitude) {
-                    obj.longitude = this.centerPoint[1]
-                }
-                this.selTreeObj = obj
-                console.log(this.selTreeObj)
-
-            },
-
-            filterNode (value, data) {
-                if (!value) return true;
-                return data.label.indexOf(value) !== -1;
-            },
-
-            // 开启加载动画
-            startLoading () {
-                loading = Loading.service({
-                    lock: true, // 是否锁定
-                    text: '正在加载……', // 加载中需要显示的文字
-                    background: 'rgba(0,0,0,.7)' // 背景颜色
-                })
-            },
-            // 结束加载动画
-            endLoading () {
-                // clearTimeout(timer);
-                if (loading) {
-                    loading.close()
-                }
-            }
-        },
-        watch: {
-            filterText (val) {
-                this.$refs.ref_tree.filter(val);
-            }
-        },
-        components: {
-            communityTable, buildTable, roomTable
+    async loadOpenNode () {
+      const url = "/gov/org/building/tree-ids"
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.openNodes = data
+
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    async loadTree (isRefresh) {
+      const url = "/gov/org/building/treelist"
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+
+        this.treeData = data
+        if (!isRefresh && data.length > 0) {
+
+          this.selTreeObj = data[0]
+          if (!this.selTreeObj.latitude) {
+            this.selTreeObj.latitude = this.centerPoint[0]
+          }
+
+          if (!this.selTreeObj.longitude) {
+            this.selTreeObj.longitude = this.centerPoint[1]
+          }
         }
-    }
-</script>
-<style lang="scss" scoped >
-  .div_main {
-    display: flex;
-  }
-  .scrollar {
-    margin-top: 10px;
-  }
 
-  .div_tree {
-    flex: 0 0 280px;
-    background-color: #ffffff;
-    border-radius: 5px;
-    padding: 10px;
-    overflow-y: hidden;
-  }
-  .filter_tree {
-    overflow-x: auto;
-  }
+      } else {
+        this.$message.error(msg)
+      }
+    },
 
-  .div_table {
-    margin-left: 15px;
-    // flex: 1;
-    width: calc(100% - 300px);
-    background-color: #ffffff;
-    border-radius: 5px;
-    padding: 10px;
-  }
+    //加载组织数据
+    async loadOrgData () {
+      const url = "/gov/org/agency/maporg"
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/agency/maporg"
+      let params = {}
 
-  .div_btn {
-    margin-top: 20px;
-  }
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.centerPoint = []
+
+        this.centerPoint.push(data.latitude)
+        this.centerPoint.push(data.longitude)
+
+      } else {
+        this.$message.error(msg)
+      }
 
-  .row {
-    padding: 10px;
+    },
+
+    handleNodeClick (obj) {
+      this.ownerName = ''
+      this.ownerPhone = ''
+      this.rentFlag = ''
+      this.purpose = ''
+      this.remark = ''
+      this.showRoomTable = false
+
+      this.selObj = JSON.parse(JSON.stringify(obj))
+      this.getTreeObj(obj)
+
+      this.$nextTick(() => {
+        if (obj.level === 'building') {//点击楼栋
+          this.$refs['ref_buildingTable'].loadTable('tree', this.selTreeObj)
+
+        } else if (obj.level === 'neighborHood') {//点击小区
+          this.$refs['ref_neighTable'].loadTable(true, this.selTreeObj)
+
+        } else {
+          this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
+        }
+      })
+
+    },
+
+    //添加小区结束
+    async refreshTree () {
+      this.treeLoading = true
+      await this.loadTree(this.selTreeObj.id)
+      this.$nextTick(() => {
+        // ref_tree 元素的ref   value 绑定的node-key
+        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
+      });
+      this.treeLoading = false
+    },
+
+    //进入下一级
+    toNextLevel (row, level) {
+
+      if (level === 'community') {
+        this.selTreeObj = this.$refs.ref_tree.getNode(row.neighborHoodId).data
+        this.openNodes.push(this.selTreeObj.id)
+      } else {
+        this.selTreeObj = this.$refs.ref_tree.getNode(row.buildingId).data
+      }
+
+
+      this.handleNodeClick(this.selTreeObj)
+      this.$nextTick(() => {
+        // ref_tree 元素的ref   value 绑定的node-key
+        this.$refs.ref_tree.setCurrentKey(this.selTreeObj.id);
+      });
+
+      const node = document.getElementById(this.selTreeObj.id) // 通过Id获取到对应的dom元素
+      setTimeout(() => {
+        if (node) {
+          this.$nextTick(() => {
+            node.scrollIntoView({ block: 'center' }) // 通过scrollIntoView方法将对应的dom元素定位到可见区域 【block: 'center'】这个属性是在垂直方向居中显示
+          })
+        }
+      }, 100)
+
+
+    },
+
+    //解析树数据
+    getTreeObj (obj) {
+      // 树接口：
+      // 组织：组织id、组织名称、type、经度、纬度
+      // 小区：小区id、小区名称、type、所属网格id、所属网格名称、所属组织id、所属组织名称、经度、纬度
+      // 楼：楼id、楼名称、type、所属小区id、所属小区名称
+      if (obj.level === 'building') {//点击楼栋
+        let neighborHoodNode = this.$refs.ref_tree.getNode(obj.pid)//所属小区
+
+        let gridNode = this.$refs.ref_tree.getNode(neighborHoodNode.data.pid)//所属网格
+        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)//所属社区
+        obj.agencyId = agencyNode.data.id
+        obj.agencyName = agencyNode.data.label
+        obj.gridId = gridNode.data.id
+        obj.gridName = gridNode.data.label
+        obj.neighborHoodId = neighborHoodNode.data.id
+        obj.neighborHoodName = neighborHoodNode.data.label
+        if (obj.agencyId === this.staffAgencyId) {
+          this.showImportBtn = true
+        } else {
+          this.showImportBtn = false
+        }
+
+      } else if (obj.level === 'neighborHood') {//点击小区
+        let gridNode = this.$refs.ref_tree.getNode(obj.pid)
+        let agencyNode = this.$refs.ref_tree.getNode(gridNode.data.pid)
+        obj.gridId = gridNode.data.id
+        obj.gridName = gridNode.data.label
+        obj.agencyId = agencyNode.data.id
+        obj.agencyName = agencyNode.data.label
+        if (obj.agencyId === this.staffAgencyId) {
+          this.showImportBtn = true
+        } else {
+          this.showImportBtn = false
+        }
+
+      } else {
+
+      }
+
+      if (!obj.latitude) {
+        obj.latitude = this.centerPoint[0]
+      }
+
+      if (!obj.longitude) {
+        obj.longitude = this.centerPoint[1]
+      }
+      this.selTreeObj = obj
+      console.log(this.selTreeObj)
+
+    },
+
+    filterNode (value, data) {
+      if (!value) return true;
+      return data.label.indexOf(value) !== -1;
+    },
+
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
+    }
+  },
+  watch: {
+    filterText (val) {
+      this.$refs.ref_tree.filter(val);
+    }
+  },
+  components: {
+    communityTable, buildTable, roomTable
   }
+}
+</script>
+<style lang="scss" scoped >
+.div_main {
+  display: flex;
+}
+.scrollar {
+  margin-top: 10px;
+}
+
+.div_tree {
+  flex: 0 0 280px;
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+  overflow-y: hidden;
+}
+.filter_tree {
+  overflow-x: auto;
+}
+
+.div_table {
+  margin-left: 15px;
+  // flex: 1;
+  width: calc(100% - 300px);
+  background-color: #ffffff;
+  border-radius: 5px;
+  padding: 10px;
+}
+
+.div_btn {
+  margin-top: 20px;
+}
+
+.row {
+  padding: 10px;
+}
 </style>
 
 <style>
-  /* .aui-content > .el-tabs > .el-tabs__content {
+/* .aui-content > .el-tabs > .el-tabs__content {
     padding: 0px;
   } */
 
-  .el-tree-node:focus > .el-tree-node__content {
-    /* background-color: #ccc !important; */
-    color: #2195fe;
-  }
+.el-tree-node:focus > .el-tree-node__content {
+  /* background-color: #ccc !important; */
+  color: #2195fe;
+}
 </style>
 <style lang="scss" scoped>
-  .div_tree {
-    /deep/ .el-scrollbar__wrap {
-      overflow-x: hidden !important;
-    }
+.div_tree {
+  /deep/ .el-scrollbar__wrap {
+    overflow-x: hidden !important;
   }
+}
 </style>
 
 <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManage.scss";
+@import "@/assets/scss/modules/visual/communityManage.scss";
 </style>
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index bc77f3d5d..525c4b984 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -115,6 +115,7 @@
                       label-width="150px"
                       style="display: block">
           <el-input class="item_width_1"
+                    maxlength="30"
                     placeholder="请输入备注"
                     v-model="dataForm.remark">
           </el-input>
@@ -135,260 +136,260 @@
 </template>
 
 <script>
-    import { mapGetters } from 'vuex'
-    import { Loading } from 'element-ui' // 引入Loading服务
-    import { requestPost, requestGet } from '@/js/dai/request'
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost, requestGet } from '@/js/dai/request'
+
+
+let loading // 加载动画
+export default {
+  data () {
+    return {
+      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+      btnDisable: false,
+      unitList: [],
+
+      houseId: '', //房屋ID
+      houseType: '1',
+      purpose: '1',
+      rentFlag: 0,
+      dataForm: {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '',//房屋类型【楼房，平房，别墅】
+        purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
+        ownerPhone: '', //房主电话
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '' // 备注
+      },
+
+      keyWords: '',
+      agencyObj: {},
 
+    }
+  },
+  components: {},
+  mounted () {
 
-    let loading // 加载动画
-    export default {
-        data () {
-            return {
-                formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-                btnDisable: false,
-                unitList: [],
+  },
 
-                houseId: '', //房屋ID
-                houseType: '1',
-                purpose: '1',
-                rentFlag: 0,
-                dataForm: {
-                    neighborHoodId: '', // 所属小区ID
-                    buildingId: '',//所属楼栋ID
-                    buildingUnitId: '',//所属单元ID
-                    doorName: '',//门牌号
-                    houseType: '',//房屋类型【楼房，平房，别墅】
-                    purpose: '',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-                    rentFlag: 0,//房屋状态【是：1，否：0】	出租1、闲置2、自住	0
-                    ownerPhone: '', //房主电话
-                    ownerName: '', //房主名字
-                    ownerIdCard: '', //房主身份证
-                    remark: '' // 备注
-                },
-
-                keyWords: '',
-                agencyObj: {},
-
-            }
-        },
-        components: {},
-        mounted () {
-
-        },
-
-        methods: {
-            async initForm (type, row, agencyObj) {
-
-                this.$refs.ref_form.resetFields();
-                this.agencyObj = agencyObj
-                this.formType = type
-                if (row) {
-
-                    this.houseId = row.houseId
-                    await this.loadHouseInfo()
-                    // this.dataForm = JSON.parse(JSON.stringify(row))
-                    // this.houseId = this.dataForm.houseId
-
-                    // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
-                    // this.dataForm = { ...  this.dataForm }
-                    // this.houseType = this.dataForm.houseTypeKey
-                    // this.purpose = this.dataForm.purposeKey
-                    // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
-
-                } else {
-
-                    this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
-                    this.dataForm.buildingId = this.agencyObj.id
-                }
-
-
-                await this.loadUnitList()
-
-            },
-
-            async loadHouseInfo () {
-
-                const url = "/gov/org/ichouse/" + this.houseId
-
-                const { data, code, msg } = await requestGet(url)
-
-                if (code === 0) {
-                    // debugger
-                    this.dataForm = { ...data }
-
-                    this.houseType = this.dataForm.houseType
-                    this.purpose = this.dataForm.purpose
-                    this.rentFlag = parseInt(this.dataForm.rentFlag)
-
-
-                } else {
-                    this.$message.error(msg)
-                }
-
-            },
-
-            //加载单元
-            async loadUnitList () {
-                const url = '/gov/org/building/buildingunitlist'
-
-                let params = {
-                    buildingId: this.dataForm.buildingId
-                }
-
-                const { data, code, msg } = await requestPost(url, params)
-
-                if (code === 0) {
-                    this.unitList = data
-                } else {
-                    this.$message.error(msg)
-                }
-            },
-
-            async handleComfirm () {
-                this.btnDisable = true
-                setTimeout(() => {
-                    this.btnDisable = false
-                }, 10000)
-
-                this.dataForm.houseType = this.houseType
-                this.dataForm.purpose = this.purpose
-                this.dataForm.rentFlag = this.rentFlag
-                this.$refs['ref_form'].validate((valid, messageObj) => {
-                    if (!valid) {
-                        this.btnDisable = false
-                        app.util.validateRule(messageObj)
-                    } else {
-                        this.addRoom()
-                    }
-
-                })
-            },
-
-            async addRoom () {
-                const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
-                if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
-                    this.btnDisable = false
-                    this.$message({
-                        type: 'warning',
-                        message: '请输入正确的身份证号码'
-                    })
-                    return false;
-                }
-                const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
-                if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
-                    this.btnDisable = false
-                    this.$message({
-                        type: 'warning',
-                        message: '请输入正确的手机号码'
-                    })
-                    return false;
-                }
-
-                let url = ''
-
-                if (this.formType === 'add') {
-                    url = '/gov/org/house/houseadd'
-                } else {
-                    url = '/gov/org/house/houseupdate'
-                    this.dataForm.houseId = this.houseId
-                }
-
-                const { data, code, msg } = await requestPost(url, this.dataForm)
-                this.btnDisable = false
-                if (code === 0) {
-                    this.$message({
-                        type: 'success',
-                        message: '操作成功'
-                    })
-                    this.resetData()
-                    this.$emit('dialogOk')
-
-                } else {
-
-                    this.$message.error(msg)
-                }
-
-            },
-
-            handleCancle () {
-                this.resetData()
-                this.$emit('dialogCancle')
-
-            },
-
-            resetData () {
-                this.houseId = '' //房屋ID
-                this.houseType = '1'
-                this.purpose = '1'
-                this.rentFlag = 0
-                this.dataForm = {
-                    neighborHoodId: '', // 所属小区ID
-                    buildingId: '',//所属楼栋ID
-                    buildingUnitId: '',//所属单元ID
-                    doorName: '',//门牌号
-                    houseType: '1',//房屋类型【楼房，平房，别墅】
-                    purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
-                    rentFlag: 0,//是否出租【是：1，否：0】
-                    ownerPhone: '', //房主电话
-                    ownerName: '', //房主名字
-                    ownerIdCard: '', //房主身份证
-                    remark: '' // 备注
-                }
-
-            },
-            // 开启加载动画
-            startLoading () {
-                loading = Loading.service({
-                    lock: true, // 是否锁定
-                    text: '正在加载……', // 加载中需要显示的文字
-                    background: 'rgba(0,0,0,.7)' // 背景颜色
-                })
-            },
-            // 结束加载动画
-            endLoading () {
-                // clearTimeout(timer);
-                if (loading) {
-                    loading.close()
-                }
-            }
-        },
-        computed: {
-            dataRule () {
-                return {
-                    buildingUnitId: [
-                        { required: true, message: '所属单元不能为空', trigger: 'blur' },
-                    ],
-                    doorName: [
-                        { required: true, message: '门牌号不能为空', trigger: 'blur' }
-                    ],
-                    houseType: [
-                        { required: true, message: '房屋类型不能为空', trigger: 'blur' }
-                    ],
-                    purpose: [
-                        { required: true, message: '房屋用途不能为空', trigger: 'blur' }
-                    ],
-                    rentFlag: [
-                        { required: true, message: '是否出租不能为空', trigger: 'blur' }
-                    ],
-                    ownerPhone: [
-                        { required: false }
-                    ],
-                    ownerName: [
-                        { required: false }
-                    ],
-                    ownerIdCard: [
-                        { required: false }
-                    ],
-                    remark: [
-                        { required: false }
-                    ]
-                }
-            },
-
-        },
-        props: {}
+  methods: {
+    async initForm (type, row, agencyObj) {
+
+      this.$refs.ref_form.resetFields();
+      this.agencyObj = agencyObj
+      this.formType = type
+      if (row) {
+
+        this.houseId = row.houseId
+        await this.loadHouseInfo()
+        // this.dataForm = JSON.parse(JSON.stringify(row))
+        // this.houseId = this.dataForm.houseId
+
+        // this.dataForm.buildingUnitId = this.dataForm.unitNumKey
+        // this.dataForm = { ...  this.dataForm }
+        // this.houseType = this.dataForm.houseTypeKey
+        // this.purpose = this.dataForm.purposeKey
+        // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
+
+      } else {
+
+        this.dataForm.neighborHoodId = this.agencyObj.neighborHoodId
+        this.dataForm.buildingId = this.agencyObj.id
+      }
+
+
+      await this.loadUnitList()
+
+    },
+
+    async loadHouseInfo () {
+
+      const url = "/gov/org/ichouse/" + this.houseId
+
+      const { data, code, msg } = await requestGet(url)
+
+      if (code === 0) {
+        // debugger
+        this.dataForm = { ...data }
+
+        this.houseType = this.dataForm.houseType
+        this.purpose = this.dataForm.purpose
+        this.rentFlag = parseInt(this.dataForm.rentFlag)
+
+
+      } else {
+        this.$message.error(msg)
+      }
+
+    },
+
+    //加载单元
+    async loadUnitList () {
+      const url = '/gov/org/building/buildingunitlist'
+
+      let params = {
+        buildingId: this.dataForm.buildingId
+      }
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        this.unitList = data
+      } else {
+        this.$message.error(msg)
+      }
+    },
+
+    async handleComfirm () {
+      this.btnDisable = true
+      setTimeout(() => {
+        this.btnDisable = false
+      }, 10000)
+
+      this.dataForm.houseType = this.houseType
+      this.dataForm.purpose = this.purpose
+      this.dataForm.rentFlag = this.rentFlag
+      this.$refs['ref_form'].validate((valid, messageObj) => {
+        if (!valid) {
+          this.btnDisable = false
+          app.util.validateRule(messageObj)
+        } else {
+          this.addRoom()
+        }
+
+      })
+    },
+
+    async addRoom () {
+      const regCard = /(^\d{15}$)|(^\d{17}(\d|X)$)/; //身份证号码为15位或者18位，15位时全为数字，18位前17位为数字，最后一位是校验位，可能为数字或字符X
+      if (this.dataForm.ownerIdCard && regCard.test(this.dataForm.ownerIdCard) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的身份证号码'
+        })
+        return false;
+      }
+      const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
+      if (this.dataForm.ownerPhone && regPhone.test(this.dataForm.ownerPhone) === false) {
+        this.btnDisable = false
+        this.$message({
+          type: 'warning',
+          message: '请输入正确的手机号码'
+        })
+        return false;
+      }
+
+      let url = ''
+
+      if (this.formType === 'add') {
+        url = '/gov/org/house/houseadd'
+      } else {
+        url = '/gov/org/house/houseupdate'
+        this.dataForm.houseId = this.houseId
+      }
+
+      const { data, code, msg } = await requestPost(url, this.dataForm)
+      this.btnDisable = false
+      if (code === 0) {
+        this.$message({
+          type: 'success',
+          message: '操作成功'
+        })
+        this.resetData()
+        this.$emit('dialogOk')
+
+      } else {
+
+        this.$message.error(msg)
+      }
+
+    },
+
+    handleCancle () {
+      this.resetData()
+      this.$emit('dialogCancle')
+
+    },
+
+    resetData () {
+      this.houseId = '' //房屋ID
+      this.houseType = '1'
+      this.purpose = '1'
+      this.rentFlag = 0
+      this.dataForm = {
+        neighborHoodId: '', // 所属小区ID
+        buildingId: '',//所属楼栋ID
+        buildingUnitId: '',//所属单元ID
+        doorName: '',//门牌号
+        houseType: '1',//房屋类型【楼房，平房，别墅】
+        purpose: '1',//房屋用途【住宅，商业，办公，工业，仓储，商住混用，其他】
+        rentFlag: 0,//是否出租【是：1，否：0】
+        ownerPhone: '', //房主电话
+        ownerName: '', //房主名字
+        ownerIdCard: '', //房主身份证
+        remark: '' // 备注
+      }
+
+    },
+    // 开启加载动画
+    startLoading () {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: '正在加载……', // 加载中需要显示的文字
+        background: 'rgba(0,0,0,.7)' // 背景颜色
+      })
+    },
+    // 结束加载动画
+    endLoading () {
+      // clearTimeout(timer);
+      if (loading) {
+        loading.close()
+      }
     }
+  },
+  computed: {
+    dataRule () {
+      return {
+        buildingUnitId: [
+          { required: true, message: '所属单元不能为空', trigger: 'blur' },
+        ],
+        doorName: [
+          { required: true, message: '门牌号不能为空', trigger: 'blur' }
+        ],
+        houseType: [
+          { required: true, message: '房屋类型不能为空', trigger: 'blur' }
+        ],
+        purpose: [
+          { required: true, message: '房屋用途不能为空', trigger: 'blur' }
+        ],
+        rentFlag: [
+          { required: true, message: '是否出租不能为空', trigger: 'blur' }
+        ],
+        ownerPhone: [
+          { required: false }
+        ],
+        ownerName: [
+          { required: false }
+        ],
+        ownerIdCard: [
+          { required: false }
+        ],
+        remark: [
+          { required: false }
+        ]
+      }
+    },
+
+  },
+  props: {}
+}
 </script>
 <style lang="scss" scoped >
-  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
 </style>
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 04488e517..daea171b1 100644
--- a/src/views/modules/base/community/roomTable.vue
+++ b/src/views/modules/base/community/roomTable.vue
@@ -188,634 +188,647 @@
 
 <script>
 
-import roomForm from './roomForm'
-
-import { requestPost } from "@/js/dai/request";
-import { mapGetters } from 'vuex'
-import { Loading } from 'element-ui' // 引入Loading服务
-
-let loading // 加载动画
-export default {
-  data () {
-    return {
-      source: 'tree',//来源
-      importRoomLoading: false,
-      total: 0,
-      pageSize: 20,
-      pageNo: 0,
-      sortType: 'asc',//asc：正，desc：倒
-      tableLoading: true,
-
-      // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
-
-      agencyObj: {},//树所选的小区对象
-      ownerName: '',
-      ownerPhone: '',
-      rentFlag: '',
-        purpose: '',
-        remark: '',
-
-      validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
-      selection: [],
-      showDeletBtn: false,
-
-      tableData: [],
-
-      //form相关
-      formShow: false,
-      formTitle: '新增房屋',
-
-      rentList: [
-        {
-          value: '1',
-          label: '出租'
-        },
-        {
-          value: '2',
-          label: '闲置'
-        },
-        {
-          value: '0',
-          label: '自住'
-        },
-      ],
+    import roomForm from './roomForm'
 
-      yihuyidangDisabled: false,
+    import { requestPost } from "@/js/dai/request";
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
 
+    let loading // 加载动画
+    export default {
+        data () {
+            return {
+                source: 'tree',//来源
+                importRoomLoading: false,
+                total: 0,
+                pageSize: 20,
+                pageNo: 0,
+                sortType: 'asc',//asc：正，desc：倒
+                tableLoading: true,
 
-    }
-  },
-  components: {
-    roomForm
-  },
-  async mounted () {
-
-  },
-  computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
-
-    },
-
-    ...mapGetters(['clientHeight', 'iframeHeight'])
-  },
-  methods: {
-    indexMethod (index) {
-      return index + 1;
-    },
-    handleSortOrderChange (value) {
-      console.log(value.column, value.prop, value.order)
-      this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
-      this.loadTable()
-
-    },
-    handleSortChange (value) {
-      console.log(value.column, value.prop, value.order)
-      this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
-      this.loadTable()
-
-    },
-
-    handleEditSort (row) {
-      if (!row.isChange) {
-        row.isChange = true
-      }
-
-    },
-
-    async handleChangeSort (row, index) {
-      // row.isChange = false
-      console.log(row.sort)
-      let params = {
-        id: row.houseId,
-        sort: row.sort,
-        type: 'house',
-      }
-
-      let url = '/gov/org/house/update-sort'
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        // this.$message({
-        //   type: 'success',
-        //   message: '修改成功'
-        // })
-
-
-      } else {
-
-        this.$message.error(msg)
-      }
-
-
-    },
-
-    checkSelect (row, index) {
-      let isChecked = false;
-      if (row.showBtn) { // 判断里面是否存在某个参数
-        isChecked = true
-      } else {
-        isChecked = false
-      }
-      return isChecked
-    },
-
-    loadTreeFromSearch () {
-
-    },
-
-    async loadTable (source, treeObj, ownerName, ownerPhone, rentFlag, purpose, remark) {
-
-      this.source = source
-      this.tableLoading = true
-
-      if (source === 'tree') {//来源于tree，查询数据清空
-        this.sortType = 'asc'
-        this.agencyObj = treeObj
-        this.ownerName = null
-        this.ownerPhone = null
-        this.rentFlag = null
-          this.purpose = null
-          this.remark = null
-      } else if (source === 'search') {//来源于查询
-        this.agencyObj = treeObj
-        this.ownerName = ownerName
-        this.ownerPhone = ownerPhone
-        this.rentFlag = rentFlag
-          this.purpose = purpose
-          this.remark = remark
-      }
-
-      // if (fromTree) {
-      //   this.agencyObj = treeObj
-
-      // }
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-        level: this.agencyObj.level,
-        id: this.agencyObj.id,
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        rentFlag: this.rentFlag,
-        sortType: this.sortType,
-        purpose: this.purpose,
-        remark: this.remark
-      }
-
-      const url = "/gov/org/house/houselist"
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.total = data.total
-        this.validTableDataNum = 0
-        data.list.forEach(item => {
-          item.sort = parseInt(item.sort) || 0;
-          item.sort = item.sort.toFixed(2)
-          item.isChange = false
-          item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
-
-          if (item.agencyId === this.staffAgencyId) {
-            item.showBtn = true
-            this.validTableDataNum++
-          } else {
-            item.showBtn = false
-          }
-
-        });
-        this.tableData = data.list
-      } else {
-        this.$message.error(msg)
-      }
-      this.tableLoading = false
-    },
-
-    diaClose () {
-      this.$refs.ref_form.resetData()
-      this.formShow = false
-    },
-
-    handleDetail (row) {
-      this.formTitle = '房屋详情'
-      this.formShow = true
-      this.$nextTick(() => {
-
-        this.$refs.ref_form.initForm('detail', row, this.agencyObj)
-      })
-    },
-
-    handleAdd () {
-
-      this.formTitle = '新增房屋'
-      this.formShow = true
-      this.$nextTick(() => {
-        console.log(this.agencyObj)
-        this.$refs.ref_form.initForm('add', null, this.agencyObj)
-      })
-    },
-
-    handleEdit (row) {
-      this.formTitle = '修改房屋'
-      this.formShow = true
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm('edit', row, this.agencyObj)
-      })
-    },
-
-    addFormCancle () {
-      this.formShow = false
-    },
-    addFormOk () {
-      this.formShow = false
-      this.loadTable()
-    },
-
-
-    deleteBatch () {
-      if (this.selection.length > 0) {
-        this.$confirm("确认删除选择的房屋?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        })
-          .then(() => {
-            this.deleteCommunityBatch()
-          })
-          .catch(err => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
-            }
+                // showImportBtn: false,//是否显示操作按钮，根据登录人所属组织判断
+
+                agencyObj: {},//树所选的小区对象
+
+
+                validTableDataNum: 0,//有效的数据数量，即有权限操作的数据数量
+                selection: [],
+                showDeletBtn: false,
+
+                tableData: [],
+
+                //form相关
+                formShow: false,
+                formTitle: '新增房屋',
+
+                rentList: [
+                    {
+                        value: '1',
+                        label: '出租'
+                    },
+                    {
+                        value: '2',
+                        label: '闲置'
+                    },
+                    {
+                        value: '0',
+                        label: '自住'
+                    },
+                ],
+
+                yihuyidangDisabled: false,
 
-          });
-      } else {
-        this.$message.warning('请先选择要删除的房屋')
-      }
-    },
-    selectAll (selection) {
-      this.selection = selection
-
-    },
-    selectionChange (selection) {
-      this.selection = selection
-
-    },
-
-    async handleDelete (row) {
-
-      this.$confirm("确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          this.deleteRoom(row)
-        })
-        .catch(err => {
-          if (err == "cancel") {
-            // this.$message({
-            //   type: "info",
-            //   message: "已取消删除"
-            // });
-          }
-
-        });
-
-
-    },
-
-    async deleteCommunityBatch () {
-      let ids = []
-      this.selection.forEach(element => {
-
-        ids.push(element.houseId)
-      });
-
-      const url = "/gov/org/house/delete"
-
-      let params = {
-        type: 'house',
-        ids: ids
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else if (code > 8000) {
-        this.$message({
-          showClose: true,
-          message: msg,
-          duration: 0
-        })
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    async deleteRoom (row) {
-      const url = "/gov/org/house/housedel"
-
-      let params = {
-        houseId: row.houseId
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功"
-        });
-        this.$emit('refreshTree')
-        this.loadTable()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //导出表格
-    async handleExport () {
-      let title = this.agencyObj.label
-      title = title + '—房屋列表'
-
-      const url = "/gov/org/house/exporthouseinfo"
-      let params = {
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        rentFlag: this.rentFlag,
-          purpose: this.purpose,
-          remark: this.remark,
-        buildingId: this.agencyObj.id
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
+
+            }
         },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-
-    },
-
-    // 下载文件
-    download (data, fileName) {
-      if (!data) {
-        return
-      }
-
-      var csvData = new Blob([data])
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, fileName);
-      }
-      // for Non-IE (chrome, firefox etc.)
-      else {
-        var a = document.createElement('a');
-        document.body.appendChild(a);
-        a.style = 'display: none';
-        var url = window.URL.createObjectURL(csvData);
-        a.href = url;
-        a.download = fileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-
-    },
-
-    handleExportModule () {
-      let title = ''
-      title = '房屋模板'
-
-      const url = "/gov/org/house/exporttemplate"
-      let params = {}
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
+        components: {
+            roomForm
         },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-    },
-
-    //导出一户一档
-    handleExportYihuyidang () {
-      this.yihuyidangDisabled = true
-      let title = this.agencyObj.label
-      title = title + '-一户一档'
-      let url = "/gov/org/house/exportHouseUser"
-
-
-      let params = {
-        agencyId: '',
-        gridId: '',
-        ownerName: this.ownerName,
-        ownerPhone: this.ownerPhone,
-        rentFlag: this.rentFlag,
-          purpose: this.purpose,
-          remark: this.remark,
-        buildingId: this.agencyObj.id
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-
-          this.download(data, title + '.xls')
-          this.yihuyidangDisabled = false
+        async mounted () {
+
         },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-          this.yihuyidangDisabled = false
-        }
-      );
-    },
-    // 上传文件之前的钩子
-    beforeUpload (file) {
-      this.files = file;
-
-      const isText = file.type === 'application/vnd.ms-excel'
-      const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-
-      if (!isText && !isTextComputer) {
-        this.$message.error('请选择正确格式的文件')
-        return false
-      } else {
-        this.fileName = file.name;
-        return true
-      }
-
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
-    },
-
-    async uploadFile () {
-
-
-      if (this.fileName == "") {
-        this.$message.warning('请选择要上传的文件！')
-        return false
-      }
-
-      this.$message({
-        showClose: true,
-        message: '导入中，请到系统管理-导入记录中查看进度',
-        duration: 0
-      })
-
-      //清空上传列表
-      this.$refs['upload'].clearFiles()
-
-      var url = '/gov/org/house/houseimport'
-
-      let fileFormData = new FormData();
-      fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-      fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      this.importRoomLoading = true
-      window.app.ajax.post2(url, fileFormData,
-        (data, rspMsg) => {
-
-          if (data.code === 0 && data.msg == 'success') {
-            // this.$message.success('导入成功')
-          } else {
-            // this.$message({
-            //   showClose: true,
-            //   message: rspMsg,
-            //   duration: 0,
-            //   type: "error"
-            // })
-            // this.$message.error(rspMsg)
-          }
-          this.$emit('refreshTree')
-          this.loadTable()
-          this.importRoomLoading = false
+        computed: {
+            tableHeight () {
+                return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
+
+            },
+
+            ...mapGetters(['clientHeight', 'iframeHeight'])
         },
-        (rspMsg, data) => {
-          this.importRoomLoading = false
-        }, { headers: { 'Content-Type': 'multipart/form-data' } })
+        methods: {
+            indexMethod (index) {
+                return index + 1;
+            },
+            handleSortOrderChange (value) {
+
+                this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
+                this.loadTable()
+
+            },
+            handleSortChange (value) {
+
+                this.sortType = value.order === 'ascending' ? 'asc' : 'desc'
+                this.loadTable()
 
+            },
 
-    },
+            handleEditSort (row) {
+                if (!row.isChange) {
+                    row.isChange = true
+                }
 
-    showMessage (msg) {
-      this.$alert(msg, '操作结果', {
-        confirmButtonText: '关闭',
-        callback: action => {
-          this.$emit('refreshTree')
-          this.loadTable()
+            },
 
+            async handleChangeSort (row, index) {
+                // row.isChange = false
+
+                let params = {
+                    id: row.houseId,
+                    sort: row.sort,
+                    type: 'house',
+                }
+
+                let url = '/gov/org/house/update-sort'
+
+                const { data, code, msg } = await requestPost(url, params)
+
+                if (code === 0) {
+                    // this.$message({
+                    //   type: 'success',
+                    //   message: '修改成功'
+                    // })
+
+
+                } else {
+
+                    this.$message.error(msg)
+                }
+
+
+            },
+
+            checkSelect (row, index) {
+                let isChecked = false;
+                if (row.showBtn) { // 判断里面是否存在某个参数
+                    isChecked = true
+                } else {
+                    isChecked = false
+                }
+                return isChecked
+            },
+
+            loadTreeFromSearch () {
+
+            },
+
+            async loadTable (source, treeObj) {
+
+                this.source = source
+                this.tableLoading = true
+
+                if (source === 'tree') {//来源于tree，查询数据清空
+                    this.sortType = 'asc'
+                    this.agencyObj = treeObj
+
+                } else if (source === 'search') {//来源于查询
+                    this.agencyObj = treeObj
+
+                }
+
+                // if (fromTree) {
+                //   this.agencyObj = treeObj
+
+                // }
+                let params = {
+                    pageSize: this.pageSize,
+                    pageNo: this.pageNo,
+                    level: this.agencyObj.level,
+                    id: this.agencyObj.id,
+                    ownerName: this.ownerName,
+                    ownerPhone: this.ownerPhone,
+                    rentFlag: this.rentFlag,
+                    purpose: this.purpose,
+                    remark: this.remark,
+                    sortType: this.sortType,
+                }
+
+                const url = "/gov/org/house/houselist"
+
+                const { data, code, msg } = await requestPost(url, params)
+
+                if (code === 0) {
+                    this.total = data.total
+                    this.validTableDataNum = 0
+                    data.list.forEach(item => {
+                        item.sort = parseInt(item.sort) || 0;
+                        item.sort = item.sort.toFixed(2)
+                        item.isChange = false
+                        item.houseNameShow = item.neighborHoodName + item.buildingName + item.unitNum + item.doorName
+
+                        if (item.agencyId === this.staffAgencyId) {
+                            item.showBtn = true
+                            this.validTableDataNum++
+                        } else {
+                            item.showBtn = false
+                        }
+
+                    });
+                    this.tableData = data.list
+                } else {
+                    this.$message.error(msg)
+                }
+                this.tableLoading = false
+            },
+
+            diaClose () {
+                this.$refs.ref_form.resetData()
+                this.formShow = false
+            },
+
+            handleDetail (row) {
+                this.formTitle = '房屋详情'
+                this.formShow = true
+                this.$nextTick(() => {
+
+                    this.$refs.ref_form.initForm('detail', row, this.agencyObj)
+                })
+            },
+
+            handleAdd () {
+
+                this.formTitle = '新增房屋'
+                this.formShow = true
+                this.$nextTick(() => {
+
+                    this.$refs.ref_form.initForm('add', null, this.agencyObj)
+                })
+            },
+
+            handleEdit (row) {
+                this.formTitle = '修改房屋'
+                this.formShow = true
+                this.$nextTick(() => {
+                    this.$refs.ref_form.initForm('edit', row, this.agencyObj)
+                })
+            },
+
+            addFormCancle () {
+                this.formShow = false
+            },
+            addFormOk () {
+                this.formShow = false
+                this.loadTable()
+            },
+
+
+            deleteBatch () {
+                if (this.selection.length > 0) {
+                    this.$confirm("确认删除选择的房屋?", "提示", {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning"
+                    })
+                        .then(() => {
+                            this.deleteCommunityBatch()
+                        })
+                        .catch(err => {
+                            if (err == "cancel") {
+                                // this.$message({
+                                //   type: "info",
+                                //   message: "已取消删除"
+                                // });
+                            }
+
+                        });
+                } else {
+                    this.$message.warning('请先选择要删除的房屋')
+                }
+            },
+            selectAll (selection) {
+                this.selection = selection
+
+            },
+            selectionChange (selection) {
+                this.selection = selection
+
+            },
+
+            async handleDelete (row) {
+
+                this.$confirm("确认删除?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                })
+                    .then(() => {
+                        this.deleteRoom(row)
+                    })
+                    .catch(err => {
+                        if (err == "cancel") {
+                            // this.$message({
+                            //   type: "info",
+                            //   message: "已取消删除"
+                            // });
+                        }
+
+                    });
+
+
+            },
+
+            async deleteCommunityBatch () {
+                let ids = []
+                this.selection.forEach(element => {
+
+                    ids.push(element.houseId)
+                });
+
+                const url = "/gov/org/house/delete"
+
+                let params = {
+                    type: 'house',
+                    ids: ids
+                }
+
+                const { data, code, msg } = await requestPost(url, params)
+
+                if (code === 0) {
+                    this.$message({
+                        type: "success",
+                        message: "删除成功"
+                    });
+                    this.$emit('refreshTree')
+                    this.loadTable()
+                } else if (code > 8000) {
+                    this.$message({
+                        showClose: true,
+                        message: msg,
+                        duration: 0
+                    })
+                    this.$emit('refreshTree')
+                    this.loadTable()
+                } else {
+                    this.$message.error(msg)
+                }
+            },
+
+            async deleteRoom (row) {
+                const url = "/gov/org/house/housedel"
+
+                let params = {
+                    houseId: row.houseId
+                }
+
+                const { data, code, msg } = await requestPost(url, params)
+
+                if (code === 0) {
+                    this.$message({
+                        type: "success",
+                        message: "删除成功"
+                    });
+                    this.$emit('refreshTree')
+                    this.loadTable()
+                } else {
+                    this.$message.error(msg)
+                }
+            },
+
+            //导出表格
+            async handleExport () {
+                let title = this.agencyObj.label
+                title = title + '—房屋列表'
+
+                const url = "/gov/org/house/exporthouseinfo"
+                let params = {
+                    ownerName: this.ownerName,
+                    ownerPhone: this.ownerPhone,
+                    rentFlag: this.rentFlag,
+                    purpose: this.purpose,
+                    remark: this.remark,
+                    buildingId: this.agencyObj.id
+                }
+
+                app.ajax.exportFilePost(
+                    url,
+                    params,
+                    (data, rspMsg) => {
+
+                        this.download(data, title + '.xls')
+                    },
+                    (rspMsg, data) => {
+                        this.$message.error(rspMsg);
+                    }
+                );
+
+            },
+
+            // 下载文件
+            download (data, fileName) {
+                if (!data) {
+                    return
+                }
+
+                var csvData = new Blob([data])
+
+                if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                    window.navigator.msSaveOrOpenBlob(csvData, fileName);
+                }
+                // for Non-IE (chrome, firefox etc.)
+                else {
+                    var a = document.createElement('a');
+                    document.body.appendChild(a);
+                    a.style = 'display: none';
+                    var url = window.URL.createObjectURL(csvData);
+                    a.href = url;
+                    a.download = fileName;
+                    a.click();
+                    a.remove();
+                    window.URL.revokeObjectURL(url);
+                }
+
+            },
+
+            handleExportModule () {
+                let title = ''
+                title = '房屋模板'
+
+                const url = "/gov/org/house/exporttemplate"
+                let params = {}
+
+                app.ajax.exportFilePost(
+                    url,
+                    params,
+                    (data, rspMsg) => {
+
+                        this.download(data, title + '.xls')
+                    },
+                    (rspMsg, data) => {
+                        this.$message.error(rspMsg);
+                    }
+                );
+            },
+
+            //导出一户一档
+            handleExportYihuyidang () {
+                this.yihuyidangDisabled = true
+                let title = this.agencyObj.label
+                title = title + '-一户一档'
+                let url = "/gov/org/house/exportHouseUser"
+
+
+
+                let params = {
+                    agencyId: '',
+                    gridId: '',
+                    ownerName: this.ownerName,
+                    ownerPhone: this.ownerPhone,
+                    rentFlag: this.rentFlag,
+                    purpose: this.purpose,
+                    remark: this.remark,
+                    buildingId: '',
+                    neighborHoodId: ''
+                }
+
+                if (this.agencyObj.level === 'grid') {
+                    params.gridId = this.agencyObj.id
+                    params.agencyId = ''
+                    params.buildingId = ''
+                    params.neighborHoodId = ''
+                } else if (this.agencyObj.level === 'neighborHood') {
+                    params.neighborHoodId = this.agencyObj.id
+                    params.agencyId = ''
+                    params.buildingId = ''
+                    params.gridId = ''
+                } else if (this.agencyObj.level === 'building') {
+                    params.buildingId = this.agencyObj.id
+                    params.agencyId = ''
+                    params.neighborHoodId = ''
+                    params.gridId = ''
+                } else {
+
+                    params.agencyId = this.agencyObj.id
+                    params.buildingId = ''
+                    params.neighborHoodId = ''
+                    params.gridId = ''
+                }
+
+                app.ajax.exportFilePost(
+                    url,
+                    params,
+                    (data, rspMsg) => {
+
+                        this.download(data, title + '.xls')
+                        this.yihuyidangDisabled = false
+                    },
+                    (rspMsg, data) => {
+                        this.$message.error(rspMsg);
+                        this.yihuyidangDisabled = false
+                    }
+                );
+            },
+            // 上传文件之前的钩子
+            beforeUpload (file) {
+                this.files = file;
+
+                const isText = file.type === 'application/vnd.ms-excel'
+                const isTextComputer = file.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+
+                if (!isText && !isTextComputer) {
+                    this.$message.error('请选择正确格式的文件')
+                    return false
+                } else {
+                    this.fileName = file.name;
+                    return true
+                }
+
+            },
+            // 上传文件个数超过定义的数量
+            handleExceed (files, fileList) {
+                this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`)
+            },
+
+            async uploadFile () {
+
+
+                if (this.fileName == "") {
+                    this.$message.warning('请选择要上传的文件！')
+                    return false
+                }
+
+                this.$message({
+                    showClose: true,
+                    message: '导入中，请到系统管理-导入记录中查看进度',
+                    duration: 0
+                })
+
+                //清空上传列表
+                this.$refs['upload'].clearFiles()
+
+                var url = '/gov/org/house/houseimport'
+
+                let fileFormData = new FormData();
+                fileFormData.append('file', this.files);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+                fileFormData.append('orgId', this.agencyObj.id);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+                fileFormData.append('orgType', this.agencyObj.level);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+                this.importRoomLoading = true
+                window.app.ajax.post2(url, fileFormData,
+                    (data, rspMsg) => {
+
+                        if (data.code === 0 && data.msg == 'success') {
+                            // this.$message.success('导入成功')
+                        } else {
+                            // this.$message({
+                            //   showClose: true,
+                            //   message: rspMsg,
+                            //   duration: 0,
+                            //   type: "error"
+                            // })
+                            // this.$message.error(rspMsg)
+                        }
+                        this.$emit('refreshTree')
+                        this.loadTable()
+                        this.importRoomLoading = false
+                    },
+                    (rspMsg, data) => {
+                        this.importRoomLoading = false
+                    }, { headers: { 'Content-Type': 'multipart/form-data' } })
+
+
+            },
+
+            showMessage (msg) {
+                this.$alert(msg, '操作结果', {
+                    confirmButtonText: '关闭',
+                    callback: action => {
+                        this.$emit('refreshTree')
+                        this.loadTable()
+
+                    }
+                });
+            },
+
+            handleSizeChange (val) {
+                this.pageSize = val
+                this.pageNo = 1
+                this.loadTable()
+            },
+            handleCurrentChange (val) {
+                this.pageNo = val
+                this.loadTable()
+            },
+
+            // 开启加载动画
+            startLoading () {
+                loading = Loading.service({
+                    lock: true, // 是否锁定
+                    text: '正在加载……', // 加载中需要显示的文字
+                    background: 'rgba(0,0,0,.7)' // 背景颜色
+                })
+            },
+            // 结束加载动画
+            endLoading () {
+                // clearTimeout(timer);
+                if (loading) {
+                    loading.close()
+                }
+            }
+        },
+        watch: {
+            selection (val) {
+
+                if (val.length > 0) {
+                    this.showDeletBtn = true
+                } else {
+                    this.showDeletBtn = false
+                }
+            }
+        },
+        props: {
+            staffAgencyId: {
+                type: String,
+                default: '',
+            },
+            showImportBtn: {
+                type: Boolean,
+                default: false,
+            },
+            ownerName: {
+                type: String,
+                default: '',
+            },
+            ownerPhone: {
+                type: String,
+                default: '',
+            },
+            rentFlag: {
+                type: String,
+                default: '',
+            },
+            purpose: {
+                type: String,
+                default: '',
+            },
+            remark: {
+                type: String,
+                default: '',
+            },
         }
-      });
-    },
-
-    handleSizeChange (val) {
-      this.pageSize = val
-      this.pageNo = 1
-      this.loadTable()
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val
-      this.loadTable()
-    },
-
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  watch: {
-    selection (val) {
-
-      if (val.length > 0) {
-        this.showDeletBtn = true
-      } else {
-        this.showDeletBtn = false
-      }
     }
-  },
-  props: {
-    staffAgencyId: {
-      type: String,
-      default: '',
-    },
-    showImportBtn: {
-      type: Boolean,
-      default: false,
-    },
-    ownerName: {
-      type: String,
-      default: '',
-    },
-    ownerPhone: {
-      type: String,
-      default: '',
-    },
-    rentFlag: {
-      type: String,
-      default: '',
-    },
-      purpose: {
-          type: String,
-          default: '',
-      },
-      remark: {
-          type: String,
-          default: '',
-      }
-  }
-}
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManage.scss";
-
-.item_width_4 {
-  width: 120px;
-}
-
-/deep/.el-input-number--medium .el-input-number__decrease,
-/deep/.el-input-number--medium .el-input-number__increase {
-  width: 26px;
-}
-/deep/.el-input-number--medium .el-input__inner {
-  padding-left: 0px;
-  padding-right: 0px;
-}
+  @import "@/assets/scss/modules/visual/communityManage.scss";
+
+  .item_width_4 {
+    width: 120px;
+  }
+
+  /deep/.el-input-number--medium .el-input-number__decrease,
+  /deep/.el-input-number--medium .el-input-number__increase {
+    width: 26px;
+  }
+  /deep/.el-input-number--medium .el-input__inner {
+    padding-left: 0px;
+    padding-right: 0px;
+  }
 </style>
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index a76cfa99d..f1f84829a 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -197,7 +197,7 @@
             <el-tabs v-model="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
-                           :key="item.columnName"
+                           :key="item.groupId"
                            :label="item.label"
                            :name="'group' + item.groupId">
                 <resi-form :ref="'group' + item.groupId"
@@ -245,7 +245,7 @@
             <el-tabs v-model="activeName"
                      @tab-click="handleClick">
               <el-tab-pane v-for="item in tabsList"
-                           :key="item.columnName"
+                           :key="item.groupId"
                            :label="item.label"
                            :name="'group' + item.groupId">
                 <edit-resi :ref="'group' + item.groupId"
@@ -833,10 +833,11 @@ export default {
     async handleChangeGroup (val) {
       console.log('changeguoprrrrr----', val)
       let { childGroup, value } = val
+      
       let hasT = false
       let i = 0
-      // const list = { ...this.tabsList }
-      this.tabsList.forEach((item, index) => {
+      let list = [...this.tabsList]
+      list.forEach((item, index) => {
         if (item.tableName === childGroup.tableName) {
           hasT = true
           i = index
@@ -853,12 +854,13 @@ export default {
               // console.log('')
             }
           })
-          this.tabsList.push(childGroup)
+          list.push(childGroup)
         }
       } else {
         // console.log('changegroup----000', value)
-        if (hasT) this.tabsList.splice(i, 1)
+        if (hasT) list.splice(i, 1)
       }
+      this.tabsList = [...list]
     },
     formetForm () {
       const _baseForm = this.$refs.baseForm.handleForm()
diff --git a/src/views/modules/communityParty/members/cpts/record.vue b/src/views/modules/communityParty/members/cpts/record.vue
index bfc176bd1..4236f0e88 100644
--- a/src/views/modules/communityParty/members/cpts/record.vue
+++ b/src/views/modules/communityParty/members/cpts/record.vue
@@ -80,7 +80,7 @@
                 class="btn-color-edit"
                 >取消</el-button>
             </template>
-            <template v-else>
+            <!-- <template v-else>
               <el-button
                 @click="handleChange(scope.row, 'edit')"
                 type="text"
@@ -101,9 +101,7 @@
                   >删除</el-button
                 >
               </el-popconfirm>
-              <!-- <el-button type="text" size="small" :disabled="disabled" class="btn-color-del"
-              @click="del(scope.row)">删除</el-button> -->
-            </template>
+            </template> -->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index b0ce18dc8..eb49b55fc 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -490,7 +490,7 @@ export default {
       }
 
     },
-    handleTimeChangePay (timvale) {
+    handleTimeChangePay (val) {
       if (val.length > 0) {
         this.searchForm.payStatrDate = val[0]
         this.searchForm.payEndDate = val[0]
diff --git a/src/views/modules/partymember/icpartyorg-add-or-update.vue b/src/views/modules/partymember/icpartyorg-add-or-update.vue
index aaa091841..b530b4553 100644
--- a/src/views/modules/partymember/icpartyorg-add-or-update.vue
+++ b/src/views/modules/partymember/icpartyorg-add-or-update.vue
@@ -42,12 +42,13 @@
                     placeholder="请选择上级党组织"
                     :props="{ checkStrictly: true, label: 'partyOrgName', value: 'id', children: 'children' }"
                     @change="handleChangeOrg"
+                    :disabled="dataForm.id || dataForm.orgId ? true : false"
                     clearable />
             </el-form-item>
             <el-form-item label="党组织介绍" prop="introduction">
                 <el-input style="width:300px" v-model="dataForm.introduction" type="textarea" maxlength="500" placeholder="党组织介绍"></el-input>
             </el-form-item>
-            <el-form-item label="位置坐标"
+            <el-form-item label="党组织位置"
                             prop="longitude"
                             style="display: block">
                 <div class="item_width_1">
@@ -70,7 +71,7 @@
                     </div>
                 </div>
 
-                <div id="lon_lat_id" style="margin-top: 10px; display: none">
+                <!-- <div id="lon_lat_id" style="margin-top: 10px; display: none">
                     <span>经度</span>
                     <el-input class="item_width_3"
                             maxlength="50"
@@ -85,7 +86,7 @@
                             :readonly="true"
                             v-model="dataForm.latitude">
                     </el-input>
-                </div>
+                </div> -->
                 </div>
             </el-form-item>
         </el-form>
@@ -123,11 +124,12 @@
                     latitude: '', //纬度
                     address: '',
                     introduction: '', // 党组织介绍
-
+                    orgId: '',
                     customerId: '',
                     staffId:'',
                     orgPidName: '',
-                    agencyName:''
+                    agencyName:'',
+                    pid: ''
                 },
                 orgListVisible: false,
                 agencyListVisible:false,
@@ -159,13 +161,15 @@
                             this.getInfo()
                         } else {
                             this.initMap()
-                            if(this.dataForm.orgPids) {
-                                this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':')
+                            if(this.dataForm.orgId) {
+                                this.dataForm.mySelectOrg = this.dataForm.orgId
+                                this.dataForm.orgPid = this.dataForm.orgId
+                                this.dataForm.orgPids = this.dataForm.orgPids + ':' + this.dataForm.orgId
+                                console.log(this.dataForm.orgPid)
+                                console.log(this.dataForm.orgPids)
                             } else {
                                 this.dataForm.mySelectOrg = ''
                             }
-
-                            this.orgListTreeSetDefaultHandle()
                         }
                     })
                 })
@@ -220,17 +224,17 @@
                 }
                 this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
                     if (res.code !== 0) {
-                        return this.$message.error(res.msg)
+                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                     }
                     this.agencyOrgList = this.removeEmptyChildren(res.data)
                 }).catch(() => {})
             },
             // 获取党组织列表
             getOrgList() {
-                return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId}}).then(({data: res}) => {
+                return this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: {agencyId: this.agencyId, orgPid: this.dataForm.id ? this.dataForm.pid : ''}}).then(({data: res}) => {
                     if (res.code !== 0) {
-                        return this.$message.error(res.msg)
-                    }                
+                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
+                    }        
                     this.orgList = this.removeEmptyChildren(res.data)
                     this.orgList.unshift({
                         partyOrgName: '一级组织',
@@ -268,14 +272,14 @@
             getInfo() {
                 this.$http.get(`/resi/partymember/icPartyOrg/${this.dataForm.id}`).then(({data: res}) => {
                     if (res.code !== 0) {
-                        return this.$message.error(res.msg)
+                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                     }
                     this.dataForm = {
                         ...this.dataForm,
                         ...res.data
                     }
                     // 党组织组织
-                    this.dataForm.mySelectOrg = this.dataForm.orgPids.split(':')
+                    this.dataForm.mySelectOrg = this.dataForm.orgPid
                     // 行政组织
                     this.dataForm.agencyId = this.dataForm.agencyId
                     this.initMap()
@@ -292,23 +296,18 @@
                                 orgType:this.dataForm.partyOrgType}
                     }).then(({data: res}) => {
                     if (res.code !== 0) {
-                        return this.$message.error(res.msg)
+                        return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                     }
                     this.agencyOrgList = res.data
                 }).catch(() => {
                 })
             },
-            // 上级党组织树, 设置默认值
-            orgListTreeSetDefaultHandle() {
-                this.dataForm.orgPid = '0'
-                this.dataForm.orgPidName = '一级组织'
-            },
             // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
             initMap () {
             document.getElementById('app').innerHTML = ''
             if (document.getElementById('app')) {
                 document.getElementById('mapSeach_id').style.display = "block"
-                document.getElementById('lon_lat_id').style.display = "block"
+                // document.getElementById('lon_lat_id').style.display = "block"
             }
 
             // 定义地图中心点坐标
@@ -416,13 +415,16 @@
             },
             // 表单提交
             dataFormSubmitHandle: debounce(function () {
+                if (!this.dataForm.latitude || !this.dataForm.longitude) {
+                    return this.$message.error('请滑动地图选择党组织位置')
+                }
                 this.$refs['dataForm'].validate((valid) => {
                     if (!valid) {
                         return false
                     }
                     this.$http[!this.dataForm.id ? 'post' : 'put']('/resi/partymember/icPartyOrg/', this.dataForm).then(({data: res}) => {
                         if (res.code !== 0) {
-                            return this.$message.error(res.msg)
+                            return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
                         }
                         this.$message({
                             message: this.$t('prompt.success'),
@@ -442,23 +444,16 @@
             dataRule() {
                 return {
                     partyOrgName: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                        {required: true, message: "党组织名称不能为空", trigger: 'blur'}
                     ],
                     mySelectOrg: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                        {required: true, message: "上级党组织不能为空", trigger: 'blur'}
                     ],
                     partyOrgType: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-
-                    longitude: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
-                    ],
-                    latitude: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                        {required: true, message: "党组织类型不能为空", trigger: 'blur'}
                     ],
                     agencyId: [
-                        {required: true, message: this.$t('validate.required'), trigger: 'blur'}
+                        {required: true, message: "行政组织不能为空", trigger: 'blur'}
                     ]
                 }
             }
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index ea30b4400..1e132a6fa 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -19,17 +19,17 @@
           <el-table-column label="操作" align="center" width="300">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                          @click="handleLook(scope.row.agencyId)"
+                          @click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)"
                           type="text"
                           size="small"
                           class="div-table-button--detail">{{'查看党员'}}</el-button>
-                <el-button v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                          @click="addOrUpdateHandle('', scope.row.orgPids)"
+                <el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '5'"
+                          @click="addOrUpdateHandle('', scope.row.id, scope.row.orgPids)"
                           type="text"
                           size="small"
                           class="div-table-button--add">新增下级</el-button>
                 <el-button  v-if="scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)"
-                          @click="addOrUpdateHandle(scope.row.id)"
+                          @click="addOrUpdateHandle(scope.row.id, '', '', scope.row.pid)"
                           type="text"
                           size="small"
                           class="div-table-button--edit">修改</el-button>
@@ -98,7 +98,7 @@
         }
         await this.$http.get('/resi/partymember/icPartyOrg/getTreelist', {params: this.dataForm}).then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
           } else {
             this.tableData = res.data
           }
@@ -106,12 +106,15 @@
         this.tableLoading = false
       },
       // 新增 / 修改
-      addOrUpdateHandle (id, orgPids) {
+      addOrUpdateHandle (id, orgId, orgPids, pid) {
+        console.log('pid:::::', pid)
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
           this.$refs.addOrUpdate.dataForm.id = id
           // 新增下级需要传
-          this.$refs.addOrUpdate.dataForm.orgPids = orgPids // 党组织
+          this.$refs.addOrUpdate.dataForm.orgId = orgId // 党组织
+          this.$refs.addOrUpdate.dataForm.orgPids = orgPids
+          this.$refs.addOrUpdate.dataForm.pid = pid
           
           this.$refs.addOrUpdate.init()
         })
@@ -125,7 +128,7 @@
         }).then(() => {
         this.$http.delete('/resi/partymember/icPartyOrg/delete', {'data': [id]}).then(({ data: res }) => {
           if (res.code !== 0) {
-            return this.$message.error(res.msg)
+            return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
           }
           this.$message({
             message: this.$t('prompt.success'),
@@ -139,10 +142,10 @@
         }).catch(() => {})
       },
       // 查看党员
-      handleLook(agencyId) {
+      handleLook(agencyPids, id, row) {
         this.lookMemberShow = true
         this.$nextTick(() => {
-            this.$refs.ref_table_Member.initForm(agencyId)
+            this.$refs.ref_table_Member.initForm(agencyPids.split(':')[agencyPids.split(':').length - 1], id)
         })
       },
       lookMemberClose () {
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index 96cbe4faf..4d2197a8f 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -6,7 +6,6 @@
           <el-table ref="ref_table"
                     :data="tableData"
                     border
-                    :height="tableHeight"
                     v-loading="tableLoading"
                     :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                     style="width: 100%"
@@ -21,6 +20,16 @@
                             label="身份证号">
             </el-table-column>
           </el-table>
+          <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>
     </div>
@@ -41,21 +50,23 @@ export default {
       // 列表相关
       tableData: [],
       tableLoading: false,
-      orgPids: ''
+      agencyId: '',
+      partyOrgId: '',
+      pageNo: 1,
+      pageSize: 20,
+      total: 1,
     }
   },
   props: {
   },
   computed: {
-    tableHeight () {
-      return this.$store.state.inIframe ? this.clientHeight - 410 + this.iframeHeight : this.clientHeight - 410
-    },
     ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   components: {},
   methods: {
-    initForm (agencyId) {
-      this.orgPids = agencyId
+    initForm (agencyId, id) {
+      this.agencyId = agencyId
+      this.partyOrgId = id
       this.tableLoading = true
       this.loadTable()
     },
@@ -66,17 +77,32 @@ export default {
     // 查询列表
     async loadTable () {
       let params = {
-        partyOrgId: this.orgPids,
-        pageNo: 1,
-        pageSize: 10000000
+        agencyId: this.agencyId,
+        partyOrgId: this.partyOrgId,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize
       }
       const url = `/resi/partymember/icPartyMember/page`
-      const { data, code, msg } = await requestPost(url, params)
+      const { data, code, internalMsg, msg } = await requestPost(url, params)
       this.tableLoading = false
+      if (code !== 0) {
+        return this.$message.error(internalMsg ? internalMsg : msg ? msg : '查询失败')
+      }
       if (code === 0) {
         this.tableData =  data.list ? data.list : []
+        this.total = data.total || 0;
       }
-    }
+    },
+    handleSizeChange (val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.loadTable()
+    },
+    handleCurrentChange (val) {
+      console.log(`当前页: ${val}`);
+        this.pageNo = val;
+        this.loadTable();
+    },
   },
 }
 </script>
diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
index 8175db9b2..2cad16bd8 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue
@@ -1,21 +1,21 @@
 <template>
   <el-dialog class="rent" :visible.sync="visible" :title="dataForm.flag === '1' ? '查看详情' : '审核'" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :inline="true" :model="dataForm" :rules="dataRule" ref="dataForm"
-             @keyup.enter.native="dataFormSubmitHandle()" label-width="140px" disabled>
+             @keyup.enter.native="dataFormSubmitHandle()" label-width="140px">
         <div v-if="dataForm.flag === '2'">
             <div style="margin-left: 50px;height: 30px;font-weight: bold;">房屋信息</div>
             <el-form-item label="所属社区" prop="gridName">
-                <el-input v-model="dataForm.gridName" placeholder="网格"></el-input>
+                <el-input v-model="dataForm.gridName" placeholder="网格" disabled></el-input>
             </el-form-item>
             <el-form-item label="所属网格" prop="gridName">
-                <el-input v-model="dataForm.gridName" placeholder="所属网格"></el-input>
+                <el-input v-model="dataForm.gridName" placeholder="所属网格" disabled></el-input>
             </el-form-item>
             <br/>
             <el-form-item label="房屋" prop="homeName">
-                <el-input v-model="dataForm.homeName" placeholder="房屋"></el-input>
+                <el-input v-model="dataForm.homeName" placeholder="房屋" disabled></el-input>
             </el-form-item>
             <el-form-item label="房主姓名" prop="ownerName">
-                <el-input v-model="dataForm.ownerName" placeholder="房主姓名"></el-input>
+                <el-input v-model="dataForm.ownerName" placeholder="房主姓名" disabled></el-input>
             </el-form-item>
         </div>
         <div style="padding:20px 30px">
@@ -30,6 +30,7 @@
               <el-table-column prop="yfzgx" label="与户主关系" header-align="center" align="center" width="120"></el-table-column>
               <el-table-column prop="mobile" label="手机" header-align="center" align="center" width="120"></el-table-column>
               <el-table-column prop="idCard" label="身份证号" header-align="center" align="center" width="180"></el-table-column>
+              <el-table-column prop="unit" label="工作单位" header-align="center" align="center" width="180" show-overflow-tooltip></el-table-column>
               <el-table-column prop="politicalStatus" label="政治面貌" header-align="center" align="center"></el-table-column>
               <el-table-column prop="isMilitary" label="是否服过兵役" header-align="center" align="center" width="120"></el-table-column>
               <el-table-column prop="nation" label="国籍" header-align="center" align="center"></el-table-column>
@@ -52,52 +53,59 @@
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同信息</div>
         <div style="margin-left: 50px;height: 30px;">出租人信息</div>
         <el-form-item label="出租人姓名" prop="lessorName">
-            <el-input v-model="dataForm.lessorName" placeholder="出租人姓名"></el-input>
+            <el-input v-model="dataForm.lessorName" placeholder="出租人姓名" disabled></el-input>
         </el-form-item>
         <el-form-item label="出租人身份证" prop="lessorIdCard">
-            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证"></el-input>
+            <el-input v-model="dataForm.lessorIdCard" placeholder="出租人身份证" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="出租人手机" prop="lessorMobile">
-            <el-input v-model="dataForm.lessorMobile" placeholder="出租人手机"></el-input>
+            <el-input v-model="dataForm.lessorMobile" placeholder="出租人手机" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="与房主关系" prop="lessorRelation">
+            <!--<el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>-->
+            <el-select v-model="dataForm.lessorRelation" placeholder="与房主关系" :disabled="dataForm.state !== '0'">
+                <el-option v-for="item in lessorRelationArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <br/>
+        <el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'">
+            <template>
+                <label v-for="(item,index) in dataForm.agencyImgList" :key="index">
+                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
+                </label>
+            </template>
         </el-form-item>
         <br/>
 
         <div style="margin-left: 50px;height: 30px;">承租人信息</div>
         <el-form-item label="承租人姓名" prop="lesseeName">
-            <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名"></el-input>
+            <el-input v-model="dataForm.lesseeName" placeholder="承租人姓名" disabled></el-input>
         </el-form-item>
         <el-form-item label="承租人身份证" prop="lesseeIdCard">
-            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证"></el-input>
+            <el-input v-model="dataForm.lesseeIdCard" placeholder="承租人身份证" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="承租人手机" prop="lesseeMobile">
-            <el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机"></el-input>
-        </el-form-item>
-        <br/>
-        <el-form-item label="与房主关系" prop="lessorRelation">
-            <el-input v-model="dataForm.lessorRelation" placeholder="与房主关系"></el-input>
+            <el-input v-model="dataForm.lesseeMobile" placeholder="承租人手机" disabled></el-input>
         </el-form-item>
-        <br/>
-        <el-form-item label="中介合同附件" prop="agencyImgList" v-if="dataForm.lessorRelation ==='中介'">
-            <template>
-                <label v-for="(item,index) in dataForm.agencyImgList" :key="index">
-                    <img :src="item.fileUrl" @click="imgShow(item.fileUrl)" width="100" height="100" />
-                </label>
-            </template>
+        <el-form-item label="工作单位" prop="lesseeUnit">
+            <el-input v-model="dataForm.lesseeUnit" placeholder="工作单位" disabled></el-input>
         </el-form-item>
         <br/>
 
+
         <div style="margin-left: 50px;height: 30px;font-weight: bold;">合同内容</div>
         <el-form-item label="签署日期" prop="signDate">
-            <el-input v-model="dataForm.signDate" placeholder="签署日期"></el-input>
+            <el-input v-model="dataForm.signDate" placeholder="签署日期" disabled></el-input>
         </el-form-item>
         <br/>
         <el-form-item label="合同开始日期" prop="startDate">
-            <el-input v-model="dataForm.startDate" placeholder="合同开始日期"></el-input>
+            <el-input v-model="dataForm.startDate" placeholder="合同开始日期" disabled></el-input>
         </el-form-item>
         <el-form-item label="合同结束日期" prop="endDate">
-            <el-input v-model="dataForm.endDate" placeholder="合同结束日期"></el-input>
+            <el-input v-model="dataForm.endDate" placeholder="合同结束日期" disabled></el-input>
         </el-form-item>
         <br/>
 
@@ -145,16 +153,30 @@ export default {
         lessorName: '',
         lessorIdCard: '',
         lessorMobile: '',
+        lessorRelation: '',
         lesseeName: '',
         lesseeIdCard: '',
         lesseeMobile: '',
+        lesseeUnit: '',
         signDate: '',
         startDate: '',
         endDate: ''
       },
         dataListLoading: false,
         dialogVisible: false,
-        dialogImageUrl: ''
+        dialogImageUrl: '',
+        lessorRelationArr: [
+            { dictValue: '本人', dictName: '本人' },
+            { dictValue: '配偶', dictName: '配偶' },
+            { dictValue: '子女', dictName: '子女' },
+            { dictValue: '父母', dictName: '父母' },
+            { dictValue: '岳父母或公婆', dictName: '岳父母或公婆' },
+            { dictValue: '祖父母', dictName: '祖父母' },
+            { dictValue: '媳婿', dictName: '媳婿' },
+            { dictValue: '孙子女', dictName: '孙子女' },
+            { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' },
+            { dictValue: '中介', dictName: '中介' }
+        ]
     }
   },
   computed: {
@@ -252,7 +274,8 @@ export default {
         const params = {
           id: this.dataForm.id,
           state: type,
-          homeId: this.dataForm.homeId
+          homeId: this.dataForm.homeId,
+          lessorRelation: this.dataForm.lessorRelation
         }
         this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => {
           if (res.code !== 0) {
diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 34b08a885..e28220ff8 100644
--- a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
@@ -46,7 +46,7 @@
             </div>
 
             <div class="icon_roomstate">
-              <div>{{item.rentFlag}}</div>
+              <div :style="{ color: item.rentFlag == '自住' ? '#3dda83' : item.rentFlag == '出租' ? '#e43c26' : '#fac126' }">{{item.rentFlag}}</div>
             </div>
 
             <div class="icon_category">
@@ -163,9 +163,6 @@ export default {
       runNum: 0,
       runAgencyArray: [],
 
-
-
-
     }
   },
   async mounted () {
diff --git a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
index 25c1f970d..893f8c5bb 100644
--- a/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
+++ b/src/views/modules/visual/basicinfo/houseStatic/houseStatic.vue
@@ -233,21 +233,21 @@ export default {
         xzHouseTotal: 200,//房屋闲置总数		
         xzHouseRatio: '70%',//房屋闲置总数占比（保留两位小数，带百分号的）	
       },
-      houseColorArray: ['#FAC126', '#3DDA83', '#2865FA'],
+      houseColorArray: ['#3dda83', '#e43c26', '#fac126'],
       housePieData: [],
 
       legendArray: [
         {
           name: '自住房屋数',
-          url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
+          url: require('../../../../../assets/img/shuju/measure/lv@2x.png')
         },
         {
           name: '出租房屋数',
-          url: require('../../../../../assets/img/shuju/measure/lv@2x.png')
+          url: require('../../../../../assets/img/shuju/measure/hong@2x.png')
         },
         {
           name: '闲置房屋数',
-          url: require('../../../../../assets/img/shuju/measure/lan@2x.png')
+          url: require('../../../../../assets/img/shuju/measure/huang@2x.png')
         }
       ],
 
@@ -265,7 +265,7 @@ export default {
         ldUserRatio: '5%',//流动居民总数占比	
 
       },
-      userColorArray: ['#ff7800', '#00E5ED'],
+      userColorArray: ['#3dda83', '#e43c26'],
       userPieData: [],
 
       subList: [],
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 73af5c970..3194f8ee1 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -1255,7 +1255,7 @@ export default {
   }
 }
 .table-h {
-  height: 360px;
+  height: 320px;
 }
 .calc-h {
   height: calc(100vh - 240px);
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index fbe6af598..6b6aa616d 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -10,8 +10,7 @@
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
-            :getCheckedNodes="getCheckedNodes"
-            clearable 
+            :getCheckedNodes="getCheckedNodes" 
             @change="handleCascader">
           </el-cascader>
         </div> 
@@ -166,8 +165,9 @@ export default {
     ]
     await this.loadOrgData()
     await this.getWorkUserInfo()
-    this.loadMap()
-    this.isfirstInit = false
+    // this.loadMap()
+    this.getMapData()
+    // this.isfirstInit = false
     // 地图相关end
   },
   methods: {
@@ -189,7 +189,6 @@ export default {
       // };
       const { data, code, msg } = await requestPost(url);
       if (code === 0) {
-        console.log('data-org----o', data)
         this.selectAgency = [`${data.agencyId}-${data.level}`]
         this.orgType = data.level
         this.agencyId = data.agencyId
@@ -230,7 +229,6 @@ export default {
     },
     // 组织点击事件
     async handleCascader(val) {
-      console.log('val-vvv', val)
       const _arr = val[val.length - 1].split('-')
       const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
       this.agencyId = _arr[0]
@@ -238,7 +236,6 @@ export default {
       this.orgType = orgType
       this.noEduInit = false
       this.agencyInfo = { ...this.orgData }
-      console.log('agencyInfo-----', this.agencyInfo)
       this.eduCode = ''
       await this.loadOrgData()
       this.getEduCount(_arr[0])
@@ -342,7 +339,6 @@ export default {
             }
 
           };
-          console.log('zlcm')
         } else {
           element.isClick = false
           element.label = {
@@ -400,7 +396,6 @@ export default {
       this.visibleLoading = false
     },
     pieInitOks (dom) {
-      console.log('pies准备好了', dom)
       this.pieEduChartS = dom
       // this.pieInitState = true
     },
@@ -424,7 +419,6 @@ export default {
           this.showedUnitMoreInfo = true
           this.unitAclist = data.list
           this.$nextTick(() => {
-            console.log(this.unitAclist[0].demandRecId)
             this.$refs['unitdetailInfo'].getDetail(this.unitAclist[0].demandRecId)
           }) 
         } else {
@@ -511,10 +505,11 @@ export default {
       window.app.ajax.post(
         url,
         params,
-        (data, rspMsg) => { 
+        (data, rspMsg) => {
           this.unitMapList = data
-          this.isfirstInit = false
           this.loadMap()
+          this.isfirstInit = false
+          this.$refs.map.handleClosePopup()
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg)
@@ -526,9 +521,7 @@ export default {
       this.userId = ''
       const featureInfo = feature.values_.properties.info
       this.userId = feature.values_.properties.info.id
-      console.log('feature.values_.properties.info:::', JSON.stringify(feature.values_.properties.info))
       let coordinate = [featureInfo.longitude, featureInfo.latitude]
-      console.log(feature.values_.properties.info)
       let showData = `
                 <div style='font-size:16px; color:#FFFFFF;'>个人信息</div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:10px'>姓名：
@@ -557,7 +550,6 @@ export default {
     },
     lookMore(e) {
       this.userId = this.userId
-      console.log('userId:', this.userId)
       this.showedMoreInfo = true
     }
   },
diff --git a/src/views/modules/visual/communityParty/memberInfo.vue b/src/views/modules/visual/communityParty/memberInfo.vue
index 55041b781..1b07df9c1 100644
--- a/src/views/modules/visual/communityParty/memberInfo.vue
+++ b/src/views/modules/visual/communityParty/memberInfo.vue
@@ -29,6 +29,10 @@
                 <span class="item-field">需求类型：</span>
                 <span v-if="info.categoryName">{{ info.categoryName }}</span>
               </div>
+              <div class="item">
+                <span class="item-field">上报类型：</span>
+                <span v-if="info.reportTypeName">{{ info.reportTypeName }}</span>
+              </div>
               <div class="item">
                 <span class="item-field">上报人：</span>
                 <span v-if="info.reportUserName">{{ info.reportUserName }}</span>
@@ -171,7 +175,7 @@ export default {
     margin-bottom: 0;
     .list {
       display: block;
-      width: 50%;
+      width: auto;
       .item {
         display: flex;
         width: 100%;
@@ -228,6 +232,7 @@ export default {
   overflow: auto;
   .left-item {
     padding: 10px 0;
+    border-right: 1px dashed  #1257c9;
     cursor: pointer;
     .item-title {
       font-size: 16px;
diff --git a/src/views/modules/visual/communityParty/unitInfo.vue b/src/views/modules/visual/communityParty/unitInfo.vue
index 75ff68ca8..8ee4c9ea3 100644
--- a/src/views/modules/visual/communityParty/unitInfo.vue
+++ b/src/views/modules/visual/communityParty/unitInfo.vue
@@ -234,6 +234,7 @@ export default {
   overflow: auto;
   .left-item {
     padding: 10px 0;
+    border-bottom: 1px dashed  #1257c9;
     cursor: pointer;
     .item-title {
       font-size: 16px;
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index 2b6c77953..bf2870126 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -33,7 +33,8 @@
       <div id="popup-content"
            class="popup-content"></div>
       <a href="#" 
-         id="popup-goMore">更多>>>></a>
+         id="popup-goMore"
+         class="popup-goMore">更多>>>></a>
     </div>
   </div>
 </template>
@@ -745,6 +746,12 @@ const vueGis = {
        //把 overlay 显示到指定的 x,y坐标
       
     },
+    // 关闭弹窗
+    handleClosePopup() {
+        this.overlay.setPosition(undefined);
+        document.getElementById("popup-closer").blur();
+        return false;
+    },
 
     //取随机数
     getRndBetween (lowerLimit, upperLimit) {
@@ -888,6 +895,9 @@ export default vueGis;
 .popup-content {
   width: 300px;
 }
+.popup-goMore{
+  margin: 20px 0;
+}
 .ol-popup-closer:after {
   content: "✖";
   // color: rgba(1, 17, 104, 1);