zcy 4 年 前
コミット
9698253d72

+ 1 - 2
src/api/request.js

@@ -47,7 +47,6 @@ export function downFile(url, parameter) {
   return request({
     url: url,
     params: parameter,
-    method: 'get',
-    responseType: 'blob'
+    method: 'get'
   })
 }

+ 7 - 25
src/mixin/listMixin.js

@@ -259,38 +259,20 @@ export const listMixin = {
       this.$refs.modalForm.disableSubmit = true
     },
     /* 导出 */
-    handleExportXls2() {
-      debugger
-      const paramsStr = encodeURI(JSON.stringify(this.getQueryParams()))
-      const url = `${process.env.VUE_APP_BASE_API}/${this.url.exportXlsUrl}?paramsStr=${paramsStr}`
-      window.location.href = url
-    },
-    handleExportXls(fileName) {
-      if (!fileName || typeof fileName !== 'string') {
-        fileName = '导出文件'
+    handleExportXls() {
+      if (this.selectedRowKeys.length <= 0) {
+        this.$message.warning('请选择一条记录!')
+        return
       }
       const param = this.getQueryParams()
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
-        param['selections'] = this.selectedRowKeys.join(',')
+        param['id'] = this.selectedRowKeys.join(',')
       }
-      console.log('导出参数', param)
       downFile(this.url.exportXlsUrl, param).then((data) => {
-        if (!data) {
+        if (data.code !== 200) {
           this.$message.warning('文件下载失败')
-          return
-        }
-        if (typeof window.navigator.msSaveBlob !== 'undefined') {
-          window.navigator.msSaveBlob(new Blob([data], { type: 'application/vnd.ms-excel' }), fileName + '.xls')
         } else {
-          const url = window.URL.createObjectURL(new Blob([data], { type: 'application/vnd.ms-excel' }))
-          const link = document.createElement('a')
-          link.style.display = 'none'
-          link.href = url
-          link.setAttribute('download', fileName + '.xls')
-          document.body.appendChild(link)
-          link.click()
-          document.body.removeChild(link) // 下载完成移除元素
-          window.URL.revokeObjectURL(url) // 释放掉blob对象
+          window.location.href = data.url
         }
       })
     },

+ 2 - 2
src/views/catenary/checklist/view/bl/index.vue

@@ -4,7 +4,7 @@
     <div class="table-page-search-wrapper">
       <!-- 操作按钮区域 -->
       <div class="table-operator" style="margin: 5px 0;float: right">
-        <a-button ghost type="danger" icon="download" @click="handleExportXls('角色信息')">导出</a-button>
+        <a-button ghost type="danger" icon="download" @click="handleExportXls()">导出</a-button>
         <a-dropdown v-if="selectedRowKeys.length > 0">
           <a-menu slot="overlay">
             <a-menu-item key="1" @click="batchDel"><a-icon type="delete" />删除</a-menu-item>
@@ -97,7 +97,7 @@ export default {
       url: {
         list: '/business/catenary/bus/jcb/blq/list',
         tree: '/system/dept/treeSelect',
-        exportXlsUrl: '/exportXlsUrl'
+        exportXlsUrl: '/business/catenary/bus/jcb/blq/export'
       }
     }
   },