|
@@ -5,48 +5,26 @@
|
|
创建账号
|
|
创建账号
|
|
</el-button>
|
|
</el-button>
|
|
</div> -->
|
|
</div> -->
|
|
- <el-table
|
|
|
|
- border
|
|
|
|
- :data="tableData"
|
|
|
|
- style="
|
|
|
|
|
|
+ <el-table border :data="tableData" style="
|
|
width: 80%;
|
|
width: 80%;
|
|
font-size: 20px;
|
|
font-size: 20px;
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
border-radius: 4px;
|
|
border-radius: 4px;
|
|
margin: 20px 0 0 50px;
|
|
margin: 20px 0 0 50px;
|
|
- "
|
|
|
|
- >
|
|
|
|
|
|
+ ">
|
|
<el-table-column prop="id" label="ID" width="180" align="center" />
|
|
<el-table-column prop="id" label="ID" width="180" align="center" />
|
|
- <el-table-column
|
|
|
|
- prop="username"
|
|
|
|
- label="用户名"
|
|
|
|
- width="180"
|
|
|
|
- align="center"
|
|
|
|
- />
|
|
|
|
- <el-table-column
|
|
|
|
- prop="full_name"
|
|
|
|
- label="全名"
|
|
|
|
- width="300"
|
|
|
|
- align="center"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-table-column prop="username" label="用户名" width="180" align="center" />
|
|
|
|
+ <el-table-column prop="full_name" label="全名" width="300" align="center" />
|
|
<el-table-column prop="email" label="邮箱" width="400" align="center" />
|
|
<el-table-column prop="email" label="邮箱" width="400" align="center" />
|
|
<el-table-column fixed="right" label="操作" align="center">
|
|
<el-table-column fixed="right" label="操作" align="center">
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
- <el-button link type="primary" @click="handleEdit(scope.row)"
|
|
|
|
- >编辑</el-button
|
|
|
|
- >
|
|
|
|
|
|
+ <el-button link type="primary" @click="handleEdit(scope.row)">编辑</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
<div class="page">
|
|
<div class="page">
|
|
- <el-pagination
|
|
|
|
- v-if="total > 0"
|
|
|
|
- :page-sizes="[10, 20, 30, 40, 100]"
|
|
|
|
- :page-size="page.pageSize"
|
|
|
|
- :total="total"
|
|
|
|
- @current-change="handleCurrentChange"
|
|
|
|
- layout="total, prev, pager, next, jumper"
|
|
|
|
- ></el-pagination>
|
|
|
|
|
|
+ <el-pagination v-if="total > 0" :page-sizes="[10, 20, 30, 40, 100]" :page-size="page.pageSize" :total="total"
|
|
|
|
+ @current-change="handleCurrentChange" layout="total, prev, pager, next, jumper"></el-pagination>
|
|
</div>
|
|
</div>
|
|
<el-dialog v-model="dialogFormVisible" title="编辑账号" width="500">
|
|
<el-dialog v-model="dialogFormVisible" title="编辑账号" width="500">
|
|
<el-form :model="form">
|
|
<el-form :model="form">
|
|
@@ -55,12 +33,7 @@
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="角色">
|
|
<el-form-item label="角色">
|
|
<el-select v-model="form.role_ids" placeholder="Please select a zone">
|
|
<el-select v-model="form.role_ids" placeholder="Please select a zone">
|
|
- <el-option
|
|
|
|
- v-for="item in rolesData"
|
|
|
|
- :key="item.id"
|
|
|
|
- :label="item.name"
|
|
|
|
- :value="item.id"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-option v-for="item in rolesData" :key="item.id" :label="item.name" :value="item.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-form>
|
|
</el-form>
|
|
@@ -71,35 +44,23 @@
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</el-dialog>
|
|
</el-dialog>
|
|
- <el-dialog
|
|
|
|
- v-model="orgRoleDialogVisible"
|
|
|
|
- title="用户机构与角色管理"
|
|
|
|
- width="70vw"
|
|
|
|
- >
|
|
|
|
- <el-button type="primary" @click="handleAddOrgRole" style="margin: 10px"
|
|
|
|
- >新增机构角色</el-button
|
|
|
|
- >
|
|
|
|
|
|
+ <el-dialog v-model="orgRoleDialogVisible" title="用户机构与角色管理" width="70vw">
|
|
|
|
+ <el-button type="primary" @click="handleAddOrgRole" style="margin: 10px">新增机构角色</el-button>
|
|
<el-table :data="orgRoleTable" style="width: 100%">
|
|
<el-table :data="orgRoleTable" style="width: 100%">
|
|
<el-table-column prop="organ_name" label="机构" />
|
|
<el-table-column prop="organ_name" label="机构" />
|
|
<el-table-column prop="role_name" label="角色" />
|
|
<el-table-column prop="role_name" label="角色" />
|
|
<el-table-column prop="data_type" label="类型">
|
|
<el-table-column prop="data_type" label="类型">
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
<span>
|
|
<span>
|
|
- {{ scope.row.data_type === 1 ? '个人' : scope.row.data_type === 2 ? '本机构' : scope.row.data_type === 3 ? '机构及下辖机构' : '' }}
|
|
|
|
|
|
+ {{ scope.row.data_type === 1 ? '个人' : scope.row.data_type === 2 ? '本机构' : scope.row.data_type === 3 ?
|
|
|
|
+ '机构及下辖机构' : '' }}
|
|
</span>
|
|
</span>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
<el-table-column label="操作" width="180">
|
|
<el-table-column label="操作" width="180">
|
|
<template #default="scope">
|
|
<template #default="scope">
|
|
- <el-button size="small" @click="handleEditOrgRole(scope.row)"
|
|
|
|
- >编辑</el-button
|
|
|
|
- >
|
|
|
|
- <el-button
|
|
|
|
- size="small"
|
|
|
|
- type="danger"
|
|
|
|
- @click="handleDeleteOrgRole(scope.row)"
|
|
|
|
- >删除</el-button
|
|
|
|
- >
|
|
|
|
|
|
+ <el-button size="small" @click="handleEditOrgRole(scope.row)">编辑</el-button>
|
|
|
|
+ <el-button size="small" type="danger" @click="handleDeleteOrgRole(scope.row)">删除</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -107,24 +68,13 @@
|
|
<el-dialog v-model="isEditOrgRole" :title="EditOrgRoleTittle" width="700">
|
|
<el-dialog v-model="isEditOrgRole" :title="EditOrgRoleTittle" width="700">
|
|
<el-form :model="orgRoleForm" label-width="80px">
|
|
<el-form :model="orgRoleForm" label-width="80px">
|
|
<el-form-item label="机构">
|
|
<el-form-item label="机构">
|
|
- <el-tree-select
|
|
|
|
- v-model="orgRoleForm.organ_id"
|
|
|
|
- :data="orgList"
|
|
|
|
- :props="{ label: 'name', value: 'id', children: 'children' }"
|
|
|
|
- placeholder="请选择机构"
|
|
|
|
- clearable
|
|
|
|
- check-strictly
|
|
|
|
- style="width: 100%"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-tree-select v-model="orgRoleForm.organ_id" :data="orgList"
|
|
|
|
+ :props="{ label: 'name', value: 'id', children: 'children' }" placeholder="请选择机构" clearable check-strictly
|
|
|
|
+ style="width: 100%" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="角色">
|
|
<el-form-item label="角色">
|
|
<el-select v-model="orgRoleForm.role_id" placeholder="请选择角色">
|
|
<el-select v-model="orgRoleForm.role_id" placeholder="请选择角色">
|
|
- <el-option
|
|
|
|
- v-for="role in roleList"
|
|
|
|
- :key="role.id"
|
|
|
|
- :label="role.name"
|
|
|
|
- :value="role.id"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-option v-for="role in roleList" :key="role.id" :label="role.name" :value="role.id" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="类型">
|
|
<el-form-item label="类型">
|
|
@@ -223,7 +173,7 @@ const handleEditOrgRole = (row) => {
|
|
};
|
|
};
|
|
// 删除机构角色
|
|
// 删除机构角色
|
|
const handleDeleteOrgRole = async (row) => {
|
|
const handleDeleteOrgRole = async (row) => {
|
|
- await proxy.$http.post("/open-platform/userRoleOrgan/delete/"+ row.id);
|
|
|
|
|
|
+ await proxy.$http.post("/open-platform/userRoleOrgan/delete/" + row.id);
|
|
fetchUserOrgRoles(currentUserId.value);
|
|
fetchUserOrgRoles(currentUserId.value);
|
|
};
|
|
};
|
|
// 保存机构角色
|
|
// 保存机构角色
|
|
@@ -247,7 +197,7 @@ const init = () => {
|
|
},
|
|
},
|
|
})
|
|
})
|
|
.then((res) => {
|
|
.then((res) => {
|
|
- console.log(res, "11");
|
|
|
|
|
|
+ // console.log(res, "11");
|
|
if (res.records && res.records.length > 0) {
|
|
if (res.records && res.records.length > 0) {
|
|
res.records.forEach((item) => {
|
|
res.records.forEach((item) => {
|
|
tableData.value.push(item);
|
|
tableData.value.push(item);
|
|
@@ -303,10 +253,14 @@ const submitChange = () => {
|
|
|
|
|
|
<style lang="less" scoped>
|
|
<style lang="less" scoped>
|
|
:deep(.el-table th) {
|
|
:deep(.el-table th) {
|
|
- background-color: #eef6ff !important; /* 设置你想要的背景颜色 */
|
|
|
|
- color: #333; /* 设置表头文字颜色 */
|
|
|
|
- font-weight: bold; /* 设置表头文字加粗 */
|
|
|
|
|
|
+ background-color: #eef6ff !important;
|
|
|
|
+ /* 设置你想要的背景颜色 */
|
|
|
|
+ color: #333;
|
|
|
|
+ /* 设置表头文字颜色 */
|
|
|
|
+ font-weight: bold;
|
|
|
|
+ /* 设置表头文字加粗 */
|
|
}
|
|
}
|
|
|
|
+
|
|
.page {
|
|
.page {
|
|
display: flex;
|
|
display: flex;
|
|
justify-content: end;
|
|
justify-content: end;
|