From fe075c4ed8283ef05fea2a7c6d67d69ca0aa120a Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 28 Apr 2022 11:10:10 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8C=89=E9=9C=80=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/checkBox.vue  | 17 ++++++--
 src/views/modules/base/diyInfo.vue | 65 +++++++++++++++++++++++++-----
 src/views/modules/base/resi.vue    |  3 +-
 3 files changed, 70 insertions(+), 15 deletions(-)

diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue
index 1f2d19a2..41bc5cfa 100644
--- a/src/views/components/checkBox.vue
+++ b/src/views/components/checkBox.vue
@@ -1,15 +1,16 @@
 <template>
-  <div>
-    <el-checkbox 
+  <div v-loading="loading">
+    <el-checkbox
       :indeterminate="isIndeterminate" 
       v-model="checkAll" 
       @change="handleCheckAllChange">全选</el-checkbox>
     <div style="margin: 15px 0;"></div>
-    <el-checkbox-group v-model="checkedList" @change="handleChange">
+    <el-checkbox-group v-if="boxList.length > 0" v-model="checkedList" @change="handleChange">
       <div v-for="n in boxList" :key="n.itemId" class="mb10">
         <el-checkbox :label="n.itemId">{{n.label}}</el-checkbox>
       </div>
     </el-checkbox-group>
+    <div v-else class="no-data">暂无数据</div>
   </div>
 </template>
 
