From cf34df5ea450cc67c9ed610417b55c5e31ee0979 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Nov 2021 17:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E7=BA=A7=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue | 16 +++++++++++++++-
 src/views/modules/base/resi.vue   | 23 +++++++++++++++++------
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 11ceee46..e5f3c907 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -486,11 +486,25 @@ export default {
       this.formList.forEach(async item => {
         if (item.optionSourceType === 'remote') {
           await this.getOptionsLists(item.optionSourceValue).then(res => {
-            item.options = res
+            item.options = this.getTreeData(res)
           })
         }
       })
     },
+    getTreeData(data){
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.children) {
+          if (item.children.length === 0) _item = { ...item, children: undefined }
+          else _item = { ...item, children: this.getTreeData(item.children)}
+        } else {
+          _item = { ...item }
+        }
+        return _item
+      })
+      return arr
+    },
     handleOpenSearch () {
       this.openSearch = !this.openSearch
     },
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 4ebd5e49..897b44c8 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -336,6 +336,7 @@ export default {
       // .post('epmetuser/icresiuser/exportExcel', params)
       axios({
         url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/exportExcel',
+        // url: 'epmetuser/icresiuser/exportExcel',
         method: 'post',
         data: params,
         responseType: 'blob'
@@ -344,10 +345,6 @@ export default {
           console.log('resllll', res)
           let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
           console.log('filename', fileName)
-          // var headerData = res.headers
-          // this.download(res, '人员数据.xlsx')
-          // console.log('res', res)
-          // const fileName = '人员数据.xlsx'
           let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
           var url = window.URL.createObjectURL(blob)
           var aLink = document.createElement('a')
@@ -780,6 +777,20 @@ export default {
           return this.$message.error('网络错误')
         })
     },
+    getTreeData(data){
+      if (!Array.isArray(data)) return []
+      let arr = data.map(item => {
+        let _item = {}
+        if (item.children) {
+          if (item.children.length === 0) _item = { ...item, children: undefined }
+          else _item = { ...item, children: this.getTreeData(item.children)}
+        } else {
+          _item = { ...item }
+        }
+        return _item
+      })
+      return arr
+    },
     async getFormList(type) {
       await this.$http
         .post('/oper/customize/icform/getcustomerform', {
@@ -799,7 +810,7 @@ export default {
                 if (item.optionSourceType === 'remote') {
                   await this.getOptionsList(item.optionSourceValue).then(
                     (res) => {
-                      item.options = res
+                      item.options = this.getTreeData(res)
                     }
                   )
                 }
@@ -810,7 +821,7 @@ export default {
                 n.tableName = item.tableName
                 if (n.optionSourceType === 'remote' && type !== 'edit') {
                   await this.getOptionsList(n.optionSourceValue).then((res) => {
-                    n.options = res
+                    n.options = this.getTreeData(res)
                   })
                 }
               })