From 8a2071f343c761884a47e0a69f87e9cc5ac494c5 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 3 Jan 2023 10:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 .../base/community/communityExportInfo.vue    | 818 ++++++++++++++++++
 .../modules/base/community/communityForm.vue  |   3 +-
 .../modules/base/community/communityTable.vue | 120 ++-
 4 files changed, 926 insertions(+), 19 deletions(-)
 create mode 100644 src/views/modules/base/community/communityExportInfo.vue

diff --git a/.env.development b/.env.development
index 18b9ba277..c26b481d7 100644
--- a/.env.development
+++ b/.env.development
@@ -9,7 +9,7 @@ VUE_APP_API_SERVER =  http://192.168.1.140/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn:41080/api
 # VUE_APP_API_SERVER =  https://epmet-dev.elinkservice.cn/api
 
-VUE_APP_NODE_ENV=dev_sdtdt
-# VUE_APP_NODE_ENV=dev
+# VUE_APP_NODE_ENV=dev_sdtdt
+VUE_APP_NODE_ENV=dev
 #项目根路径
 VUE_APP_PUBLIC_PATH=epmet-oper
\ No newline at end of file
diff --git a/src/views/modules/base/community/communityExportInfo.vue b/src/views/modules/base/community/communityExportInfo.vue
new file mode 100644
index 000000000..709dd6253
--- /dev/null
+++ b/src/views/modules/base/community/communityExportInfo.vue
@@ -0,0 +1,818 @@
+<template>
+  <div v-if="list.length > 0"
+       class="diy-container">
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="自定义模板"
+                   name="first">
+        <div class="diy-wr">
+          <div class="left">
+            <el-tabs v-model="leftActive"
+                     tab-position="left"
+                     class="left-h"
+                     @tab-click="handleTabsClick">
+              <el-tab-pane v-for="item in leftList"
+                           :key="item.id"
+                           :label="item.label"
+                           :name="item.id">
+                <div class="pd10 check-boxwr scroll-h">
+                  <checkBox v-if="item.queryItemList.length > 0"
+                            :ref="'checkbox' + item.id"
+                            :list="item.queryItemList"
+                            @change="handleChangeBox" />
+                </div>
+              </el-tab-pane>
+
+            </el-tabs>
+          </div>
+          <div class="right">
+            <div class="right-header">
+              <div class="title">导出信息</div>
+              <el-button plain
+                         @click="handlePreview('')">预览</el-button>
+            </div>
+            <div class="h80 scroll-h">
+              <el-collapse v-model="activeCollapse"
+                           id="collapsWr">
+                <el-collapse-item v-for="item in rightList"
+                                  :key="item.id"
+                                  :title="item.label"
+                                  :name="item.id"
+                                  class="col-h">
+                  <dragItem :ref="'drag' + item.id"
+                            :list="item.queryItemList"
+                            :id="item.id"
+                            @del="handleDelItem"
+                            @drag="handleDrag($event, item)"></dragItem>
+                </el-collapse-item>
+              </el-collapse>
+            </div>
+          </div>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="模板列表"
+                   name="second">
+        <el-table :data="tableData"
+                  height="calc(80vh - 140px)"
+                  style="width: 100%">
+          <el-table-column type="index"
+                           label="序号"
+                           align="center"
+                           width="50">
+          </el-table-column>
+          <el-table-column prop="name"
+                           label="模板名称"
+                           align="center"
+                           min-width="180">
+          </el-table-column>
+          <el-table-column prop="createdBy"
+                           align="center"
+                           label="创建者"
+                           width="180">
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="createdTime"
+                           label="创建时间"
+                           width="180">
+          </el-table-column>
+          <el-table-column align="center"
+                           label="操作"
+                           width="160">
+            <template slot-scope="scope">
+              <el-button v-if="scope.row.isSelf"
+                         type="text"
+                         size="small"
+                         class="div-table-button--delete"
+                         @click="handleDeltemplate(scope.row.id)">删除</el-button>
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--detail"
+                         @click="handlePreview(scope.row.id)">预览</el-button>
+              <el-button type="text"
+                         size="small"
+                         class="div-table-button--edit"
+                         @click="handleExportTemplate(scope.row.id)">导出</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+    <div v-if="activeName == 'first'"
+         class="diy-footer">
+      <div class="left">
+        <div class="flex-div">
+          <div>模板名称：</div>
+          <el-input v-model="form.name"
+                    maxlength="20"
+                    class="wd200 mr10" />
+          <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
+        </div>
+      </div>
+      <el-button class="diy-button--delete"
+                 :loading="exportLoading"
+                 @click="handleExport">导出</el-button>
+    </div>
+    <el-dialog :visible.sync="diyDialog"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               width="1150px"
+               append-to-body
+               top="5vh"
+               class="dialog-h"
+               @close="handleClose">
+      <div style="padding: 20px;">
+        <el-table :data="tableData"
+                  height="calc(80vh - 140px)"
+                  style="width: 100%">
+          <el-table-column v-for="(item, index) in previewList"
+                           :label="item.label"
+                           :key="index"
+                           align="center"
+                           min-width="120">
+            <el-table-column v-for="(n, i) in item.children"
+                             :label="n.label"
+                             :key="i"
+                             align="center"
+                             min-width="120">
+
+            </el-table-column>
+          </el-table-column>
+
+        </el-table>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import checkBox from '../../../components/checkBox.vue'
+import dragItem from '../../../components/dragItem.vue'
+import Sortable from 'sortablejs'
+import { requestPost } from "@/js/dai/request"
+export default {
+  props: {
+    list: {
+      type: Array,
+      default: () => []
+    },
+    search: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  components: {
+    checkBox,
+    dragItem
+  },
+  data () {
+    return {
+      exportLoading: false,
+      activeCollapse: ['1'],
+      activeName: 'first',
+      leftActive: '',
+      info: {},
+      rightList: [],
+      leftList: [],
+      form: {
+        isSaveTemp: false,
+        name: '',
+        itemList: []
+      },
+      tableData: [],
+      previewList: [],
+      diyDialog: false,
+    }
+  },
+  async created () {
+    this.list.forEach(item => {
+      this.$set(this.info, item.id, [])
+    })
+    this.leftActive = this.list[0].id
+    this.leftList = [...this.list]
+    this.leftList[0].queryItemList = await this.getExportChildList(this.leftList[0].id)
+    console.log('infodiy----', this.leftList)
+    this.getTemplateList()
+  },
+  watch: {
+    rightList: {
+      handler (val) {
+        if (val.length > 0) this.dragSort()
+
+      },
+      deep: true
+    },
+    // list: {
+    //   handler(val) {
+    //     if (val.length > 0) {
+    //       this.leftList = [...val]
+    //       this.leftList[0].queryItemList = this.getExportChildList(this.leftList[0].id)
+    //     }
+    //   },
+    //   deep: true,
+    //   // immediate: true
+    // },
+  },
+  methods: {
+    handleChangeBox ({ list, pid }) {
+      console.log('ccccc----', list)
+      // if (list.length == 0) return
+      let obj = {}
+      this.leftList.forEach(item => {
+        if (item.id == pid) obj = { ...item, queryItemList: [...list] }
+      })
+      const groups = this.rightList.map(item => item.id)
+      if (groups.includes(pid)) {
+        this.rightList.forEach((item, i) => {
+          if (item.id == pid) {
+            item.queryItemList = [...list]
+            if (list.length == 0) this.rightList.splice(i, 1)
+          }
+        })
+      } else {
+        this.rightList.push(obj)
+
+        this.$nextTick(() => {
+          console.log('itemttt------', this.$refs[`drag${pid}`])
+          this.$refs[`drag${pid}`][0].dragSort()
+        })
+      }
+      this.activeCollapse = [...this.activeCollapse, pid]
+    },
+    handleTabsClick (val) {
+      console.log('tabs-----', val)
+      this.leftList.forEach(async item => {
+        if (item.id == val.name) {
+          if (item.queryItemList.length == 0) item.queryItemList = await this.getExportChildList(item.id)
+        }
+      })
+    },
+    handleDelItem (val) {
+      const { item, index } = val
+      console.log('item------', item, this.$refs[`checkbox${item.itemGroupId}`])
+      let checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
+      checkList.forEach((n, i) => {
+        if (n == item.itemId) {
+          checkList.splice(i, 1)
+          this.$refs[`checkbox${item.itemGroupId}`][0].handleChange(checkList)
+        }
+      })
+      this.rightList.forEach((n, i) => {
+        if (n.id === item.itemGroupId) {
+          n.queryItemList.splice(index, 1)
+          if (n.queryItemList.length === 0) this.rightList.splice(i, 1)
+        }
+      })
+
+    },
+    dragSort () {
+      const el = document.getElementById('collapsWr')
+      this.sortTable = Sortable.create(el, {
+        group: 'el-collapse-item',
+        ghostClass: 'sortable-ghost', // Class name for the drop placeholder,
+        animation: 500,
+        delay: 0,
+        onEnd: evt => {
+          console.log('evt----', evt)
+          const targetRow = this.rightList.splice(evt.oldIndex, 1)[0]
+          this.rightList.splice(evt.newIndex, 0, targetRow)
+        }
+      })
+    },
+    handleDrag (val, item) {
+      console.log('drag-----', val)
+      console.log('drag-----', item)
+      this.rightList.forEach((n, i) => {
+        if (item.id == n.id) n.queryItemList = [...val]
+      })
+    },
+    handleClose () {
+      this.previewList = []
+      this.diyDialog = false
+    },
+    handleDeltemplate (id) {
+      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.delTemplate(id)
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      })
+    },
+    handlePreview (id) {
+      if (id) this.getPreview(id)
+      else {
+        if (this.rightList.length == 0) return this.$message.error('请选择导出信息')
+        this.previewList = this.rightList.map(item => {
+          return {
+            label: item.label,
+            children: item.queryItemList
+          }
+        })
+      }
+      this.diyDialog = true
+    },
+    handleExport () {
+      if (this.rightList.length === 0) return this.$message.error('请选择导出信息')
+      if (this.form.isSaveTemp && !this.form.name) return this.$message.error('请输入模板名称')
+      this.exportLoading = true
+      this.exportTemplate()
+
+    },
+    handleExportTemplate (id) {
+      this.exportTemplate(id)
+    },
+    async exportTemplate (id) {
+      let url = "/epmetuser/icresiuser/exportExcelCustom"
+
+      let params = {
+        templateId: id || '',
+        searchForm: { ...this.search },
+        exportConfig: {
+          ...this.form,
+          formCode: 'resi_base_info',
+          itemList: this.rightList.map(item => {
+            return {
+              itemId: item.id,
+              label: item.label,
+              tableName: item.queryItemList[0].tableName,
+              children: item.queryItemList,
+              supportAdd: item.supportAdd
+            }
+          })
+        }
+      }
+      await this.$http({
+        method: 'POST',
+        url,
+        responseType: 'blob',
+        data: params
+      })
+        .then(res => {
+          console.log('res----dddd', res)
+          // this.download(res.data, title + '.xls')
+          // this.getTemplateList()
+
+          this.exportLoading = false
+          // if (res.data.code && res.data.code == 9999) {
+          //   return this.$message.error(res.data.msg)
+          // }
+          this.formatData(res)
+
+        })
+        .catch(err => {
+          console.log('err', err)
+          this.exportLoading = false
+          return this.$message.error('网络错误')
+        })
+    },
+    async getTemplateList () {
+      let params = {
+        formCode: 'resi_base_info'
+      }
+      await this.$http
+        .post('/oper/customize/icExportTemplate/templateList', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.tableData = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getPreview (id) {
+      let params = {
+        id: id || ''
+      }
+      await this.$http
+        .post('/oper/customize/icExportTemplate/templateDetail', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.previewList = res.data
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async delTemplate (id) {
+      let params = [id]
+      await this.$http
+        .post('/oper/customize/icExportTemplate/delete', params)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.$message({
+              type: 'success',
+              message: '删除成功!'
+            });
+            this.getTemplateList()
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    async getExportChildList (groupId) {
+      const url = `/oper/customize/icformitem/getItemList/${groupId}`
+      let params = {}
+
+      const { data, code, msg } = await requestPost(url, params)
+
+      if (code === 0) {
+        let dataTemp = []
+
+        if (groupId === '45687aa479955f9d06204d415238f7cc_0') {
+          dataTemp = [
+            {
+              columnName: "GRID_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+              itemId: "20220422102809_1001",
+              itemType: null,
+              label: "所属组织",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/customergrid/gridoption",
+              options: null,
+              sort: 0,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+            {
+              columnName: "VILLAGE_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+              itemId: "20220422102809_1002",
+              itemType: null,
+              label: "所属网格",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/icneighborhood/neighborhoodoption?20220422102809_1001",
+              options: null,
+              sort: 1,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+            {
+              columnName: "BUILD_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+              itemId: "20220422102809_1003",
+              itemType: null,
+              label: "小区名称",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/icbuilding/buildingoption?20220422102809_1002",
+              options: null,
+              sort: 2,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+            {
+              columnName: "UNIT_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+              itemId: "20220422102809_10031",
+              itemType: null,
+              label: "关联物业",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/icbuildingunit/unitoption?20220422102809_1003",
+              options: null,
+              sort: 3,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+            {
+              columnName: "HOME_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+              itemId: "20220422102809_1004",
+              itemType: null,
+              label: "详细地址",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/ichouse/houseoption?20220422102809_10031",
+              options: null,
+              sort: 4,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+            {
+              columnName: "IS_BDHJ",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "45687aa479955f9d06204d415238f7cc_0",
+              itemId: "20220422102809_1005",
+              itemType: null,
+              label: "备注",
+              optionSourceType: "local",
+              optionSourceValue: "options表取",
+              options: null,
+              sort: 5,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+
+          ]
+        }
+
+        if (groupId === '20220422102809_101') {
+          dataTemp = [
+            {
+              columnName: "GRID_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_101",
+              itemId: "20220422102809_1001",
+              itemType: null,
+              label: "所属小区",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/customergrid/gridoption",
+              options: null,
+              sort: 0,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+
+            {
+              columnName: "VILLAGE_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_101",
+              itemId: "20220422102809_1002",
+              itemType: null,
+              label: "楼栋名称",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/icneighborhood/neighborhoodoption?20220422102809_1001",
+              options: null,
+              sort: 1,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+
+            {
+              columnName: "BUILD_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_101",
+              itemId: "20220422102809_1003",
+              itemType: null,
+              label: "楼栋类型",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/icbuilding/buildingoption?20220422102809_1002",
+              options: null,
+              sort: 2,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+
+            {
+              columnName: "UNIT_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_101",
+              itemId: "20220422102809_10031",
+              itemType: null,
+              label: "单元数",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/icbuildingunit/unitoption?20220422102809_1003",
+              options: null,
+              sort: 3,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+
+            {
+              columnName: "HOME_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_101",
+              itemId: "20220422102809_1004",
+              itemType: null,
+              label: "楼栋地址",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/ichouse/houseoption?20220422102809_10031",
+              options: null,
+              sort: 4,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+          ]
+        }
+
+        if (groupId === '20220422102809_102') {
+          dataTemp = [
+            {
+              columnName: "GRID_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_102",
+              itemId: "20220422102809_1001",
+              itemType: null,
+              label: "所属楼栋",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/customergrid/gridoption",
+              options: null,
+              sort: 0,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+
+            {
+              columnName: "VILLAGE_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_102",
+              itemId: "20220422102809_1002",
+              itemType: null,
+              label: "单元号",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/icneighborhood/neighborhoodoption?20220422102809_1001",
+              options: null,
+              sort: 1,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+
+            {
+              columnName: "BUILD_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_102",
+              itemId: "20220422102809_1003",
+              itemType: null,
+              label: "门牌号",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/icbuilding/buildingoption?20220422102809_1002",
+              options: null,
+              sort: 2,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+
+            {
+              columnName: "UNIT_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_102",
+              itemId: "20220422102809_10031",
+              itemType: null,
+              label: "房屋类型",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/icbuildingunit/unitoption?20220422102809_1003",
+              options: null,
+              sort: 3,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+
+            {
+              columnName: "HOME_ID",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_102",
+              itemId: "20220422102809_1004",
+              itemType: null,
+              label: "房屋用途",
+              optionSourceType: "remote",
+              optionSourceValue: "/gov/org/ichouse/houseoption?20220422102809_10031",
+              options: null,
+              sort: 4,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+            {
+              columnName: "IS_BDHJ",
+              customerId: "45687aa479955f9d06204d415238f7cc",
+              itemGroupId: "20220422102809_102",
+              itemId: "20220422102809_1005",
+              itemType: null,
+              label: "房屋状态",
+              optionSourceType: "local",
+              optionSourceValue: "options表取",
+              options: null,
+              sort: 5,
+              supportAdd: false,
+              tableName: "ic_resi_user",
+            },
+          ]
+        }
+
+        return dataTemp
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
+    formatData (res) {
+      const fileReader = new FileReader()
+      fileReader.onloadend = () => {
+        try {
+          const jsonData = JSON.parse(fileReader.result) // 说明是普通对象数据，后台转换失败
+          // 后台信息
+          console.log('jsonData---1', jsonData)
+          return this.$message.error(jsonData.msg)
+        } catch (err) { // 解析成对象失败，说明是正常的文件流
+          // 下载文件
+          console.log('errr-----', err, this)
+          this.downloadFile(res)
+        }
+      }
+      fileReader.readAsText(res.data)
+    },
+    downloadFile (res) {
+      if (res.headers["content-disposition"]) {
+        let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+        console.log('filename', fileName)
+        let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+        var url = window.URL.createObjectURL(blob)
+        var aLink = document.createElement('a')
+        aLink.style.display = 'none'
+        aLink.href = url
+        aLink.setAttribute('download', fileName)
+        document.body.appendChild(aLink)
+        aLink.click()
+        document.body.removeChild(aLink) //下载完成移除元素
+        window.URL.revokeObjectURL(url) //释放掉blob对象
+        this.$message.success('导出成功')
+        this.$emit('close')
+      } else this.$message.error('下载失败')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.diy-container {
+  padding: 20px 20px 0 20px;
+}
+.diy-wr {
+  display: flex;
+  width: 100%;
+  height: calc(80vh - 120px);
+  .left {
+    width: 49%;
+    height: 100%;
+    .check-boxwr {
+      height: calc(80vh - 120px);
+      overflow: auto;
+    }
+  }
+  .right {
+    flex-shrink: 0;
+    width: 50%;
+    height: 100%;
+    box-sizing: border-box;
+    margin-left: 20px;
+    padding: 0 20px;
+    border-left: 1px solid #eee;
+    .right-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding-bottom: 10px;
+      // border-bottom: 1px solid #eee;
+      .title {
+        font-weight: 500;
+      }
+    }
+  }
+}
+.h80 {
+  height: calc(80vh - 160px);
+  overflow: auto;
+}
+.diy-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-top: 10px;
+}
+.left-h {
+  height: 100%;
+  ::v-deep .el-tabs__header.is-left,
+  ::v-deep .el-tabs__nav-wrap.is-left::after {
+    height: calc(80vh - 120px);
+  }
+}
+.flex-div {
+  display: flex;
+  align-items: center;
+}
+// #collapsWr {
+//   .col-h {
+//     ::v-deep .el-collapse-item__wrap {
+//       max-height: calc(80vh - 220px);
+//       // overflow: auto;
+//     }
+
+//   }
+// }
+.mb10 {
+  margin-bottom: 10px;
+}
+.pd10 {
+  padding: 10px;
+}
+.mr10 {
+  margin-right: 10px;
+}
+.wd200 {
+  width: 200px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 3ca8a717f..e25708305 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -301,6 +301,7 @@ export default {
 
       let { msg, data } = await map.getAddress(lat, lng);
       if (msg == "success") {
+        debugger
         this.dataForm.address = data.address
         this.searchValue = data.address
         this.searchOptions = []
@@ -376,7 +377,7 @@ export default {
     },
     //加载网格
     async loadGrid () {
-      const url = '/gov/org/grid/allgridsnopermission '
+      const url = '/gov/org/grid/allgridsnopermission'
       // const url = "https://epmet-dev.elinkservice.cn:7082/api/apimock-v2/95518686fa128a53f64c678906848062/gov/org/grid/allgrids"
       let params = {
         agencyId: this.dataForm.agencyId
diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue
index 5415a0285..2e9973164 100644
--- a/src/views/modules/base/community/communityTable.vue
+++ b/src/views/modules/base/community/communityTable.vue
@@ -280,7 +280,7 @@
                       @dialogOk="addFormOk"></community-form>
     </el-dialog>
 
-    <el-dialog title="导出"
+    <!-- <el-dialog title="导出"
                :visible.sync="dialogVisible"
                width="30%"
                :before-close="handleClose">
@@ -298,11 +298,25 @@
                    :loading="exportBtn"
                    @click="handleExportYihuyima()">导出一房一码</el-button>
       </div>
-      <span slot="footer"
-            class="dialog-footer">
-        <el-button @click="dialogVisible = false">取 消</el-button>
-        <!-- <el-button type="primary" @click="dialogVisible = false">确 定</el-button> -->
-      </span>
+
+    </el-dialog> -->
+
+    <el-dialog :visible.sync="diyDialog"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               width="1150px"
+               top="5vh"
+               class="dialog-h">
+      <community-export-info v-if="diyDialog"
+                             ref="ref_diy"
+                             :list="exportList"
+                             :search="{
+          formCode: 'resi_base_info',
+          pageNo: pageNo,
+          pageSize: pageSize,
+          conditions: conditions,
+        }"
+                             @close="handleDiyClose"></community-export-info>
     </el-dialog>
 
     <baobiao ref="baobiao" />
@@ -313,6 +327,7 @@
 
 import CommunityForm from './communityForm'
 import CommunityDetail from './communityDetail'
+import communityExportInfo from "./communityExportInfo.vue";
 
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
@@ -345,30 +360,33 @@ export default {
       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,
-      dialogVisible: false, // 导出
 
       displayedBaobiaoBtn: false,
       customerId: '',//烟台的客户id :  1535072605621841922
+
+      //导出
+      exportList: [],
+      diyDialog: false,
+      conditions: [],
     }
   },
   components: {
     baobiao,
     CommunityForm,
-    CommunityDetail
+    CommunityDetail,
+    communityExportInfo
   },
   async mounted () {
     this.customerId = localStorage.getItem('customerId')
@@ -478,7 +496,6 @@ export default {
       return isChecked
     },
 
-
     diaClose () {
       this.$refs.ref_form.resetData()
       this.formShow = false
@@ -600,7 +617,6 @@ export default {
       this.$emit('refreshTree')
     },
 
-
     deleteBatch () {
       if (this.selection.length > 0) {
         this.$confirm("确认删除选择的小区?", "提示", {
@@ -737,8 +753,78 @@ export default {
       })
     },
     // 导出按钮点击事件
-    handleExportOpen () {
-      this.dialogVisible = true
+    async handleExportOpen () {
+      await this.getExportList();
+
+    },
+    async getExportList (type) {
+      const url = "/oper/customize//icformitemgroup/list";
+      let params = {
+        formCode: "resi_base_info",
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        //暂无接口
+        let dataTemp = [
+          {
+            childShowFlag: "0",
+            customerId: "45687aa479955f9d06204d415238f7cc",
+            display: false,
+            formCode: "resi_base_info",
+            formId: "20220422102809_1",
+            groupCode: "jcxx",
+            id: "45687aa479955f9d06204d415238f7cc_0",
+            label: "小区信息",
+            policyFlag: "1",
+            sort: 0,
+            supportAdd: false,
+            tableName: "ic_resi_user"
+          },
+          {
+            childShowFlag: "0",
+            customerId: "45687aa479955f9d06204d415238f7cc",
+            display: true,
+            formCode: "resi_base_info",
+            formId: "20220422102809_1",
+            groupCode: "jyxx",
+            id: "20220422102809_101",
+            label: "楼栋信息",
+            policyFlag: "1",
+            sort: 1,
+            supportAdd: false,
+            tableName: "ic_resi_user",
+          },
+          {
+            childShowFlag: "0",
+            customerId: "45687aa479955f9d06204d415238f7cc",
+            display: true,
+            formCode: "resi_base_info",
+            formId: "20220422102809_1",
+            groupCode: "xqah",
+            id: "20220422102809_102",
+            label: "房屋信息",
+            policyFlag: "1",
+            sort: 2,
+            supportAdd: false,
+            tableName: "ic_resi_user",
+          }
+        ]
+        dataTemp.forEach((item) => {
+          (async (id) => {
+            // item.queryItemList = await this.getExportChildList(id)
+            item.queryItemList = [];
+          })(item.id);
+        });
+        this.exportList = [...dataTemp];
+        this.$nextTick(() => {
+          this.diyDialog = true;
+        });
+        console.log("获取详情成功getExportList----", this.exportList);
+      } else {
+        this.$message.error(msg);
+      }
     },
     //导出表格 以前是导出 现在改成导出房屋数据
     async handleExport () {
@@ -765,9 +851,11 @@ export default {
       );
 
     },
-
+    handleDiyClose () {
+      this.diyDialog = false;
+    },
     handleClose (done) {
-      this.dialogVisible = false
+      this.diyDialog = false
     },
 
     // 下载文件