diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 3175b2145..87f73a6c9 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -1,670 +1,550 @@
 <template>
-  <div>
-    <div class="dialog-h-content scroll-h">
-      <div v-show="!propertyFormShow">
-        <el-form ref="ref_form"
-                 :inline="true"
-                 :model="dataForm"
-                 :rules="dataRule"
-                 label-width="150px"
-                 class="g-edit-form">
-
-          <el-form-item v-if="formType==='edit'"
-                        label="所属网格"
-                        style="display: block">
-            <span>{{ dataForm.agencyName+'-'+dataForm.gridName }}</span>
-          </el-form-item>
-          <el-form-item v-if="formType==='add'"
-                        label="所属组织"
-                        prop="gridId"
-                        style="display: block">
-            <el-cascader ref="ref_cascader_agency"
-                         class="u-edit-width-normal"
-                         v-model="dataForm.gridId"
-                         @change="handleChangeAngency"
-                         :props="props"
-                         clearable />
-
-          </el-form-item>
-
-          <el-form-item label="小区名称"
-                        prop="neighborHoodName"
-                        style="display: block">
-            <el-input class="u-edit-width-normal"
-                      maxlength="50"
-                      show-word-limit
-                      placeholder="请输入小区名称"
-                      v-model="dataForm.neighborHoodName">
-            </el-input>
-          </el-form-item>
-          <el-form-item label="居民区类型"
-                        prop="quartersType"
-                        style="display: block">
-            <el-radio-group v-model="quartersType">
-
-              <el-radio :label="'0'">小区</el-radio>
-              <el-radio :label="'1'">片区</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item label="小区编码"
-                        prop="coding"
-                        style="display: block">
-            <el-input class="u-edit-width-normal"
-                      maxlength="50"
-                      placeholder="请输入小区编码"
-                      v-model="dataForm.coding">
-
-            </el-input>
-            <el-button style="margin-left: 10px"
-                       type="text"
-                       class="div-table-button--blue"
-                       icon="el-icon-upload2"
-                       size="small"
-                       @click="handleCode">生成</el-button>
-
-          </el-form-item>
-          <el-form-item v-if="dataForm.qrcodeUrl"
-                        label="二维码"
-                        prop="coding"
-                        style="display: block">
-            <div style="display: flex; align-items:center">
-              <div class="u-edit-width-normal">
-                <img style="margin-left: 30px;width: 200px;"
-                     :src="dataForm.qrcodeUrl">
-              </div>
-              <a style="margin-left: 10px;"
-                 class="div-table-button--blue"
-                 :href="dataForm.qrcodeUrl"
-                 target="_blank"><i class="el-icon-download"></i>下载</a>
-            </div>
-          </el-form-item>
-
-          <!-- <div
+    <div>
+        <div class="dialog-h-content scroll-h">
+            <div v-show="!propertyFormShow">
+                <el-form ref="ref_form" :inline="true" :model="dataForm" :rules="dataRule" label-width="150px"
+                    class="g-edit-form">
+
+                    <el-form-item v-if="formType === 'edit'" label="所属网格" style="display: block">
+                        <span>{{ dataForm.agencyName + '-' + dataForm.gridName }}</span>
+                    </el-form-item>
+                    <el-form-item v-if="formType === 'add'" label="所属组织" prop="gridId" style="display: block">
+                        <el-cascader ref="ref_cascader_agency" class="u-edit-width-normal" v-model="dataForm.gridId"
+                            @change="handleChangeAngency" :props="props" clearable />
+
+                    </el-form-item>
+
+                    <el-form-item label="小区名称" prop="neighborHoodName" style="display: block">
+                        <el-input class="u-edit-width-normal" maxlength="50" show-word-limit placeholder="请输入小区名称"
+                            v-model="dataForm.neighborHoodName">
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="居民区类型" prop="quartersType" style="display: block">
+                        <el-radio-group v-model="quartersType">
+
+                            <el-radio :label="'0'">小区</el-radio>
+                            <el-radio :label="'1'">片区</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+
+                    <el-form-item label="小区编码" prop="coding" style="display: block">
+                        <el-input class="u-edit-width-normal" maxlength="50" placeholder="请输入小区编码"
+                            v-model="dataForm.coding">
+
+                        </el-input>
+                        <el-button style="margin-left: 10px" type="text" class="div-table-button--blue"
+                            icon="el-icon-upload2" size="small" @click="handleCode">生成</el-button>
+
+                    </el-form-item>
+                    <el-form-item v-if="dataForm.qrcodeUrl" label="二维码" prop="coding" style="display: block">
+                        <div style="display: flex; align-items:center">
+                            <div class="u-edit-width-normal">
+                                <img style="margin-left: 30px;width: 200px;" :src="dataForm.qrcodeUrl">
+                            </div>
+                            <a style="margin-left: 10px;" class="div-table-button--blue" :href="dataForm.qrcodeUrl"
+                                target="_blank"><i class="el-icon-download"></i>下载</a>
+                        </div>
+                    </el-form-item>
+
+                    <!-- <div
                style="display: flex;flex-direction: column;">
 
             <a style="margin-left: 80px"
                :href="dataForm.qrcodeUrl"
                target="_blank">下载</a>
           </div> -->
-          <el-form-item label="关联物业"
-                        prop="propertyId"
-                        style="display: block">
-            <el-select class="u-edit-width-normal"
-                       v-model="propertyId"
-                       placeholder="请选择"
-                       filterable
-                       clearable>
-              <el-option v-for="item in propertyList"
-                         :key="item.propertyId"
-                         :label="item.propertyName"
-                         :value="item.propertyId">
-              </el-option>
-            </el-select>
-            <el-button style="margin-left: 10px"
-                       type="text"
-                       class="div-table-button--blue"
-                       icon="el-icon-plus"
-                       size="small"
-                       @click="handleAddProperty">添加物业</el-button>
-
-          </el-form-item>
-          <el-form-item label="实有楼栋"
-                        style="display: block"
-                        prop="realBuilding">
-            <el-input-number class="u-edit-width-normal"
-                             v-model="dataForm.realBuilding"
-                             :min="0"
-                             :max="9999"
-                             label="总户数"></el-input-number>
-          </el-form-item>
-
-          <el-form-item label="地图位置"
-                        prop="longitude"
-                        style="display: block">
-            <div class="u-edit-width-normal m-edit-map">
-              <el-select v-model="searchValue"
-                         filterable
-                         class="u-edit-width-normal m-edit-map-search"
-                         remote
-                         :reserve-keyword="true"
-                         placeholder="请输入关键词"
-                         :remote-method="remoteMethod"
-                         :loading="loading">
-                <el-option v-for="(item,index) in searchOptions"
-                           @click.native="handleClickKey(index)"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-              <div id="app_community"
-                   class="m-map-item"></div>
+                    <el-form-item label="关联物业" prop="propertyId" style="display: block">
+                        <el-select class="u-edit-width-normal" v-model="propertyId" placeholder="请选择" filterable clearable>
+                            <el-option v-for="item in propertyList" :key="item.propertyId" :label="item.propertyName"
+                                :value="item.propertyId">
+                            </el-option>
+                        </el-select>
+                        <el-button style="margin-left: 10px" type="text" class="div-table-button--blue" icon="el-icon-plus"
+                            size="small" @click="handleAddProperty">添加物业</el-button>
+
+                    </el-form-item>
+                    <el-form-item label="实有楼栋" style="display: block" prop="realBuilding">
+                        <el-input-number class="u-edit-width-normal" v-model="dataForm.realBuilding" :min="0" :max="9999"
+                            label="总户数"></el-input-number>
+                    </el-form-item>
+
+                    <el-form-item label="地图位置" prop="longitude" style="display: block">
+                        <div class="u-edit-width-normal m-edit-map">
+                            <el-select v-model="searchValue" filterable class="u-edit-width-normal m-edit-map-search" remote
+                                :reserve-keyword="true" placeholder="请输入关键词" :remote-method="remoteMethod"
+                                :loading="loading">
+                                <el-option v-for="(item, index) in searchOptions" @click.native="handleClickKey(index)"
+                                    :key="item.value" :label="item.label" :value="item.value">
+                                </el-option>
+                            </el-select>
+                            <div id="app_community" class="m-map-item"></div>
+                        </div>
+                    </el-form-item>
+
+                    <el-form-item label="详细地址" prop="address" style="display: block">
+                        <el-input class="u-edit-width-normal" maxlength="50" show-word-limit placeholder="请输入详细地址"
+                            v-model="dataForm.address">
+                        </el-input>
+                    </el-form-item>
+
+                    <el-form-item label="备注" prop="remark" style="display: block">
+                        <el-input class="u-edit-width-normal" type="textarea" maxlength="500" show-word-limit :rows="3"
+                            placeholder="请输入备注，不超过500字" v-model="dataForm.remark"></el-input>
+                    </el-form-item>
+                </el-form>
             </div>
-          </el-form-item>
-
-          <el-form-item label="详细地址"
-                        prop="address"
-                        style="display: block">
-            <el-input class="u-edit-width-normal"
-                      maxlength="50"
-                      show-word-limit
-                      placeholder="请输入详细地址"
-                      v-model="dataForm.address">
-            </el-input>
-          </el-form-item>
-
-          <el-form-item label="备注"
-                        prop="remark"
-                        style="display: block">
-            <el-input class="u-edit-width-normal"
-                      type="textarea"
-                      maxlength="500"
-                      show-word-limit
-                      :rows="3"
-                      placeholder="请输入备注，不超过500字"
-                      v-model="dataForm.remark"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-
-      <div v-show="propertyFormShow">
-        <el-form :inline="false"
-                 :model="propertyForm"
-                 :rules="propertyRule"
-                 label-width="150px"
-                 class="g-edit-form">
-          <el-form-item label="物业名称"
-                        prop="name"
-                        style="display: block">
-            <el-input class="u-edit-width-normal"
-                      maxlength="10"
-                      placeholder="请输入小区名称"
-                      v-model="propertyForm.name">
-            </el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-    <div class="m-edit-btn">
-      <el-button size="small"
-                 @click="handleCancle">取 消</el-button>
-      <el-button size="small"
-                 type="primary"
-                 :disabled="btnDisable"
-                 @click="handleComfirm">保 存</el-button>
+
+            <div v-show="propertyFormShow">
+                <el-form :inline="false" :model="propertyForm" :rules="propertyRule" label-width="150px"
+                    class="g-edit-form">
+                    <el-form-item label="物业名称" prop="name" style="display: block">
+                        <el-input class="u-edit-width-normal" maxlength="10" placeholder="请输入小区名称"
+                            v-model="propertyForm.name">
+                        </el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+        </div>
+        <div class="m-edit-btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">保 存</el-button>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
 import { Loading } from 'element-ui' // 引入Loading服务
 import { requestPost, requestGet } from '@/js/dai/request'
 import daiMap from "@/utils/dai-map";
 var map
