From bf544deeaaeaec7135aef322478d9b44bbf45a3c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 01 Aug 2020 19:25:18 +0800
Subject: [PATCH] 表格工具栏右侧添加刷新&显隐查询栏
---
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
index c7a3f6e..a6ae202 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
#foreach($column in $columns)
#if($column.query)
#set($dictType=$column.dictType)
@@ -51,23 +51,30 @@
#end
#end
<el-form-item>
+ <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
- class="filter-item"
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >搜索</el-button>
- <el-button
- class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['${moduleName}:${businessName}:add']"
>新增</el-button>
- </el-form-item>
- </el-form>
+ </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"
@@ -151,6 +158,12 @@
></el-option>
</el-select>
</el-form-item>
+#elseif($column.htmlType == "select" && $dictType)
+ <el-form-item label="${comment}">
+ <el-select v-model="form.${field}" placeholder="请选择${comment}">
+ <el-option label="请选择字典生成" value="" />
+ </el-select>
+ </el-form-item>
#elseif($column.htmlType == "checkbox" && "" != $dictType)
<el-form-item label="${comment}">
<el-checkbox-group v-model="form.${field}">
@@ -167,12 +180,6 @@
<el-checkbox-group v-model="form.${field}">
<el-checkbox>请选择字典生成</el-checkbox>
</el-checkbox-group>
- </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}">
- <el-select v-model="form.${field}" placeholder="请选择${comment}">
- <el-option label="请选择字典生成" value="" />
- </el-select>
</el-form-item>
#elseif($column.htmlType == "radio" && "" != $dictType)
<el-form-item label="${comment}">
@@ -229,6 +236,8 @@
return {
// 遮罩层
loading: true,
+ // 显示搜索条件
+ showSearch: true,
// ${functionName}表格数据
${businessName}List: [],
// ${functionName}树选项
@@ -253,7 +262,7 @@
queryParams: {
#foreach ($column in $columns)
#if($column.query)
- $column.javaField: undefined#if($velocityCount != $columns.size()),#end
+ $column.javaField: null#if($velocityCount != $columns.size()),#end
#end
#end
@@ -349,7 +358,7 @@
$column.javaField: []#if($velocityCount != $columns.size()),#end
#else
- $column.javaField: undefined#if($velocityCount != $columns.size()),#end
+ $column.javaField: null#if($velocityCount != $columns.size()),#end
#end
#end
@@ -376,7 +385,7 @@
handleUpdate(row) {
this.reset();
this.getTreeselect();
- if (row != undefined) {
+ if (row != null) {
this.form.${treeParentCode} = row.${treeCode};
}
get${BusinessName}(row.${pkColumn.javaField}).then(response => {
@@ -391,7 +400,7 @@
});
},
/** 提交按钮 */
- submitForm: function() {
+ submitForm() {
this.#[[$]]#refs["form"].validate(valid => {
if (valid) {
#foreach ($column in $columns)
@@ -399,7 +408,7 @@
this.form.$column.javaField = this.form.${column.javaField}.join(",");
#end
#end
- if (this.form.${pkColumn.javaField} != undefined) {
+ if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => {
if (response.code === 200) {
this.msgSuccess("修改成功");
@@ -434,4 +443,4 @@
}
}
};
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3