@@ -37,6 +38,7 @@ export default {
       checkedList: [],
       isIndeterminate: false,
       pid: '',
+      loading: false
     }
   },
   created() {
@@ -53,8 +55,9 @@ export default {
       this.$emit('change', { list: this.filterArr(this.checkedList), pid: this.pid })
     },
     handleChange(value) {
+      console.log('value----', value)
       let checkedCount = value.length;
-      this.checkAll = checkedCount === this.list.length;
+      this.checkAll = checkedCount === this.boxList.length;
       this.isIndeterminate = checkedCount > 0 && checkedCount < this.boxList.length;
       this.$emit('change', { list: this.filterArr(this.checkedList), pid: this.pid })
     },
@@ -75,4 +78,10 @@ export default {
 .mb10 {
   margin-bottom: 10px;
 }
+.no-data {
+  padding-top: 30px;
+  font-size: 14px;
+  text-align: center;
+  color: #999;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index ec4a3eb3..a202036a 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -4,10 +4,10 @@
       <el-tab-pane label="自定义模板" name="first">
         <div class="diy-wr">
           <div class="left">
-            <el-tabs tab-position="left" class="left-h">
-              <el-tab-pane v-for="item in list" :key="item.id" :label="item.label">
+            <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 dialog-h-content scroll-h">
-                  <checkBox v-if="item.queryItemList" :ref="'checkbox' + item.id" 
+                  <checkBox v-if="item.queryItemList.length > 0" :ref="'checkbox' + item.id" 
                   :list="item.queryItemList" @change="handleChangeBox" />
                 </div>
               </el-tab-pane>
@@ -19,7 +19,7 @@
               <div class="title">导出信息</div>
               <el-button plain @click="handlePreview('')">预览</el-button>
             </div>
-            <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">
@@ -129,6 +129,7 @@
 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: {
@@ -149,8 +150,10 @@ export default {
       exportLoading: false,
       activeCollapse: ['1'],
       activeName: 'first',
+      leftActive: '',
       info: {},
       rightList: [],
+      leftList: [],
       form: {
         isSaveTemp: false,
         name: '',
@@ -161,11 +164,14 @@ export default {
       diyDialog: false,
     }
   },
-  created() {
+  async created() {
     this.list.forEach(item => {
       this.$set(this.info, item.id, [])
     })
-    console.log('infodiy----', this.list)
+    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: {
@@ -175,14 +181,24 @@ export default {
         
       },
       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.list.forEach(item =>{
+      this.leftList.forEach(item =>{
         if (item.id == pid) obj = { ...item, queryItemList: [...list] }
       })
       const groups = this.rightList.map(item => item.id)
@@ -203,12 +219,23 @@ export default {
       }
       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}`])
-      const checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
+      let checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
       checkList.forEach((n, i) => {
-        if (n == item.itemId) this.$refs[`checkbox${item.itemGroupId}`][0].checkedList.splice(i, 1)
+        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) {
@@ -387,6 +414,20 @@ export default {
           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) {
+
+        return data
+
+      } else {
+        this.$message.error(msg)
+      }
+    },
   }
 }
 </script>
@@ -422,6 +463,10 @@ export default {
     }
   }
 }
+.h80 {
+  height: calc(80vh - 160px);
+  overflow: auto;
+}
 .diy-footer {
   display: flex;
   align-items: center;
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 391035b1..01335d6c 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -1260,7 +1260,8 @@ export default {
 
         data.forEach(item => {
           (async (id) => {
-            item.queryItemList = await this.getExportChildList(id)
+            // item.queryItemList = await this.getExportChildList(id)
+            item.queryItemList = []
           })(item.id)
         })
         this.exportList = [...data]

From e802c7b421f4901e86040911fa72b937bf50d0cb Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 28 Apr 2022 14:59:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/diyInfo.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index a202036a..0fd29a40 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -83,7 +83,7 @@
       <div class="left">
         <div class="flex-div">
           <div>模板名称：</div>
-          <el-input v-model="form.name" class="wd200 mr10" />
+          <el-input v-model="form.name" maxlength="20" class="wd200 mr10" />
           <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
         </div>
       </div>
@@ -330,13 +330,17 @@ export default {
       await this.$http({
         method: 'POST',
         url,
-        responseType: 'blob',
+        // responseType: 'blob',
         data: params
       })
         .then(res => {
           console.log('res----dddd', res)
           // this.download(res.data, title + '.xls')
-          this.getTemplateList()
+          // this.getTemplateList()
+          this.exportLoading = false
+          if (res.data.code && res.data.code == 9999) {
+            return this.$message.error(res.data.msg)
+          }
           if (res.headers["content-disposition"]) {
             let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
             console.log('filename', fileName)
@@ -353,7 +357,6 @@ export default {
             this.$message.success('导出成功')
             this.$emit('close')
           } else this.$message.error('下载失败')
-          this.exportLoading = false
         })
         .catch(err => {
           console.log('err', err)

From 74e15f913ead57356c9391bb072ffbcc5354bf2f Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 28 Apr 2022 15:09:30 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/visual/basicinfo/basicInfoMain.vue | 4 +++-
 src/views/modules/visual/basicinfo/peopleList.vue    | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 3358597d..77950ef5 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -316,7 +316,9 @@ const vueGis = {
         path: `/main-shuju/visual-basicinfo-people-list`,
         query: {
           columnName: item.columnName,
-          label: item.label
+          label: item.label,
+          id: this.orgId,
+          level: this.orgLevel
         }
       });
     },
diff --git a/src/views/modules/visual/basicinfo/peopleList.vue b/src/views/modules/visual/basicinfo/peopleList.vue
index b6757fb4..1438a50d 100644
--- a/src/views/modules/visual/basicinfo/peopleList.vue
+++ b/src/views/modules/visual/basicinfo/peopleList.vue
@@ -127,10 +127,10 @@ export default {
 
     this.searchName = ''
     this.tableData = []
-    const { columnName, label } = this.$route.query
+    const { columnName, label, id, level } = this.$route.query
     this.searchName = columnName
     this.tableTitle = label
-    this.loadList()
+    this.loadList(id, level)
 
   },
   beforeRouteEnter(to, from, next) {
@@ -146,11 +146,13 @@ export default {
 
 
 
-    async loadList () {
+    async loadList (id, level) {
       this.loading = true
       const url = "/epmetuser/icresiuser/searchbycategory"
       let params = {
         columnName: this.searchName,
+        id,
+        level,
         pageSize: this.pageSize,
         pageNo: this.pageNo
       }