From 1e5ac4c55fcc766352275c6027952bbe2c17fb8d Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期三, 08 六月 2022 19:23:36 +0800
Subject: [PATCH] Merge pull request #60 from zzh948498/master
---
src/views/system/user/index.vue | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 3f988fa..da3a501 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -8,7 +8,7 @@
v-model="deptName"
placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
clearable
- prefix-icon="el-icon-search"
+ prefix-icon="Search"
style="margin-bottom: 20px"
/>
</div>
@@ -19,6 +19,7 @@
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="deptTreeRef"
+ highlight-current
default-expand-all
@node-click="handleNodeClick"
/>
@@ -151,36 +152,32 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="150" class-name="small-padding fixed-width">
<template #default="scope">
- <el-tooltip content="淇敼" placement="top">
+ <el-tooltip content="淇敼" placement="top" v-if="scope.row.userId !== 1">
<el-button
- v-if="scope.row.userId !== 1"
type="text"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:user:edit']"
></el-button>
</el-tooltip>
- <el-tooltip content="鍒犻櫎" placement="top">
+ <el-tooltip content="鍒犻櫎" placement="top" v-if="scope.row.userId !== 1">
<el-button
- v-if="scope.row.userId !== 1"
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:user:remove']"
></el-button>
</el-tooltip>
- <el-tooltip content="閲嶇疆瀵嗙爜" placement="top">
+ <el-tooltip content="閲嶇疆瀵嗙爜" placement="top" v-if="scope.row.userId !== 1">
<el-button
- v-if="scope.row.userId !== 1"
type="text"
icon="Key"
@click="handleResetPwd(scope.row)"
v-hasPermi="['system:user:resetPwd']"
></el-button>
</el-tooltip>
- <el-tooltip content="鍒嗛厤瑙掕壊" placement="top">
+ <el-tooltip content="鍒嗛厤瑙掕壊" placement="top" v-if="scope.row.userId !== 1">
<el-button
- v-if="scope.row.userId !== 1"
type="text"
icon="CircleCheck"
@click="handleAuthRole(scope.row)"
@@ -211,11 +208,13 @@
</el-col>
<el-col :span="12">
<el-form-item label="褰掑睘閮ㄩ棬" prop="deptId">
- <tree-select
- v-model:value="form.deptId"
- :options="deptOptions"
+ <el-tree-select
+ v-model="form.deptId"
+ :data="deptOptions"
+ :props="{ value: 'id', label: 'label', children: 'children' }"
+ value-key="id"
placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬"
- :objMap="{ value: 'id', label: 'label', children: 'children' }"
+ check-strictly
/>
</el-form-item>
</el-col>
@@ -386,7 +385,7 @@
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
headers: { Authorization: "Bearer " + getToken() },
// 涓婁紶鐨勫湴鍧�
- url: import.meta.env.VITE_APP_BASE_API + "system/user/importData"
+ url: import.meta.env.VITE_APP_BASE_API + "/system/user/importData"
});
// 鍒楁樉闅愪俊鎭�
const columns = ref([
@@ -543,7 +542,7 @@
const handleFileSuccess = (response, file, fileList) => {
upload.open = false;
upload.isUploading = false;
- proxy.$refs["uploadRef"].clearFiles();
+ proxy.$refs["uploadRef"].handleRemove(file);
proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
getList();
};
@@ -592,7 +591,7 @@
roleOptions.value = response.roles;
open.value = true;
title.value = "娣诲姞鐢ㄦ埛";
- form.password.value = initPassword.value;
+ form.value.password = initPassword.value;
});
};
/** 淇敼鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3