From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/views/system/role/selectUser.vue | 196 +++++++++++++++++++++++-------------------------
1 files changed, 94 insertions(+), 102 deletions(-)
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 9be1ec9..e55120a 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -1,83 +1,69 @@
<template>
- <!-- 鎺堟潈鐢ㄦ埛 -->
- <el-dialog title="閫夋嫨鐢ㄦ埛" v-model="visible" width="800px" top="5vh" append-to-body>
- <el-form :model="queryParams" ref="queryRef" :inline="true">
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
- <el-input
- v-model="queryParams.userName"
- placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
- <el-input
- v-model="queryParams.phonenumber"
- placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
- clearable
- style="width: 200px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
+ <el-row>
+ <el-dialog v-model="visible" title="閫夋嫨鐢ㄦ埛" width="800px" top="5vh" append-to-body>
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
+ <el-input v-model="queryParams.userName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鎵嬫満鍙风爜" prop="phonenumber">
+ <el-input v-model="queryParams.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
</el-form>
<el-row>
- <el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="260px">
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column label="鐢ㄦ埛鍚嶇О" prop="userName" :show-overflow-tooltip="true" />
- <el-table-column label="鐢ㄦ埛鏄电О" prop="nickName" :show-overflow-tooltip="true" />
- <el-table-column label="閭" prop="email" :show-overflow-tooltip="true" />
- <el-table-column label="鎵嬫満" prop="phonenumber" :show-overflow-tooltip="true" />
- <el-table-column label="鐘舵��" align="center" prop="status">
- <template #default="scope">
- <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
- </template>
- </el-table-column>
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
- <template #default="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
+ <el-table ref="tableRef" :data="userList" height="260px" @row-click="clickRow" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column label="鐢ㄦ埛鍚嶇О" prop="userName" :show-overflow-tooltip="true" />
+ <el-table-column label="鐢ㄦ埛鏄电О" prop="nickName" :show-overflow-tooltip="true" />
+ <el-table-column label="閭" prop="email" :show-overflow-tooltip="true" />
+ <el-table-column label="鎵嬫満" prop="phonenumber" :show-overflow-tooltip="true" />
+ <el-table-column label="鐘舵��" align="center" prop="status">
+ <template #default="scope">
+ <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="180">
+ <template #default="scope">
+ <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination v-if="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
</el-row>
<template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="handleSelectUser">纭� 瀹�</el-button>
- <el-button @click="visible = false">鍙� 娑�</el-button>
- </div>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="handleSelectUser">纭� 瀹�</el-button>
+ <el-button @click="visible = false">鍙� 娑�</el-button>
+ </div>
</template>
- </el-dialog>
+ </el-dialog>
+ </el-row>
</template>
-<script setup name="SelectUser">
-import { authUserSelectAll, unallocatedUserList } from "@/api/system/role";
+<script setup name="SelectUser" lang="ts">
+import { authUserSelectAll, unallocatedUserList } from '@/api/system/role';
+import { UserVO } from '@/api/system/user/types';
+import { UserQuery } from '@/api/system/user/types';
const props = defineProps({
roleId: {
- type: [Number, String]
+ type: [Number, String],
+ required: true
}
});
-const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
-const userList = ref([]);
+const userList = ref<UserVO[]>([]);
const visible = ref(false);
const total = ref(0);
-const userIds = ref([]);
+const userIds = ref<Array<string | number>>([]);
-const queryParams = reactive({
+const queryParams = reactive<UserQuery>({
pageNum: 1,
pageSize: 10,
roleId: undefined,
@@ -85,56 +71,62 @@
phonenumber: undefined
});
-// 鏄剧ず寮规
-function show() {
+const tableRef = ref<ElTableInstance>();
+const queryFormRef = ref<ElFormInstance>();
+
+const show = () => {
queryParams.roleId = props.roleId;
getList();
visible.value = true;
-}
-/**閫夋嫨琛� */
-function clickRow(row) {
- proxy.$refs["refTable"].toggleRowSelection(row);
-}
-// 澶氶�夋閫変腑鏁版嵁
-function handleSelectionChange(selection) {
- userIds.value = selection.map(item => item.userId);
-}
-// 鏌ヨ琛ㄦ暟鎹�
-function getList() {
- unallocatedUserList(queryParams).then(res => {
- userList.value = res.rows;
- total.value = res.total;
- });
-}
+};
+
+/**
+ * 閫夋嫨琛�
+ */
+const clickRow = (row: any) => {
+ // ele鐨刡ug
+ tableRef.value?.toggleRowSelection(row, false);
+};
+/** 澶氶�夋閫変腑鏁版嵁 */
+const handleSelectionChange = (selection: UserVO[]) => {
+ userIds.value = selection.map((item: UserVO) => item.userId);
+};
+
+/** 鏌ヨ鏁版嵁 */
+const getList = async () => {
+ const res = await unallocatedUserList(queryParams);
+ userList.value = res.rows;
+ total.value = res.total;
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
+const handleQuery = () => {
queryParams.pageNum = 1;
getList();
-}
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
- proxy.resetForm("queryRef");
- handleQuery();
-}
-const emit = defineEmits(["ok"]);
-/** 閫夋嫨鎺堟潈鐢ㄦ埛鎿嶄綔 */
-function handleSelectUser() {
+const resetQuery = () => {
+ queryFormRef.value?.resetFields();
+ getList();
+};
+
+const emit = defineEmits(['ok']);
+/**閫夋嫨鎺堟潈鐢ㄦ埛鎿嶄綔 */
+const handleSelectUser = async () => {
const roleId = queryParams.roleId;
- const uIds = userIds.value.join(",");
- if (uIds == "") {
- proxy.$modal.msgError("璇烽�夋嫨瑕佸垎閰嶇殑鐢ㄦ埛");
+ const ids = userIds.value.join(',');
+ if (ids == '') {
+ proxy?.$modal.msgError('璇烽�夋嫨瑕佸垎閰嶇殑鐢ㄦ埛');
return;
}
- authUserSelectAll({ roleId: roleId, userIds: uIds }).then(res => {
- proxy.$modal.msgSuccess(res.msg);
- if (res.code === 200) {
- visible.value = false;
- emit("ok");
- }
- });
-}
-
+ await authUserSelectAll({ roleId, userIds: ids });
+ proxy?.$modal.msgSuccess('鍒嗛厤鎴愬姛');
+ emit('ok');
+ visible.value = false;
+};
+// 鏆撮湶
defineExpose({
- show,
+ show
});
</script>
+
+<style scoped></style>
--
Gitblit v1.9.3