From c966d9bada8e189f0beb4867fce81ae73f3fcebd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 02 八月 2020 18:31:47 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/system/menu/index.vue | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/views/system/menu/index.vue b/ruoyi-ui/src/views/system/menu/index.vue
index 9fc2d78..cf75ebf 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"
@@ -21,10 +21,30 @@
</el-select>
</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 type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</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"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['system:menu:add']"
+ >鏂板</el-button>
+ </el-col>
+ <div class="top-right-btn">
+ <el-tooltip class="item" effect="dark" content="鍒锋柊" placement="top">
+ <el-button size="mini" circle icon="el-icon-refresh" @click="handleQuery" />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" :content="showSearch ? '闅愯棌鎼滅储' : '鏄剧ず鎼滅储'" placement="top">
+ <el-button size="mini" circle icon="el-icon-search" @click="showSearch=!showSearch" />
+ </el-tooltip>
+ </div>
+ </el-row>
<el-table
v-loading="loading"
@@ -197,6 +217,8 @@
return {
// 閬僵灞�
loading: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
// 鑿滃崟琛ㄦ牸鏍戞暟鎹�
menuList: [],
// 鑿滃崟鏍戦�夐」
@@ -310,6 +332,11 @@
handleQuery() {
this.getList();
},
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd(row) {
this.reset();
--
Gitblit v1.9.3