From 25f50d74c5b71876f62bd7374eae6cb4d44df2f2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 27 九月 2021 18:54:43 +0800
Subject: [PATCH] 升级sass-loader到最新版本10.1.1
---
ruoyi-ui/src/views/system/role/index.vue | 58 +++++++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/index.vue b/ruoyi-ui/src/views/system/role/index.vue
index 97a2f84..6e58558 100644
--- a/ruoyi-ui/src/views/system/role/index.vue
+++ b/ruoyi-ui/src/views/system/role/index.vue
@@ -413,17 +413,13 @@
// 角色状态修改
handleStatusChange(row) {
let text = row.status === "0" ? "启用" : "停用";
- this.$confirm('确认要"' + text + '""' + row.roleName + '"角色吗?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return changeRoleStatus(row.roleId, row.status);
- }).then(() => {
- this.msgSuccess(text + "成功");
- }).catch(function() {
- row.status = row.status === "0" ? "1" : "0";
- });
+ this.$modal.confirm('确认要"' + text + '""' + row.roleName + '"角色吗？').then(function() {
+ return changeRoleStatus(row.roleId, row.status);
+ }).then(() => {
+ this.$modal.msgSuccess(text + "成功");
+ }).catch(function() {
+ row.status = row.status === "0" ? "1" : "0";
+ });
},
// 取消按钮
cancel() {
@@ -579,14 +575,14 @@
if (this.form.roleId != undefined) {
this.form.menuIds = this.getMenuAllCheckedKeys();
updateRole(this.form).then(response => {
- this.msgSuccess("修改成功");
+ this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
this.form.menuIds = this.getMenuAllCheckedKeys();
addRole(this.form).then(response => {
- this.msgSuccess("新增成功");
+ this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
@@ -599,7 +595,7 @@
if (this.form.roleId != undefined) {
this.form.deptIds = this.getDeptAllCheckedKeys();
dataScope(this.form).then(response => {
- this.msgSuccess("修改成功");
+ this.$modal.msgSuccess("修改成功");
this.openDataScope = false;
this.getList();
});
@@ -608,31 +604,23 @@
/** 删除按钮操作 */
handleDelete(row) {
const roleIds = row.roleId || this.ids;
- this.$confirm('是否确认删除角色编号为"' + roleIds + '"的数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return delRole(roleIds);
- }).then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- }).catch(() => {});
+ this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function() {
+ return delRole(roleIds);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ }).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
const queryParams = this.queryParams;
- this.$confirm('是否确认导出所有角色数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(() => {
- this.exportLoading = true;
- return exportRole(queryParams);
- }).then(response => {
- this.download(response.msg);
- this.exportLoading = false;
- }).catch(() => {});
+ this.$modal.confirm('是否确认导出所有用户数据项？').then(() => {
+ this.exportLoading = true;
+ return exportRole(queryParams);
+ }).then(response => {
+ this.$download.name(response.msg);
+ this.exportLoading = false;
+ }).catch(() => {});
}
}
};
--
Gitblit v1.9.2