Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

RuoYi

2020-08-07 a7eb07c7a0afb7da1eb9eb1bd902b0cec77921e2

 ruoyi-generator/src/main/resources/vm/vue/index.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,7 +51,7 @@
#end

#end

      <el-form-item>

        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</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>

@@ -95,6 +95,14 @@
          v-hasPermi="['${moduleName}:${businessName}:export']"

        >导出</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" :data="${businessName}List" @selection-change="handleSelectionChange">

@@ -260,6 +268,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // ${functionName}表格数据

@@ -357,7 +367,7 @@
      this.form = {

#foreach ($column in $columns)

#if($column.htmlType == "radio")

        $column.javaField: "0"#if($velocityCount != $columns.size()),#end

        $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end



#elseif($column.htmlType == "checkbox")

        $column.javaField: []#if($velocityCount != $columns.size()),#end