From d0bec404f2c22ca04e8592f1a2ba0b39eab0be2f Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期一, 22 五月 2023 09:37:03 +0800
Subject: [PATCH] Default Changelist
---
src/views/system/user/index.vue | 63 +++++++++++++++----------------
1 files changed, 30 insertions(+), 33 deletions(-)
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f60a998..9af926e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -31,22 +31,22 @@
<el-table-column prop="username" label="用户名" show-overflow-tooltip></el-table-column>
<el-table-column prop="realName" label="真实姓名" show-overflow-tooltip></el-table-column>
<el-table-column prop="gender" label="性别" show-overflow-tooltip>
- <template #default="scope">
- <el-tag type="success" v-if="scope.row.gender == 1">男</el-tag>
- <el-tag type="success" v-else-if="scope.row.gender == 0">女</el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="positionId" label="职务" show-overflow-tooltip>
- <template #default="scope">
- {{ parseNumber(scope.row.positionId) }}
- </template>
- </el-table-column>
- <el-table-column prop="type" label="职务" show-overflow-tooltip>
<template #default="scope">
- {{ `${userTypeList.find(item => item.id === scope.row.type)?.name}` }}
+ <el-tag type="success" v-if="scope.row.gender == 1">男</el-tag>
+ <el-tag type="success" v-else-if="scope.row.gender == 0">女</el-tag>
</template>
</el-table-column>
- <el-table-column prop="department.depName" label="部门" show-overflow-tooltip></el-table-column>
+ <el-table-column prop="positionId" label="职务" show-overflow-tooltip>
+ <template #default="scope">
+ {{ scope.row.positions?.map(i=>i.positionName).join('、') }}
+ </template>
+ </el-table-column>
+<!-- <el-table-column prop="type" label="职务" show-overflow-tooltip>-->
+<!-- <template #default="scope">-->
+<!-- {{ `${userTypeList.find(item => item.id === scope.row.type)?.name}` }}-->
+<!-- </template>-->
+<!-- </el-table-column>-->
+ <el-table-column prop="depName" label="部门" show-overflow-tooltip></el-table-column>
<el-table-column prop="phone" label="手机号" show-overflow-tooltip></el-table-column>
<el-table-column prop="email" label="邮箱" show-overflow-tooltip></el-table-column>
<el-table-column prop="status" label="用户状态" show-overflow-tooltip>
@@ -56,8 +56,9 @@
</template>
</el-table-column>
<el-table-column prop="gmtCreate" label="创建时间" show-overflow-tooltip></el-table-column>
- <el-table-column label="操作" width="100">
+ <el-table-column label="操作" width="140">
<template #default="scope">
+ <el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenUserDialog('查看', scope.row)">查看</el-button>
<el-button :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onOpenUserDialog('修改', scope.row)">修改</el-button>
<el-button style="color: red" :disabled="scope.row.userName === 'admin'" size="small" text type="primary" @click="onRowDel(scope.row)">删除</el-button>
</template>
@@ -143,10 +144,10 @@
roleList: [],
dutyList: [],
props: {
- label: 'depName',
- value: 'depId',
- checkStrictly: true,
- emitPath: false
+ label: 'depName',
+ value: 'depId',
+ checkStrictly: true,
+ emitPath: false
},
userTypeList: [
{ id: 1, name: '超级管理员' },
@@ -196,17 +197,17 @@
}
};
- const getDutyData = async () => {
- let res = await dutyApi().getAllList({positionName: '',positionCode: ''});
- if (res.data.code === '200') {
- state.dutyList = res.data.data;
- } else {
- ElMessage({
- type: 'warning',
- message: res.data.msg
- });
- }
- };
+ const getDutyData = async () => {
+ let res = await dutyApi().getAllList({positionName: '',positionCode: ''});
+ if (res.data.code === '200') {
+ state.dutyList = res.data.data;
+ } else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+ };
// 打开新增修改用户弹窗
const onOpenUserDialog = (type: string, value: any) => {
@@ -250,10 +251,6 @@
};
// 页面加载时
onMounted(() => {
- let a = { name: 1, c: { name: 1 } };
- let b = Object.assign({}, a);
- b.c.name = 2;
- console.log(a.c.name);
initUserTableData();
getDepartmentData();
getRoleData();
--
Gitblit v1.9.2