From ee10d8087f8c460ee8db04a782cba8badf955190 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Fri, 20 May 2022 10:41:57 +0800
Subject: [PATCH 1/6] no message

---
 .../modules/communityParty/regionalParty/activitysForm.vue      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue
index 8bc70b9f8..933292e41 100644
--- a/src/views/modules/communityParty/regionalParty/activitysForm.vue
+++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue
@@ -223,7 +223,7 @@
 import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost } from '@/js/dai/request'
-import Tinymce from '@c/tinymce/index.vue'
+import Tinymce from '@c/tinymce2/index.vue'
 
 var map
 var search

From 0872c54201dab75c9b0203ed1ddde95b082c3757 Mon Sep 17 00:00:00 2001
From: ZhaoTongYao <531131322@qq.com>
Date: Fri, 20 May 2022 18:09:33 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/community/communityForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 9dd8aef98..413a01706 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -21,6 +21,7 @@
             <el-select class="item_width_1"
                        v-model="dataForm.gridId"
                        placeholder="请选择"
+                       :disabled="formType=='edit'"
                        clearable>
               <el-option v-for="item in gridList"
                          :key="item.gridId"

From ae22c563f1ad1a5c90b31dfb500dfd8b3757c6e9 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 23 May 2022 16:18:36 +0800
Subject: [PATCH 3/6] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0872c542
---
 src/views/modules/base/community/communityForm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 413a01706..9dd8aef98 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -21,7 +21,6 @@
             <el-select class="item_width_1"
                        v-model="dataForm.gridId"
                        placeholder="请选择"
-                       :disabled="formType=='edit'"
                        clearable>
               <el-option v-for="item in gridList"
                          :key="item.gridId"

From 00ee8796d9f13080051e8c5015f1650884e7de20 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 24 May 2022 09:52:09 +0800
Subject: [PATCH 4/6] 111

---
 src/views/modules/visual/basicinfo/basicInfoCommunity.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 959397b4a..7c1961019 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>出租</div>
+              <div>item.rentFlag</div>
             </div>
 
             <div class="icon_category">

From fbeba32e4f34825589272cf26405b34f5dde16d6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 24 May 2022 09:52:31 +0800
Subject: [PATCH 5/6] 11

---
 src/views/modules/visual/basicinfo/basicInfoCommunity.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/basicinfo/basicInfoCommunity.vue b/src/views/modules/visual/basicinfo/basicInfoCommunity.vue
index 7c1961019..34b08a885 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>{{item.rentFlag}}</div>
             </div>
 
             <div class="icon_category">

From d4615a65c0e5d880d75ab1236181ad0939959638 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 25 May 2022 15:22:09 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/community/community.vue      | 726 +++++++++---------
 src/views/modules/base/community/roomForm.vue | 506 ++++++------
 2 files changed, 643 insertions(+), 589 deletions(-)

diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index 01f94046b..e89875332 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -48,7 +48,6 @@
           <div class="resi-cell-label">房主手机</div>
           <div class="resi-cell-value">
             <el-input v-model="ownerPhone"
-                      class="resi-cell-input"
                       size="small"
                       clearable
                       placeholder="请输入内容">
@@ -75,6 +74,32 @@
 
           </div>
         </div>
+
+        <div class="resi-cell">
+          <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-option>
+            </el-select>
+
+          </div>
+        </div>
+
+        <div class="resi-cell">
+          <div class="resi-cell-label">备注</div>
+          <div class="resi-cell-value">
+
+            <el-input v-model="remark"
+                      size="small"
+                      clearable
+                      placeholder="请输入备注">
+            </el-input>
+
+          </div>
+        </div>
+
         <el-button style="margin-left:10px"
                    class="diy-button--search"
                    size="small"
@@ -122,376 +147,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: '出租'
+    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: '其他' }
+                ]
+            }
         },
