From 75cfe2f8f77a641469d62c8bf8d3c6a00a5604f1 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 23 四月 2022 22:04:12 +0800
Subject: [PATCH] Merge pull request #48 from JavaLionLi/patch-1
---
src/views/system/user/index.vue | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 367d147..e5616f0 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>
@@ -151,36 +151,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)"
@@ -386,7 +382,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([
@@ -413,7 +409,7 @@
userName: [{ required: true, message: "鐢ㄦ埛鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }, { min: 2, max: 20, message: "鐢ㄦ埛鍚嶇О闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿", trigger: "blur" }],
nickName: [{ required: true, message: "鐢ㄦ埛鏄电О涓嶈兘涓虹┖", trigger: "blur" }],
password: [{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }, { min: 5, max: 20, message: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿", trigger: "blur" }],
- email: [{ type: "email", message: "'璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
+ email: [{ type: "email", message: "璇疯緭鍏ユ纭殑閭鍦板潃", trigger: ["blur", "change"] }],
phonenumber: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "璇疯緭鍏ユ纭殑鎵嬫満鍙风爜", trigger: "blur" }]
}
});
@@ -592,7 +588,7 @@
roleOptions.value = response.roles;
open.value = true;
title.value = "娣诲姞鐢ㄦ埛";
- form.password.value = initPassword.value;
+ form.value.password = initPassword.value;
});
};
/** 淇敼鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3