delete alert style

This commit is contained in:
ailanyin
2023-05-17 09:56:28 +08:00
parent e9764b6eb3
commit 26d259e8f0
111 changed files with 7876 additions and 6223 deletions

View File

@ -1,160 +1,232 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryRef" :inline="true" :model="queryParams">
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入部门名称"
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" clearable placeholder="部门状态" style="width: 200px">
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:dept:add']"
icon="Plus"
plain
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
icon="Sort"
plain
type="info"
@click="toggleExpandAll"
>展开/折叠
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="deptList"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
row-key="deptId"
<div class="app-container">
<el-form
v-show="showSearch"
ref="queryRef"
:inline="true"
:model="queryParams"
>
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入部门名称"
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
clearable
placeholder="部门状态"
style="width: 200px"
>
<el-table-column label="部门名称" prop="deptName" width="260"></el-table-column>
<el-table-column align="center" label="排序" prop="orderNum" width="200"></el-table-column>
<el-table-column align="center" label="状态" prop="status" width="100">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column align="center" label="创建时间" prop="createTime" width="200">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作">
<template #default="scope">
<el-button v-hasPermi="['system:dept:edit']" icon="Edit" link type="primary"
@click="handleUpdate(scope.row)">修改
</el-button>
<el-button v-hasPermi="['system:dept:add']" icon="Plus" link type="primary"
@click="handleAdd(scope.row)">新增
</el-button>
<!--v-if="scope.row.parentId != 0"-->
<el-button v-hasPermi="['system:dept:remove']" icon="Delete" link
type="primary" @click="handleDelete(scope.row)">删除
</el-button>
</template>
</el-table-column>
</el-table>
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 添加或修改部门对话框 -->
<el-dialog v-model="open" :title="title" append-to-body width="600px">
<el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col v-if="form.parentId !== '0'" :span="24">
<el-form-item label="上级部门" prop="parentId">
<el-tree-select
v-model="form.parentId"
:data="deptOptions"
:props="{ value: 'deptId', label: 'deptName', children: 'children' }"
check-strictly
clearable
placeholder="选择上级部门"
value-key="deptId"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入部门名称"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="显示排序" prop="orderNum">
<el-input-number v-model="form.orderNum" :min="0" controls-position="right"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="负责人" prop="leader">
<el-input v-model="form.leader" maxlength="20" placeholder="请输入负责人"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" maxlength="11" placeholder="请输入联系电话"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input v-model="form.email" maxlength="50" placeholder="请输入邮箱"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:dept:add']"
icon="Plus"
plain
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button icon="Sort" plain type="info" @click="toggleExpandAll"
>展开/折叠
</el-button>
</el-col>
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="deptList"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
row-key="deptId"
>
<el-table-column
label="部门名称"
prop="deptName"
width="260"
></el-table-column>
<el-table-column
align="center"
label="排序"
prop="orderNum"
width="200"
></el-table-column>
<el-table-column align="center" label="状态" prop="status" width="100">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
align="center"
label="创建时间"
prop="createTime"
width="200"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
align="center"
class-name="small-padding fixed-width"
label="操作"
>
<template #default="scope">
<el-button
v-hasPermi="['system:dept:edit']"
icon="Edit"
link
type="primary"
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
v-hasPermi="['system:dept:add']"
icon="Plus"
link
type="primary"
@click="handleAdd(scope.row)"
>新增
</el-button>
<!--v-if="scope.row.parentId != 0"-->
<el-button
v-hasPermi="['system:dept:remove']"
icon="Delete"
link
type="primary"
@click="handleDelete(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改部门对话框 -->
<el-dialog v-model="open" :title="title" append-to-body width="600px">
<el-form ref="deptRef" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col v-if="form.parentId !== '0'" :span="24">
<el-form-item label="上级部门" prop="parentId">
<el-tree-select
v-model="form.parentId"
:data="deptOptions"
:props="{
value: 'deptId',
label: 'deptName',
children: 'children',
}"
check-strictly
clearable
placeholder="选择上级部门"
value-key="deptId"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入部门名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="显示排序" prop="orderNum">
<el-input-number
v-model="form.orderNum"
:min="0"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="负责人" prop="leader">
<el-input
v-model="form.leader"
maxlength="20"
placeholder="请输入负责人"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系电话" prop="phone">
<el-input
v-model="form.phone"
maxlength="11"
placeholder="请输入联系电话"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="邮箱" prop="email">
<el-input
v-model="form.email"
maxlength="50"
placeholder="请输入邮箱"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="部门状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script name="Dept" setup>
import {addDept, delDept, getDept, listDept, listDeptExcludeChild, updateDept} from "@/api/system/dept";
import {sys_normal_disable} from "@/constant/dict";
<script lang="jsx" name="Dept" setup>
import {
addDept,
delDept,
getDept,
listDept,
listDeptExcludeChild,
updateDept,
} from "@/api/system/dept";
import { sys_normal_disable } from "@/constant/dict";
import { ElMessageBox } from "element-plus";
const {proxy} = getCurrentInstance();
const { proxy } = getCurrentInstance();
const deptList = ref([]);
const open = ref(false);
@ -166,131 +238,157 @@ const isExpandAll = ref(true);
const refreshTable = ref(true);
const data = reactive({
form: {},
queryParams: {
deptName: undefined,
status: undefined
},
rules: {
// parentId: [{required: true, message: "上级部门不能为空", trigger: "blur"}],
deptName: [{required: true, message: "部门名称不能为空", trigger: "blur"}],
orderNum: [{required: true, message: "显示排序不能为空", trigger: "blur"}],
email: [{type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"]}],
phone: [{pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur"}]
},
form: {},
queryParams: {
deptName: undefined,
status: undefined,
},
rules: {
// parentId: [{required: true, message: "上级部门不能为空", trigger: "blur"}],
deptName: [
{ required: true, message: "部门名称不能为空", trigger: "blur" },
],
orderNum: [
{ required: true, message: "显示排序不能为空", trigger: "blur" },
],
email: [
{
type: "email",
message: "请输入正确的邮箱地址",
trigger: ["blur", "change"],
},
],
phone: [
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur",
},
],
},
});
const {queryParams, form, rules} = toRefs(data);
const { queryParams, form, rules } = toRefs(data);
/** 查询部门列表 */
function getList() {
loading.value = true;
listDept(queryParams.value).then(response => {
deptList.value = proxy.handleTree(response.data, "deptId");
loading.value = false;
});
loading.value = true;
listDept(queryParams.value).then((response) => {
deptList.value = proxy.handleTree(response.data, "deptId");
loading.value = false;
});
}
/** 取消按钮 */
function cancel() {
open.value = false;
reset();
open.value = false;
reset();
}
/** 表单重置 */
function reset() {
form.value = {
deptId: undefined,
parentId: undefined,
deptName: undefined,
orderNum: 0,
leader: undefined,
phone: undefined,
email: undefined,
status: "1"
};
proxy.resetForm("deptRef");
form.value = {
deptId: undefined,
parentId: undefined,
deptName: undefined,
orderNum: 0,
leader: undefined,
phone: undefined,
email: undefined,
status: "1",
};
proxy.resetForm("deptRef");
}
/** 搜索按钮操作 */
function handleQuery() {
getList();
getList();
}
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryRef");
handleQuery();
proxy.resetForm("queryRef");
handleQuery();
}
/** 新增按钮操作 */
function handleAdd(row) {
reset();
listDept().then(response => {
deptOptions.value = proxy.handleTree(response.data, "deptId");
});
if (row != undefined) {
form.value.parentId = row.deptId;
}
open.value = true;
title.value = "添加部门";
reset();
listDept().then((response) => {
deptOptions.value = proxy.handleTree(response.data, "deptId");
});
if (row != undefined) {
form.value.parentId = row.deptId;
}
open.value = true;
title.value = "添加部门";
}
/** 展开/折叠操作 */
function toggleExpandAll() {
refreshTable.value = false;
isExpandAll.value = !isExpandAll.value;
nextTick(() => {
refreshTable.value = true;
});
refreshTable.value = false;
isExpandAll.value = !isExpandAll.value;
nextTick(() => {
refreshTable.value = true;
});
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset();
listDeptExcludeChild(row.deptId).then(response => {
deptOptions.value = proxy.handleTree(response.data, "deptId");
});
getDept(row.deptId).then(response => {
form.value = response.data;
open.value = true;
title.value = "修改部门";
});
reset();
listDeptExcludeChild(row.deptId).then((response) => {
deptOptions.value = proxy.handleTree(response.data, "deptId");
});
getDept(row.deptId).then((response) => {
form.value = response.data;
open.value = true;
title.value = "修改部门";
});
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["deptRef"].validate(valid => {
if (valid) {
if (!form.value.parentId) {
form.value.parentId = "0"
}
if (form.value.deptId != undefined) {
updateDept(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addDept(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
});
}
}
});
proxy.$refs["deptRef"].validate((valid) => {
if (valid) {
if (!form.value.parentId) {
form.value.parentId = "0";
}
if (form.value.deptId != undefined) {
updateDept(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addDept(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
});
}
}
});
}
/** 删除按钮操作 */
function handleDelete(row) {
proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
return delDept(row.deptId);
}).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
}).catch(() => {
});
const messageVnode = () => (
<>
<el-tag type="warning">{row.deptName}</el-tag>
</>
);
ElMessageBox.confirm(messageVnode, "确认删除", {
type: "danger",
"confirm-button-class": "confirm-delete-button",
})
.then(function () {
return delDept(row.deptId);
})
.then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}
getList();

