From 61ef4c71bcb083f6169b1247b4f636b2a6f39f6a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 14 一月 2023 00:57:31 +0800
Subject: [PATCH] remove 删除 主子表相关代码
---
ruoyi-ui/src/views/system/user/index.vue | 57 ++++++++++++++++++++++++++-------------------------------
1 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index aaa202d..b2120e6 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -20,20 +20,21 @@
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="tree"
+ node-key="id"
default-expand-all
+ highlight-current
@node-click="handleNodeClick"
/>
</div>
</el-col>
<!--鐢ㄦ埛鏁版嵁-->
<el-col :span="20" :xs="24">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="璇疯緭鍏ョ敤鎴峰悕绉�"
clearable
- size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
@@ -43,7 +44,6 @@
v-model="queryParams.phonenumber"
placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�"
clearable
- size="small"
style="width: 240px"
@keyup.enter.native="handleQuery"
/>
@@ -53,7 +53,6 @@
v-model="queryParams.status"
placeholder="鐢ㄦ埛鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
@@ -67,7 +66,6 @@
<el-form-item label="鍒涘缓鏃堕棿">
<el-date-picker
v-model="dateRange"
- size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
@@ -131,7 +129,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['system:user:export']"
>瀵煎嚭</el-button>
@@ -183,9 +180,7 @@
v-hasPermi="['system:user:remove']"
>鍒犻櫎</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
- <span class="el-dropdown-link">
- <i class="el-icon-d-arrow-right el-icon--right"></i>鏇村
- </span>
+ <el-button size="mini" type="text" icon="el-icon-d-arrow-right">鏇村</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleResetPwd" icon="el-icon-key"
v-hasPermi="['system:user:resetPwd']">閲嶇疆瀵嗙爜</el-dropdown-item>
@@ -207,7 +202,7 @@
</el-col>
</el-row>
- <!-- 娣诲姞鎴栦慨鏀瑰弬鏁伴厤缃璇濇 -->
+ <!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
@@ -249,7 +244,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="鐢ㄦ埛鎬у埆">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
<el-option
v-for="dict in dict.type.sys_user_sex"
:key="dict.value"
@@ -274,7 +269,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="宀椾綅">
- <el-select v-model="form.postIds" multiple placeholder="璇烽�夋嫨">
+ <el-select v-model="form.postIds" multiple placeholder="璇烽�夋嫨宀椾綅">
<el-option
v-for="item in postOptions"
:key="item.postId"
@@ -287,7 +282,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="瑙掕壊">
- <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨">
+ <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨瑙掕壊">
<el-option
v-for="item in roleOptions"
:key="item.roleId"
@@ -346,9 +341,8 @@
</template>
<script>
-import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";
+import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { getToken } from "@/utils/auth";
-import { treeselect } from "@/api/system/dept";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -360,8 +354,6 @@
return {
// 閬僵灞�
loading: true,
- // 瀵煎嚭閬僵灞�
- exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -446,7 +438,7 @@
email: [
{
type: "email",
- message: "'璇疯緭鍏ユ纭殑閭鍦板潃",
+ message: "璇疯緭鍏ユ纭殑閭鍦板潃",
trigger: ["blur", "change"]
}
],
@@ -468,7 +460,7 @@
},
created() {
this.getList();
- this.getTreeselect();
+ this.getDeptTree();
this.getConfigKey("sys.user.initPassword").then(response => {
this.initPassword = response.msg;
});
@@ -485,8 +477,8 @@
);
},
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
- getTreeselect() {
- treeselect().then(response => {
+ getDeptTree() {
+ deptTreeSelect().then(response => {
this.deptOptions = response.data;
});
},
@@ -498,7 +490,7 @@
// 鑺傜偣鍗曞嚮浜嬩欢
handleNodeClick(data) {
this.queryParams.deptId = data.id;
- this.getList();
+ this.handleQuery();
},
// 鐢ㄦ埛鐘舵�佷慨鏀�
handleStatusChange(row) {
@@ -543,6 +535,8 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
+ this.queryParams.deptId = undefined;
+ this.$refs.tree.setCurrentKey(null);
this.handleQuery();
},
// 澶氶�夋閫変腑鏁版嵁
@@ -567,7 +561,6 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.reset();
- this.getTreeselect();
getUser().then(response => {
this.postOptions = response.data.posts;
this.roleOptions = response.data.roles;
@@ -579,14 +572,13 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
- this.getTreeselect();
const userId = row.userId || this.ids;
getUser(userId).then(response => {
this.form = response.data.user;
this.postOptions = response.data.posts;
this.roleOptions = response.data.roles;
- this.form.postIds = response.data.postIds;
- this.form.roleIds = response.data.roleIds;
+ this.$set(this.form, "postIds", response.data.postIds);
+ this.$set(this.form, "roleIds", response.data.roleIds);
this.open = true;
this.title = "淇敼鐢ㄦ埛";
this.form.password = "";
@@ -599,7 +591,7 @@
cancelButtonText: "鍙栨秷",
closeOnClickModal: false,
inputPattern: /^.{5,20}$/,
- inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿",
+ inputErrorMessage: "鐢ㄦ埛瀵嗙爜闀垮害蹇呴』浠嬩簬 5 鍜� 20 涔嬮棿"
}).then(({ value }) => {
resetUserPwd(row.userId, value).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛锛屾柊瀵嗙爜鏄細" + value);
@@ -643,7 +635,9 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- this.downLoadExcel('/system/user/export', this.queryParams);
+ this.download('system/user/export', {
+ ...this.queryParams
+ }, `user_${new Date().getTime()}.xlsx`)
},
/** 瀵煎叆鎸夐挳鎿嶄綔 */
handleImport() {
@@ -652,7 +646,8 @@
},
/** 涓嬭浇妯℃澘鎿嶄綔 */
importTemplate() {
- this.downLoadExcel('/system/user/importTemplate');
+ this.download('system/user/importTemplate', {
+ }, `user_template_${new Date().getTime()}.xlsx`)
},
// 鏂囦欢涓婁紶涓鐞�
handleFileUploadProgress(event, file, fileList) {
@@ -663,7 +658,7 @@
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
- this.$alert(response.msg, "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
+ this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "瀵煎叆缁撴灉", { dangerouslyUseHTMLString: true });
this.getList();
},
// 鎻愪氦涓婁紶鏂囦欢
@@ -672,4 +667,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3