-var search
-var markers
-var infoWindowList
 let loading // 加载动画
 export default {
-  data () {
-    return {
-      formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
-      searchOptions: [],
-      searchValue: '',
-      resultList: [],
-      loading: false,
-
-      propertyList: [],
-      btnDisable: false,
-
-      neighborHoodId: '', //小区ID
-      quartersType: '0',
-      propertyId: '',
-      dataForm: {
-        // cascaderId: '',
-        neighborHoodName: '', // 小区名称【不超过50字】
-        agencyId: '', // 所属组织ID
-        agencyName: '',
-        gridId: '', //所属网格ID
-        gridName: '',
-        propertyId: '', //关联物业
-        address: '', //详细地址
-        remark: '', //备注【最大500字】
-        location: '', //坐标位置
-        longitude: '', //经度
-        latitude: '', //纬度
-        realBuilding: 0,
-        coding: '',
-        sysCoding: '',
-        quartersType: ''// 居民区类型（0小区；1片区）
-      },
-
-      propertyFormShow: false,
-      propertyForm: {
-        name: ''
-      },
-
-      keyWords: '',
-      agencyObj: {},
-
-      //级联
-      props: {
-        checkStrictly: true,
-        emitPath: false,
-        // children: 'subAgencyList',
-        // label: 'agencyName',
-        // value: 'agencyId',
-        lazy: true,
-        lazyLoad: this.lazyLoadAgency
-      },
-      userAgencyId: '',
-    }
-  },
-  components: {},
-  async created () {
-    this.user = this.$store.state.user;
-    this.userAgencyId = this.user.agencyId;
-    await this.loadAgency()
-
-    await this.loadProperty()
-  },
-
-  methods: {
-    lazyLoadAgency (node, resolve) {
-
-      setTimeout(() => {
-        this.getAgency(node, resolve)
-      }, 200)
-    },
-    async getAgency (node, resolve) {
-
-      const url = "/gov/org/agency/dynamicOrgTreeWithDepth"
-      console.log('级联', node.value)
-
-      let params = {
-        rootOrgId: node.value ? node.value : '',
-        leafDepth: 1
-      }
-
-      const { data, code, msg } = await requestGet(url, params)
-      let array = []
-      if (node.value) {//根节点
-        array = data.children.length > 0 ? data.children : []
-
-      } else {
-        array = [data]
-      }
-
-      if (code === 0) {
-        const nodes = array.map(item => ({
-          value: item.id, //
-          label: item.name,
-          level: item.agencyLevel,
-          orgType: item.orgType,
-          leaf: node.level >= 4 // 5层级
-        }))
-        resolve(nodes)
-
-      } else {
-        this.$message.error(msg)
-      }
-
-    },
-
-    handleChangeAngency (val) {
-
-
-      let selAgency = this.$refs.ref_cascader_agency.getCheckedNodes()[0]
-      console.log('选择的组织', selAgency)
-      if (selAgency.data) {
-        if (selAgency.data.orgType !== 'grid') {
-          this.dataForm.gridId = ''
-          this.dataForm.agencyId = ''
-          this.$message.info('请选择网格')
-          return false
-        } else {
-          this.dataForm.gridId = val
-          this.dataForm.agencyId = selAgency.parent.value
+    data() {
+        return {
+            formType: 'add', //表单操作类型 add新增，edit编辑，detail详情
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            loading: false,
+
+            propertyList: [],
+            btnDisable: false,
+
+            neighborHoodId: '', //小区ID
+            quartersType: '0',
+            propertyId: '',
+            dataForm: {
+                // cascaderId: '',
+                neighborHoodName: '', // 小区名称【不超过50字】
+                agencyId: '', // 所属组织ID
+                agencyName: '',
+                gridId: '', //所属网格ID
+                gridName: '',
+                propertyId: '', //关联物业
+                address: '', //详细地址
+                remark: '', //备注【最大500字】
+                location: '', //坐标位置
+                longitude: '', //经度
+                latitude: '', //纬度
+                realBuilding: 0,
+                coding: '',
+                sysCoding: '',
+                quartersType: ''// 居民区类型（0小区；1片区）
+            },
+
+            propertyFormShow: false,
+            propertyForm: {
+                name: ''
+            },
+
+            keyWords: '',
+            agencyObj: {},
+
+            //级联
+            props: {
+                checkStrictly: true,
+                emitPath: false,
+                // children: 'subAgencyList',
+                // label: 'agencyName',
+                // value: 'agencyId',
+                lazy: true,
+                lazyLoad: this.lazyLoadAgency
+            },
+            userAgencyId: '',
         }
-      } else {
-        this.dataForm.gridId = ''
-        this.dataForm.agencyId = ''
-      }
-
-    },
-
-    async initForm (type, row, agencyObj) {
-
-      this.$refs.ref_form.resetFields();
-      this.agencyObj = agencyObj
-      let { latitude, longitude } = this.$store.state.user;
-      this.formType = type
-      if (row) {
-        console.log(row);
-        this.dataForm = JSON.parse(JSON.stringify(row))
-        this.dataForm.neighborHoodId = this.dataForm.id
-        this.neighborHoodId = this.dataForm.neighborHoodId
-        this.quartersType = this.dataForm.quartersType
-        // this.propertyId = this.propertyList[0].id
-
-      } else {
-        this.dataForm.latitude = latitude
-        this.dataForm.longitude = longitude
-      }
-      // if (!map) {
-      this.initMap(this.dataForm.latitude, this.dataForm.longitude);
-      // } else {
-      //   map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
-      //   map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
-      // }
-
-      // if (agencyObj.level == 'grid') {
-      //   console.log(agencyObj)
-      //   this.dataForm.gridId = agencyObj.id
-      //   this.dataForm.gridName = agencyObj.label
-      // }
     },
-    // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
-    initMap (latitude, longitude) {
-      map = new daiMap(
-        document.getElementById("app_community"),
-        { latitude, longitude },
-        {
-          zoom: 16.2, // 设置地图缩放级别
-          pitch: 43.5, // 设置俯仰角
-          rotation: 45, // 设置地图旋转角度
-        }
-      );
-
-      // 监听地图平移结束
-      map.on("dragend", (e) => {
-        this.handleMoveCenter(e);
-      });
-
-      map.setCenter(latitude, longitude);
-      map.setMarker(latitude, longitude);
-
+    components: {},
+    async created() {
+        this.user = this.$store.state.user;
+        this.userAgencyId = this.user.agencyId;
+        await this.loadAgency()
+        await this.loadProperty()
     },
 
+    methods: {
+        lazyLoadAgency(node, resolve) {
+            setTimeout(() => {
+                this.getAgency(node, resolve)
+            }, 200)
+        },
+        async getAgency(node, resolve) {
+            const url = "/gov/org/agency/dynamicOrgTreeWithDepth"
+            let params = {
+                rootOrgId: node.value ? node.value : '',
+                leafDepth: 1
+            }
+            const { data, code, msg } = await requestGet(url, params)
+            let array = []
+            if (node.value) {//根节点
+                array = data.children.length > 0 ? data.children : []
+            } else {
+                array = [data]
+            }
+            if (code === 0) {
+                const nodes = array.map(item => ({
+                    value: item.id, //
+                    label: item.name,
+                    level: item.agencyLevel,
+                    orgType: item.orgType,
+                    leaf: node.level >= 4 // 5层级
+                }))
+                resolve(nodes)
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        handleChangeAngency(val) {
+            let selAgency = this.$refs.ref_cascader_agency.getCheckedNodes()[0]
+            if (selAgency.data) {
+                if (selAgency.data.orgType !== 'grid') {
+                    this.dataForm.gridId = ''
+                    this.dataForm.agencyId = ''
+                    this.$message.info('请选择网格')
+                    return false
+                } else {
+                    this.dataForm.gridId = val
+                    this.dataForm.agencyId = selAgency.parent.value
+                }
+            } else {
+                this.dataForm.gridId = ''
+                this.dataForm.agencyId = ''
+            }
+        },
+
+        async initForm(type, row, agencyObj) {
+            // this.$refs.ref_form.resetFields();
+            this.agencyObj = agencyObj
+            let { latitude, longitude } = this.$store.state.user;
+            this.formType = type
+            if (row) {
+                console.log(row);
+                this.dataForm = JSON.parse(JSON.stringify(row))
+                this.dataForm.neighborHoodId = this.dataForm.id
+                this.neighborHoodId = this.dataForm.neighborHoodId
+                this.quartersType = this.dataForm.quartersType
+                this.propertyId = this.dataForm.propertyId
+            } else {
+                this.dataForm.latitude = latitude
+                this.dataForm.longitude = longitude
+            }
+            // if (!map) {
+            this.initMap(this.dataForm.latitude, this.dataForm.longitude);
+            // } else {
+            //   map.setCenter(this.dataForm.latitude, this.dataForm.longitude);
+            //   map.setMarker(this.dataForm.latitude, this.dataForm.longitude);
+            // }
+
+            // if (agencyObj.level == 'grid') {
+            //   console.log(agencyObj)
+            //   this.dataForm.gridId = agencyObj.id
+            //   this.dataForm.gridName = agencyObj.label
+            // }
+        },
+        // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
+        initMap(latitude, longitude) {
+            map = new daiMap(
+                document.getElementById("app_community"),
+                { latitude, longitude },
+                {
+                    zoom: 16.2, // 设置地图缩放级别
+                    pitch: 43.5, // 设置俯仰角
+                    rotation: 45, // 设置地图旋转角度
+                }
+            );
+
+            // 监听地图平移结束
+            map.on("dragend", (e) => {
+                this.handleMoveCenter(e);
+            });
 
-    async handleMoveCenter () {
-      //修改地图中心点
-      const { lat, lng } = map.getCenter();
-      this.dataForm.latitude = lat;
-      this.dataForm.longitude = lng;
-      map.setMarker(lat, lng);
-
-      let { msg, data } = await map.getAddress(lat, lng);
-      if (msg == "success") {
+            map.setCenter(latitude, longitude);
+            map.setMarker(latitude, longitude);
 
-        this.dataForm.address = data.address
-        this.searchValue = data.address
-        this.searchOptions = []
+        },
 
-      }
-    },
 
-    async remoteMethod (query) {
+        async handleMoveCenter() {
+            //修改地图中心点
+            const { lat, lng } = map.getCenter();
+            this.dataForm.latitude = lat;
+            this.dataForm.longitude = lng;
+            map.setMarker(lat, lng);
 
-      if (query !== '') {
-        this.loading = true;
+            let { msg, data } = await map.getAddress(lat, lng);
+            if (msg == "success") {
 
-        const { msg, data } = await map.searchNearby(query);
-        this.loading = false;
-        this.resultList = []
+                this.dataForm.address = data.address
+                this.searchValue = data.address
+                this.searchOptions = []
 
-        if (msg == "success" && data.resultList && data.resultList.length > 0) {
+            }
+        },
+
+        async remoteMethod(query) {
+
+            if (query !== '') {
+                this.loading = true;
+
+                const { msg, data } = await map.searchNearby(query);
+                this.loading = false;
+                this.resultList = []
+
+                if (msg == "success" && data.resultList && data.resultList.length > 0) {
+
+                    if (data.resultList && data.resultList.length > 0) {
+                        this.resultList = data.resultList
+                        this.searchOptions = this.resultList.map(item => {
+                            return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
+
+                        });
+                    }
+                } else {
+                    this.searchOptions = [
+                        {
+                            value: '0',
+                            label: '未检索到结果'
+                        }
+                    ]
+                }
+            } else {
+                this.searchOptions = [];
+            }
+        },
+
+        handleClickKey(index) {
+            let selPosition = this.resultList[index]
+            let lonlat = selPosition.lonlat.split(" ")
+            map.setCenter(lonlat[1], lonlat[0]);
+            map.setMarker(lonlat[1], lonlat[0]);
+            this.dataForm.latitude = lonlat[1];
+            this.dataForm.longitude = lonlat[0];
+            this.dataForm.address = selPosition.address + selPosition.name
+        },
+
+
+        async handleCode() {
+            if (!this.dataForm.gridId) return this.$message.error('请选择网格')
+            const { data, code, msg } = await requestPost(
+                "/actual/base/communityQuarters/getNeighborHoodCoding/" + this.dataForm.gridId);
+            if (msg == "success" && code == 0) {
+                this.dataForm.coding = data.coding
+                this.dataForm.sysCoding = data.sysCoding
 
-          if (data.resultList && data.resultList.length > 0) {
-            this.resultList = data.resultList
-            this.searchOptions = this.resultList.map(item => {
-              return { value: `${item.hotPointID}`, label: `${item.address + item.name}` };
+            }
+        },
+        //加载组织
+        async loadAgency() {
+            const url = '/epmetuser/customerstaff/staffbasicinfo'
+            let params = {}
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.dataForm.agencyId = data.agencyId
+                this.dataForm.agencyName = data.agencyName
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        //加载物业
+        async loadProperty() {
+            const url = '/actual/base/communityPropertyManagement/listPropertyManagements'
+            let params = {}
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.propertyList = data
+            } else {
+                this.$message.error(msg)
+            }
+        },
+
+        handleAddProperty() {
+            this.propertyForm.name = ''
+            this.propertyFormShow = true
+        },
+
+        async handleComfirm() {
+            if (this.propertyFormShow) {
+                this.addProperty()
+            } else {
+                this.btnDisable = true
+                setTimeout(() => {
+                    this.btnDisable = false
+                }, 10000)
+                this.dataForm.quartersType = this.quartersType
+                this.dataForm.propertyId = this.propertyId
+                this.$refs['ref_form'].validate((valid, messageObj) => {
+                    if (!valid) {
+                        app.util.validateRule(messageObj)
+                        this.btnDisable = false
+                    } else {
+                        this.addCommunity()
+                    }
+
+                })
 
-            });
-          }
-        } else {
-          this.searchOptions = [
-            {
-              value: '0',
-              label: '未检索到结果'
             }
-          ]
+        },
+        async addCommunity() {
+            let url = ''
+            if (this.formType === 'add') {
+                url = '/actual/base/communityQuarters/saveCommunityQuarters'
+            } else {
+                url = '/actual/base/communityQuarters/updateCommunityQuarters'
+                this.dataForm.neighborHoodId = this.neighborHoodId
+            }
+            const { data, code, msg } = await requestPost(url, this.dataForm)
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                })
+                this.resetData()
+                this.$emit('dialogOk')
+                this.btnDisable = false
+            } else if (code >= 8000) {
+                this.btnDisable = false
+                this.$message.error(msg)
+            }
+        },
+        async addProperty() {
+            if (!this.propertyForm.name || this.propertyForm.name === '') {
+                this.$message({
+                    type: 'error',
+                    message: '物业名称不能为空'
+                })
+                return false
+            }
+            const url = '/actual/base/communityPropertyManagement/savePropertyManagement'
+            let params = {
+                name: this.propertyForm.name
+            }
+            const { data, code, msg } = await requestPost(url, params)
+            if (code === 0) {
+                this.$message({
+                    type: 'success',
+                    message: '操作成功'
+                })
+                this.dataForm.propertyId = data.propertyId
+                this.propertyForm.name = ''
+                this.propertyFormShow = false
+                this.loadProperty()
+            } else {
+                this.$message.error(msg)
+            }
+        },
+        handleCancle() {
+            if (this.propertyFormShow) {
+                this.propertyForm.name = ''
+                this.propertyFormShow = false
+            } else {
+                this.resetData()
+                this.$emit('dialogCancle')
+            }
+        },
+        resetData() {
+            this.searchValue = ''
+            this.searchOptions = []
+            this.resultList = []
+            this.neighborHoodId = '' //小区ID
+            this.quartersType = '1'
+            this.dataForm = {
+                neighborHoodName: '', // 小区名称【不超过50字】
+                agencyId: '', // 所属组织ID
+                agencyName: '',
+                gridId: '', //所属网格ID
+                gridName: '',
+                propertyId: '', //关联物业
+                address: '', //详细地址
+                remark: '', //备注【最大500字】
+                location: '', //坐标位置
+                longitude: '', //经度
+                latitude: '', //纬度
+                realBuilding: 0,
+                coding: '',
+                sysCoding: '',
+                quartersType: ''
+            }
+            this.propertyFormShow = false
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
         }
-      } else {
-        this.searchOptions = [];
-      }
-    },
-
-    handleClickKey (index) {
-      let selPosition = this.resultList[index]
-      let lonlat = selPosition.lonlat.split(" ")
-      map.setCenter(lonlat[1], lonlat[0]);
-      map.setMarker(lonlat[1], lonlat[0]);
-      this.dataForm.latitude = lonlat[1];
-      this.dataForm.longitude = lonlat[0];
-      this.dataForm.address = selPosition.address + selPosition.name
-    },
-
-
-    async handleCode () {
-      if (!this.dataForm.gridId) return this.$message.error('请选择网格')
-      const { data, code, msg } = await requestPost(
-        "/actual/base/communityQuarters/getNeighborHoodCoding/" + this.dataForm.gridId);
-      if (msg == "success" && code == 0) {
-        this.dataForm.coding = data.coding
-        this.dataForm.sysCoding = data.sysCoding
-
-      }
-    },
-    //加载组织
-    async loadAgency () {
-      const url = '/epmetuser/customerstaff/staffbasicinfo'
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.dataForm.agencyId = data.agencyId
-        this.dataForm.agencyName = data.agencyName
-      } else {
-        this.$message.error(msg)
-      }
-    },
-
-    //加载物业
-    async loadProperty () {
-      const url = '/actual/base/communityPropertyManagement/listPropertyManagements'
-      let params = {}
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.propertyList = data
-      } else {
-        this.$message.error(msg)
-      }
     },
-
-    handleAddProperty () {
-      this.propertyForm.name = ''
-      this.propertyFormShow = true
-    },
-
-    async handleComfirm () {
-
-      if (this.propertyFormShow) {
-
-        this.addProperty()
-
-      } else {
-        this.btnDisable = true
-        setTimeout(() => {
-          this.btnDisable = false
-        }, 10000)
-        this.dataForm.quartersType = this.quartersType
-        this.dataForm.propertyId = this.propertyId
-        this.$refs['ref_form'].validate((valid, messageObj) => {
-          if (!valid) {
-            app.util.validateRule(messageObj)
-            this.btnDisable = false
-          } else {
-            this.addCommunity()
-          }
-
-        })
-
-      }
-    },
-    async addCommunity () {
-      console.log('dataForm', this.dataForm)
-
-      let url = ''
-      if (this.formType === 'add') {
-        url = '/actual/base/communityQuarters/saveCommunityQuarters'
-
-      } else {
-        url = '/actual/base/communityQuarters/updateCommunityQuarters'
-
-        this.dataForm.neighborHoodId = this.neighborHoodId
-      }
-
-      const { data, code, msg } = await requestPost(url, this.dataForm)
-
-      if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.resetData()
-        this.$emit('dialogOk')
-        this.btnDisable = false
-      } else if (code >= 8000) {
-        this.btnDisable = false
-        this.$message.error(msg)
-      }
-
-    },
-    async addProperty () {
-      if (!this.propertyForm.name || this.propertyForm.name === '') {
-        this.$message({
-          type: 'error',
-          message: '物业名称不能为空'
-        })
-        return false
-      }
-      const url = '/actual/base/communityPropertyManagement/savePropertyManagement'
-
-      let params = {
-        name: this.propertyForm.name
-      }
-
-      const { data, code, msg } = await requestPost(url, params)
-
-      if (code === 0) {
-        this.$message({
-          type: 'success',
-          message: '操作成功'
-        })
-        this.dataForm.propertyId = data.propertyId
-        this.propertyForm.name = ''
-        this.propertyFormShow = false
-        this.loadProperty()
-      } else {
-        this.$message.error(msg)
-      }
-    },
-    handleCancle () {
-      if (this.propertyFormShow) {
-        this.propertyForm.name = ''
-        this.propertyFormShow = false
-      } else {
-        this.resetData()
-        this.$emit('dialogCancle')
-      }
-    },
-    resetData () {
-      this.searchValue = ''
-      this.searchOptions = []
-      this.resultList = []
-      this.neighborHoodId = '' //小区ID
-      this.quartersType = '1'
-      this.dataForm = {
-        neighborHoodName: '', // 小区名称【不超过50字】
-        agencyId: '', // 所属组织ID
-        agencyName: '',
-        gridId: '', //所属网格ID
-        gridName: '',
-        propertyId: '', //关联物业
-        address: '', //详细地址
-        remark: '', //备注【最大500字】
-        location: '', //坐标位置
-        longitude: '', //经度
-        latitude: '', //纬度
-        realBuilding: 0,
-        coding: '',
-        sysCoding: '',
-        quartersType: ''
-      }
-      this.propertyFormShow = false
-    },
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: '正在加载……', // 加载中需要显示的文字
-        background: 'rgba(0,0,0,.7)' // 背景颜色
-      })
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close()
-      }
-    }
-  },
-  computed: {
-    dataRule () {
-      return {
-        neighborHoodName: [
-          { required: true, message: '小区名称不能为空', trigger: 'blur' },
-          {
-            min: 1,
-            max: 50,
-            message: '小区名称长度在 1 到 50个字符',
-            trigger: 'blur'
-          }
-        ],
-        quartersType: [
-          { required: true, message: '居民区类型不能为空', trigger: 'blur' }
-        ],
-        agencyId: [
-          { required: true, message: '所属组织不能为空', trigger: 'blur' }
-        ],
-        gridId: [
-          { required: true, message: '所属组织不能为空', trigger: 'blur' }
-        ],
-        coding: [
-          { required: true, message: '小区编码不能为空', trigger: 'blur' }
-        ],
-        address: [
-          { required: true, message: '详细地址不能为空', trigger: 'blur' }
-        ],
-        longitude: [
-          { required: true, message: '坐标不能为空', trigger: 'blur' }
-        ]
-      }
+    computed: {
+        dataRule() {
+            return {
+                neighborHoodName: [
+                    { required: true, message: '小区名称不能为空', trigger: 'blur' },
+                    {
+                        min: 1,
+                        max: 50,
+                        message: '小区名称长度在 1 到 50个字符',
+                        trigger: 'blur'
+                    }
+                ],
+                quartersType: [
+                    { required: true, message: '居民区类型不能为空', trigger: 'blur' }
+                ],
+                agencyId: [
+                    { required: true, message: '所属组织不能为空', trigger: 'blur' }
+                ],
+                gridId: [
+                    { required: true, message: '所属组织不能为空', trigger: 'blur' }
+                ],
+                coding: [
+                    { required: true, message: '小区编码不能为空', trigger: 'blur' }
+                ],
+                address: [
+                    { required: true, message: '详细地址不能为空', trigger: 'blur' }
+                ],
+                longitude: [
+                    { required: true, message: '坐标不能为空', trigger: 'blur' }
+                ]
+            }
+        },
+        propertyRule() {
+            name: [
+                { required: true, message: '物业名称不能为空', trigger: 'blur' }
+                // { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
+            ]
+        }
     },
-    propertyRule () {
-      name: [
-        { required: true, message: '物业名称不能为空', trigger: 'blur' }
-        // { min: 1, max: 50, message: '小区名称长度在 1 到 50个字符', trigger: 'blur' }
-      ]
-    }
-  },
-  props: {}
+    props: {}
 }
 </script>
 <style lang="scss" scoped >
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index afb6dc2a3..e7e19ff92 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -1,138 +1,83 @@
 <template>