View File

@ -1,316 +1,417 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryRef" :inline="true" :model="queryParams">
<el-form-item label="菜单名称" prop="menuName">
<el-input
v-model="queryParams.menuName"
clearable
placeholder="请输入菜单名称"
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="展示状态" prop="isVisible">
<el-select v-model="queryParams.isVisible" clearable placeholder="展示状态" style="width: 200px">
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:menu:add']"
icon="Plus"
plain
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
icon="Sort"
plain
type="info"
@click="toggleExpandAll"
>展开/折叠
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="menuList"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
row-key="menuId"
<div class="app-container">
<el-form
v-show="showSearch"
ref="queryRef"
:inline="true"
:model="queryParams"
>
<el-form-item label="菜单名称" prop="menuName">
<el-input
v-model="queryParams.menuName"
clearable
placeholder="请输入菜单名称"
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="展示状态" prop="isVisible">
<el-select
v-model="queryParams.isVisible"
clearable
placeholder="展示状态"
style="width: 200px"
>
<el-table-column :show-overflow-tooltip="true" align="center" label="菜单名称" prop="menuName"
width="160"></el-table-column>
<el-table-column align="center" label="图标" prop="icon" width="100">
<template #default="scope">
<svg-icon :icon-class="scope.row.icon"/>
</template>
</el-table-column>
<el-table-column align="center" label="排序" prop="orderNum" width="60"></el-table-column>
<el-table-column width="120"></el-table-column>
<el-table-column :show-overflow-tooltip="true" label="权限标识" prop="perms"></el-table-column>
<el-table-column :show-overflow-tooltip="true" label="组件路径" prop="component"></el-table-column>
<el-table-column align="center" label="是否显示" prop="isVisible" width="80">
<template #default="scope">
<dict-tag :options="menu_show_hide" :value="scope.row.isVisible"/>
</template>
</el-table-column>
<el-table-column width="120"></el-table-column>
<el-table-column align="center" label="创建时间" prop="createTime" width="160">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column align="center" class-name="small-padding fixed-width" label="操作" width="210">
<template #default="scope">
<el-button v-hasPermi="['system:menu:edit']" icon="Edit" link type="primary"
@click="handleUpdate(scope.row)">修改
</el-button>
<el-button v-hasPermi="['system:menu:add']" icon="Plus" link type="primary"
@click="handleAdd(scope.row)">新增
</el-button>
<el-button v-hasPermi="['system:menu:remove']" icon="Delete" link type="primary"
@click="handleDelete(scope.row)">删除
</el-button>
</template>
</el-table-column>
</el-table>
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button icon="Search" type="primary" @click="handleQuery"
>搜索
</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- 添加或修改菜单对话框 -->
<el-dialog v-model="open" :title="title" append-to-body width="680px">
<el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">
<el-form-item label="上级菜单">
<el-tree-select
v-model="form.parentId"
:data="menuOptions"
:props="{ value: 'menuId', label: 'menuName', children: 'children' }"
check-strictly
placeholder="选择上级菜单"
value-key="menuId"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="菜单类型" prop="menuType">
<el-radio-group v-model="form.menuType">
<el-radio label="M">目录</el-radio>
<el-radio label="C">菜单</el-radio>
<el-radio label="F">按钮</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'F'" :span="24">
<el-form-item label="菜单图标" prop="icon">
<el-popover
v-model:visible="showChooseIcon"
:width="540"
placement="bottom-start"
trigger="click"
@show="showSelectIcon"
>
<template #reference>
<el-input v-model="form.icon" v-click-outside="hideSelectIcon"
placeholder="点击选择图标"
readonly @blur="showSelectIcon">
<template #prefix>
<svg-icon
v-if="form.icon"
:icon-class="form.icon"
class="el-input__icon"
style="height: 32px;width: 16px;"
/>
<el-icon v-else style="height: 32px;width: 16px;">
<search/>
</el-icon>
</template>
</el-input>
</template>
<icon-select ref="iconSelectRef" :active-icon="form.icon" @selected="selected"/>
</el-popover>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="菜单名称" prop="menuName">
<el-input v-model="form.menuName" placeholder="请输入菜单名称"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="显示排序" prop="orderNum">
<el-input-number v-model="form.orderNum" :min="0" controls-position="right"/>
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'F'" :span="12">
<el-form-item>
<template #label>
<span>
<el-tooltip content="选择是外链则路由地址需要以`http(s)://`开头" placement="top">
<el-icon><question-filled/></el-icon>
</el-tooltip>是否外链
</span>
</template>
<el-radio-group v-model="form.isFrame">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'F'" :span="12">
<el-form-item prop="path">
<template #label>
<span>
<el-tooltip content="访问的路由地址,如:`user`,如外网地址需内链访问则以`http(s)://`开头"
placement="top">
<el-icon><question-filled/></el-icon>
</el-tooltip>
路由地址
</span>
</template>
<el-input v-model="form.path" placeholder="请输入路由地址"/>
</el-form-item>
</el-col>
<el-col v-if="form.menuType == 'C'" :span="12">
<el-form-item prop="component">
<template #label>
<span>
<el-tooltip content="访问的组件路径,如:`system/user/index`,默认在`views`目录下"
placement="top">
<el-icon><question-filled/></el-icon>
</el-tooltip>
组件路径
</span>
</template>
<el-input v-model="form.component" placeholder="请输入组件路径"/>
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'M'" :span="12">
<el-form-item>
<el-input v-model="form.perms" maxlength="100" placeholder="请输入权限标识"/>
<template #label>
<span>
<el-tooltip
content="控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasPermi('system:user:list')`)"
placement="top">
<el-icon><question-filled/></el-icon>
</el-tooltip>
权限字符
</span>
</template>
</el-form-item>
</el-col>
<el-col v-if="form.menuType == 'C'" :span="12">
<el-form-item>
<el-input v-model="form.query" maxlength="255" placeholder="请输入路由参数"/>
<template #label>
<span>
<el-tooltip content='访问路由的默认传递参数,如:`{"id": 1, "name": "ry"}`' placement="top">
<el-icon><question-filled/></el-icon>
</el-tooltip>
路由参数
</span>
</template>
</el-form-item>
</el-col>
<el-col v-if="form.menuType == 'C'" :span="12">
<el-form-item>
<template #label>
<span>
<el-tooltip content="选择是则会被`keep-alive`缓存,需要匹配组件的`name`和地址保持一致"
placement="top">
<el-icon><question-filled/></el-icon>
</el-tooltip>
是否缓存
</span>
</template>
<el-radio-group v-model="form.isCache">
<el-radio label="1">缓存</el-radio>
<el-radio label="0">不缓存</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'F'" :span="12">
<el-form-item>
<template #label>
<span>
<el-tooltip content="选择隐藏则路由将不会出现在侧边栏,但仍然可以访问" placement="top">
<el-icon><question-filled/></el-icon>
</el-tooltip>
显示状态
</span>
</template>
<el-radio-group v-model="form.isVisible">
<el-radio label="1">
显示
</el-radio>
<el-radio label="0">
隐藏
</el-radio>
<!-- <el-radio-->
<!-- v-for="dict in sys_show_hide"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{ dict.label }}</el-radio>-->
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="12" v-if="form.menuType != 'F'">-->
<!-- <el-form-item>-->
<!-- <template #label>-->
<!-- <span>-->
<!-- <el-tooltip content="选择停用则路由将不会出现在侧边栏,也不能被访问" placement="top">-->
<!-- <el-icon><question-filled /></el-icon>-->
<!-- </el-tooltip>-->
<!-- 菜单状态-->
<!-- </span>-->
<!-- </template>-->
<!-- <el-radio-group v-model="form.status">-->
<!-- <el-radio-->
<!-- v-for="dict in sys_normal_disable"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{ dict.label }}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
v-hasPermi="['system:menu:add']"
icon="Plus"
plain
type="primary"
@click="handleAdd"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button icon="Sort" plain type="info" @click="toggleExpandAll"
>展开/折叠
</el-button>
</el-col>
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="menuList"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
row-key="menuId"
>
<el-table-column
:show-overflow-tooltip="true"
align="center"
label="菜单名称"
prop="menuName"
width="160"
></el-table-column>
<el-table-column align="center" label="图标" prop="icon" width="100">
<template #default="scope">
<svg-icon :icon-class="scope.row.icon" />
</template>
</el-table-column>
<el-table-column
align="center"
label="排序"
prop="orderNum"
width="60"
></el-table-column>
<el-table-column width="120"></el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="权限标识"
prop="perms"
></el-table-column>
<el-table-column
:show-overflow-tooltip="true"
label="组件路径"
prop="component"
></el-table-column>
<el-table-column
align="center"
label="是否显示"
prop="isVisible"
width="80"
>
<template #default="scope">
<dict-tag :options="menu_show_hide" :value="scope.row.isVisible" />
</template>
</el-table-column>
<el-table-column width="120"></el-table-column>
<el-table-column
align="center"
label="创建时间"
prop="createTime"
width="160"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
align="center"
class-name="small-padding fixed-width"
label="操作"
width="210"
>
<template #default="scope">
<el-button
v-hasPermi="['system:menu:edit']"
icon="Edit"
link
type="primary"
@click="handleUpdate(scope.row)"
>修改
</el-button>
<el-button
v-hasPermi="['system:menu:add']"
icon="Plus"
link
type="primary"
@click="handleAdd(scope.row)"
>新增
</el-button>
<el-button
v-hasPermi="['system:menu:remove']"
icon="Delete"
link
type="primary"
@click="handleDelete(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改菜单对话框 -->
<el-dialog v-model="open" :title="title" append-to-body width="680px">
<el-form ref="menuRef" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">
<el-form-item label="上级菜单">
<el-tree-select
v-model="form.parentId"
:data="menuOptions"
:props="{
value: 'menuId',
label: 'menuName',
children: 'children',
}"
check-strictly
placeholder="选择上级菜单"
value-key="menuId"
/>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="菜单类型" prop="menuType">
<el-radio-group v-model="form.menuType">
<el-radio label="M">目录</el-radio>
<el-radio label="C">菜单</el-radio>
<el-radio label="F">按钮</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'F'" :span="24">
<el-form-item label="菜单图标" prop="icon">
<el-popover
v-model:visible="showChooseIcon"
:width="540"
placement="bottom-start"
trigger="click"
@show="showSelectIcon"
>
<template #reference>
<el-input
v-model="form.icon"
v-click-outside="hideSelectIcon"
placeholder="点击选择图标"
readonly
@blur="showSelectIcon"
>
<template #prefix>
<svg-icon
v-if="form.icon"
:icon-class="form.icon"
class="el-input__icon"
style="height: 32px; width: 16px"
/>
<el-icon v-else style="height: 32px; width: 16px">
<search />
</el-icon>
</template>
</el-input>
</template>
<icon-select
ref="iconSelectRef"
:active-icon="form.icon"
@selected="selected"
/>
</el-popover>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="菜单名称" prop="menuName">
<el-input v-model="form.menuName" placeholder="请输入菜单名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="显示排序" prop="orderNum">
<el-input-number
v-model="form.orderNum"
:min="0"
controls-position="right"
/>
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'F'" :span="12">
<el-form-item>
<template #label>
<span>
<el-tooltip
content="选择是外链则路由地址需要以`http(s)://`开头"
placement="top"
>
<el-icon><question-filled /></el-icon> </el-tooltip
>是否外链
</span>
</template>
<el-radio-group v-model="form.isFrame">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'F'" :span="12">
<el-form-item prop="path">
<template #label>
<span>
<el-tooltip
content="访问的路由地址,如:`user`,如外网地址需内链访问则以`http(s)://`开头"
placement="top"
>
<el-icon><question-filled /></el-icon>
</el-tooltip>
路由地址
</span>
</template>
<el-input v-model="form.path" placeholder="请输入路由地址" />
</el-form-item>
</el-col>
<el-col v-if="form.menuType == 'C'" :span="12">
<el-form-item prop="component">
<template #label>
<span>
<el-tooltip
content="访问的组件路径,如:`system/user/index`,默认在`views`目录下"
placement="top"
>
<el-icon><question-filled /></el-icon>
</el-tooltip>
组件路径
</span>
</template>
<el-input v-model="form.component" placeholder="请输入组件路径" />
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'M'" :span="12">
<el-form-item>
<el-input
v-model="form.perms"
maxlength="100"
placeholder="请输入权限标识"
/>
<template #label>
<span>
<el-tooltip
content="控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasPermi('system:user:list')`)"
placement="top"
>
<el-icon><question-filled /></el-icon>
</el-tooltip>
权限字符
</span>
</template>
</el-form-item>
</el-col>
<el-col v-if="form.menuType == 'C'" :span="12">
<el-form-item>
<el-input
v-model="form.query"
maxlength="255"
placeholder="请输入路由参数"
/>
<template #label>
<span>
<el-tooltip
content='访问路由的默认传递参数,如:`{"id": 1, "name": "ry"}`'
placement="top"
>
<el-icon><question-filled /></el-icon>
</el-tooltip>
路由参数
</span>
</template>
</el-form-item>
</el-col>
<el-col v-if="form.menuType == 'C'" :span="12">
<el-form-item>
<template #label>
<span>
<el-tooltip
content="选择是则会被`keep-alive`缓存,需要匹配组件的`name`和地址保持一致"
placement="top"
>
<el-icon><question-filled /></el-icon>
</el-tooltip>
是否缓存
</span>
</template>
<el-radio-group v-model="form.isCache">
<el-radio label="1">缓存</el-radio>
<el-radio label="0">不缓存</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col v-if="form.menuType != 'F'" :span="12">
<el-form-item>
<template #label>
<span>
<el-tooltip
content="选择隐藏则路由将不会出现在侧边栏,但仍然可以访问"
placement="top"
>
<el-icon><question-filled /></el-icon>
</el-tooltip>
显示状态
</span>
</template>
<el-radio-group v-model="form.isVisible">
<el-radio label="1"> 显示</el-radio>
<el-radio label="0"> 隐藏</el-radio>
<!-- <el-radio-->
<!-- v-for="dict in sys_show_hide"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{ dict.label }}</el-radio>-->
</el-radio-group>
</el-form-item>
</el-col>
<!-- <el-col :span="12" v-if="form.menuType != 'F'">-->
<!-- <el-form-item>-->
<!-- <template #label>-->
<!-- <span>-->
<!-- <el-tooltip content="选择停用则路由将不会出现在侧边栏,也不能被访问" placement="top">-->
<!-- <el-icon><question-filled /></el-icon>-->
<!-- </el-tooltip>-->
<!-- 菜单状态-->
<!-- </span>-->
<!-- </template>-->
<!-- <el-radio-group v-model="form.status">-->
<!-- <el-radio-->
<!-- v-for="dict in sys_normal_disable"-->
<!-- :key="dict.value"-->
<!-- :label="dict.value"-->
<!-- >{{ dict.label }}</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
</el-row>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script name="Menu" setup>
import {addMenu, delMenu, getMenu, listMenu, updateMenu} from "@/api/system/menu";
<script lang="jsx" name="Menu" setup>
import {
addMenu,
delMenu,
getMenu,
listMenu,
updateMenu,
} from "@/api/system/menu";
import SvgIcon from "@/components/SvgIcon";
import IconSelect from "@/components/IconSelect";
import {ClickOutside as vClickOutside} from 'element-plus'
import {menu_show_hide} from "@/constant/dict";
import {sys_normal_disable} from "@/constant/dict";
const {proxy} = getCurrentInstance();
import { ClickOutside as vClickOutside, ElMessageBox } from "element-plus";
import { menu_show_hide, sys_normal_disable } from "@/constant/dict";
const { proxy } = getCurrentInstance();
const menuList = ref([]);
const open = ref(false);
@ -324,157 +425,175 @@ const showChooseIcon = ref(false);
const iconSelectRef = ref(null);
const data = reactive({
form: {},
queryParams: {
menuName: undefined,
isVisible: undefined
},
rules: {
menuName: [{required: true, message: "菜单名称不能为空", trigger: "blur"}],
orderNum: [{required: true, message: "菜单顺序不能为空", trigger: "blur"}],
path: [{required: true, message: "路由地址不能为空", trigger: "blur"}]
},
form: {},
queryParams: {
menuName: undefined,
isVisible: undefined,
},
rules: {
menuName: [
{ required: true, message: "菜单名称不能为空", trigger: "blur" },
],
orderNum: [
{ required: true, message: "菜单顺序不能为空", trigger: "blur" },
],
path: [{ required: true, message: "路由地址不能为空", trigger: "blur" }],
},
});
const {queryParams, form, rules} = toRefs(data);
const { queryParams, form, rules } = toRefs(data);
/** 查询菜单列表 */
function getList() {
loading.value = true;
listMenu(queryParams.value).then(response => {
menuList.value = proxy.handleTree(response.data, "menuId");
loading.value = false;
});
loading.value = true;
listMenu(queryParams.value).then((response) => {
menuList.value = proxy.handleTree(response.data, "menuId");
loading.value = false;
});
}
/** 查询菜单下拉树结构 */
function getTreeselect() {
menuOptions.value = [];
listMenu().then(response => {
const menu = {menuId: "0", menuName: "主类目", children: []};
menu.children = proxy.handleTree(response.data, "menuId");
menuOptions.value.push(menu);
});
menuOptions.value = [];
listMenu().then((response) => {
const menu = { menuId: "0", menuName: "主类目", children: [] };
menu.children = proxy.handleTree(response.data, "menuId");
menuOptions.value.push(menu);
});
}
/** 取消按钮 */
function cancel() {
open.value = false;
reset();
open.value = false;
reset();
}
/** 表单重置 */
function reset() {
form.value = {
menuId: undefined,
parentId: "0",
menuName: undefined,
icon: undefined,
menuType: "M",
orderNum: undefined,
isFrame: "0",
isCache: "1",
isVisible: "1",
status: "1"
};
proxy.resetForm("menuRef");
form.value = {
menuId: undefined,
parentId: "0",
menuName: undefined,
icon: undefined,
menuType: "M",
orderNum: undefined,
isFrame: "0",
isCache: "1",
isVisible: "1",
status: "1",
};
proxy.resetForm("menuRef");
}
/** 展示下拉图标 */
function showSelectIcon() {
iconSelectRef.value.reset();
showChooseIcon.value = true;
iconSelectRef.value.reset();
showChooseIcon.value = true;
}
/** 选择图标 */
function selected(name) {
form.value.icon = name;
showChooseIcon.value = false;
form.value.icon = name;
showChooseIcon.value = false;
}
/** 图标外层点击隐藏下拉列表 */
function hideSelectIcon(event) {
var elem = event.relatedTarget || event.srcElement || event.target || event.currentTarget;
var className = elem.className;
if (className !== "el-input__inner") {
showChooseIcon.value = false;
}
var elem =
event.relatedTarget ||
event.srcElement ||
event.target ||
event.currentTarget;
var className = elem.className;
if (className !== "el-input__inner") {
showChooseIcon.value = false;
}
}
/** 搜索按钮操作 */
function handleQuery() {
getList();
getList();
}
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryRef");
handleQuery();
proxy.resetForm("queryRef");
handleQuery();
}
/** 新增按钮操作 */
function handleAdd(row) {
reset();
getTreeselect();
if (row != null && row.menuId) {
form.value.parentId = row.menuId;
} else {
form.value.parentId = "0";
}
open.value = true;
title.value = "添加菜单";
reset();
getTreeselect();
if (row != null && row.menuId) {
form.value.parentId = row.menuId;
} else {
form.value.parentId = "0";
}
open.value = true;
title.value = "添加菜单";
}
/** 展开/折叠操作 */
function toggleExpandAll() {
refreshTable.value = false;
isExpandAll.value = !isExpandAll.value;
nextTick(() => {
refreshTable.value = true;
});
refreshTable.value = false;
isExpandAll.value = !isExpandAll.value;
nextTick(() => {
refreshTable.value = true;
});
}
/** 修改按钮操作 */
async function handleUpdate(row) {
reset();
await getTreeselect();
getMenu(row.menuId).then(response => {
form.value = response.data;
open.value = true;
title.value = "修改菜单";
});
reset();
await getTreeselect();
getMenu(row.menuId).then((response) => {
form.value = response.data;
open.value = true;
title.value = "修改菜单";
});
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["menuRef"].validate(valid => {
if (valid) {
if (form.value.menuId != undefined) {
updateMenu(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addMenu(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
});
}
}
});
proxy.$refs["menuRef"].validate((valid) => {
if (valid) {
if (form.value.menuId != undefined) {
updateMenu(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addMenu(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
});
}
}
});
}
/** 删除按钮操作 */
function handleDelete(row) {
proxy.$modal.confirm('是否确认删除名称为"' + row.menuName + '"的数据项?').then(function () {
return delMenu(row.menuId);
}).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
}).catch(() => {
});
const messageVnode = () => (
<>
<el-tag type="warning">{row.menuName}</el-tag>
</>
);
ElMessageBox.confirm(messageVnode, "确认删除", {
type: "danger",
"confirm-button-class": "confirm-delete-button",
})
.then(function () {
return delMenu(row.menuId);
})
.then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}
getList();

