Merge branch 'dev-shuju' into test

src/views/modules/base/resi.vue

@@ -350,7 +350,7 @@ export default {
         })
         .catch((err) => {
           console.log('获取导出情失败', err)
-          this.$message.error('网络错误')
+          this.$message.error('获取导出失败')
         })
         this.exportBtnTitle = '导出'
         this.exportBtn = false
@@ -396,24 +396,27 @@ export default {
         responseType: 'blob'
       })
       .then((res) => {
-        
+        if (res.headers["content-disposition"]) {
-        let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          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' })
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
-        var url = window.URL.createObjectURL(blob)
+          var url = window.URL.createObjectURL(blob)
-        var aLink = document.createElement('a')
+          var aLink = document.createElement('a')
-        aLink.style.display = 'none'
+          aLink.style.display = 'none'
-        aLink.href = url
+          aLink.href = url
-        aLink.setAttribute('download', fileName)
+          aLink.setAttribute('download', fileName)
-        document.body.appendChild(aLink)
+          document.body.appendChild(aLink)
-        aLink.click()
+          aLink.click()
-        document.body.removeChild(aLink) //下载完成移除元素
+          document.body.removeChild(aLink) //下载完成移除元素
-        window.URL.revokeObjectURL(url) //释放掉blob对象
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+        }
+        
         this.getTableData()
       })
       .catch( err => {
           console.log('失败', err)
-          err.onError() //上传失败的文件会从文件列表中删除
+          file.onError() //上传失败的文件会从文件列表中删除
+          this.$message.error('导入失败')
       })
       this.importLoading = false
       this.importBtnTitle = '导入人员数据'

src/views/modules/communityParty/elegant/index.vue

@@ -34,7 +34,7 @@
       </div>
       <div class="resi-row-btn">
         <el-button type="success" @click="handleAdd">新增</el-button>
-        <el-button type="warning" size="small" @click="handleExport">导出</el-button>
+        <el-button type="warning" size="small" :loading="exportBtn" @click="handleExport">{{ exportBtnTitle }}</el-button>
         <el-upload
           ref="upload"
           class="upload-demo"
@@ -197,6 +197,8 @@ export default {
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
       importBtnTitle: '导入人员数据',
       importLoading: false,
+      exportBtn: false,
+      exportBtnTitle: '导出',
       tableLoading: false,
       btnLoading: false,
       uploading: false,
@@ -325,20 +327,20 @@ export default {
       }
       return fileType && isLt1M
     },
-    uploadHttpRequest(file) {
+    async uploadHttpRequest(file) {
       this.importLoading = true
       this.importBtnTitle = '正在上传中...'
       const formData = new FormData() //FormData对象，添加参数只能通过append('key', value)的形式添加
       formData.append('file', file.file) //添加文件对象
-      axios({
+      await axios({
         url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/import',
         method: 'post',
         data: formData,
         responseType: 'blob'
       })
       .then((res) => {
-        this.importLoading = false
+        // this.importLoading = false
-        this.importBtnTitle = '导入人员数据'
+        // this.importBtnTitle = '导入人员数据'
         // 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' })
@@ -355,17 +357,23 @@ export default {
       })
       .catch( err => {
           console.log('失败', err)
-          param.onError() //上传失败的文件会从文件列表中删除
+          file.onError() //上传失败的文件会从文件列表中删除
+          this.$message.error('导入失败')
       })
+      this.importLoading = false
+      this.importBtnTitle = '导入人员数据'
+      this.$refs.upload.clearFiles()
     },
-    handleExport() {
+    async handleExport() {
+      this.exportBtn = true
+      this.exportBtnTitle = '正在导出...'
       let params = {
         agencyId: this.$store.state.user.agencyId,
         pageSize: 9999,
         pageNo: this.currentPage
       }
       // .post('epmetuser/icresiuser/exportExcel', params)
-      axios({
+      await axios({
         url: window.SITE_CONFIG['apiURL'] + '/resi/partymember/icpartymemberstyle/export',
         // url: 'epmetuser/icresiuser/exportExcel',
         method: 'post',
@@ -389,8 +397,10 @@ export default {
         })
         .catch((err) => {
           console.log('获取导出情失败', err)
-          return this.$message.error('网络错误')
+          this.$message.error('获取导出失败')
         })
+        this.exportBtn = false
+        this.exportBtnTitle = '导出'
     },
     beforeImgUpload (file) {
       const isPNG = (file.type === 'image/png') || (file.type === 'image/jpeg')