-  <div class="m-table">
-    <div class="u-table-btn2">
-      <div class="u-table-btn2-left">
-        <el-button style=""
-                   size="small"
-                   type="primary "
-                   icon="el-icon-plus"
-                   @click="handleAdd">新增小区</el-button>
-
-        <div v-if="showImportBtn"
-             class="u-btn-upload">
-          <el-popover v-if="showImportBtn"
-                      popper-class="btn-popper"
-                      placement="bottom"
-                      width="20"
-                      trigger="click">
-            <div class="table-more-btn">
-              <el-upload :headers="$getElUploadHeaders()"
-                         ref="upload_community"
-                         style="text-align: center"
-                         :multiple="false"
-                         :show-file-list="false"
-                         :before-upload="(file) => {
-                    beforeUpload(file, 'community');
-                  }
-                  "
-                         action=""
-                         accept=".xls,.xlsx"
-                         :http-request="() => {
-      uploadFile('community');
+    <div class="m-table">
+        <div class="u-table-btn2">
+            <div class="u-table-btn2-left">
+                <el-button style="" size="small" type="primary " icon="el-icon-plus" @click="handleAdd">新增小区</el-button>
+
+                <div v-if="showImportBtn" class="u-btn-upload">
+                    <el-popover v-if="showImportBtn" popper-class="btn-popper" placement="bottom" width="20"
+                        trigger="click">
+                        <div class="table-more-btn">
+                            <el-upload :headers="$getElUploadHeaders()" ref="upload_community" style="text-align: center"
+                                :multiple="false" :show-file-list="false" :before-upload="(file) => {
+                                    beforeUpload(file, 'community');
+                                }
+                                    " action="" accept=".xls,.xlsx" :http-request="() => {
+        uploadFile('community');
     }
