From 03b31652a2179f812a63af77077d826fdf05bc12 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 23 九月 2021 18:53:17 +0800 Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev --- ruoyi-ui/src/views/system/role/authUser.vue | 18 +++++------------- 1 files changed, 5 insertions(+), 13 deletions(-) diff --git a/ruoyi-ui/src/views/system/role/authUser.vue b/ruoyi-ui/src/views/system/role/authUser.vue index 661c369..e18ea8b 100644 --- a/ruoyi-ui/src/views/system/role/authUser.vue +++ b/ruoyi-ui/src/views/system/role/authUser.vue @@ -178,30 +178,22 @@ /** 鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */ cancelAuthUser(row) { const roleId = this.queryParams.roleId; - this.$confirm('纭瑕佸彇娑堣鐢ㄦ埛"' + row.userName + '"瑙掕壊鍚楋紵', "璀﹀憡", { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning" - }).then(function() { + this.$modal.confirm('纭瑕佸彇娑堣鐢ㄦ埛"' + row.userName + '"瑙掕壊鍚楋紵').then(function() { return authUserCancel({ userId: row.userId, roleId: roleId }); }).then(() => { this.getList(); - this.msgSuccess("鍙栨秷鎺堟潈鎴愬姛"); + this.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛"); }).catch(() => {}); }, /** 鎵归噺鍙栨秷鎺堟潈鎸夐挳鎿嶄綔 */ cancelAuthUserAll(row) { const roleId = this.queryParams.roleId; const userIds = this.userIds.join(","); - this.$confirm('鏄惁鍙栨秷閫変腑鐢ㄦ埛鎺堟潈鏁版嵁椤�?', "璀﹀憡", { - confirmButtonText: "纭畾", - cancelButtonText: "鍙栨秷", - type: "warning" - }).then(() => { - return authUserCancelAll({ roleId: roleId, userIds: userIds }); + this.$modal.confirm('鏄惁鍙栨秷閫変腑鐢ㄦ埛鎺堟潈鏁版嵁椤癸紵').then(function() { + return authUserCancelAll({ roleId: roleId, userIds: userIds }); }).then(() => { this.getList(); - this.msgSuccess("鍙栨秷鎺堟潈鎴愬姛"); + this.$modal.msgSuccess("鍙栨秷鎺堟潈鎴愬姛"); }).catch(() => {}); } } -- Gitblit v1.9.3