This commit is contained in:
朱菊兰 2024-06-28 11:09:02 +08:00
parent daaec2417c
commit fc21359f8f
3 changed files with 119 additions and 92 deletions

View File

@ -137,7 +137,7 @@
<!-- 添加或修改菜单对话框 --> <!-- 添加或修改菜单对话框 -->
<base-dialog :dialogTitle="title" :dialogVisible="open" width="50%"> <base-dialog :dialogTitle="title" :dialogVisible="open" width="50%">
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="上级菜单"> <el-form-item label="上级菜单">
@ -205,6 +205,7 @@
v-model="form.sort" v-model="form.sort"
controls-position="right" controls-position="right"
:min="0" :min="0"
style="width: 100%"
/> />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -331,8 +332,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
<el-button type="primary" @click="submitForm"> </el-button>
</div> </div>
</base-dialog> </base-dialog>
</div> </div>
@ -437,6 +438,12 @@ export default {
}, },
], ],
tableBtn: [ tableBtn: [
this.$auth.hasPermi("system:menu:create")
? {
type: "add",
btnName: "新增",
}
: undefined,
this.$auth.hasPermi("system:menu:update") this.$auth.hasPermi("system:menu:update")
? { ? {
type: "edit", type: "edit",
@ -449,12 +456,6 @@ export default {
btnName: "删除", btnName: "删除",
} }
: undefined, : undefined,
this.$auth.hasPermi("system:menu:create")
? {
type: "add",
btnName: "新增",
}
: undefined,
].filter((v) => v), ].filter((v) => v),
tableProps, tableProps,
heightNum: 210, heightNum: 210,

View File

@ -83,7 +83,7 @@
{{ parseTime(form.startTime) }} | {{ form.duration }} ms {{ parseTime(form.startTime) }} | {{ form.duration }} ms
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="24">
<el-form-item label="操作结果:"> <el-form-item label="操作结果:">
<div v-if="form.resultCode === 0"> <div v-if="form.resultCode === 0">
正常 | {{ form.resultData }} 正常 | {{ form.resultData }}

View File

@ -1,5 +1,5 @@
<template> <template>
<div class="app-container"> <div class="user-container">
<!-- <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" /> <!-- <doc-alert title="用户体系" url="https://doc.iocoder.cn/user-center/" />
<doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" /> <doc-alert title="三方登陆" url="https://doc.iocoder.cn/social-user/" />
<doc-alert <doc-alert
@ -8,40 +8,43 @@
/> --> /> -->
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-row :gutter="20"> <el-row :gutter="8" class="user-box">
<!--部门数据--> <!--部门数据-->
<el-col :span="4" :xs="24"> <el-col :span="4" :xs="24">
<div class="head-container"> <div class="user-box-left">
<el-input <div class="head-container">
v-model="deptName" <el-input
placeholder="请输入部门名称" v-model="deptName"
clearable placeholder="请输入部门名称"
size="small" clearable
prefix-icon="el-icon-search" size="small"
style="margin-bottom: 20px" prefix-icon="el-icon-search"
/> style="margin-bottom: 20px"
</div> />
<div class="head-container"> </div>
<el-tree <div class="head-container">
:data="deptOptions" <el-tree
:props="defaultProps" :data="deptOptions"
:expand-on-click-node="false" :props="defaultProps"
:filter-node-method="filterNode" :expand-on-click-node="false"
ref="tree" :filter-node-method="filterNode"
default-expand-all ref="tree"
highlight-current default-expand-all
@node-click="handleNodeClick" highlight-current
/> @node-click="handleNodeClick"
/>
</div>
</div> </div>
</el-col> </el-col>
<!--用户数据--> <!--用户数据-->
<el-col :span="20" :xs="24"> <el-col :span="20" :xs="24">
<search-bar <div class="user-box-right">
:formConfigs="formConfig" <search-bar
ref="searchBarForm" :formConfigs="formConfig"
@headBtnClick="buttonClick" ref="userSearchBarForm"
/> @headBtnClick="buttonClick"
<!-- <el-form />
<!-- <el-form
:model="queryParams" :model="queryParams"
ref="queryForm" ref="queryForm"
size="small" size="small"
@ -104,7 +107,7 @@
</el-form-item> </el-form-item>
</el-form> --> </el-form> -->
<!-- <el-row :gutter="10" class="mb8"> <!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
@ -144,25 +147,25 @@
></right-toolbar> ></right-toolbar>
</el-row> --> </el-row> -->
<!-- 列表 --> <!-- 列表 -->
<base-table <base-table
:page="queryParams.pageNo" :page="queryParams.pageNo"
:limit="queryParams.pageSize" :limit="queryParams.pageSize"
:table-props="tableProps" :table-props="tableProps"
:table-data="userList" :table-data="userList"
:max-height="tableH" :max-height="tableH"
@emitFun="handleStatusChange" @emitFun="handleStatusChange"
> >
<method-btn <method-btn
v-if="tableBtn.length" v-if="tableBtn.length"
slot="handleBtn" slot="handleBtn"
:width="220" :width="220"
label="操作" label="操作"
:method-list="tableBtn" :method-list="tableBtn"
@clickBtn="handleClick" @clickBtn="handleClick"
/> />
</base-table> </base-table>
<!-- <el-table v-loading="loading" :data="userList"> <!-- <el-table v-loading="loading" :data="userList">
<el-table-column <el-table-column
label="用户编号" label="用户编号"
align="center" align="center"
@ -288,18 +291,19 @@
</el-table-column> </el-table-column>
</el-table> --> </el-table> -->
<pagination <pagination
:page.sync="queryParams.pageNo" :page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
:total="total" :total="total"
@pagination="getList" @pagination="getList"
/> />
</div>
</el-col> </el-col>
</el-row> </el-row>
<!-- 添加或修改参数配置对话框 --> <!-- 添加或修改参数配置对话框 -->
<base-dialog :dialogTitle="title" :dialogVisible="open" width="50%"> <base-dialog :dialogTitle="title" :dialogVisible="open" width="50%">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用户昵称" prop="nickname"> <el-form-item label="用户昵称" prop="nickname">
@ -412,8 +416,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
<el-button type="primary" @click="submitForm"> </el-button>
</div> </div>
</base-dialog> </base-dialog>
@ -448,7 +452,7 @@
:underline="false" :underline="false"
style="font-size: 12px; vertical-align: baseline" style="font-size: 12px; vertical-align: baseline"
@click="importTemplate" @click="importTemplate"
>下载模板</el-link >导出模板</el-link
> >
</div> </div>
</el-upload> </el-upload>
@ -606,6 +610,11 @@ export default {
name: "search", name: "search",
color: "primary", color: "primary",
}, },
{
type: "button",
btnName: "重置",
name: "cancel",
},
{ {
type: this.$auth.hasPermiOr([ type: this.$auth.hasPermiOr([
"system:user:create", "system:user:create",
@ -615,18 +624,11 @@ export default {
? "separate" ? "separate"
: "", : "",
}, },
{
type: this.$auth.hasPermi("system:user:create") ? "button" : "",
btnName: "新增",
name: "addNew",
color: "success",
plain: true,
},
{ {
type: this.$auth.hasPermi("system:user:import") ? "button" : "", type: this.$auth.hasPermi("system:user:import") ? "button" : "",
btnName: "导入", btnName: "导入",
name: "import", name: "import",
color: "warning", color: "primary",
plain: true, plain: true,
}, },
{ {
@ -636,20 +638,15 @@ export default {
color: "primary", color: "primary",
plain: true, plain: true,
}, },
{
type: this.$auth.hasPermi("system:user:create") ? "button" : "",
btnName: "新增",
name: "addNew",
color: "success",
plain: true,
},
], ],
tableBtn: [ tableBtn: [
this.$auth.hasPermi("system:user:update")
? {
type: "edit",
btnName: "修改",
}
: undefined,
this.$auth.hasPermi("system:user:delete")
? {
type: "delete",
btnName: "删除",
}
: undefined,
this.$auth.hasPermi("system:user:update-password") this.$auth.hasPermi("system:user:update-password")
? { ? {
type: "reset", type: "reset",
@ -662,6 +659,18 @@ export default {
btnName: "分配角色", btnName: "分配角色",
} }
: undefined, : undefined,
this.$auth.hasPermi("system:user:update")
? {
type: "edit",
btnName: "修改",
}
: undefined,
this.$auth.hasPermi("system:user:delete")
? {
type: "delete",
btnName: "删除",
}
: undefined,
].filter((v) => v), ].filter((v) => v),
tableProps, tableProps,
// //
@ -803,6 +812,15 @@ export default {
case "search": case "search":
this.handleQuery(val); this.handleQuery(val);
break; break;
case "cancel":
this.$refs["userSearchBarForm"].resetForm();
this.queryParams.pageNo = 1;
this.queryParams.username = "";
this.queryParams.mobile = "";
this.queryParams.status = "";
this.queryParams.createTime = [];
this.getList();
break;
case "addNew": case "addNew":
this.handleAdd(); this.handleAdd();
break; break;
@ -1033,7 +1051,7 @@ export default {
this.upload.title = "用户导入"; this.upload.title = "用户导入";
this.upload.open = true; this.upload.open = true;
}, },
/** 下载模板操作 */ /** 导出模板操作 */
importTemplate() { importTemplate() {
importTemplate().then((response) => { importTemplate().then((response) => {
this.$download.excel(response, "用户导入模板.xls"); this.$download.excel(response, "用户导入模板.xls");
@ -1090,11 +1108,19 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.app-container { .user-container {
width: 100%; width: 100%;
height: calc(100vh - 120px - 8px); height: calc(100vh - 120px - 8px);
background-color: #fff; background-color: #f2f4f9;
border-radius: 8px;
padding: 8px; .user-box {
.user-box-left,
.user-box-right {
background-color: #fff;
padding: 8px;
border-radius: 8px;
height: calc(100vh - 128px);
}
}
} }
</style> </style>