-    ">
-                <el-button size="small"
-                           type="text"
-                           class="diy-button--other">导入小区数据</el-button>
-              </el-upload>
-            </div>
-
-            <div class="table-more-btn">
-              <el-upload :headers="$getElUploadHeaders()"
-                         style="text-align: center"
-                         ref="upload_building"
-                         :multiple="false"
-                         :show-file-list="false"
-                         :before-upload="(file) => {
-                    beforeUpload(file, 'building');
-                  }
-                  "
-                         action=""
-                         accept=".xls,.xlsx"
-                         :http-request="() => {
-      uploadFile('building');
+        ">
+                                <el-button size="small" type="text" class="diy-button--other">导入小区数据</el-button>
+                            </el-upload>
+                        </div>
+
+                        <div class="table-more-btn">
+                            <el-upload :headers="$getElUploadHeaders()" style="text-align: center" ref="upload_building"
+                                :multiple="false" :show-file-list="false" :before-upload="(file) => {
+                                    beforeUpload(file, 'building');
+                                }
+                                    " action="" accept=".xls,.xlsx" :http-request="() => {
+        uploadFile('building');
     }
-    ">
-                <el-button size="small"
-                           type="text"
-                           class="diy-button--other">导入楼栋数据</el-button>
-              </el-upload>
-            </div>
-
-            <div class="table-more-btn">
-              <el-upload :headers="$getElUploadHeaders()"
-                         style="text-align: center"
-                         ref="upload_room"
-                         :multiple="false"
-                         :show-file-list="false"
-                         :before-upload="(file) => {
-                    beforeUpload(file, 'room');
-                  }
-                  "
-                         action=""
-                         accept=".xls,.xlsx"
-                         :http-request="() => {
-      uploadFile('room');
+        ">
+                                <el-button size="small" type="text" class="diy-button--other">导入楼栋数据</el-button>
+                            </el-upload>
+                        </div>
+
+                        <div class="table-more-btn">
+                            <el-upload :headers="$getElUploadHeaders()" style="text-align: center" ref="upload_room"
+                                :multiple="false" :show-file-list="false" :before-upload="(file) => {
+                                    beforeUpload(file, 'room');
+                                }
+                                    " action="" accept=".xls,.xlsx" :http-request="() => {
+        uploadFile('room');
     }
-    ">
-                <el-button size="small"
-                           type="text"
-                           class="diy-button--other">导入房屋数据</el-button>
-              </el-upload>
-            </div>
-            <el-button size="small"
-                       style="float: right"
-                       class="diy-button--white"
-                       slot="reference">导入<i class="el-icon-arrow-down el-icon--right"></i></el-button>
-          </el-popover>
-        </div>
-        <el-button style="margin-left: 10px"
-                   class="diy-button--white"
-                   size="small"
-                   @click="handleExportOpen">导出</el-button>
-
-        <el-button style="margin-left: 10px"
-                   class="diy-button--white"
-                   size="small"
-                   @click="deleteBatch">批量删除</el-button>
-
-        <!-- <el-button style=";margin-left:10px"
+        ">
+                                <el-button size="small" type="text" class="diy-button--other">导入房屋数据</el-button>
+                            </el-upload>
+                        </div>
+                        <el-button size="small" style="float: right" class="diy-button--white" slot="reference">导入<i
+                                class="el-icon-arrow-down el-icon--right"></i></el-button>
+                    </el-popover>
+                </div>
+                <el-button style="margin-left: 10px" class="diy-button--white" size="small"
+                    @click="handleExportOpen">导出</el-button>
+
+                <el-button style="margin-left: 10px" class="diy-button--white" size="small"
+                    @click="deleteBatch">批量删除</el-button>
+
+                <!-- <el-button style=";margin-left:10px"
                  class="diy-button--export"
                  size="small"
                  :disabled="yihuyidangDisabled"
                  @click="handleExportYihuyidang()">导出一户一档</el-button> -->
-      </div>
-      <div>
-        <el-popover popper-class="btn-popper"
-                    placement="bottom"
-                    style="margin-left: 10px"
-                    width="20"
+            </div>
+            <div>
+                <el-popover popper-class="btn-popper" placement="bottom" style="margin-left: 10px" width="20"
                     trigger="click">
-          <div v-if="showImportBtn"
-               class="table-more-btn">
-            <el-button class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('community')">下载小区模板</el-button>
-          </div>
-
-          <div v-if="showImportBtn"
-               class="table-more-btn">
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('building')">下载楼栋模板</el-button>
-          </div>
-          <div v-if="showImportBtn"
-               class="table-more-btn">
-            <el-button :headers="$getElUploadHeaders()"
-                       class="diy-button--other"
-                       size="small"
-                       type="text"
-                       @click="handleExportModule('room')">下载房屋模板</el-button>
-          </div>
-          <!-- <div
+                    <div v-if="showImportBtn" class="table-more-btn">
+                        <el-button class="diy-button--other" size="small" type="text"
+                            @click="handleExportModule('community')">下载小区模板</el-button>
+                    </div>
+
+                    <div v-if="showImportBtn" class="table-more-btn">
+                        <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+                            @click="handleExportModule('building')">下载楼栋模板</el-button>
+                    </div>
+                    <div v-if="showImportBtn" class="table-more-btn">
+                        <el-button :headers="$getElUploadHeaders()" class="diy-button--other" size="small" type="text"
+                            @click="handleExportModule('room')">下载房屋模板</el-button>
+                    </div>
+                    <!-- <div
 						v-if="
 							showYhymInfo && customerId !== '1535072605621841922'
 						"
@@ -163,14 +108,10 @@
 							>补全小程序小区码</el-button
 						>
 					</div> -->
-          <div v-if="displayedBaobiaoBtn"
-               class="table-more-btn">
-            <el-button size="small"
-                       type="text"
-                       class="diy-button--other"
-                       @click="reportForm">智能填报</el-button>
-          </div>
-          <!-- <div
+                    <div v-if="displayedBaobiaoBtn" class="table-more-btn">
+                        <el-button size="small" type="text" class="diy-button--other" @click="reportForm">智能填报</el-button>
+                    </div>
+                    <!-- <div
 						v-if="agencyObj.level == 'community'"
 						class="table-more-btn"
 					>
@@ -182,53 +123,30 @@
 							>社区二维码</el-button
 						>
 					</div> -->
-          <el-button size="small"
-                     style="float: right"
-                     class="diy-button--white"
-                     slot="reference">更多<i class="el-icon-arrow-down el-icon--right"></i></el-button>
-        </el-popover>
-      </div>
-    </div>
+                    <el-button size="small" style="float: right" class="diy-button--white" slot="reference">更多<i
+                            class="el-icon-arrow-down el-icon--right"></i></el-button>
+                </el-popover>
+            </div>
+        </div>
 
-    <div class="m-table-item">
-      <el-table ref="ref_table"
-                :data="tableData"
-                border
-                :height="tableHeight"
-                v-loading="tableLoading"
-                style="width: 100%"
-                :show-overflow-tooltip="true"
-                @select-all="selectAll"
+        <div class="m-table-item">
+            <el-table ref="ref_table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
+                style="width: 100%" :show-overflow-tooltip="true" @select-all="selectAll"
                 @selection-change="selectionChange">
