From 95010d4a4c21cd53b78f51cbd518a315a8861fbc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 12 十月 2022 10:55:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'ruoyi-vue/master' into dev
---
ruoyi-ui/src/views/system/role/selectUser.vue | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ruoyi-ui/src/views/system/role/selectUser.vue b/ruoyi-ui/src/views/system/role/selectUser.vue
index 14ae0bb..e0f83fa 100644
--- a/ruoyi-ui/src/views/system/role/selectUser.vue
+++ b/ruoyi-ui/src/views/system/role/selectUser.vue
@@ -1,13 +1,12 @@
<template>
<!-- 鎺堟潈鐢ㄦ埛 -->
<el-dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="visible" width="800px" top="5vh" append-to-body>
- <el-form :model="queryParams" ref="queryForm" :inline="true">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -16,7 +15,6 @@
v-model="queryParams.phonenumber"
placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -34,7 +32,7 @@
<el-table-column label="鎵嬫満" prop="phonenumber" :show-overflow-tooltip="true" />
<el-table-column label="鐘舵��" align="center" prop="status">
<template slot-scope="scope">
- <dict-tag :options="statusOptions" :value="scope.row.status"/>
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
@@ -61,10 +59,11 @@
<script>
import { unallocatedUserList, authUserSelectAll } from "@/api/system/role";
export default {
+ dicts: ['sys_normal_disable'],
props: {
// 瑙掕壊缂栧彿
roleId: {
- type: Number
+ type: [Number, String]
}
},
data() {
@@ -77,8 +76,6 @@
total: 0,
// 鏈巿鏉冪敤鎴锋暟鎹�
userList: [],
- // 鐘舵�佹暟鎹瓧鍏�
- statusOptions: [],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -88,11 +85,6 @@
phonenumber: undefined
}
};
- },
- created() {
- this.getDicts("sys_normal_disable").then(response => {
- this.statusOptions = response.data;
- });
},
methods: {
// 鏄剧ず寮规
@@ -129,8 +121,12 @@
handleSelectUser() {
const roleId = this.queryParams.roleId;
const userIds = this.userIds.join(",");
+ if (userIds == "") {
+ this.$modal.msgError("璇烽�夋嫨瑕佸垎閰嶇殑鐢ㄦ埛");
+ return;
+ }
authUserSelectAll({ roleId: roleId, userIds: userIds }).then(res => {
- this.msgSuccess(res.msg);
+ this.$modal.msgSuccess(res.msg);
if (res.code === 200) {
this.visible = false;
this.$emit("ok");
--
Gitblit v1.9.3