-        {
-          value: '2',
-          label: '闲置'
+        components: {
+            CDialog
         },
-        {
-          value: '0',
-          label: '自住'
-        },
-      ],
-      ownerName: '',
-      ownerPhone: '',
-      rentFlag: '',
-      showRoomTable: false,
-      selObj: {},
-    }
-  },
-  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
-
-  },
-  computed: {
-    rowHeight () {
+        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'
-
-    },
-    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.showRoomTable = true
-
-        this.$nextTick(() => {
-          this.$refs['ref_buildingTable'].loadTable('search', this.selTreeObj, this.ownerName, this.ownerPhone, this.rentFlag)
-        })
-      } else {
-        this.$message.warning('请输入查询条件')
-      }
-
-
-    },
+        },
+        computed: {
+            rowHeight () {
 
-    //重置搜索条件
-    resetSearch () {
-      this.ownerName = ''
-      this.ownerPhone = ''
-      this.rentFlag = ''
+                return this.$store.state.inIframe ? this.clientHeight - 140 + this.iframeHeight + 'px' : this.clientHeight - 140 + 'px'
 
-      this.pageSize = 10
-      this.pageNo = 1
-      this.handleNodeClick(this.selObj)
-      // this.loadTable()
-    },
+            },
+            treeHeight () {
+                return this.$store.state.inIframe ? this.clientHeight - 200 + this.iframeHeight + 'px' : this.clientHeight - 200 + 'px'
 
-    async loadOpenNode () {
-      const url = "/gov/org/building/tree-ids"
-      let params = {}
+            },
 
-      const { data, code, msg } = await requestPost(url, params)
+            ...mapGetters(['clientHeight', 'iframeHeight'])
+        },
+        methods: {
 
-      if (code === 0) {
-        this.openNodes = data
+            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('请输入查询条件')
+                }
 
-      } 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) {
+            //重置搜索条件
+            resetSearch () {
+                this.ownerName = ''
+                this.ownerPhone = ''
+                this.rentFlag = ''
+                this.purpose = ''
+                this.remark = ''
+
+                this.pageSize = 10
+                this.pageNo = 1
+                this.handleNodeClick(this.selObj)
+                // this.loadTable()
+            },
 
-        this.treeData = data
-        if (!isRefresh && data.length > 0) {
+            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
 
-          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 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
         }
+    }
+</script>
+<style lang="scss" scoped >
+  .div_main {
+    display: flex;
+  }
+  .scrollar {
+    margin-top: 10px;
+  }
 
-      } 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.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)
+  .div_tree {
+    flex: 0 0 280px;
+    background-color: #ffffff;
+    border-radius: 5px;
+    padding: 10px;
+    overflow-y: hidden;
+  }
+  .filter_tree {
+    overflow-x: auto;
+  }
 
-        } 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
-        }
+  .div_table {
+    margin-left: 15px;
+    // flex: 1;
+    width: calc(100% - 300px);
+    background-color: #ffffff;
+    border-radius: 5px;
+    padding: 10px;
+  }
 
-      } 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
-        }
+  .div_btn {
+    margin-top: 20px;
+  }
 
-      } 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
+  .row {
+    padding: 10px;
   }
-}
-</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 {
-  padding: 0px;
-} */
-
-.el-tree-node:focus > .el-tree-node__content {
-  /* background-color: #ccc !important; */
-  color: #2195fe;
-}
+  /* .aui-content > .el-tabs > .el-tabs__content {
+    padding: 0px;
+  } */
+
+  .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 aaf8d1a54..bc77f3d5d 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -110,6 +110,15 @@
                     v-model="dataForm.ownerIdCard">
           </el-input>
         </el-form-item>
+        <el-form-item label="备注"
+                      prop="remark"
+                      label-width="150px"
+                      style="display: block">
+          <el-input class="item_width_1"
+                    placeholder="请输入备注"
+                    v-model="dataForm.remark">
+          </el-input>
+        </el-form-item>
       </el-form>
 
     </div>
@@ -126,255 +135,260 @@
 </template>
 
 <script>
-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: '' //房主身份证	
-      },
-
-      keyWords: '',
-      agencyObj: {},
+    import { mapGetters } from 'vuex'
+    import { Loading } from 'element-ui' // 引入Loading服务
+    import { requestPost, requestGet } from '@/js/dai/request'
 
-    }
-  },
-  components: {},
-  mounted () {
 
-  },
+    let loading // 加载动画
+    export default {
+        data () {
+            return {
+                formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+                btnDisable: false,
+                unitList: [],
 
-  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: '' //房主身份证	
-      }
-
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
+                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: {}
     }
-  },
-  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 }
-        ],
-      }
-    },
-
-  },
-  props: {}
-}
 </script>
 <style lang="scss" scoped >
-@import "@/assets/scss/modules/visual/communityManageForm.scss";
-</style>
\ No newline at end of file
+  @import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>