From db6e95bb9620371c1280b11d01c596c58dfcc0dd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 30 六月 2023 14:54:32 +0800
Subject: [PATCH] fix 修复 菜单管理字段不对应问题
---
src/views/system/user/index.vue | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index c911bd9..bf5a3d3 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -3,11 +3,12 @@
<el-row :gutter="20">
<!-- 閮ㄩ棬鏍� -->
<el-col :lg="4" :xs="24" style="">
- <el-card shadow="never">
+ <el-card shadow="hover">
<el-input v-model="deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" prefix-icon="Search" clearable />
<el-tree
class="mt-2"
ref="deptTreeRef"
+ node-key="id"
:data="deptOptions"
:props="{ label: 'label', children: 'children' }"
:expand-on-click-node="false"
@@ -52,17 +53,19 @@
</div>
</transition>
- <el-card shadow="never">
+ <el-card shadow="hover">
<template #header>
<el-row :gutter="10">
<el-col :span="1.5">
- <el-button type="primary" plain @click="handleAdd()" v-has-permi="['sys:user:add']" icon="Plus">鏂板</el-button>
+ <el-button type="primary" plain @click="handleAdd()" v-has-permi="['system:user:add']" icon="Plus">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="success" plain @click="handleUpdate()" :disabled="single" v-has-permi="['sys:user:add']" icon="Edit">淇敼</el-button>
+ <el-button type="success" plain @click="handleUpdate()" :disabled="single" v-has-permi="['system:user:add']" icon="Edit">
+ 淇敼
+ </el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="danger" plain @click="handleDelete()" :disabled="multiple" v-has-permi="['sys:user:delete']" icon="Delete">
+ <el-button type="danger" plain @click="handleDelete()" :disabled="multiple" v-has-permi="['system:user:delete']" icon="Delete">
鍒犻櫎
</el-button>
</el-col>
@@ -136,7 +139,7 @@
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
- @pagination="handleQuery"
+ @pagination="getList"
/>
</el-card>
</el-col>
@@ -303,7 +306,7 @@
import { DeptVO } from "@/api/system/dept/types";
import { RoleVO } from "@/api/system/role/types";
import { PostVO } from "@/api/system/post/types";
-import { DateModelType, ElTree, ElUpload, UploadFile, UploadFiles, ElForm } from 'element-plus';
+import { DateModelType, ElTree, ElUpload, UploadFile, ElForm } from 'element-plus';
import { to } from "await-to-js";
const router = useRouter();
const { proxy } = getCurrentInstance() as ComponentInternalInstance
@@ -440,6 +443,8 @@
dateRange.value = ['','']
queryFormRef.value.resetFields();
queryParams.value.pageNum = 1;
+ queryParams.value.deptId = undefined;
+ deptTreeRef.value.setCurrentKey(null);
handleQuery();
}
@@ -457,14 +462,13 @@
/** 鐢ㄦ埛鐘舵�佷慨鏀� */
const handleStatusChange = async (row: UserVO) => {
let text = row.status === "0" ? "鍚敤" : "鍋滅敤"
- const [err] = await to(proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚�?') as any)
- if(err) {
- row.status = row.status === "0" ? "1" : "0";
- } else {
+ try {
+ await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.userName + '"鐢ㄦ埛鍚�?');
await changeUserStatus(row.userId, row.status);
proxy?.$modal.msgSuccess(text + "鎴愬姛");
+ } catch (err) {
+ row.status = row.status === "0" ? "1" : "0";
}
-
}
/** 璺宠浆瑙掕壊鍒嗛厤 */
const handleAuthRole = (row: UserVO) => {
@@ -516,7 +520,7 @@
upload.isUploading = true;
}
/** 鏂囦欢涓婁紶鎴愬姛澶勭悊 */
-const handleFileSuccess = (response: any, file: UploadFile, fileList: UploadFiles) => {
+const handleFileSuccess = (response: any, file: UploadFile) => {
upload.open = false;
upload.isUploading = false;
uploadRef.value.handleRemove(file);
--
Gitblit v1.9.3