修复用户excel导出条件为空的判断逻辑

dev
smallchill 4 years ago
parent 4201def6e6
commit 298ff021fe
  1. 12
      src/util/func.js
  2. 5
      src/views/system/user.vue

@ -90,4 +90,16 @@ export default class func {
static split(str) {
return str ? String(str).split(',') : '';
}
/**
* 转换空字符串
* @param str
* @returns {string|*}
*/
static toStr(str) {
if (typeof str === 'undefined' || str === null) {
return "";
}
return str;
}
}

@ -188,6 +188,7 @@
import {dateNow} from "@/util/date";
import NProgress from 'nprogress';
import 'nprogress/nprogress.css';
import func from "@/util/func";
export default {
data() {
@ -902,13 +903,15 @@
done();
},
handleExport() {
const account = func.toStr(this.search.account);
const realName = func.toStr(this.search.realName);
this.$confirm("是否导出用户数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(() => {
NProgress.start();
exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${this.search.account}&realName=${this.search.realName}`).then(res => {
exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
downloadXls(res.data, `用户数据表${dateNow()}.xlsx`);
NProgress.done();
})

Loading…
Cancel
Save