diff --git a/src/views/modules/base/community/community.vue b/src/views/modules/base/community/community.vue
index e89875332..fe7977bdc 100644
--- a/src/views/modules/base/community/community.vue
+++ b/src/views/modules/base/community/community.vue
@@ -48,6 +48,7 @@
           <div class="resi-cell-label">房主手机</div>
           <div class="resi-cell-value">
             <el-input v-model="ownerPhone"
+                      class="resi-cell-input"
                       size="small"
                       clearable
                       placeholder="请输入内容">
@@ -99,7 +100,6 @@
 
           </div>
         </div>
-
         <el-button style="margin-left:10px"
                    class="diy-button--search"
                    size="small"
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index bc77f3d5d..0c1f73415 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>
@@ -163,7 +164,7 @@
                     ownerPhone: '', //房主电话
                     ownerName: '', //房主名字
                     ownerIdCard: '', //房主身份证
-                    remark: '' // 备注
+                    remark: ''
                 },
 
                 keyWords: '',
@@ -381,7 +382,7 @@
                     ],
                     remark: [
                         { required: false }
-                    ]
+                    ],
                 }
             },
 
diff --git a/src/views/modules/base/community/roomTable.vue b/src/views/modules/base/community/roomTable.vue
index 04488e517..9231cb35b 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,
+                    purpose: this.purpose,
+                    remark: this.remark,
+                    rentFlag: this.rentFlag,
+                    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>