From 1a695159e3cd3010381b0dff8b3dcd6f73fa189a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 九月 2021 10:49:56 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/views/system/user/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 3214a72..22eaa4b 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -351,7 +351,6 @@
import { treeselect } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import { downLoadExcel } from "@/utils/download";
export default {
name: "User",
@@ -419,6 +418,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ reasonable: true,
userName: undefined,
phonenumber: undefined,
status: undefined,
@@ -661,7 +661,7 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- downLoadExcel('/system/user/export', this.queryParams);
+ this.downLoadExcel('/system/user/export', this.queryParams);
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
@@ -670,7 +670,7 @@
},
/** 涓嬭浇妯℃澘鎿嶄綔 */
importTemplate() {
- downLoadExcel('/system/user/importTemplate');
+ this.downLoadExcel('/system/user/importTemplate');
},
// 鏂囦欢涓婁紶涓鐞�
handleFileUploadProgress(event, file, fileList) {
--
Gitblit v1.9.3