-        <el-table-column type="selection"
-                         :selectable="checkSelect"
-                         width="55">
-        </el-table-column>
-        <el-table-column prop="neighborHoodName"
-                         label="小区名称"
-                         header-align="left"
-                         align="left"
-                         min-width="100">
-          <template slot-scope="scope">
-            <a class="name-a"
-               @click="handleToNextLevel(scope.row)">
-              {{ scope.row.neighborHoodName }}
-            </a>
-          </template>
-        </el-table-column>
-        <el-table-column prop="agencyName"
-                         label="所属组织"
-                         header-align="left"
-                         align="left"
-                         min-width="100">
-        </el-table-column>
-        <el-table-column prop="gridName"
-                         label="所属网格"
-                         header-align="left"
-                         align="left"
-                         min-width="120">
-        </el-table-column>
-        <!-- <el-table-column prop="总单元数"
+                <el-table-column type="selection" :selectable="checkSelect" width="55">
+                </el-table-column>
+                <el-table-column prop="neighborHoodName" label="小区名称" header-align="left" align="left" min-width="100">
+                    <template slot-scope="scope">
+                        <a class="name-a" @click="handleToNextLevel(scope.row)">
+                            {{ scope.row.neighborHoodName }}
+                        </a>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="agencyName" label="所属组织" header-align="left" align="left" min-width="100">
+                </el-table-column>
+                <el-table-column prop="gridName" label="所属网格" header-align="left" align="left" min-width="120">
+                </el-table-column>
+                <!-- <el-table-column prop="总单元数"
                          label="所属网格"
                          min-width="80">
         </el-table-column>
@@ -236,25 +154,14 @@
                          label="所属网格"
                          min-width="80">
         </el-table-column> -->
-        <el-table-column prop="address"
-                         label="详细地址"
-                         header-align="left"
-                         align="left"
-                         min-width="180">
-        </el-table-column>
-
-        <el-table-column label="操作"
-                         fixed="right"
-                         width="220"
-                         header-align="center"
-                         align="center"
-                         class="operate">
-          <template slot-scope="scope">
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleDetail(scope.row)">查看</el-button>
-            <!-- <el-button v-if="scope.row.showBtn"
+                <el-table-column prop="address" label="详细地址" header-align="left" align="left" min-width="180">
+                </el-table-column>
+
+                <el-table-column label="操作" fixed="right" width="220" header-align="center" align="center" class="operate">
+                    <template slot-scope="scope">
+                        <el-button type="text" class="div-table-button--blue" size="small"
+                            @click="handleDetail(scope.row)">查看</el-button>
+                        <!-- <el-button v-if="scope.row.showBtn"
                        type="text"
                        class="div-table-button--blue"
                        size="small"
@@ -265,58 +172,34 @@
                        class="div-table-button--blue"
                        size="small"
                        @click="handleDelete(scope.row)">删除</el-button> -->
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleEdit(scope.row)">编辑</el-button>
-
-            <el-button type="text"
-                       class="div-table-button--blue"
-                       size="small"
-                       @click="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <el-pagination @size-change="handleSizeChange"
-                       @current-change="handleCurrentChange"
-                       :current-page.sync="pageNo"
-                       :page-sizes="[20, 50, 100, 200]"
-                       :page-size="pageSize"
-                       layout="sizes, prev, pager, next, total"
-                       :total="total">
-        </el-pagination>
-      </div>
-    </div>
-    <!-- 详情弹出框 -->
-    <el-dialog :visible.sync="detailShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="'小区详情'"
-               width="920px"
-               top="5vh"
-               class="dialog-h"
-               @closed="detailFormCancle">
-      <community-detail ref="ref_form_detail"
-                        @diaDetailClose="detailFormCancle"></community-detail>
-    </el-dialog>
-
-    <!-- 修改弹出框 -->
-    <el-dialog :visible.sync="formShow"
-               v-if="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               width="670px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose">
-      <community-form ref="ref_form"
-                      @dialogCancle="addFormCancle"
-                      @dialogOk="addFormOk"></community-form>
-    </el-dialog>
-
-    <!-- <el-dialog title="导出"
+                        <el-button type="text" class="div-table-button--blue" size="small"
+                            @click="handleEdit(scope.row)">编辑</el-button>
+
+                        <el-button type="text" class="div-table-button--blue" size="small"
+                            @click="handleDelete(scope.row)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <div>
+                <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+                    :current-page.sync="pageNo" :page-sizes="[20, 50, 100, 200]" :page-size="pageSize"
+                    layout="sizes, prev, pager, next, total" :total="total">
+                </el-pagination>
+            </div>
+        </div>
+        <!-- 详情弹出框 -->
+        <el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'小区详情'"
+            width="920px" top="5vh" class="dialog-h" @closed="detailFormCancle">
+            <community-detail ref="ref_form_detail" @diaDetailClose="detailFormCancle"></community-detail>
+        </el-dialog>
+
+        <!-- 修改弹出框 -->
+        <el-dialog :visible.sync="formShow" v-if="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
+            :title="formTitle" width="670px" top="5vh" class="dialog-h" @closed="diaClose">
+            <community-form ref="ref_form" @dialogCancle="addFormCancle" @dialogOk="addFormOk"></community-form>
+        </el-dialog>
+
+        <!-- <el-dialog title="导出"
                :visible.sync="dialogVisible"
                width="30%"
                :before-close="handleClose">
@@ -337,28 +220,18 @@
 
     </el-dialog> -->
 
-    <el-dialog :visible.sync="diyDialog"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               width="1150px"
-               title="导出模板"
-               top="5vh"
-               class="dialog-h">
-      <community-export-info v-if="diyDialog"
-                             ref="ref_diy"
-                             :list="exportList"
-                             :search="{
-        formCode: 'community_info',
-        pageNo: pageNo,
-        pageSize: pageSize,
-        conditions:queryConditions
-      }"
-                             :orgId="treeObj.id"
-                             @close="handleDiyClose"></community-export-info>
-    </el-dialog>
-
-    <baobiao ref="baobiao" />
-  </div>
+        <el-dialog :visible.sync="diyDialog" :close-on-click-modal="false" :close-on-press-escape="false" width="1150px"
+            title="导出模板" top="5vh" class="dialog-h">
+            <community-export-info v-if="diyDialog" ref="ref_diy" :list="exportList" :search="{
+                formCode: 'community_info',
+                pageNo: pageNo,
+                pageSize: pageSize,
+                conditions: queryConditions
+            }" :orgId="treeObj.id" @close="handleDiyClose"></community-export-info>
+        </el-dialog>
+
+        <baobiao ref="baobiao" />
+    </div>
 </template>
 
 <script>
