From 2a604c0548f5b45a00d56298e0c60d09e071e88b Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期三, 02 六月 2021 20:40:09 +0800 Subject: [PATCH] !237 同步菜单新增、修改界面“功能权限”maxlength为100(保持与数据库字段长度一致),避免因超过50后不能录入问题 Merge pull request !237 from 老李/origin --- ruoyi-ui/src/views/system/menu/index.vue | 68 +++++++++++++++++++++++----------- 1 files changed, 46 insertions(+), 22 deletions(-) diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue index e156b6a..cee61b7 100644 --- a/ruoyi-ui/src/views/system/menu/index.vue +++ b/ruoyi-ui/src/views/system/menu/index.vue @@ -1,7 +1,7 @@ <template> <div class="app-container"> - <el-form :inline="true"> - <el-form-item label="菜单名称"> + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"> + <el-form-item label="菜单名称" prop="menuName"> <el-input v-model="queryParams.menuName" placeholder="请输入菜单名称" @@ -10,7 +10,7 @@ @keyup.enter.native="handleQuery" /> </el-form-item> - <el-form-item label="状态"> + <el-form-item label="状态" prop="status"> <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small"> <el-option v-for="dict in statusOptions" @@ -22,9 +22,23 @@ </el-form-item> <el-form-item> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> - <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:menu:add']">新增</el-button> + <el-button icon="el-icon-refresh" size="mini" @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="el-icon-plus" + size="mini" + @click="handleAdd" + v-hasPermi="['system:menu:add']" + >新增</el-button> + </el-col> + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> + </el-row> <el-table v-loading="loading" @@ -74,7 +88,7 @@ </el-table> <!-- 添加或修改菜单对话框 --> - <el-dialog :title="title" :visible.sync="open" width="600px"> + <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body> <el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-row> <el-col :span="24"> @@ -149,7 +163,7 @@ </el-col> <el-col :span="12"> <el-form-item v-if="form.menuType != 'M'" label="权限标识"> - <el-input v-model="form.perms" placeholder="请权限标识" maxlength="50" /> + <el-input v-model="form.perms" placeholder="请权限标识" maxlength="100" /> </el-form-item> </el-col> <el-col :span="12"> @@ -171,6 +185,14 @@ :key="dict.dictValue" :label="dict.dictValue" >{{dict.dictLabel}}</el-radio> + </el-radio-group> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item v-if="form.menuType == 'C'" label="是否缓存"> + <el-radio-group v-model="form.isCache"> + <el-radio label="0">缓存</el-radio> + <el-radio label="1">不缓存</el-radio> </el-radio-group> </el-form-item> </el-col> @@ -197,6 +219,8 @@ return { // 遮罩层 loading: true, + // 显示搜索条件 + showSearch: true, // 菜单表格树数据 menuList: [], // 菜单树选项 @@ -301,6 +325,7 @@ menuType: "M", orderNum: undefined, isFrame: "1", + isCache: "0", visible: "0", status: "0" }; @@ -310,12 +335,19 @@ handleQuery() { this.getList(); }, + /** 重置按钮操作 */ + resetQuery() { + this.resetForm("queryForm"); + this.handleQuery(); + }, /** 新增按钮操作 */ handleAdd(row) { this.reset(); this.getTreeselect(); - if (row != null) { + if (row != null && row.menuId) { this.form.parentId = row.menuId; + } else { + this.form.parentId = 0; } this.open = true; this.title = "添加菜单"; @@ -336,23 +368,15 @@ if (valid) { if (this.form.menuId != undefined) { updateMenu(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("修改成功"); - this.open = false; - this.getList(); - } else { - this.msgError(response.msg); - } + this.msgSuccess("修改成功"); + this.open = false; + this.getList(); }); } else { addMenu(this.form).then(response => { - if (response.code === 200) { - this.msgSuccess("新增成功"); - this.open = false; - this.getList(); - } else { - this.msgError(response.msg); - } + this.msgSuccess("新增成功"); + this.open = false; + this.getList(); }); } } @@ -369,7 +393,7 @@ }).then(() => { this.getList(); this.msgSuccess("删除成功"); - }).catch(function() {}); + }) } } }; -- Gitblit v1.9.2