From 8d81c0fd140addfa641a1e70532fb8b6447a3174 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 13 二月 2025 13:07:11 +0800
Subject: [PATCH] 用户管理页面联调
---
src/views/system/user/index.vue | 115 +++++++++++++++++--------------------
src/router/index.js | 6 --
2 files changed, 53 insertions(+), 68 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 5b337ae..91a52f6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -93,12 +93,6 @@
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
export const dynamicRoutes = [
{
- // 鍘熸潗鏂欐姤妫�
- path: '/rawMaterialInspection',
- component: Layout,
- hidden: true,
- },
- {
// 鍘熸潗鏂欎笅鍗�
path: '/materialOrder',
component: Layout,
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index a999c8f..eabb966 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -19,11 +19,11 @@
<div class="search_form">
<div>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
+ <el-form-item label="鐢ㄦ埛鍚嶇О" prop="nickName">
+ <el-input v-model="queryParams.nickName" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" clearable style="width: 240px" @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鐘舵��" prop="state">
- <el-select v-model="queryParams.state" placeholder="鐢ㄦ埛鐘舵��" clearable style="width: 240px">
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="鐢ㄦ埛鐘舵��" clearable style="width: 240px">
<el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
@@ -41,16 +41,15 @@
<el-col>
<el-table v-loading="loading" :data="userList">
<el-table-column label="搴忓彿" align="center" type="index" />
- <el-table-column label="濮撳悕" align="center" key="name" prop="name" :show-overflow-tooltip="true" />
- <el-table-column label="璐﹀彿" align="center" key="account" prop="account" :show-overflow-tooltip="true" />
- <el-table-column label="瑙掕壊" align="center" key="roleName" prop="roleName" :show-overflow-tooltip="true" />
- <el-table-column label="鐘舵��" align="center" key="state">
+ <el-table-column label="濮撳悕" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
+ <el-table-column label="璐﹀彿" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
+ <el-table-column label="鐘舵��" align="center" key="status">
<template slot-scope="scope">
- <el-switch v-model="scope.row.state" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
+ <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
</template>
</el-table-column>
- <el-table-column label="鎵嬫満鍙风爜" align="center" key="phone" prop="phone" width="120" />
- <el-table-column label="鎿嶄綔" align="center" width="160" class-name="small-padding fixed-width">
+ <el-table-column label="鎵嬫満鍙风爜" align="center" key="phonenumber" prop="phonenumber" width="120" />
+ <el-table-column label="鎿嶄綔" align="center" width="160" class-nickName="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">淇敼</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">鍒犻櫎</el-button>-->
@@ -71,39 +70,39 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body @close="reset">
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<el-row>
<el-col :span="12">
- <el-form-item label="濮撳悕" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
+ <el-form-item label="濮撳悕" prop="nickName">
+ <el-input v-model="form.nickName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="璐﹀彿" prop="account">
- <el-input v-model="form.account" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
+ <el-form-item label="璐﹀彿" prop="userName">
+ <el-input v-model="form.userName" placeholder="璇疯緭鍏ョ敤鎴锋樀绉�" maxlength="30" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鐘舵��" prop="state">
- <el-radio-group v-model="form.state">
+ <el-form-item label="鐘舵��" prop="status">
+ <el-radio-group v-model="form.status">
<el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐢佃瘽鍙风爜" prop="phone">
- <el-input v-model="form.phone" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="11" />
+ <el-form-item label="鐢佃瘽鍙风爜" prop="phonenumber">
+ <el-input v-model="form.phonenumber" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="11" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="瑙掕壊" prop="roleName">
- <el-select v-model="form.roleName" placeholder="璇烽�夋嫨瑙掕壊" style="width: 100%" clearable>
- <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+ <el-form-item label="瑙掕壊" prop="roleIds">
+ <el-select v-model="form.roleIds" multiple placeholder="璇烽�夋嫨瑙掕壊" clearable>
+ <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -120,17 +119,12 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="骞撮緞" prop="age">
- <el-input v-model="form.age" placeholder="璇疯緭鍏ョ敤鎴峰悕绉�" maxlength="30" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
<el-form-item label="閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="鍗曚綅" prop="company">
<el-select v-model="form.company" placeholder="璇烽�夋嫨宀椾綅" style="width: 100%" clearable>
@@ -223,7 +217,7 @@
</el-table-column>
<el-table-column prop="employeeID" label="鍛樺伐鍙�">
</el-table-column>
- <el-table-column prop="name" label="鍛樺伐濮撳悕">
+ <el-table-column prop="nickName" label="鍛樺伐濮撳悕">
</el-table-column>
<el-table-column prop="department" label="閮ㄩ棬" min-width="200">
</el-table-column>
@@ -248,7 +242,7 @@
<span class="required-span">* </span>鏋舵瀯鍚嶇О锛�
</el-col>
<el-col :span="16" :offset="1">
- <el-input v-model="addOb.name" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small"></el-input>
+ <el-input v-model="addOb.nickName" placeholder="璇疯緭鍏ユ灦鏋勫悕绉�" clearable size="small"></el-input>
</el-col>
</el-row>
</div>
@@ -279,7 +273,7 @@
import "splitpanes/dist/splitpanes.css";
export default {
- name: "User",
+ nickName: "User",
dicts: ['sys_normal_disable', 'sys_user_sex'],
components: { Treeselect, Splitpanes, Pane },
data() {
@@ -344,9 +338,9 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- name: undefined,
- phone: undefined,
- state: undefined,
+ nickName: undefined,
+ phonenumber: undefined,
+ status: undefined,
deptId: undefined
},
// 鍒椾俊鎭�
@@ -361,25 +355,25 @@
],
// 琛ㄥ崟鏍￠獙
rules: {
- name: [
+ nickName: [
{ required: true, message: "璇峰～鍐欏鍚�", trigger: "blur" },
],
- account: [
+ userName: [
{ required: true, message: "璇峰～鍐欒处鍙�", trigger: "blur" }
],
nameEn: [
{ required: true, message: "璇疯緭鍏ュ鍚岴N", trigger: "blur" }
],
- state: [
+ status: [
{ required: true, message: "璇烽�夋嫨鐘舵��", trigger: "change" }
],
- roleName: [
+ roleIds: [
{ required: true, message: "璇烽�夋嫨瑙掕壊", trigger: "change" }
],
password: [
{ required: true, message: "瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" },
],
- phone: [
+ phonenumber: [
{
required: true,
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
@@ -404,7 +398,7 @@
addDia: false, // 娣诲姞鏋舵瀯寮规
addOb: {
fatherId: 10001,
- name: '',
+ nickName: '',
},
};
},
@@ -438,7 +432,7 @@
},
// 鎻愪氦鏋舵瀯
addStandardTree () {
- if (this.addOb.name == null || this.addOb.factory == '') {
+ if (this.addOb.nickName == null || this.addOb.factory == '') {
this.$message.error('鏋勬灦鍚嶇О鏄繀濉」')
return
}
@@ -452,7 +446,7 @@
this.addDia = false
this.getList()
this.addLoad = false
- this.addOb.name = ''
+ this.addOb.nickName = ''
}).catch(e => {
this.addDia = false
this.addLoad = false
@@ -489,13 +483,13 @@
},
// 鐢ㄦ埛鐘舵�佷慨鏀�
handleStatusChange(row) {
- let text = row.state === "0" ? "鍚敤" : "鍋滅敤";
- this.$modal.confirm('纭瑕�"' + text + '""' + row.name + '"鐢ㄦ埛鍚楋紵').then(function() {
- return changeUserStatus(row.userId, row.state);
+ let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
+ this.$modal.confirm('纭瑕�"' + text + '""' + row.nickName + '"鐢ㄦ埛鍚楋紵').then(function() {
+ return changeUserStatus(row.userId, row.status);
}).then(() => {
this.$modal.msgSuccess(text + "鎴愬姛");
}).catch(function() {
- row.state = row.state === "0" ? "1" : "0";
+ row.status = row.status === "0" ? "1" : "0";
});
},
// 鍙栨秷鎸夐挳
@@ -508,16 +502,16 @@
this.form = {
userId: undefined,
deptId: undefined,
- name: undefined,
- account: undefined,
- phone: undefined,
+ nickName: undefined,
+ userName: undefined,
+ phonenumber: undefined,
password: undefined,
nameEn: undefined,
email: undefined,
sex: undefined,
- state: "0",
+ status: "0",
company: '',
- roleName: ''
+ roleIds: []
};
this.resetForm("form");
},
@@ -591,7 +585,7 @@
searchPerson() {
let arr = JSON.parse(JSON.stringify(this.personListCopy))
this.personList = arr.filter(a => {
- if (a.employeeID.includes(this.userSearch2) || a.name.includes(this.userSearch2)) {
+ if (a.employeeID.includes(this.userSearch2) || a.nickName.includes(this.userSearch2)) {
return true
}
})
@@ -669,10 +663,8 @@
selectCustomEnum().then(res => {
this.postOptions = res.data;
})
- selectRoleList().then(res => {
- this.roleOptions = res.data;
- })
getUser().then(response => {
+ this.roleOptions = response.roles;
this.title = "娣诲姞鐢ㄦ埛";
this.form.password = this.initPassword;
});
@@ -683,12 +675,11 @@
selectCustomEnum().then(res => {
this.postOptions = res.data;
})
- selectRoleList().then(res => {
- this.roleOptions = res.data;
- })
- const userId = row.userId;
+ const userId = row.userId || this.ids;
getUser(userId).then(response => {
this.form = response.data;
+ this.roleOptions = response.roles;
+ this.$set(this.form, "roleIds", response.roleIds);
this.open = true;
this.title = "淇敼鐢ㄦ埛";
this.form.password = "";
@@ -696,7 +687,7 @@
},
/** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */
handleResetPwd(row) {
- this.$prompt('璇疯緭鍏�"' + row.name + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
+ this.$prompt('璇疯緭鍏�"' + row.nickName + '"鐨勬柊瀵嗙爜', "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
closeOnClickModal: false,
--
Gitblit v1.9.3