From d734bfc34f65b6cd036b5f21b718294152fecacf Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 17 二月 2022 11:56:11 +0800
Subject: [PATCH] 修复分页组件请求两次问题(I4SQOR)
---
ruoyi-ui/src/views/system/user/index.vue | 29 ++++++++++-------------------
1 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 4f20b08..4b00e03 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -131,7 +131,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['system:user:export']"
>导出</el-button>
@@ -207,7 +206,7 @@
</el-col>
</el-row>
- <!-- 添加或修改参数配置对话框 -->
+ <!-- 添加或修改用户配置对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
@@ -346,7 +345,7 @@
</template>
<script>
-import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
import { getToken } from "@/utils/auth";
import { treeselect } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
@@ -360,8 +359,6 @@
return {
// 遮罩层
loading: true,
- // 导出遮罩层
- exportLoading: false,
// 选中数组
ids: [],
// 非单个禁用
@@ -498,7 +495,7 @@
// 节点单击事件
handleNodeClick(data) {
this.queryParams.deptId = data.id;
- this.getList();
+ this.handleQuery();
},
// 用户状态修改
handleStatusChange(row) {
@@ -599,7 +596,7 @@
cancelButtonText: "取消",
closeOnClickModal: false,
inputPattern: /^.{5,20}$/,
- inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+ inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
}).then(({ value }) => {
resetUserPwd(row.userId, value).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value);
@@ -643,14 +640,9 @@
},
/** 导出按钮操作 */
handleExport() {
- const queryParams = this.queryParams;
- this.$modal.confirm('是否确认导出所有用户数据项？').then(() => {
- this.exportLoading = true;
- return exportUser(queryParams);
- }).then(response => {
- this.$download.name(response.msg);
- this.exportLoading = false;
- }).catch(() => {});
+ this.download('system/user/export', {
+ ...this.queryParams
+ }, `user_${new Date().getTime()}.xlsx`)
},
/** 导入按钮操作 */
handleImport() {
@@ -659,9 +651,8 @@
},
/** 下载模板操作 */
importTemplate() {
- importTemplate().then(response => {
- this.$download.name(response.msg);
- });
+ this.download('system/user/importTemplate', {
+ }, `user_template_${new Date().getTime()}.xlsx`)
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
@@ -672,7 +663,7 @@
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
- this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+ this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
this.getList();
},
// 提交上传文件
--
Gitblit v1.9.2