View File

@ -1,152 +1,224 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
<el-form-item label="岗位编码" prop="postCode">
<el-input
v-model="queryParams.postCode"
placeholder="请输入岗位编码"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="岗位名称" prop="postName">
<el-input
v-model="queryParams.postName"
placeholder="请输入岗位名称"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="岗位状态" clearable style="width: 200px">
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryRef"
:inline="true"
v-show="showSearch"
>
<el-form-item label="岗位编码" prop="postCode">
<el-input
v-model="queryParams.postCode"
placeholder="请输入岗位编码"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="岗位名称" prop="postName">
<el-input
v-model="queryParams.postName"
placeholder="请输入岗位名称"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="岗位状态"
clearable
style="width: 200px"
>
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['system:post:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:post:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:post:remove']"
>删除</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['system:post:export']"
>导出</el-button
>
</el-col>
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table
v-loading="loading"
:data="postList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="岗位编号" align="center" prop="postId" />
<el-table-column label="岗位编码" align="center" prop="postCode" />
<el-table-column label="岗位名称" align="center" prop="postName" />
<el-table-column label="岗位排序" align="center" prop="postSort" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
width="180"
align="center"
class-name="small-padding fixed-width"
>
<template #default="scope">
<el-button
link
type="primary"
icon="Edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:post:edit']"
>修改</el-button
>
<el-button
link
type="primary"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:post:remove']"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改岗位对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="岗位名称" prop="postName">
<el-input
v-model="form.postName"
placeholder="请输入岗位名称"
maxlength="20"
/>
</el-form-item>
<el-form-item label="岗位编码" prop="postCode">
<el-input
v-model="form.postCode"
placeholder="请输入编码名称"
maxlength="20"
/>
</el-form-item>
<el-form-item label="岗位顺序" prop="postSort">
<el-input-number
v-model="form.postSort"
controls-position="right"
:min="0"
/>
</el-form-item>
<el-form-item label="岗位状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio
>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input
v-model="form.remark"
type="textarea"
placeholder="请输入内容"
maxlength="500"
/>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['system:post:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:post:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:post:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['system:post:export']"
>导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="岗位编号" align="center" prop="postId" />
<el-table-column label="岗位编码" align="center" prop="postCode" />
<el-table-column label="岗位名称" align="center" prop="postName" />
<el-table-column label="岗位排序" align="center" prop="postSort" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']">修改</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改岗位对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="岗位名称" prop="postName">
<el-input v-model="form.postName" placeholder="请输入岗位名称" maxlength="20"/>
</el-form-item>
<el-form-item label="岗位编码" prop="postCode">
<el-input v-model="form.postCode" placeholder="请输入编码名称" maxlength="20"/>
</el-form-item>
<el-form-item label="岗位顺序" prop="postSort">
<el-input-number v-model="form.postSort" controls-position="right" :min="0" />
</el-form-item>
<el-form-item label="岗位状态" prop="status">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="500"/>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup name="Post">
import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post";
import {sys_normal_disable} from "@/constant/dict";
<script setup name="Post" lang="jsx">
import {
listPost,
addPost,
delPost,
getPost,
updatePost,
} from "@/api/system/post";
import { sys_normal_disable } from "@/constant/dict";
import { ElMessageBox } from "element-plus";
const { proxy } = getCurrentInstance();
@ -167,13 +239,19 @@ const data = reactive({
pageSize: 10,
postCode: undefined,
postName: undefined,
status: undefined
status: undefined,
},
rules: {
postName: [{ required: true, message: "岗位名称不能为空", trigger: "blur" }],
postCode: [{ required: true, message: "岗位编码不能为空", trigger: "blur" }],
postSort: [{ required: true, message: "岗位顺序不能为空", trigger: "blur" }],
}
postName: [
{ required: true, message: "岗位名称不能为空", trigger: "blur" },
],
postCode: [
{ required: true, message: "岗位编码不能为空", trigger: "blur" },
],
postSort: [
{ required: true, message: "岗位顺序不能为空", trigger: "blur" },
],
},
});
const { queryParams, form, rules } = toRefs(data);
@ -181,7 +259,7 @@ const { queryParams, form, rules } = toRefs(data);
/** 查询岗位列表 */
function getList() {
loading.value = true;
listPost(queryParams.value).then(response => {
listPost(queryParams.value).then((response) => {
postList.value = response.rows;
total.value = response.total;
loading.value = false;
@ -200,7 +278,7 @@ function reset() {
postName: undefined,
postSort: 0,
status: "1",
remark: undefined
remark: undefined,
};
proxy.resetForm("postRef");
}
@ -216,7 +294,7 @@ function resetQuery() {
}
/** 多选框选中数据 */
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.postId);
ids.value = selection.map((item) => item.postId);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
@ -230,7 +308,7 @@ function handleAdd() {
function handleUpdate(row) {
reset();
const postId = row.postId || ids.value;
getPost(postId).then(response => {
getPost(postId).then((response) => {
form.value = response.data;
open.value = true;
title.value = "修改岗位";
@ -238,16 +316,16 @@ function handleUpdate(row) {
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["postRef"].validate(valid => {
proxy.$refs["postRef"].validate((valid) => {
if (valid) {
if (form.value.postId != undefined) {
updatePost(form.value).then(response => {
updatePost(form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addPost(form.value).then(response => {
addPost(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
@ -259,18 +337,50 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const postIds = row.postId || ids.value;
proxy.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项?').then(function() {
return delPost(postIds);
}).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
}).catch(() => {});
const postNames = row.postId
? [row.postName]
: postList.value
.filter((el) => postIds.includes(el.postId))
.map((el) => el.postName);
// const messageVnode = () => h('el-tag', {innerHtml: 'rer'})
const messageVnode = () => (
<>
{postNames.map((postName, idx) => (
<el-tag
key={idx}
style={{
marginLeft: idx >= 1 ? "4px" : 0,
}}
type="warning"
>
{postName}
</el-tag>
))}
</>
);
// `是否确认删除角色名称为"${roleNames.join(',')}"的数据项?`
ElMessageBox.confirm(messageVnode, "确认删除", {
type: "danger",
"confirm-button-class": "confirm-delete-button",
})
.then(function () {
return delPost(postIds);
})
.then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}
/** 导出按钮操作 */
function handleExport() {
proxy.download("system/post/export", {
...queryParams.value
}, `post_${new Date().getTime()}.xlsx`);
proxy.download(
"system/post/export",
{
...queryParams.value,
},
`post_${new Date().getTime()}.xlsx`
);
}
getList();

View File

@ -1,96 +1,137 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
<el-form-item label="用户名称" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryRef"
v-show="showSearch"
:inline="true"
>
<el-form-item label="用户名称" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入用户名称"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入手机号码"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="openSelectUser"
v-hasPermi="['system:role:add']"
>添加用户</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="CircleClose"
:disabled="multiple"
@click="cancelAuthUser"
v-hasPermi="['system:role:remove']"
>取消授权</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Close"
@click="handleClose"
>关闭</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="openSelectUser"
v-hasPermi="['system:role:add']"
>添加用户</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="CircleClose"
:disabled="multiple"
@click="cancelAuthUser"
v-hasPermi="['system:role:remove']"
>取消授权</el-button
>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Close" @click="handleClose"
>关闭</el-button
>
</el-col>
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="登录账号" prop="username" :show-overflow-tooltip="true" />
<el-table-column label="姓名" prop="nickname" :show-overflow-tooltip="true" />
<el-table-column label="部门" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
<el-table
v-loading="loading"
:data="userList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column
label="登录账号"
prop="username"
:show-overflow-tooltip="true"
/>
<select-user ref="selectRef" :roleId="queryParams.roleId" @ok="handleQuery" />
</div>
<el-table-column
label="姓名"
prop="nickname"
:show-overflow-tooltip="true"
/>
<el-table-column
label="部门"
prop="deptName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="邮箱"
prop="email"
:show-overflow-tooltip="true"
/>
<el-table-column
label="手机"
prop="phone"
:show-overflow-tooltip="true"
/>
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
<select-user
ref="selectRef"
:roleId="queryParams.roleId"
@ok="handleQuery"
/>
</div>
</template>
<script setup name="AuthUser">
import selectUser from "./selectUser";
import { allocatedUserList, authUserCancel } from "@/api/system/role";
import {sys_normal_disable} from "@/constant/dict";
import { sys_normal_disable } from "@/constant/dict";
const route = useRoute();
const { proxy } = getCurrentInstance();
@ -114,7 +155,7 @@ const queryParams = reactive({
/** 查询授权用户列表 */
function getList() {
loading.value = true;
allocatedUserList(queryParams).then(response => {
allocatedUserList(queryParams).then((response) => {
userList.value = response.rows;
total.value = response.total;
loading.value = false;
@ -137,7 +178,7 @@ function resetQuery() {
}
// 多选框选中数据
function handleSelectionChange(selection) {
userIds.value = selection.map(item => item.userId);
userIds.value = selection.map((item) => item.userId);
multiple.value = !selection.length;
}
/** 打开授权用户表弹窗 */
@ -149,12 +190,16 @@ function openSelectUser() {
function cancelAuthUser(row) {
const roleId = queryParams.roleId;
const uIds = userIds.value.join(",");
proxy.$modal.confirm("是否取消选中用户授权数据项?").then(function () {
return authUserCancel({ roleId: roleId, userIds: uIds });
}).then(() => {
getList();
proxy.$modal.msgSuccess("取消授权成功");
}).catch(() => {});
proxy.$modal
.confirm("是否取消选中用户授权数据项?")
.then(function () {
return authUserCancel({ roleId: roleId, userIds: uIds });
})
.then(() => {
getList();
proxy.$modal.msgSuccess("取消授权成功");
})
.catch(() => {});
}
getList();

File diff suppressed because it is too large Load Diff

View File

@ -1,73 +1,109 @@
<template>
<!-- 授权用户 -->
<el-dialog @open="resetQuery" title="选择用户" v-model="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryRef" :inline="true">
<el-form-item label="登录账号" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入登录账号"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入手机号码"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row>
<el-table @row-click="clickRow" ref="refTable" :data="userList" @selection-change="handleSelectionChange" height="260px">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="登录账号" prop="username" :show-overflow-tooltip="true" />
<el-table-column label="姓名" prop="nickname" :show-overflow-tooltip="true" />
<el-table-column label="部门" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="手机" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</el-row>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="handleSelectUser"> </el-button>
<el-button @click="visible = false"> </el-button>
</div>
</template>
</el-dialog>
<!-- 授权用户 -->
<el-dialog
@open="resetQuery"
title="选择用户"
v-model="visible"
width="800px"
top="5vh"
append-to-body
>
<el-form :model="queryParams" ref="queryRef" :inline="true">
<el-form-item label="登录账号" prop="username">
<el-input
v-model="queryParams.username"
placeholder="请输入登录账号"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input
v-model="queryParams.phone"
placeholder="请输入手机号码"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row>
<el-table
@row-click="clickRow"
ref="refTable"
:data="userList"
@selection-change="handleSelectionChange"
height="260px"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column
label="登录账号"
prop="username"
:show-overflow-tooltip="true"
/>
<el-table-column
label="姓名"
prop="nickname"
:show-overflow-tooltip="true"
/>
<el-table-column
label="部门"
prop="deptName"
:show-overflow-tooltip="true"
/>
<el-table-column
label="手机"
prop="phone"
:show-overflow-tooltip="true"
/>
<el-table-column label="状态" align="center" prop="status">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</el-row>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="handleSelectUser"> </el-button>
<el-button @click="visible = false"> </el-button>
</div>
</template>
</el-dialog>
</template>
<script setup name="SelectUser">
import { insertAuthUser, unallocatedUserList } from "@/api/system/role";
import {sys_normal_disable} from "@/constant/dict";
import { sys_normal_disable } from "@/constant/dict";
const props = defineProps({
roleId: {
type: [Number, String]
}
type: [Number, String],
},
});
const { proxy } = getCurrentInstance();
@ -80,10 +116,10 @@ const userIds = ref([]);
const queryParams = reactive({
pageNum: 1,
pageSize: 10,
isDelete: '0',
isDelete: "0",
roleId: undefined,
username: undefined,
phone: undefined
phone: undefined,
});
// 显示弹框
@ -98,11 +134,11 @@ function clickRow(row) {
}
// 多选框选中数据
function handleSelectionChange(selection) {
userIds.value = selection.map(item => item.userId);
userIds.value = selection.map((item) => item.userId);
}
// 查询表数据
function getList() {
unallocatedUserList(queryParams).then(res => {
unallocatedUserList(queryParams).then((res) => {
userList.value = res.rows;
total.value = res.total;
});
@ -126,7 +162,7 @@ function handleSelectUser() {
proxy.$modal.msgError("请选择要分配的用户");
return;
}
insertAuthUser({ roleId: roleId, userIds: uIds }).then(res => {
insertAuthUser({ roleId: roleId, userIds: uIds }).then((res) => {
proxy.$modal.msgSuccess(res.msg);
if (res.code === 200) {
visible.value = false;

View File

@ -1,49 +1,69 @@
<template>
<div class="app-container">
<h4 class="form-header h4">基本信息</h4>
<el-form :model="form" label-width="80px">
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="form.nickname" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="登录账号" prop="username">
<el-input v-model="form.username" disabled />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="app-container">
<h4 class="form-header h4">基本信息</h4>
<el-form :model="form" label-width="80px">
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="form.nickname" disabled />
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="登录账号" prop="username">
<el-input v-model="form.username" disabled />
</el-form-item>
</el-col>
</el-row>
</el-form>
<h4 class="form-header h4">角色信息</h4>
<el-table v-loading="loading" :row-key="getRowKey" @row-click="clickRow" ref="roleRef"
@selection-change="handleSelectionChange" :data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)">
<el-table-column label="序号" width="55" type="index" align="center">
<template #default="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column type="selection" :reserve-selection="true" width="55"></el-table-column>
<el-table-column label="角色编号" align="center" prop="roleId" />
<el-table-column label="角色名称" align="center" prop="roleName" />
<el-table-column label="权限字符" align="center" prop="roleKey" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<h4 class="form-header h4">角色信息</h4>
<el-table
v-loading="loading"
:row-key="getRowKey"
@row-click="clickRow"
ref="roleRef"
@selection-change="handleSelectionChange"
:data="roles.slice((pageNum - 1) * pageSize, pageNum * pageSize)"
>
<el-table-column label="号" width="55" type="index" align="center">
<template #default="scope">
<span>{{ (pageNum - 1) * pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column
type="selection"
:reserve-selection="true"
width="55"
></el-table-column>
<el-table-column label="角色编号" align="center" prop="roleId" />
<el-table-column label="角色名称" align="center" prop="roleName" />
<el-table-column label="权限字符" align="center" prop="roleKey" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="pageNum" v-model:limit="pageSize" />
<pagination
v-show="total > 0"
:total="total"
v-model:page="pageNum"
v-model:limit="pageSize"
/>
<el-form label-width="100px">
<div style="text-align: center;margin-left:-120px;margin-top:30px;">
<el-button type="primary" @click="submitForm()">提交</el-button>
<el-button @click="close()">返回</el-button>
</div>
</el-form>
</div>
<el-form label-width="100px">
<div style="text-align: center; margin-left: -120px; margin-top: 30px">
<el-button type="primary" @click="submitForm()">提交</el-button>
<el-button @click="close()">返回</el-button>
</div>
</el-form>
</div>
</template>
<script setup name="AuthRole">
@ -60,55 +80,55 @@ const roleIds = ref([]);
const roles = ref([]);
const form = ref({
nickName: undefined,
userName: undefined,
userId: undefined
nickName: undefined,
userName: undefined,
userId: undefined,
});
/** 单击选中行数据 */
function clickRow(row) {
proxy.$refs["roleRef"].toggleRowSelection(row);
};
proxy.$refs["roleRef"].toggleRowSelection(row);
}
/** 多选框选中数据 */
function handleSelectionChange(selection) {
roleIds.value = selection.map(item => item.roleId);
};
roleIds.value = selection.map((item) => item.roleId);
}
/** 保存选中的数据编号 */
function getRowKey(row) {
return row.roleId;
};
return row.roleId;
}
/** 关闭按钮 */
function close() {
const obj = { path: "/system/user" };
proxy.$tab.closeOpenPage(obj);
};
const obj = { path: "/system/user" };
proxy.$tab.closeOpenPage(obj);
}
/** 提交按钮 */
function submitForm() {
const userId = form.value.userId;
const rIds = roleIds.value.join(",");
updateAuthRole({ userId: userId, roleIds: rIds }).then(response => {
proxy.$modal.msgSuccess("授权成功");
close();
});
};
const userId = form.value.userId;
const rIds = roleIds.value.join(",");
updateAuthRole({ userId: userId, roleIds: rIds }).then((response) => {
proxy.$modal.msgSuccess("授权成功");
close();
});
}
(() => {
const userId = route.params && route.params.userId;
if (userId) {
loading.value = true;
getAuthRole(userId).then(response => {
form.value = response.user;
roles.value = response.roles;
const hasRoleIds = response.hasRoleIds
total.value = roles.value.length;
nextTick(() => {
hasRoleIds.forEach((roleId) => {
const role = roles.value.find(row => row.roleId === roleId)
role && proxy.$refs["roleRef"].toggleRowSelection(role);
})
});
loading.value = false;
const userId = route.params && route.params.userId;
if (userId) {
loading.value = true;
getAuthRole(userId).then((response) => {
form.value = response.user;
roles.value = response.roles;
const hasRoleIds = response.hasRoleIds;
total.value = roles.value.length;
nextTick(() => {
hasRoleIds.forEach((roleId) => {
const role = roles.value.find((row) => row.roleId === roleId);
role && proxy.$refs["roleRef"].toggleRowSelection(role);
});
});
}
loading.value = false;
});
}
})();
</script>

File diff suppressed because it is too large Load Diff

View File

@ -1,65 +1,67 @@
<template>
<div class="app-container">
<el-row :gutter="20">
<el-col :span="6" :xs="24">
<el-card class="box-card">
<template v-slot:header>
<div class="clearfix">
<span>个人信息</span>
</div>
</template>
<div>
<div class="text-center">
<userAvatar :user="state.user" />
</div>
<ul class="list-group list-group-striped">
<li class="list-group-item">
<svg-icon icon-class="user" />用户名称
<div class="pull-right">{{ state.user.userName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="phone" />手机号码
<div class="pull-right">{{ state.user.phonenumber }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱
<div class="pull-right">{{ state.user.email }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="state.user.dept">{{ state.user.dept.deptName }} / {{ state.postGroup }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色
<div class="pull-right">{{ state.roleGroup }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="date" />创建日期
<div class="pull-right">{{ state.user.createTime }}</div>
</li>
</ul>
</div>
</el-card>
</el-col>
<el-col :span="18" :xs="24">
<el-card>
<template v-slot:header>
<div class="clearfix">
<span>基本资料</span>
</div>
</template>
<el-tabs v-model="activeTab">
<el-tab-pane label="基本资料" name="userinfo">
<userInfo :user="state.user" />
</el-tab-pane>
<el-tab-pane label="修改密码" name="resetPwd">
<resetPwd />
</el-tab-pane>
</el-tabs>
</el-card>
</el-col>
</el-row>
</div>
<div class="app-container">
<el-row :gutter="20">
<el-col :span="6" :xs="24">
<el-card class="box-card">
<template v-slot:header>
<div class="clearfix">
<span>个人信息</span>
</div>
</template>
<div>
<div class="text-center">
<userAvatar :user="state.user" />
</div>
<ul class="list-group list-group-striped">
<li class="list-group-item">
<svg-icon icon-class="user" />用户名称
<div class="pull-right">{{ state.user.userName }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="phone" />手机号码
<div class="pull-right">{{ state.user.phonenumber }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="email" />用户邮箱
<div class="pull-right">{{ state.user.email }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="tree" />所属部门
<div class="pull-right" v-if="state.user.dept">
{{ state.user.dept.deptName }} / {{ state.postGroup }}
</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="peoples" />所属角色
<div class="pull-right">{{ state.roleGroup }}</div>
</li>
<li class="list-group-item">
<svg-icon icon-class="date" />创建日期
<div class="pull-right">{{ state.user.createTime }}</div>
</li>
</ul>
</div>
</el-card>
</el-col>
<el-col :span="18" :xs="24">
<el-card>
<template v-slot:header>
<div class="clearfix">
<span>基本资料</span>
</div>
</template>
<el-tabs v-model="activeTab">
<el-tab-pane label="基本资料" name="userinfo">
<userInfo :user="state.user" />
</el-tab-pane>
<el-tab-pane label="修改密码" name="resetPwd">
<resetPwd />
</el-tab-pane>
</el-tabs>
</el-card>
</el-col>
</el-row>
</div>
</template>
<script setup name="Profile">
@ -72,16 +74,16 @@ const activeTab = ref("userinfo");
const state = reactive({
user: {},
roleGroup: {},
postGroup: {}
postGroup: {},
});
function getUser() {
getUserProfile().then(response => {
getUserProfile().then((response) => {
state.user = response.data;
state.roleGroup = response.roleGroup;
state.postGroup = response.postGroup;
});
};
}
getUser();
</script>

View File

@ -1,19 +1,34 @@
<template>
<el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
<el-form-item label="旧密码" prop="oldPassword">
<el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
</el-form-item>
<el-form-item label="新密码" prop="newPassword">
<el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
</el-form-item>
<el-form-item label="确认密码" prop="confirmPassword">
<el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
</el-form-item>
<el-form-item>
<el-form ref="pwdRef" :model="user" :rules="rules" label-width="80px">
<el-form-item label="旧密码" prop="oldPassword">
<el-input
v-model="user.oldPassword"
placeholder="请输入旧密码"
type="password"
show-password
/>
</el-form-item>
<el-form-item label="新密码" prop="newPassword">
<el-input
v-model="user.newPassword"
placeholder="请输入新密码"
type="password"
show-password
/>
</el-form-item>
<el-form-item label="确认密码" prop="confirmPassword">
<el-input
v-model="user.confirmPassword"
placeholder="请确认新密码"
type="password"
show-password
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">保存</el-button>
<el-button type="danger" @click="close">关闭</el-button>
</el-form-item>
</el-form>
</el-form-item>
</el-form>
</template>
<script setup>
@ -24,7 +39,7 @@ const { proxy } = getCurrentInstance();
const user = reactive({
oldPassword: undefined,
newPassword: undefined,
confirmPassword: undefined
confirmPassword: undefined,
});
const equalToPassword = (rule, value, callback) => {
@ -36,22 +51,28 @@ const equalToPassword = (rule, value, callback) => {
};
const rules = ref({
oldPassword: [{ required: true, message: "旧密码不能为空", trigger: "blur" }],
newPassword: [{ required: true, message: "新密码不能为空", trigger: "blur" }, { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }],
confirmPassword: [{ required: true, message: "确认密码不能为空", trigger: "blur" }, { required: true, validator: equalToPassword, trigger: "blur" }]
newPassword: [
{ required: true, message: "密码不能为空", trigger: "blur" },
{ min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" },
],
confirmPassword: [
{ required: true, message: "确认密码不能为空", trigger: "blur" },
{ required: true, validator: equalToPassword, trigger: "blur" },
],
});
/** 提交按钮 */
function submit() {
proxy.$refs.pwdRef.validate(valid => {
proxy.$refs.pwdRef.validate((valid) => {
if (valid) {
updateUserPwd(user.oldPassword, user.newPassword).then(response => {
updateUserPwd(user.oldPassword, user.newPassword).then((response) => {
proxy.$modal.msgSuccess("修改成功");
});
}
});
};
}
/** 关闭按钮 */
function close() {
proxy.$tab.closePage();
};
}
</script>

View File

@ -1,7 +1,14 @@
<template>
<div class="user-info-head" @click="editCropper()">
<img :src="options.img" title="点击上传头像" class="img-circle img-lg" />
<el-dialog :title="title" v-model="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
<el-dialog
:title="title"
v-model="open"
width="800px"
append-to-body
@opened="modalOpened"
@close="closeDialog"
>
<el-row>
<el-col :xs="24" :md="12" :style="{ height: '350px' }">
<vue-cropper
@ -79,7 +86,7 @@ const options = reactive({
autoCropHeight: 200, // 默认生成截图框高度
fixedBox: true, // 固定截图框大小 不允许改变
outputType: "png", // 默认生成截图为PNG格式
previews: {} //预览数据
previews: {}, //预览数据
});
/** 编辑头像 */
@ -108,7 +115,9 @@ function changeScale(num) {
/** 上传预处理 */
function beforeUpload(file) {
if (file.type.indexOf("image/") == -1) {
proxy.$modal.msgError("文件格式错误,请上传图片类型,如JPGPNG后缀的文件。");
proxy.$modal.msgError(
"文件格式错误,请上传图片类型,如JPGPNG后缀的文件。"
);
} else {
const reader = new FileReader();
reader.readAsDataURL(file);
@ -119,10 +128,10 @@ function beforeUpload(file) {
}
/** 上传图片 */
function uploadImg() {
proxy.$refs.cropper.getCropBlob(data => {
proxy.$refs.cropper.getCropBlob((data) => {
let formData = new FormData();
formData.append("avatarfile", data);
uploadAvatar(formData).then(response => {
uploadAvatar(formData).then((response) => {
open.value = false;
options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
userStore.avatar = options.img;
@ -142,7 +151,7 @@ function closeDialog() {
}
</script>
<style lang='scss' scoped>
<style lang="scss" scoped>
.user-info-head {
position: relative;
display: inline-block;
@ -166,4 +175,4 @@ function closeDialog() {
line-height: 110px;
border-radius: 50%;
}
</style>
</style>

View File

@ -1,25 +1,25 @@
<template>
<el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="user.nickname" maxlength="30" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="user.phonenumber" maxlength="11" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="user.email" maxlength="50" />
</el-form-item>
<el-form-item label="性别">
<el-radio-group v-model="user.gender">
<el-radio label="0"></el-radio>
<el-radio label="1"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
<el-form ref="userRef" :model="user" :rules="rules" label-width="80px">
<el-form-item label="用户昵称" prop="nickname">
<el-input v-model="user.nickname" maxlength="30" />
</el-form-item>
<el-form-item label="手机号码" prop="phonenumber">
<el-input v-model="user.phonenumber" maxlength="11" />
</el-form-item>
<el-form-item label="邮箱" prop="email">
<el-input v-model="user.email" maxlength="50" />
</el-form-item>
<el-form-item label="性别">
<el-radio-group v-model="user.gender">
<el-radio label="0"></el-radio>
<el-radio label="1"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submit">保存</el-button>
<el-button type="danger" @click="close">关闭</el-button>
</el-form-item>
</el-form>
</el-form-item>
</el-form>
</template>
<script setup>
@ -27,30 +27,44 @@ import { updateUserProfile } from "@/api/system/user";
const props = defineProps({
user: {
type: Object
}
type: Object,
},
});
const { proxy } = getCurrentInstance();
const rules = ref({
nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
email: [{ required: true, message: "邮箱地址不能为空", trigger: "blur" }, { type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
phonenumber: [{ required: true, message: "手机号码不能为空", trigger: "blur" }, { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
email: [
{ required: true, message: "邮箱地址不能为空", trigger: "blur" },
{
type: "email",
message: "请输入正确的邮箱地址",
trigger: ["blur", "change"],
},
],
phonenumber: [
{ required: true, message: "手机号码不能为空", trigger: "blur" },
{
pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
message: "请输入正确的手机号码",
trigger: "blur",
},
],
});
/** 提交按钮 */
function submit() {
proxy.$refs.userRef.validate(valid => {
proxy.$refs.userRef.validate((valid) => {
if (valid) {
updateUserProfile(props.user).then(response => {
updateUserProfile(props.user).then((response) => {
proxy.$modal.msgSuccess("修改成功");
});
}
});
};
}
/** 关闭按钮 */
function close() {
proxy.$tab.closePage();
};
}
</script>