@@ -376,836 +249,832 @@ import util from "@/js/util";
 let loading; // 加载动画
 
 export default {
-  props: {
-    staffAgencyId: {
-      type: String,
-      default: "",
-    },
-    ownerName: {
-      type: String,
-      default: "",
-    },
-    ownerPhone: {
-      type: String,
-      default: "",
-    },
-    rentFlag: {
-      type: String,
-      default: "",
-    },
-    purpose: {
-      type: String,
-      default: "",
-    },
-    remark: {
-      type: String,
-      default: "",
-    },
-    updateStartDate: {
-      type: String,
-      default: "",
-    },
-    updateEndDate: {
-      type: String,
-      default: "",
-    },
-  },
-
-  data () {
-    return {
-      searchHeight: 190, //搜索栏高度
-      // tableHeight: 0,
-      importBuildingLoading: false,
-      importRoomLoading: false,
-      importCommunityLoading: false,
-      total: 0,
-      pageSize: 20,
-      pageNo: 0,
-      tableLoading: true,
-
-      showImportBtn: false, //是否显示操作按钮，根据登录人所属组织判断
-      roleList: [], //角色列表
-      showYhymInfo: false, // 是否显示补全一房一码信息按钮
-      yhymLoading: false,
-      xcxmLoading: false,
-
-      agencyObj: {}, //树所选的组织对象
-      treeObj: {},
-      tableData: [],
-      validTableDataNum: 0, //有效的数据数量，即有权限操作的数据数量
-      selection: [],
-      showDeletBtn: false,
-
-      //form相关
-      formShow: false,
-      formTitle: "新增小区",
-
-      detailShow: false,
-
-      files: "",
-      fileName: "",
-      uploadUlr:
-        window.SITE_CONFIG["apiURL"] + "/gov/org/neighborhood/import",
-      yihuyidangDisabled: false,
-      yihuyimaDisabled: false,
-      exportBtn: false,
-
-      displayedBaobiaoBtn: false,
-      customerId: "", //烟台的客户id :  1535072605621841922
-
-      //导出
-      exportList: [],
-      diyDialog: false,
-
-
-      queryConditions: [],
-    };
-  },
-
-  computed: {
-    tableHeight () {
-      console.log(this.searchHeight);
-      let height = this.searchHeight + 270;
-      return this.$store.state.inIframe
-        ? this.clientHeight - height + this.iframeHeight
-        : this.clientHeight - height;
+    props: {
+        staffAgencyId: {
+            type: String,
+            default: "",
+        },
+        ownerName: {
+            type: String,
+            default: "",
+        },
+        ownerPhone: {
+            type: String,
+            default: "",
+        },
+        rentFlag: {
+            type: String,
+            default: "",
+        },
+        purpose: {
+            type: String,
+            default: "",
+        },
+        remark: {
+            type: String,
+            default: "",
+        },
+        updateStartDate: {
+            type: String,
+            default: "",
+        },
+        updateEndDate: {
+            type: String,
+            default: "",
+        },
     },
 
-    ...mapGetters(["clientHeight", "iframeHeight"]),
-  },
-  watch: {
-    selection (val) {
-      if (val.length > 0) {
-        this.showDeletBtn = true;
-      } else {
-        this.showDeletBtn = false;
-      }
-    },
-    "$store.state.sidebarFold": {
-      handler (newVal, oldVal) {
-        if (newVal) {
-          //收起
-          this.searchHeight = 155;
-        } else {
-          this.searchHeight = 190;
-        }
-      },
-      deep: true,
-    },
-  },
-
-  components: {
-    baobiao,
-    CommunityForm,
-    CommunityDetail,
-    communityExportInfo,
-  },
-
-  activated () { },
-
-  async mounted () {
-    this.customerId = localStorage.getItem("customerId");
-    this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
-      elseParams: {
-        categoryKeys: ['house_info'], categoryKey: 'house_info',
-      }
-    });
-    this.getQueryConditions();
-  },
-
-  methods: {
-    async getQueryConditions () {
-      let params = {
-        formCode: "community_info",
-        customerId: this.$store.state.user.customerId,
-      };
-
-      const { data } = await this.$http.post(
-        "/oper/customize/icform/queryItems",
-        params
-      );
-
-      if (data.code === 0) {
-        this.queryConditions = data.data.map((item) => {
-          return {
-            ...item,
-            humpName: util.capitalToHump(item.columnName),
-          };
-        });
-        console.log(this.queryConditions);
-      } else {
-        this.$message.error(data.msg);
-      }
+    data() {
+        return {
+            searchHeight: 190, //搜索栏高度
+            // tableHeight: 0,
+            importBuildingLoading: false,
+            importRoomLoading: false,
+            importCommunityLoading: false,
+            total: 0,
+            pageSize: 20,
+            pageNo: 0,
+            tableLoading: true,
+
+            showImportBtn: false, //是否显示操作按钮，根据登录人所属组织判断
+            roleList: [], //角色列表
+            showYhymInfo: false, // 是否显示补全一房一码信息按钮
+            yhymLoading: false,
+            xcxmLoading: false,
+
+            agencyObj: {}, //树所选的组织对象
+            treeObj: {},
+            tableData: [],
+            validTableDataNum: 0, //有效的数据数量，即有权限操作的数据数量
+            selection: [],
+            showDeletBtn: false,
+
+            //form相关
+            formShow: false,
+            formTitle: "新增小区",
+
+            detailShow: false,
+
+            files: "",
+            fileName: "",
+            uploadUlr:
+                window.SITE_CONFIG["apiURL"] + "/gov/org/neighborhood/import",
+            yihuyidangDisabled: false,
+            yihuyimaDisabled: false,
+            exportBtn: false,
+
+            displayedBaobiaoBtn: false,
+            customerId: "", //烟台的客户id :  1535072605621841922
+
+            //导出
+            exportList: [],
+            diyDialog: false,
+
+
+            queryConditions: [],
+        };
     },
 
-    reportForm () {
-      let paramMap = {
-        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,
-        updateStartDate: this.updateStartDate,
-        updateEndDate: this.updateEndDate,
-      };
-      this.$refs.baobiao.init({
-        elseParams: {
-          categoryKeys: ["house_info"],
-          categoryKey: "house_info",
-          paramMap,
+    computed: {
+        tableHeight() {
+            console.log(this.searchHeight);
+            let height = this.searchHeight + 270;
+            return this.$store.state.inIframe
+                ? this.clientHeight - height + this.iframeHeight
+                : this.clientHeight - height;
         },
-      });
+
+        ...mapGetters(["clientHeight", "iframeHeight"]),
     },
-    async loadTable (fromTree, treeObj) {
-
-      this.treeObj = { ...treeObj }
-
-      // 是否显示补全一房一码信息按钮
-      this.roleList = localStorage.getItem("roleList");
-
-
-      if (
-        this.roleList.indexOf("root_manager") > -1 ||
-        this.roleList.indexOf("manager") > -1
-      ) {
-        this.showYhymInfo = true;
-      } else {
-        this.showYhymInfo = false;
-      }
-      this.tableLoading = true;
-      if (fromTree) {
-        this.agencyObj = treeObj;
-        if (this.agencyObj.level === "community") {
-          //只有社区和网格显示操作按钮
-          if (this.agencyObj.id === this.staffAgencyId) {
-            //如果所选树的组织id和登录人员id相同，有权限
-            this.showImportBtn = true;
-          } else {
-            this.showImportBtn = false;
-          }
-        } else if (this.agencyObj.level === "grid") {
-          //网格下
-          if (this.agencyObj.pid === this.staffAgencyId) {
-            //如果所选树的父级组织id和登录人员id相同，有权限
-            this.showImportBtn = true;
-          } else {
-            this.showImportBtn = false;
-          }
-        } else {
-          this.showImportBtn = false;
-        }
-      }
-
-      const url = "/actual/base/communityQuarters/listQuarters";
-
-      let params = {
-        pageSize: this.pageSize,
-        pageNo: this.pageNo,
-
-        level: this.agencyObj.level,
-        id: this.agencyObj.id,
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        this.validTableDataNum = 0;
-        this.total = data.total;
-        data.list.forEach((item) => {
-          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;
+    watch: {
+        selection(val) {
+            if (val.length > 0) {
+                this.showDeletBtn = true;
+            } else {
+                this.showDeletBtn = false;
+            }
+        },
+        "$store.state.sidebarFold": {
+            handler(newVal, oldVal) {
+                if (newVal) {
+                    //收起
+                    this.searchHeight = 155;
+                } else {
+                    this.searchHeight = 190;
+                }
+            },
+            deep: true,
+        },
     },
 
-    checkSelect (row, index) {
-      let isChecked = true;
-      // if (row.showBtn) {
-      //   // 判断里面是否存在某个参数
-      //   isChecked = true;
-      // } else {
-      //   isChecked = false;
-      // }
-      return isChecked;
+    components: {
+        baobiao,
+        CommunityForm,
+        CommunityDetail,
+        communityExportInfo,
     },
 
-    diaClose () {
-      this.$refs.ref_form.resetData();
-      this.formShow = false;
+    activated() { },
+
+    async mounted() {
+        this.customerId = localStorage.getItem("customerId");
+        this.displayedBaobiaoBtn = await this.$refs.baobiao.existsTemplate({
+            elseParams: {
+                categoryKeys: ['house_info'], categoryKey: 'house_info',
+            }
+        });
+        this.getQueryConditions();
     },
 
-    async handleDetail (row) {
-      // this.formTitle = '小区详情'
-      // this.formShow = true
-      // const _data = await this.detail(row)
-      // this.$nextTick(() => {
-      //   this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
-      // })
+    methods: {
+        async getQueryConditions() {
+            let params = {
+                formCode: "community_info",
+                customerId: this.$store.state.user.customerId,
+            };
+
+            const { data } = await this.$http.post(
+                "/oper/customize/icform/queryItems",
+                params
+            );
+
+            if (data.code === 0) {
+                this.queryConditions = data.data.map((item) => {
+                    return {
+                        ...item,
+                        humpName: util.capitalToHump(item.columnName),
+                    };
+                });
+                console.log(this.queryConditions);
+            } else {
+                this.$message.error(data.msg);
+            }
+        },
 
-      this.detailShow = true;
+        reportForm() {
+            let paramMap = {
+                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,
+                updateStartDate: this.updateStartDate,
+                updateEndDate: this.updateEndDate,
+            };
+            this.$refs.baobiao.init({
+                elseParams: {
+                    categoryKeys: ["house_info"],
+                    categoryKey: "house_info",
+                    paramMap,
+                },
+            });
+        },
+        async loadTable(fromTree, treeObj) {
+            this.treeObj = { ...treeObj }
+            // 是否显示补全一房一码信息按钮
+            this.roleList = localStorage.getItem("roleList");
+            if (
+                this.roleList.indexOf("root_manager") > -1 ||
+                this.roleList.indexOf("manager") > -1
+            ) {
+                this.showYhymInfo = true;
+            } else {
+                this.showYhymInfo = false;
+            }
+            this.tableLoading = true;
+            if (fromTree) {
+                this.agencyObj = treeObj;
+                if (this.agencyObj.level === "community") {
+                    //只有社区和网格显示操作按钮
+                    if (this.agencyObj.id === this.staffAgencyId) {
+                        //如果所选树的组织id和登录人员id相同，有权限
+                        this.showImportBtn = true;
+                    } else {
+                        this.showImportBtn = false;
+                    }
+                } else if (this.agencyObj.level === "grid") {
+                    //网格下
+                    if (this.agencyObj.pid === this.staffAgencyId) {
+                        //如果所选树的父级组织id和登录人员id相同，有权限
+                        this.showImportBtn = true;
+                    } else {
+                        this.showImportBtn = false;
+                    }
+                } else {
+                    this.showImportBtn = false;
+                }
+            }
 
-      const _data = await this.detail(row);
-      this.$nextTick(() => {
-        this.$refs.ref_form_detail.initForm(_data);
-      });
-    },
+            const url = "/actual/base/communityQuarters/listQuarters";
+
+            let params = {
+                pageSize: this.pageSize,
+                pageNo: this.pageNo,
+
+                level: this.agencyObj.level,
+                id: this.agencyObj.id,
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.validTableDataNum = 0;
+                this.total = data.total;
+                data.list.forEach((item) => {
+                    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;
+        },
 
-    handleAdd () {
-      this.formTitle = "新增小区";
-      this.formShow = true;
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm("add", null, this.agencyObj);
-      });
-    },
-    async detail (row) {
-      const url =
-        "/actual/base/communityQuarters/getQuartersDetail/" +
-        row.neighborHoodId;
-
-      const { data, code, msg } = await requestPost(url);
-
-      if (code === 0) {
-        return data;
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    // 补全一房一码点击事件
-    async handleYhymInfo () {
-      this.yhymLoading = true;
-      const url = "/gov/org/house/createBatchHouseCodeAndUrl";
+        checkSelect(row, index) {
+            let isChecked = true;
+            // if (row.showBtn) {
+            //   // 判断里面是否存在某个参数
+            //   isChecked = true;
+            // } else {
+            //   isChecked = false;
+            // }
+            return isChecked;
+        },
 
-      let params = {};
+        diaClose() {
+            this.$refs.ref_form.resetData();
+            this.formShow = false;
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
+        async handleDetail(row) {
+            // this.formTitle = '小区详情'
+            // this.formShow = true
+            // const _data = await this.detail(row)
+            // this.$nextTick(() => {
+            //   this.$refs.ref_form.initForm('detail', _data, this.agencyObj)
+            // })
 
-      if (code === 0) {
-        this.yhymLoading = false;
-        this.$message({
-          type: "success",
-          message: "批量生成成功",
-        });
-      } else if (code > 8000) {
-        this.yhymLoading = false;
-        this.$message({
-          showClose: true,
-          message: msg,
-          duration: 0,
-        });
-      } else {
-        this.yhymLoading = false;
-        this.$message.error(msg);
-      }
-    },
-    // 补全小程序一户一码
-    async createBatchNeiQrUrl () {
-      this.xcxmLoading = true;
-      const url = "/gov/org/neighborhood/createBatchNeiQrUrl";
+            this.detailShow = true;
 
-      let params = {};
+            const _data = await this.detail(row);
+            this.$nextTick(() => {
+                this.$refs.ref_form_detail.initForm(_data);
+            });
+        },
 
-      const { data, code, msg } = await requestPost(url, params);
+        handleAdd() {
+            this.formTitle = "新增小区";
+            this.formShow = true;
+            this.$nextTick(() => {
+                this.$refs.ref_form.initForm("add", null, this.agencyObj);
+            });
+        },
+        async detail(row) {
+            const url =
+                "/actual/base/communityQuarters/getQuartersDetail/" +
+                row.neighborHoodId;
 
-      if (code === 0) {
-        this.xcxmLoading = false;
-        this.$message({
-          type: "success",
-          message: "批量生成成功",
-        });
-      } else if (code > 8000) {
-        this.xcxmLoading = false;
-        this.$message({
-          showClose: true,
-          message: msg,
-          duration: 0,
-        });
-      } else {
-        this.xcxmLoading = false;
-        this.$message.error(msg);
-      }
-    },
-    async handleEdit (row) {
-      this.formTitle = "修改小区";
-      this.formShow = true;
-      const _data = await this.detail(row);
-      this.$nextTick(() => {
-        this.$refs.ref_form.initForm("edit", _data, this.agencyObj);
-      });
-    },
+            const { data, code, msg } = await requestPost(url);
 
-    handleToNextLevel (row) {
-      this.$emit("toNextLevel", row, "community");
-    },
+            if (code === 0) {
+                return data;
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        // 补全一房一码点击事件
+        async handleYhymInfo() {
+            this.yhymLoading = true;
+            const url = "/gov/org/house/createBatchHouseCodeAndUrl";
+
+            let params = {};
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.yhymLoading = false;
+                this.$message({
+                    type: "success",
+                    message: "批量生成成功",
+                });
+            } else if (code > 8000) {
+                this.yhymLoading = false;
+                this.$message({
+                    showClose: true,
+                    message: msg,
+                    duration: 0,
+                });
+            } else {
+                this.yhymLoading = false;
+                this.$message.error(msg);
+            }
+        },
+        // 补全小程序一户一码
+        async createBatchNeiQrUrl() {
+            this.xcxmLoading = true;
+            const url = "/gov/org/neighborhood/createBatchNeiQrUrl";
+
+            let params = {};
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                this.xcxmLoading = false;
+                this.$message({
+                    type: "success",
+                    message: "批量生成成功",
+                });
+            } else if (code > 8000) {
+                this.xcxmLoading = false;
+                this.$message({
+                    showClose: true,
+                    message: msg,
+                    duration: 0,
+                });
+            } else {
+                this.xcxmLoading = false;
+                this.$message.error(msg);
+            }
+        },
+        async handleEdit(row) {
+            this.formTitle = "修改小区";
+            this.formShow = true;
+            const _data = await this.detail(row);
+            this.$nextTick(() => {
+                this.$refs.ref_form.initForm("edit", _data, this.agencyObj);
+            });
+        },
 
-    addFormCancle () {
-      this.formShow = false;
-    },
-    detailFormCancle () {
-      this.$refs.ref_form_detail.diaDestroy();
-      this.detailShow = false;
-    },
-    addFormOk () {
-      this.formShow = false;
-      this.loadTable();
-      this.$emit("refreshTree");
-    },
+        handleToNextLevel(row) {
+            this.$emit("toNextLevel", row, "community");
+        },
 
+        addFormCancle() {
+            this.formShow = false;
+        },
+        detailFormCancle() {
+            this.$refs.ref_form_detail.diaDestroy();
+            this.detailShow = false;
+        },
+        addFormOk() {
+            this.formShow = false;
+            this.loadTable();
+            this.$emit("refreshTree");
+        },
 
-    selectAll (selection) {
-      this.selection = selection;
-    },
-    selectionChange (selection) {
-      this.selection = selection;
-    },
 
-    async handleDelete (row) {
-      this.$confirm("确认删除?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          let ids = [row.neighborHoodId];
-
-          //第一次删除，非强制删除
-          this.deleteCommunity(ids, false);
-        })
-        .catch((err) => {
-          if (err == "cancel") {
-
-          }
-        });
-    },
-    deleteBatch () {
-      if (this.selection.length > 0) {
-        this.$confirm("确认删除选择的小区?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
-
-            let ids = [];
-            console.log(this.selection);
-            this.selection.forEach((element) => {
-              ids.push(element.neighborHoodId);
-            });
+        selectAll(selection) {
+            this.selection = selection;
+        },
+        selectionChange(selection) {
+            this.selection = selection;
+        },
 
-            //第一次删除，非强制删除
-            this.deleteCommunity(ids, false);
-          })
-          .catch((err) => {
-            if (err == "cancel") {
-              // this.$message({
-              //   type: "info",
-              //   message: "已取消删除"
-              // });
+        async handleDelete(row) {
+            this.$confirm("确认删除?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    let ids = [row.neighborHoodId];
+
+                    //第一次删除，非强制删除
+                    this.deleteCommunity(ids, false);
+                })
+                .catch((err) => {
+                    if (err == "cancel") {
+
+                    }
+                });
+        },
+        deleteBatch() {
+            if (this.selection.length > 0) {
+                this.$confirm("确认删除选择的小区?", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
+
+                        let ids = [];
+                        console.log(this.selection);
+                        this.selection.forEach((element) => {
+                            ids.push(element.neighborHoodId);
+                        });
+
+                        //第一次删除，非强制删除
+                        this.deleteCommunity(ids, false);
+                    })
+                    .catch((err) => {
+                        if (err == "cancel") {
+                            // this.$message({
+                            //   type: "info",
+                            //   message: "已取消删除"
+                            // });
+                        }
+                    });
+            } else {
+                this.$message.warning("请先选择要删除的小区");
             }
-          });
-      } else {
-        this.$message.warning("请先选择要删除的小区");
-      }
-    },
+        },
 
-    async deleteCommunity (ids, forceDelete) {
-      const url = "/actual/base/communityHouse/deleteCommunityInfoByIds";
-      let params = {
-        forceDelete: forceDelete,
-        type: 'neighborHood',
-        ids: ids
-      }
+        async deleteCommunity(ids, forceDelete) {
+            const url = "/actual/base/communityHouse/deleteCommunityInfoByIds";
+            let params = {
+                forceDelete: forceDelete,
+                type: 'neighborHood',
+                ids: ids
+            }
 
-      const { data, code, msg } = await requestPost(url, params);
+            const { data, code, msg } = await requestPost(url, params);
 
-      if (code === 0) {
-        this.$message({
-          type: "success",
-          message: "删除成功",
-        });
-        this.$emit("refreshTree");
-        this.loadTable();
+            if (code === 0) {
+                this.$message({
+                    type: "success",
+                    message: "删除成功",
+                });
+                this.$emit("refreshTree");
+                this.loadTable();
 
-      } else if (code > 8000) {
+            } else if (code > 8000) {
 
-        this.$confirm(msg, "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        })
-          .then(() => {
+                this.$confirm(msg, "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                })
+                    .then(() => {
 
-            this.deleteCommunity(ids, true);
-          })
-          .catch((err) => {
-            if (err == "cancel") {
+                        this.deleteCommunity(ids, true);
+                    })
+                    .catch((err) => {
+                        if (err == "cancel") {
 
-            }
-          });
+                        }
+                    });
 
 
-      } else {
-        this.$message.error(msg);
-      }
-    },
+            } else {
+                this.$message.error(msg);
+            }
+        },
 
-    async handleDownQr (row, type) {
-      let title = row.label + "二维码.png";
-      // const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
-      const url = "/gov/org/agency/create-qrcode";
-      const _id = type == "community" ? row.id : row.neighborHoodId;
-      const params = {
-        id: _id,
-        type,
-      };
-      await axios({
-        method: "POST",
-        url: window.SITE_CONFIG["apiURL"] + url,
-        data: params,
-        responseType: "blob",
-      }).then((res) => {
-        console.log("res----1r", res);
-        if (res.data) {
-          // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
-          // console.log('filename', fileName)
-          this.download(res.data, title); //释放掉blob对象
-        } else this.$message.error("下载失败");
-        // this.download(res.data, '1.png')
-      });
-    },
-    // 导出按钮点击事件
-    async handleExportOpen () {
-      await this.getExportList();
-    },
-    async getExportList (type) {
-      const url = "/oper/customize/icformitemgroup/list";
-      let params = {
-        formCode: "community_info",
-      };
-
-      const { data, code, msg } = await requestPost(url, params);
-
-      if (code === 0) {
-        data.forEach((item) => {
-          (async (id) => {
-            // item.queryItemList = await this.getExportChildList(id)
-            item.queryItemList = [];
-          })(item.id);
-        });
-        this.exportList = [...data];
-        this.$nextTick(() => {
-          this.diyDialog = true;
-        });
-        console.log("获取详情成功getExportList----", this.exportList);
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    //导出表格 以前是导出 现在改成导出房屋数据
-    async handleExport () {
-      let title = this.agencyObj.label;
-      title = title + "—小区列表";
-
-      const url = "/gov/org/neighborhood/exportneighborhoodinfo";
-      let params = {
-        level: this.agencyObj.level,
-        id: this.agencyObj.id,
-      };
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-          this.download(data, title + ".xls");
+        async handleDownQr(row, type) {
+            let title = row.label + "二维码.png";
+            // const url = window.SITE_CONFIG['apiURL'] + `/gov/org/icneighborhood/createQrCode/${row.neighborHoodId}`
+            const url = "/gov/org/agency/create-qrcode";
+            const _id = type == "community" ? row.id : row.neighborHoodId;
+            const params = {
+                id: _id,
+                type,
+            };
+            await axios({
+                method: "POST",
+                url: window.SITE_CONFIG["apiURL"] + url,
+                data: params,
+                responseType: "blob",
+            }).then((res) => {
+                console.log("res----1r", res);
+                if (res.data) {
+                    // let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+                    // console.log('filename', fileName)
+                    this.download(res.data, title); //释放掉blob对象
+                } else this.$message.error("下载失败");
+                // this.download(res.data, '1.png')
+            });
+        },
+        // 导出按钮点击事件
+        async handleExportOpen() {
+            await this.getExportList();
+        },
+        async getExportList(type) {
+            const url = "/oper/customize/icformitemgroup/list";
+            let params = {
+                formCode: "community_info",
+            };
+
+            const { data, code, msg } = await requestPost(url, params);
+
+            if (code === 0) {
+                data.forEach((item) => {
+                    (async (id) => {
+                        // item.queryItemList = await this.getExportChildList(id)
+                        item.queryItemList = [];
+                    })(item.id);
+                });
+                this.exportList = [...data];
+                this.$nextTick(() => {
+                    this.diyDialog = true;
+                });
+                console.log("获取详情成功getExportList----", this.exportList);
+            } else {
+                this.$message.error(msg);
+            }
+        },
+        //导出表格 以前是导出 现在改成导出房屋数据
+        async handleExport() {
+            let title = this.agencyObj.label;
+            title = title + "—小区列表";
+
+            const url = "/gov/org/neighborhood/exportneighborhoodinfo";
+            let params = {
+                level: this.agencyObj.level,
+                id: this.agencyObj.id,
+            };
+
+            app.ajax.exportFilePost(
+                url,
+                params,
+                (data, rspMsg) => {
+                    this.download(data, title + ".xls");
+                },
+                (rspMsg, data) => {
+                    this.$message.error(rspMsg);
+                }
+            );
+        },
+        handleDiyClose() {
+            this.diyDialog = false;
+        },
+        handleClose(done) {
+            this.diyDialog = false;
         },
-        (rspMsg, data) => {
-          this.$message.error(rspMsg);
-        }
-      );
-    },
-    handleDiyClose () {
-      this.diyDialog = false;
-    },
-    handleClose (done) {
-      this.diyDialog = false;
-    },
 
-    // 下载文件
-    download (data, downFileName) {
-      if (!data) {
-        return;
-      }
-
-      var csvData = new Blob([data]);
-
-      if (window.navigator && window.navigator.msSaveOrOpenBlob) {
-        window.navigator.msSaveOrOpenBlob(csvData, downFileName);
-      }
-      // 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 = downFileName;
-        a.click();
-        a.remove();
-        window.URL.revokeObjectURL(url);
-      }
-    },
+        // 下载文件
+        download(data, downFileName) {
+            if (!data) {
+                return;
+            }
+
+            var csvData = new Blob([data]);
 
-    handleExportModule (type) {
-      let title = "";
-      let url = "";
-      if (type === "community") {
-        title = "小区导入模板";
-        url = "/gov/org/neighborhood/exporttemplate";
-      } else if (type === "building") {
-        title = "楼栋导入模板";
-        url = "/gov/org/building/exporttemplate";
-      } else if (type === "room") {
-        title = "房屋导入模板";
-        url = "/gov/org/house/exporttemplate";
-      }
-
-      let params = {};
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-          this.download(data, title + ".xls");
+            if (window.navigator && window.navigator.msSaveOrOpenBlob) {
+                window.navigator.msSaveOrOpenBlob(csvData, downFileName);
+            }
+            // 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 = downFileName;
+                a.click();
+                a.remove();
+                window.URL.revokeObjectURL(url);
+            }
         },
-        (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,
-        updateStartDate: this.updateStartDate,
-        updateEndDate: this.updateEndDate,
-      };
-
-      if (this.agencyObj.level === "grid") {
-        params.gridId = this.agencyObj.id;
-        params.agencyId = "";
-      } else {
-        params.gridId = "";
-        params.agencyId = this.agencyObj.id;
-      }
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-          this.download(data, title + ".xls");
-          this.yihuyidangDisabled = false;
+        handleExportModule(type) {
+            let title = "";
+            let url = "";
+            if (type === "community") {
+                title = "小区导入模板";
+                url = "/gov/org/neighborhood/exporttemplate";
+            } else if (type === "building") {
+                title = "楼栋导入模板";
+                url = "/gov/org/building/exporttemplate";
+            } else if (type === "room") {
+                title = "房屋导入模板";
+                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);
+                }
+            );
         },
-        (rspMsg, data) => {
-          this.yihuyidangDisabled = false;
-          this.$message.error(rspMsg);
-        }
-      );
-    },
 
-    // 导出一房一码
-
-    handleExportYihuyima () {
-      this.exportBtn = true;
-      this.yihuyimaDisabled = true;
-      let title = this.agencyObj.label;
-      title = title + "-一房一码";
-      let url = "/gov/org/house/downloadZip";
-
-      let params = {
-        level: this.agencyObj.level,
-        id: this.agencyObj.id,
-      };
-
-      app.ajax.exportFilePost(
-        url,
-        params,
-        (data, rspMsg) => {
-          this.download(data, title + ".Zip");
-          this.exportBtn = false;
-          this.yihuyimaDisabled = false;
+        //导出一户一档
+        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,
+                updateStartDate: this.updateStartDate,
+                updateEndDate: this.updateEndDate,
+            };
+
+            if (this.agencyObj.level === "grid") {
+                params.gridId = this.agencyObj.id;
+                params.agencyId = "";
+            } else {
+                params.gridId = "";
+                params.agencyId = this.agencyObj.id;
+            }
+
+            app.ajax.exportFilePost(
+                url,
+                params,
+                (data, rspMsg) => {
+                    this.download(data, title + ".xls");
+                    this.yihuyidangDisabled = false;
+                },
+                (rspMsg, data) => {
+                    this.yihuyidangDisabled = false;
+                    this.$message.error(rspMsg);
+                }
+            );
         },
-        (rspMsg, data) => {
-          this.exportBtn = false;
-          this.yihuyimaDisabled = false;
-          this.$message.error(rspMsg);
-        }
-      );
-    },
 
-    // 上传文件之前的钩子
-    beforeUpload (file, type) {
-      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("请选择正确格式的文件");
-        this.files = null;
-        this.fileName = "";
-        return false;
-      } else {
-        this.fileName = file.name;
-        return true;
-      }
-    },
-    // 上传文件个数超过定义的数量
-    handleExceed (files, fileList) {
-      this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
-    },
+        // 导出一房一码
+
+        handleExportYihuyima() {
+            this.exportBtn = true;
+            this.yihuyimaDisabled = true;
+            let title = this.agencyObj.label;
+            title = title + "-一房一码";
+            let url = "/gov/org/house/downloadZip";
+
+            let params = {
+                level: this.agencyObj.level,
+                id: this.agencyObj.id,
+            };
+
+            app.ajax.exportFilePost(
+                url,
+                params,
+                (data, rspMsg) => {
+                    this.download(data, title + ".Zip");
+                    this.exportBtn = false;
+                    this.yihuyimaDisabled = false;
+                },
+                (rspMsg, data) => {
+                    this.exportBtn = false;
+                    this.yihuyimaDisabled = false;
+                    this.$message.error(rspMsg);
+                }
+            );
+        },
 
-    async uploadFile (type) {
-      if (this.fileName == "") {
-        this.$message.warning("请选择要上传的文件！");
-        return false;
-      }
-
-      this.$message({
-        showClose: true,
-        dangerouslyUseHTMLString: true,
-        message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
-        duration: 3000,
-      });
-      let than = this
-      document.getElementById('clickA').addEventListener('click', function () {
-        than.$router.replace('/main/importRecord-index');
-      })
-      //清空上传列表
-      let url = "";
-
-      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 === "grid" ? "grid" : "agency"
-      ); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
-
-      if (type === "community") {
-        this.importCommunityLoading = true;
-        this.$refs["upload_community"].clearFiles();
-        url = "/actual/base/communityQuarters/neighborhoodimport";
-      } else if (type === "building") {
-        this.$refs["upload_building"].clearFiles();
-        url = "/actual/base/communityBuilding/buildingimport";
-        this.importBuildingLoading = true;
-      } else if (type === "room") {
-        this.$refs["upload_room"].clearFiles();
-        url = "/actual/base/communityHouse/houseimport";
-        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.showMessage(rspMsg)
-          if (type === "community") {
-            this.importCommunityLoading = false;
-          } else if (type === "building") {
-            this.importBuildingLoading = false;
-          } else if (type === "room") {
-            this.importRoomLoading = false;
-          }
+        // 上传文件之前的钩子
+        beforeUpload(file, type) {
+            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("请选择正确格式的文件");
+                this.files = null;
+                this.fileName = "";
+                return false;
+            } else {
+                this.fileName = file.name;
+                return true;
+            }
         },
-        (rspMsg, data) => {
-          if (type === "community") {
-            this.importCommunityLoading = false;
-          } else if (type === "building") {
-            this.importBuildingLoading = false;
-          } else if (type === "room") {
-            this.importRoomLoading = false;
-          }
-          // this.$message.error(rspMsg)
+        // 上传文件个数超过定义的数量
+        handleExceed(files, fileList) {
+            this.$message.warning(`当前限制选择 1 个文件，请删除后继续上传`);
         },
-        { headers: { "Content-Type": "multipart/form-data" } }
-      );
-    },
 
-    showMessage (msg) {
-      this.$alert(msg, "操作结果", {
-        confirmButtonText: "关闭",
-        callback: (action) => {
-          this.$emit("refreshTree");
-          this.loadTable();
+        async uploadFile(type) {
+            if (this.fileName == "") {
+                this.$message.warning("请选择要上传的文件！");
+                return false;
+            }
+
+            this.$message({
+                showClose: true,
+                dangerouslyUseHTMLString: true,
+                message: "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+                duration: 3000,
+            });
+            let than = this
+            document.getElementById('clickA').addEventListener('click', function () {
+                than.$router.replace('/main/importRecord-index');
+            })
+            //清空上传列表
+            let url = "";
+
+            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 === "grid" ? "grid" : "agency"
+            ); //filename是键，file是值，就是要传的文件，test.zip是要传的文件名
+
+            if (type === "community") {
+                this.importCommunityLoading = true;
+                this.$refs["upload_community"].clearFiles();
+                url = "/actual/base/communityQuarters/neighborhoodimport";
+            } else if (type === "building") {
+                this.$refs["upload_building"].clearFiles();
+                url = "/actual/base/communityBuilding/buildingimport";
+                this.importBuildingLoading = true;
+            } else if (type === "room") {
+                this.$refs["upload_room"].clearFiles();
+                url = "/actual/base/communityHouse/houseimport";
+                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.showMessage(rspMsg)
+                    if (type === "community") {
+                        this.importCommunityLoading = false;
+                    } else if (type === "building") {
+                        this.importBuildingLoading = false;
+                    } else if (type === "room") {
+                        this.importRoomLoading = false;
+                    }
+                },
+                (rspMsg, data) => {
+                    if (type === "community") {
+                        this.importCommunityLoading = false;
+                    } else if (type === "building") {
+                        this.importBuildingLoading = false;
+                    } else if (type === "room") {
+                        this.importRoomLoading = false;
+                    }
+                    // this.$message.error(rspMsg)
+                },
+                { headers: { "Content-Type": "multipart/form-data" } }
+            );
         },
-      });
-    },
-    handleSizeChange (val) {
-      this.pageSize = val;
-      this.pageNo = 1;
-      this.loadTable(this.treeObj);
-    },
-    handleCurrentChange (val) {
-      this.pageNo = val;
-      this.loadTable(this.treeObj);
-    },
 
-    // 开启加载动画
-    startLoading () {
-      loading = Loading.service({
-        lock: true, // 是否锁定
-        text: "正在加载……", // 加载中需要显示的文字
-        background: "rgba(0,0,0,.7)", // 背景颜色
-      });
-    },
-    // 结束加载动画
-    endLoading () {
-      // clearTimeout(timer);
-      if (loading) {
-        loading.close();
-      }
+        showMessage(msg) {
+            this.$alert(msg, "操作结果", {
+                confirmButtonText: "关闭",
+                callback: (action) => {
+                    this.$emit("refreshTree");
+                    this.loadTable();
+                },
+            });
+        },
+        handleSizeChange(val) {
+            this.pageSize = val;
+            this.pageNo = 1;
+            this.loadTable(true, this.treeObj);
+        },
+        handleCurrentChange(val) {
+            this.pageNo = val;
+            this.loadTable(true, this.treeObj);
+        },
+
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: "正在加载……", // 加载中需要显示的文字
+                background: "rgba(0,0,0,.7)", // 背景颜色
+            });
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close();
+            }
+        },
     },
-  },
 };
 </script>
 <style lang="scss" scoped>
@@ -1215,10 +1084,10 @@ export default {
 
 <style>
 .el-message.is-closable .el-message__content {
-  line-height: 20px;
+    line-height: 20px;
 }
 
 ::v-deep .el-dialog__body {
-  padding: 0;
+    padding: 0;
 }
 </style>