From 6db4b036b0981f42ddd6bcbf14a9791c6d97e03e Mon Sep 17 00:00:00 2001
From: wyd <475583447@qq.com>
Date: Wed, 24 Apr 2024 15:05:28 +0800
Subject: [PATCH] ...

---
 ...{JGApplication.java => JgApplication.java} |    4 +-
 ...ializer.java => JgServletInitializer.java} |    4 +-
 .../controller/AboutPartThreeController.java  |   19 +
 .../project/about/domain/AboutPartThree.java  |    8 +
 .../about/service/IAboutPartThreeService.java |    1 +
 src/main/resources/vm/java/controller.java.vm |   22 +-
 src/main/resources/vm/java/domain.java.vm     |    3 +
 src/main/resources/vm/vue/index.vue.vm        | 1273 +++++++++--------
 src/main/resources/vm/vue/v3/index.vue.vm     |   16 +
 target/classes/com/jg/JGApplication.class     |  Bin 3217 -> 3217 bytes
 .../classes/com/jg/JGServletInitializer.class |  Bin 889 -> 889 bytes
 .../controller/AboutPartThreeController.class |  Bin 4738 -> 5685 bytes
 ...AboutPartThree$AboutPartThreeBuilder.class |  Bin 2447 -> 2447 bytes
 .../project/about/domain/AboutPartThree.class |  Bin 6330 -> 6451 bytes
 target/classes/vm/java/controller.java.vm     |   22 +-
 target/classes/vm/java/domain.java.vm         |    2 +
 target/classes/vm/vue/index.vue.vm            | 1273 +++++++++--------
 target/classes/vm/vue/v3/index.vue.vm         |   16 +
 18 files changed, 1509 insertions(+), 1154 deletions(-)
 rename src/main/java/com/jg/{JGApplication.java => JgApplication.java} (97%)
 rename src/main/java/com/jg/{JGServletInitializer.java => JgServletInitializer.java} (73%)

diff --git a/src/main/java/com/jg/JGApplication.java b/src/main/java/com/jg/JgApplication.java
similarity index 97%
rename from src/main/java/com/jg/JGApplication.java
rename to src/main/java/com/jg/JgApplication.java
index b812702..0a4e5d6 100644
--- a/src/main/java/com/jg/JGApplication.java
+++ b/src/main/java/com/jg/JgApplication.java
@@ -19,10 +19,10 @@ import java.net.UnknownHostException;
 @Slf4j
 @EnableScheduling
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class JGApplication
+public class JgApplication
 {
     public static void main(String[] args) throws UnknownHostException {
-        ConfigurableApplicationContext application = SpringApplication.run(JGApplication.class, args);
+        ConfigurableApplicationContext application = SpringApplication.run(JgApplication.class, args);
         Environment env = application.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();
         String port = env.getProperty("server.port");
diff --git a/src/main/java/com/jg/JGServletInitializer.java b/src/main/java/com/jg/JgServletInitializer.java
similarity index 73%
rename from src/main/java/com/jg/JGServletInitializer.java
rename to src/main/java/com/jg/JgServletInitializer.java
index 139908c..d6efddb 100644
--- a/src/main/java/com/jg/JGServletInitializer.java
+++ b/src/main/java/com/jg/JgServletInitializer.java
@@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  * 
  * @author jg
  */
-public class JGServletInitializer extends SpringBootServletInitializer
+public class JgServletInitializer extends SpringBootServletInitializer
 {
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
     {
-        return application.sources(JGApplication.class);
+        return application.sources(JgApplication.class);
     }
 }
diff --git a/src/main/java/com/jg/project/about/controller/AboutPartThreeController.java b/src/main/java/com/jg/project/about/controller/AboutPartThreeController.java
index 5798aba..dcd27ae 100644
--- a/src/main/java/com/jg/project/about/controller/AboutPartThreeController.java
+++ b/src/main/java/com/jg/project/about/controller/AboutPartThreeController.java
@@ -1,6 +1,7 @@
 package com.jg.project.about.controller;
 import java.util.List;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,6 +11,9 @@ import com.github.pagehelper.PageInfo;
 import com.jg.common.utils.ListPage;
 import com.jg.common.utils.PageUtils;
 import com.jg.common.utils.QueryPage;
+import com.jg.common.utils.poi.ExcelUtil;
+import com.jg.framework.aspectj.lang.annotation.Log;
+import com.jg.framework.aspectj.lang.enums.BusinessType;
 import com.jg.framework.web.controller.BaseController;
 import com.jg.framework.web.page.TableDataInfo;
 import com.jg.project.about.mapper.AboutPartThreeMapper;
@@ -101,4 +105,19 @@ public class AboutPartThreeController extends BaseController {
         boolean res = aboutPartThreeService.removeById(id);
         return R.ok(res);
     }
+
+    /**
+     * 导出关于第三部分列表
+     */
+    @ApiOperation("第三部分列表数据导出")
+    @PreAuthorize("@ss.hasPermi('PartThree:partthree:export')")
+    @Log(title = "关于第三部分", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, AboutPartThree aboutPartThree)
+    {
+        List<AboutPartThree> list = aboutPartThreeService.selectAboutPartThreeList(aboutPartThree);
+        ExcelUtil<AboutPartThree> util = new ExcelUtil<AboutPartThree>(AboutPartThree.class);
+        util.exportExcel(response, list, "关于第三部分数据");
+    }
+
 }
diff --git a/src/main/java/com/jg/project/about/domain/AboutPartThree.java b/src/main/java/com/jg/project/about/domain/AboutPartThree.java
index fd10d0f..0c803d9 100644
--- a/src/main/java/com/jg/project/about/domain/AboutPartThree.java
+++ b/src/main/java/com/jg/project/about/domain/AboutPartThree.java
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.jg.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -42,32 +43,39 @@ private static final long serialVersionUID=1L;
         private Long id;
     /** 第一标题 */
         @ApiModelProperty("第一标题")
+        @Excel(name = "第一标题")
         @TableField("title_one")
         private String titleOne;
     /** 第二标题 */
         @ApiModelProperty("第二标题")
+        @Excel(name = "第二标题")
         @TableField("title_two")
         private String titleTwo;
     /** 备注 */
         @ApiModelProperty("备注")
+        @Excel(name = "备注")
         @TableField("remarks")
         private String remarks;
     /** 图标 */
         @ApiModelProperty("图标")
+        @Excel(name = "图标")
         @TableField("icon")
         private String icon;
     /** 排序 */
         @ApiModelProperty("排序")
+        @Excel(name = "排序")
         @TableField("sorts")
         private Long sorts;
 
         /** 创建时间 */
         @ApiModelProperty(value = "创建时间",hidden = true)
+        @Excel(name = "创建时间")
         @TableField("create_time")
         @JsonSerialize(using = ToStringSerializer.class)
         private String createTime;
         /** 更新时间 */
         @ApiModelProperty(value = "更新时间",hidden = true)
+        @Excel(name = "更新时间")
         @TableField("update_time")
         @JsonSerialize(using = ToStringSerializer.class)
         private String updateTime;
diff --git a/src/main/java/com/jg/project/about/service/IAboutPartThreeService.java b/src/main/java/com/jg/project/about/service/IAboutPartThreeService.java
index 01225ed..99e320b 100644
--- a/src/main/java/com/jg/project/about/service/IAboutPartThreeService.java
+++ b/src/main/java/com/jg/project/about/service/IAboutPartThreeService.java
@@ -14,4 +14,5 @@ import java.util.List;
  */
 public interface IAboutPartThreeService extends IService<AboutPartThree> {
      List<AboutPartThree> selectAboutPartThreeList(AboutPartThree aboutPartThree);
+
 }
diff --git a/src/main/resources/vm/java/controller.java.vm b/src/main/resources/vm/java/controller.java.vm
index edc7108..eae8fdb 100644
--- a/src/main/resources/vm/java/controller.java.vm
+++ b/src/main/resources/vm/java/controller.java.vm
@@ -3,9 +3,11 @@ import java.util.List;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import io.swagger.annotations.Api;
+import com.jg.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.jg.common.utils.QueryPage;
+import com.jg.framework.aspectj.lang.annotation.Log;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,11 +31,10 @@ import com.jg.framework.web.domain.R;
 @RestController
 @RequestMapping("/${moduleName}")
 public class ${ClassName}Controller extends BaseController{
+
     @Resource
     private I${ClassName}Service ${className}Service;
 
-
-
     /**
      * ${functionName}分页列表
      */
@@ -55,6 +56,7 @@ public class ${ClassName}Controller extends BaseController{
         List<${ClassName}> list = ${className}Service.list();
         return R.ok(list);
     }
+
     /**
      * ${functionName}id详细信息
      */
@@ -70,6 +72,7 @@ public class ${ClassName}Controller extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
     @ApiOperation(value = "${functionName}新增信息", notes = "${functionName}新增信息")
+    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public R<Boolean> add(${ClassName} ${className}) {
         boolean res = ${className}Service.save(${className});
@@ -80,6 +83,7 @@ public class ${ClassName}Controller extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
     @ApiOperation(value = "${functionName}修改信息", notes = "${functionName}修改信息")
+    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public R<Boolean> edit(${ClassName} ${className}) {
         boolean res = ${className}Service.updateById(${className});
@@ -90,9 +94,23 @@ public class ${ClassName}Controller extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
     @ApiOperation(value = "${functionName}删除信息", notes = "${functionName}删除信息")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     public R<Boolean> remove(Long id) {
         boolean res = ${className}Service.removeById(id);
         return R.ok(res);
     }
+
+    /**
+     * 导出${functionName}列表
+     */
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+        util.exportExcel(response, list, "${functionName}数据");
+    }
 }
diff --git a/src/main/resources/vm/java/domain.java.vm b/src/main/resources/vm/java/domain.java.vm
index b1b4f5e..16d34a5 100644
--- a/src/main/resources/vm/java/domain.java.vm
+++ b/src/main/resources/vm/java/domain.java.vm
@@ -4,6 +4,7 @@ import com.alibaba.fastjson2.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.jg.framework.aspectj.lang.annotation.Excel;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
@@ -49,6 +50,7 @@ private static final long serialVersionUID=1L;
         private $column.javaType $column.javaField;
         #else
         @ApiModelProperty("$column.columnComment")
+        @Excel(name = "$column.columnComment")
         @TableField("$column.columnName")
         private $column.javaType $column.javaField;
         #end
@@ -56,6 +58,7 @@ private static final long serialVersionUID=1L;
         #if($column.javaType == 'Date')
     /** $column.columnComment */
         @ApiModelProperty(value = "$column.columnComment",hidden = true)
+        @Excel(name = "$column.columnComment")
         @TableField("$column.columnName")
         @JsonSerialize(using = ToStringSerializer.class)
         private String $column.javaField;
diff --git a/src/main/resources/vm/vue/index.vue.vm b/src/main/resources/vm/vue/index.vue.vm
index 5ff768a..e5fdf74 100644
--- a/src/main/resources/vm/vue/index.vue.vm
+++ b/src/main/resources/vm/vue/index.vue.vm
@@ -1,586 +1,713 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-input
-          v-model="queryParams.${column.javaField}"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option
-            v-for="dict in dict.type.${dictType}"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-date-picker clearable
-          v-model="queryParams.${column.javaField}"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择${comment}">
-        </el-date-picker>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      <el-form-item label="${comment}">
-        <el-date-picker
-          v-model="daterange${AttrName}"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-#end
-#end
-#end
-      <el-form-item>
-        <el-button type="primary" 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>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+            #foreach($column in $columns)
+                #if($column.query)
+                    #set($dictType=$column.dictType)
+                    #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                    #if($column.htmlType == "input")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-input
+                                    v-model="queryParams.${column.javaField}"
+                                    placeholder="请输入${comment}"
+                                    clearable
+                                    @keyup.enter.native="handleQuery"
+                            />
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                                <el-option
+                                        v-for="dict in dict.type.${dictType}"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                                <el-option label="请选择字典生成" value=""/>
+                            </el-select>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-date-picker clearable
+                                            v-model="queryParams.${column.javaField}"
+                                            type="date"
+                                            value-format="yyyy-MM-dd"
+                                            placeholder="请选择${comment}">
+                            </el-date-picker>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        <el-form-item label="${comment}">
+                            <el-date-picker
+                                    v-model="daterange${AttrName}"
+                                    style="width: 240px"
+                                    value-format="yyyy-MM-dd"
+                                    type="daterange"
+                                    range-separator="-"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期"
+                            ></el-date-picker>
+                        </el-form-item>
+                    #end
+                #end
+            #end
+            <el-form-item>
+                <el-button type="primary" 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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['${moduleName}:${businessName}:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['${moduleName}:${businessName}:remove']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
-        <template slot-scope="scope">
-#if($column.htmlType == "checkbox")
-          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
-          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
-#end
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $javaField)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-        </el-form-item>
-#elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <image-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <file-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "editor")
-        <el-form-item label="${comment}">
-          <editor v-model="form.${field}" :min-height="192"/>
-        </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-              :value="parseInt(dict.value)"
-#else
-              :value="dict.value"
-#end
-            ></el-option>
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <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}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              :label="dict.value">
-              {{dict.label}}
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox>请选择字典生成</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-              :label="parseInt(dict.value)"
-#else
-              :label="dict.value"
-#end
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "datetime")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-date-picker clearable
-            v-model="form.${field}"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
-#elseif($column.htmlType == "textarea")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-#end
-#end
-#end
-#end
-#if($table.sub)
-        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
-          </el-col>
+            <el-col :span="1.5">
+                <el-button
+                        type="primary"
+                        plain
+                        icon="el-icon-plus"
+                        size="mini"
+                        @click="handleAdd"
+                        v-hasPermi="['${moduleName}:${businessName}:add']"
+                >新增
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                        type="success"
+                        plain
+                        icon="el-icon-edit"
+                        size="mini"
+                        :disabled="single"
+                        @click="handleUpdate"
+                        v-hasPermi="['${moduleName}:${businessName}:edit']"
+                >修改
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                        type="danger"
+                        plain
+                        icon="el-icon-delete"
+                        size="mini"
+                        :disabled="multiple"
+                        @click="handleDelete"
+                        v-hasPermi="['${moduleName}:${businessName}:remove']"
+                >删除
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                        type="warning"
+                        plain
+                        icon="Download"
+                        @click="handleExport"
+                        v-hasPermi="['${moduleName}:${businessName}:export']"
+                >导出
+                </el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
-          <el-table-column label="$comment" prop="${javaField}" width="240">
-            <template slot-scope="scope">
-              <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd" placeholder="请选择$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option
-                  v-for="dict in dict.type.$column.dictType"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </template>
-          </el-table-column>
-#end
-#end
+
+        <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center"/>
+            #foreach($column in $columns)
+                #set($javaField=$column.javaField)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                #if($column.pk)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}"/>
+                #elseif($column.list && $column.htmlType == "datetime")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                        <template slot-scope="scope">
+                            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && $column.htmlType == "imageUpload")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+                        <template slot-scope="scope">
+                            <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $column.dictType)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}">
+                        <template slot-scope="scope">
+                            #if($column.htmlType == "checkbox")
+                                <dict-tag :options="dict.type.${column.dictType}"
+                                          :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+                            #else
+                                <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+                            #end
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $javaField)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}"/>
+                #end
+            #end
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-edit"
+                            @click="handleUpdate(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:edit']"
+                    >修改
+                    </el-button>
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-delete"
+                            @click="handleDelete(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:remove']"
+                    >删除
+                    </el-button>
+                </template>
+            </el-table-column>
         </el-table>
-#end
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+
+        <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"
+        />
+
+        <!-- 添加或修改${functionName}对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                #foreach($column in $columns)
+                    #set($field=$column.javaField)
+                    #if($column.insert && !$column.pk)
+                        #if(($column.usableColumn) || (!$column.superColumn))
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #set($dictType=$column.dictType)
+                            #if($column.htmlType == "input")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" placeholder="请输入${comment}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "imageUpload")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <image-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "fileUpload")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <file-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "editor")
+                                <el-form-item label="${comment}">
+                                    <editor v-model="form.${field}" :min-height="192"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && "" != $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.label"
+                                            #if($column.javaType == "Integer" || $column.javaType == "Long")
+                                                :value="parseInt(dict.value)"
+                                            #else
+                                                :value="dict.value"
+                                            #end
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <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}" prop="${field}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.value">
+                                            {{dict.label}}
+                                        </el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox>请选择字典生成</el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && "" != $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                            #if($column.javaType == "Integer" || $column.javaType == "Long")
+                                                :label="parseInt(dict.value)"
+                                            #else
+                                                :label="dict.value"
+                                            #end
+                                        >{{dict.label}}
+                                        </el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio label="1">请选择字典生成</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "datetime")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-date-picker clearable
+                                                    v-model="form.${field}"
+                                                    type="date"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="请选择${comment}">
+                                    </el-date-picker>
+                                </el-form-item>
+                            #elseif($column.htmlType == "textarea")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容"/>
+                                </el-form-item>
+                            #end
+                        #end
+                    #end
+                #end
+                #if($table.sub)
+                    <el-divider content-position="center">${subTable.functionName}信息</el-divider>
+                    <el-row :gutter="10" class="mb8">
+                        <el-col :span="1.5">
+                            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">
+                                添加
+                            </el-button>
+                        </el-col>
+                        <el-col :span="1.5">
+                            <el-button type="danger" icon="el-icon-delete" size="mini"
+                                       @click="handleDelete${subClassName}">删除
+                            </el-button>
+                        </el-col>
+                    </el-row>
+                    <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index"
+                              @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+                        <el-table-column type="selection" width="50" align="center"/>
+                        <el-table-column label="序号" align="center" prop="index" width="50"/>
+                        #foreach($column in $subTable.columns)
+                            #set($javaField=$column.javaField)
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #if($column.pk || $javaField == ${subTableFkclassName})
+                            #elseif($column.list && $column.htmlType == "input")
+                                <el-table-column label="$comment" prop="${javaField}" width="150">
+                                    <template slot-scope="scope">
+                                        <el-input v-model="scope.row.$javaField" placeholder="请输入$comment"/>
+                                    </template>
+                                </el-table-column>
+                            #elseif($column.list && $column.htmlType == "datetime")
+                                <el-table-column label="$comment" prop="${javaField}" width="240">
+                                    <template slot-scope="scope">
+                                        <el-date-picker clearable v-model="scope.row.$javaField" type="date"
+                                                        value-format="yyyy-MM-dd" placeholder="请选择$comment"/>
+                                    </template>
+                                </el-table-column>
+                            #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") &&
+                                "" != $column.dictType)
+                                <el-table-column label="$comment" prop="${javaField}" width="150">
+                                    <template slot-scope="scope">
+                                        <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
+                                            <el-option
+                                                    v-for="dict in dict.type.$column.dictType"
+                                                    :key="dict.value"
+                                                    :label="dict.label"
+                                                    :value="dict.value"
+                                            ></el-option>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                            #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") &&
+                                "" == $column.dictType)
+                                <el-table-column label="$comment" prop="${javaField}" width="150">
+                                    <template slot-scope="scope">
+                                        <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
+                                            <el-option label="请选择字典生成" value=""/>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                            #end
+                        #end
+                    </el-table>
+                #end
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listPage${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+    import {
+        listPage${BusinessName},
+        get${BusinessName},
+        del${BusinessName},
+        add${BusinessName},
+        update${BusinessName}
+    } from "@/api/${moduleName}/${businessName}";
 
-export default {
-  name: "${BusinessName}",
-#if(${dicts} != '')
-  dicts: [${dicts}],
-#end
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-#if($table.sub)
-      // 子表选中数据
-      checked${subClassName}: [],
-#end
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // ${functionName}表格数据
-      ${businessName}List: [],
-#if($table.sub)
-      // ${subTable.functionName}表格数据
-      ${subclassName}List: [],
-#end
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      // $comment时间范围
-      daterange${AttrName}: [],
-#end
-#end
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-#foreach ($column in $columns)
-#if($column.query)
-        $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-#foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-        $column.javaField: [
-          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-        ]#if($foreach.count != $columns.size()),#end
-#end
-#end
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询${functionName}列表 */
-    getList() {
-      this.loading = true;
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      this.queryParams.params = {};
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
-        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
-        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
-      }
-#end
-#end
-      listPage${BusinessName}(this.queryParams).then(response => {
-        this.${businessName}List = response.data;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-        $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
-        $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
-      };
-#if($table.sub)
-      this.${subclassName}List = [];
-#end
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      this.daterange${AttrName} = [];
-#end
-#end
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.${pkColumn.javaField})
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加${functionName}";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
-      get${BusinessName}(${pkColumn.javaField}).then(response => {
-        this.form = response.data;
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-        this.form.$column.javaField = this.form.${column.javaField}.split(",");
-#end
-#end
-#if($table.sub)
-        this.${subclassName}List = response.data.${subclassName}List;
-#end
-        this.open = true;
-        this.title = "修改${functionName}";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.#[[$]]#refs["form"].validate(valid => {
-        if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-          this.form.$column.javaField = this.form.${column.javaField}.join(",");
-#end
-#end
-#if($table.sub)
-          this.form.${subclassName}List = this.${subclassName}List;
-#end
-          if (this.form.${pkColumn.javaField} != null) {
-            update${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            add${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
-      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
-        return del${BusinessName}(${pkColumn.javaField}s);
-      }).then(() => {
-        this.getList();
-        this.#[[$modal]]#.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-#if($table.sub)
-	/** ${subTable.functionName}序号 */
-    row${subClassName}Index({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
+    export default {
+        name: "${BusinessName}",
+        #if(${dicts} != '')
+            dicts: [${dicts}],
+        #end
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                #if($table.sub)
+                    // 子表选中数据
+                    checked${subClassName}: [],
+                #end
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // ${functionName}表格数据
+                    ${businessName}List: [],
+                #if($table.sub)
+                    // ${subTable.functionName}表格数据
+                        ${subclassName}List: [],
+                #end
+                // 弹出层标题
+                title: "",
+                // 是否显示弹出层
+                open: false,
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        // $comment时间范围
+                        daterange${AttrName}: [],
+                    #end
+                #end
+                // 查询参数
+                queryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    #foreach ($column in $columns)
+                        #if($column.query)
+                                $column.javaField: null#if($foreach.count != $columns.size()),#end
+                        #end
+                    #end
+                },
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    #foreach ($column in $columns)
+                        #if($column.required)
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                                $column.javaField: [
+                                {
+                                    required: true, message: "$comment不能为空", trigger: #if($column.htmlType ==
+                                    "select" || $column.htmlType == "radio")"change"#else"blur"#end }
+                            ]#if($foreach.count != $columns.size()),#end
+                        #end
+                    #end
+                }
+            };
+        },
+        created() {
+            this.getList();
+        },
+        methods: {
+            /** 查询${functionName}列表 */
+            getList() {
+                this.loading = true;
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        this.queryParams.params = {};
+                        #break
+                    #end
+                #end
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+                            this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+                            this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+                        }
+                    #end
+                #end
+                listPage${BusinessName}(this.queryParams).then(response => {
+                    this.${businessName}List = response.data;
+                    this.total = response.total;
+                    this.loading = false;
+                });
+            },
+            // 取消按钮
+            cancel() {
+                this.open = false;
+                this.reset();
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                    #foreach ($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                                $column.javaField: []#if($foreach.count != $columns.size()),#end
+                        #else
+                                $column.javaField: null#if($foreach.count != $columns.size()),#end
+                        #end
+                    #end
+                };
+                #if($table.sub)
+                    this.${subclassName}List = [];
+                #end
+                this.resetForm("form");
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1;
+                this.getList();
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        this.daterange${AttrName} = [];
+                    #end
+                #end
+                this.resetForm("queryForm");
+                this.handleQuery();
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.ids = selection.map(item => item.${pkColumn.javaField})
+                this.single = selection.length !== 1
+                this.multiple = !selection.length
+            },
+            /** 新增按钮操作 */
+            handleAdd() {
+                this.reset();
+                this.open = true;
+                this.title = "添加${functionName}";
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                this.reset();
+                const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
+                get${BusinessName}(${pkColumn.javaField}).then(response => {
+                    this.form = response.data;
+                    #foreach ($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                            this.form.$column.javaField = this.form.${column.javaField}.split(",");
+                        #end
+                    #end
+                    #if($table.sub)
+                        this.${subclassName}List = response.data.${subclassName}List;
+                    #end
+                    this.open = true;
+                    this.title = "修改${functionName}";
+                });
+            },
+            /** 提交按钮 */
+            submitForm() {
+                this.#[[$]]
+                #refs["form"].validate(valid => {
+                    if (valid) {
+                        #foreach($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                        this.form.$column.javaField = this.form.$
+                        {
+                            column.javaField
+                        }
+                    .
+                        join(",");
+                        #end
+                        #end
+                        #if($table.sub)
+                        this.form.$
+                        {
+                            subclassName
+                        }
+                        List = this.$
+                        {
+                            subclassName
+                        }
+                        List;
+                        #end
+                        if (this.form.${
+                            pkColumn.javaField
+                        }
+                    !=
+                        null
+                    )
+                        {
+                            update$
+                            {
+                                BusinessName
+                            }
+                            (this.form).then(response => {
+                                this.#[[$modal]]
+                                #.msgSuccess("修改成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        }
+                    else
+                        {
+                            add$
+                            {
+                                BusinessName
+                            }
+                            (this.form).then(response => {
+                                this.#[[$modal]]
+                                #.msgSuccess("新增成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        }
+                    }
+                });
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                const ${pkColumn.javaField}s = row.$
+                {
+                    pkColumn.javaField
+                }
+            ||
+                this.ids;
+                this.#[[$modal]]
+                #.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function () {
+                    return del$
+                    {
+                        BusinessName
+                    }
+                    (${pkColumn.javaField}s);
+                }).then(() => {
+                    this.getList();
+                    this.#[[$modal]]
+                    #.msgSuccess("删除成功");
+                }).catch(() => {
+                });
+            },
+    #if($table.sub)
+    /** ${subTable.functionName}序号 */
+    row$
+    {
+        subClassName
+    }
+    Index({row, rowIndex})
+    {
+        row.index = rowIndex + 1;
+    }
+    ,
     /** ${subTable.functionName}添加按钮操作 */
-    handleAdd${subClassName}() {
-      let obj = {};
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
-      obj.$column.javaField = "";
-#end
-#end
-      this.${subclassName}List.push(obj);
-    },
+    handleAdd$
+    {
+        subClassName
+    }
+    ()
+    {
+        let obj = {};
+        #foreach($column in $subTable.columns)
+        #if($column.pk || $column.javaField == ${subTableFkclassName})
+        #elseif($column.list && "" != $javaField)
+        obj.$column.javaField = "";
+        #end
+        #end
+        this.$
+        {
+            subclassName
+        }
+        List.push(obj);
+    }
+    ,
     /** ${subTable.functionName}删除按钮操作 */
-    handleDelete${subClassName}() {
-      if (this.checked${subClassName}.length == 0) {
-        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
-      } else {
-        const ${subclassName}List = this.${subclassName}List;
-        const checked${subClassName} = this.checked${subClassName};
-        this.${subclassName}List = ${subclassName}List.filter(function(item) {
-          return checked${subClassName}.indexOf(item.index) == -1
-        });
-      }
-    },
+    handleDelete$
+    {
+        subClassName
+    }
+    ()
+    {
+        if (this.checked${
+            subClassName
+        }
+    .
+        length == 0
+    )
+        {
+            this.#[[$modal]]
+            #.msgError("请先选择要删除的                        数据");
+        }
+    else
+        {
+            const List = this.List;
+            const checked = this.checked;
+            this.List = List.filter(function (item) {
+                return checked.indexOf(item.index) == -1
+            });
+        }
+    }
+    ,
     /** 复选框选中数据 */
-    handle${subClassName}SelectionChange(selection) {
-      this.checked${subClassName} = selection.map(item => item.index)
-    },
-#end
-  }
-};
+    handle$
+    {
+        subClassName
+    }
+    SelectionChange(selection)
+    {
+        this.checked$
+        {
+            subClassName
+        }
+        = selection.map(item => item.index)
+    }
+    ,
+    #end
+    /** 导出按钮操作 */
+    handleExport()
+    {
+        this.download('${moduleName}/${businessName}/export', {
+            ...this.queryParams
+        }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+    }
+    }
+    }
+    ;
 </script>
diff --git a/src/main/resources/vm/vue/v3/index.vue.vm b/src/main/resources/vm/vue/v3/index.vue.vm
index 748d8d1..56b7d38 100644
--- a/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/src/main/resources/vm/vue/v3/index.vue.vm
@@ -96,6 +96,16 @@
           v-hasPermi="['${moduleName}:${businessName}:remove']"
         >删除</el-button>
       </el-col>
+      <el-col :span="1.5">
+            <el-button
+                    type="warning"
+                    plain
+                    icon="Download"
+                    @click="handleExport"
+                    v-hasPermi="['${moduleName}:${businessName}:export']"
+            >导出
+            </el-button>
+        </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -570,5 +580,11 @@ function handle${subClassName}SelectionChange(selection) {
 }
 
 #end
+/** 导出按钮操作 */
+function handleExport() {
+    proxy.download('${moduleName}/${businessName}/export', {
+        ...queryParams.value
+    }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+}
 getList();
 </script>
diff --git a/target/classes/com/jg/JGApplication.class b/target/classes/com/jg/JGApplication.class
index 9f23032df06bba12fbf3c73cb666471e15719cb7..12d2766e3a3a1d54e59de56ae20ddedcc127f7e4 100644
GIT binary patch
delta 26
fcmbOzIZ<-Lea7^S4>TDW(>HT534thC<`PZ-d#DH5

delta 26
fcmbOzIZ<-LeMa|<4>TDW-8XYF34thC<`PZ-cIXFr

diff --git a/target/classes/com/jg/JGServletInitializer.class b/target/classes/com/jg/JGServletInitializer.class
index 8361341380f2e274b0257a163cfb31f04fd158bc..d7880131d2dedadf94ed7fbca3ef81c560e050af 100644
GIT binary patch
delta 29
jcmey#_LFTw0b}~cLKjBH^vT;8<$$CjlgQ?mj1w3EqiG5L

delta 29
jcmey#_LFTw0i*lILKj9x_sQEB<$$CjlgQ?mj1w3EooNZ4

diff --git a/target/classes/com/jg/project/about/controller/AboutPartThreeController.class b/target/classes/com/jg/project/about/controller/AboutPartThreeController.class
index 798dfb9d9d07bdcd50e0a29a06f06abf601379e1..5948b49952a7b7fa131e305235269812715b4599 100644
GIT binary patch
delta 2111
zcmb`IYg<%R6vzL280K>32sK=#vJpjO0FNk;i77&q>4?fzqQa35!{9JyoO8H!o6=OQ
zH1%Y5H|<7ADxreZ(+B7?^ir%|^$mJj`|KGS=<&%H&5M0md!My_`@h!SbEM>EMdFvg
z=6(iHjadoHG2})*hCLX;sDv@RB+>L`K7B>Pt9Xq!2@hV!8xoG-DBtoXUp?l;ao(Sh
zFpiUa^cHX4cH$igUYv5_H1FSa;*5l|ILD)yPQ1r3rPa7LI@Hma7B?6=*9HcH!@*HS
zSL4GG)lm8kBc|-2rd1ePR6V9eb+yhs?5S+%U~t8g7KZ!&mcc$`gd+^A0_Kz_*BjHq
zO4Des8fhnM9m77$oVCcjg#uQr*-EP`ew&=UGkfxnqZ9Mv$LGf{{C;WT?)mF?PhFkA
z_S5`{IR?L3<tW}Rj#OI4urAQ64Jrd6r7s>FR7bS<Atk8C)Lvsii3Fn|B^ZrrM$iar
zQ6->-C_<(YHX`adcR{;+a7YhFRb6izi>VA7{=<_R9U9b?hO}?Uo1<y}-aRdC3{FKb
znU`G$%ocZr+34;J_^?vO!+6Ar^D;{Dz7rQ@e1H#Se8g8i#wSjED&sR;l<_$(I&n$H
zWqjepmomP>*D}7rgp6<T9X~g7_={v*!K4%4^X02Du3=Kfbxbj=<XYD(5><u|KQI)|
zADg~2cRF2Hp{R^$++f&5j`PfIQi<oLj9ZwIQG|!4HK{Nokt>oeglvoib-k{Ps=^~q
zY9*Cn_kCA}RecIC4kZxQjXE*6veatC!_koCy+DhH6g|>cJz$<))|AMndjr@Aim<E^
z=?N+n8at?elzKPyBsI0gG*hT&)Mxr<z@}(m!zya|W}qCasg=bBlwb|b7^P+{GOUlg
zXl5f@w*Llfw~>)x2$avlew}O?mLJJluZ4uiEMNIzf6|wPO!8JnUi`^8!ctC_3bNQx
zX`z>pw{>JwbgV}enQ5>A8+CdrYPh)@Oh+x4i=u4eZ04_7wF!QXESdrJuwy&2(O@z7
zX$B$?=i#Hrv6<ZPQ609B`)qm>I9J93m#~zR<q6v7w$Ue`%~*=JHHEhgMZ{N6VN-k!
zG-||?6uj8HlD*o(6Y}gL%z%aFvv6}3&~ng(r|7#Z66$FSjfc-<WJXe<9ZM0ONg?dy
z3hhi&Xcu`3U^gcK%;pD*(-_*}LB~B9xF}S}aG@D{NS-7EKfcJ)-lYutQVcDep(Ra)
zR`S%g!0_iHh8~J>;D2LiPcd|GhK@9bPGZ<EGC?|=c`#jvFfk0=gF)otUpoAgi>{?Q
zJey+Z<_z6w49^k6^LT;sO}R+W3umVk13rF}DsIDJL-UXDc6pc0AZN3ExxKv7n|lj+
z{Dz8~<+ZAKm~cm^T1V+>k6GB&!p}kp`Orh6^6K^_tJ{OTWOe7$y$s?Y5_YT5`Q;Rg
zywJsBFNH~#d=L3ZmHc`#SCLn`h%ctDriwmt5Yo|)uu38xN;__Zif3@)(czB||GB;S
tvnZHGeIY*={RvVlUY=6&6s4IBnx*Lq0*cX&!`4;rN1WDl9^aZ9e*@urdZGXT

delta 1342
zcmb`G$5RwR6vn^V6$WNoaAyG#1W{Pg6-9!IikJbFAQ%uqjIah2Va;h3BpCo5G3!+i
zTqv|e4wha#_;)~A{u7p8&+OuW#m!5<(68V7&DYZ(v)aAEAHT=G0LaH%4e>Y@4IRf_
zIDtkDP4H_BPs;F=hSNABmu45v;+%#SoR=l7a<@%IK-vo$F5;5(F3aVLimMu~;kxX4
zL&Z%6&gK@s0==xI&7U1;Zpt6-_eL4tv<8np(K#|c*7tL0XneHySI7H_o-QNB)mb(l
zDFTU@r{b1CI)W;03*14wK!@D9i%u0?0^R5l=tYl;djj|IK*d9WKJ*I=;E}*%7z%ub
zJJOdV@C1V@p33cK0?#oh@B%Lt6mUD<7!Y39D}mQ|Banc(BVR?L(<q-)8Pq8c;6Rd0
zn;xm4Fa{!NlWC)93CuN>Q8ukY8{zu|Wtffw3%JT+AQNd^g;jusSj0%-2WG%&9<F8N
zU@q480glgb8p-b2L3vy=)48;HW{U)?EYw0n1e<tycyXw`mC0mg2{R5XHHp0(<6~}F
z09jbhG@TX54qzp6WV#MY0J-$?_-j~1-7wy{b4-R9rhr1s!Un{m$mH-b0w-IaBE3~u
z%?8q2g946-rE-$ZImu>aGMQP+x@ZTFfW?@OxGs#i9!X>@<k&D{5xtGr#Nnw%tDa$#
zs01-6HPO;cT+bw$2b-~l=VB<<RufH*k5HIKNTqGl5w?dBils`$HkC@)sT4aT0bm4l
zx8e1;Z5&l_p?U@mDU8DXDD1>8N)+Od5?HrYHl3q9%uyjZDr`zrveWJ<9N(vK)NxMz
zf8(eMb5u)?Y8%HMa_qHkB&3Hw&aOuzIhtnRu<qp_J^tRyzUg}G4|CK=jv5=s0jgRX
zevDPTe1)p=FVpo=ct#K>U!-Dtk?GX`Aaf4XnL|?f*VMD(koguGaF}~X7+Y`S=pV1n
Bn!x}7

diff --git a/target/classes/com/jg/project/about/domain/AboutPartThree$AboutPartThreeBuilder.class b/target/classes/com/jg/project/about/domain/AboutPartThree$AboutPartThreeBuilder.class
index 340094c525f6069abe3d739e8a3329f466249741..244047d2aa02b4f04c4172ec0c93a3ce04532361 100644
GIT binary patch
delta 97
zcmeAd?ib#$i<MDv@@`f;AnC^@K3R~>2FwbE@^?b{;*)vVAu{5V6Tz%`>@YQ)959(!
Pj#!Xs9Ls@ZGN%pzz~C5P

delta 97
zcmeAd?ib#$i<MDf@@`f;AnC^@K3R~>2FwbE@^?b{;*)vVAu{5V6Tz%`>@YQ)959(!
Pj#!Xs9Ls@ZGN%pzzSkI3

diff --git a/target/classes/com/jg/project/about/domain/AboutPartThree.class b/target/classes/com/jg/project/about/domain/AboutPartThree.class
index 67eb04c83c65981bd78b247eebc41bd6a7dfe705..7111208304372a33e6e47cbbed01d99e7f68ab18 100644
GIT binary patch
literal 6451
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
D^D#m`

literal 6330
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

diff --git a/target/classes/vm/java/controller.java.vm b/target/classes/vm/java/controller.java.vm
index edc7108..eae8fdb 100644
--- a/target/classes/vm/java/controller.java.vm
+++ b/target/classes/vm/java/controller.java.vm
@@ -3,9 +3,11 @@ import java.util.List;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import io.swagger.annotations.Api;
+import com.jg.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
 import com.jg.common.utils.QueryPage;
+import com.jg.framework.aspectj.lang.annotation.Log;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,11 +31,10 @@ import com.jg.framework.web.domain.R;
 @RestController
 @RequestMapping("/${moduleName}")
 public class ${ClassName}Controller extends BaseController{
+
     @Resource
     private I${ClassName}Service ${className}Service;
 
-
-
     /**
      * ${functionName}分页列表
      */
@@ -55,6 +56,7 @@ public class ${ClassName}Controller extends BaseController{
         List<${ClassName}> list = ${className}Service.list();
         return R.ok(list);
     }
+
     /**
      * ${functionName}id详细信息
      */
@@ -70,6 +72,7 @@ public class ${ClassName}Controller extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
     @ApiOperation(value = "${functionName}新增信息", notes = "${functionName}新增信息")
+    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     public R<Boolean> add(${ClassName} ${className}) {
         boolean res = ${className}Service.save(${className});
@@ -80,6 +83,7 @@ public class ${ClassName}Controller extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
     @ApiOperation(value = "${functionName}修改信息", notes = "${functionName}修改信息")
+    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     public R<Boolean> edit(${ClassName} ${className}) {
         boolean res = ${className}Service.updateById(${className});
@@ -90,9 +94,23 @@ public class ${ClassName}Controller extends BaseController{
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
     @ApiOperation(value = "${functionName}删除信息", notes = "${functionName}删除信息")
+    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
     @PostMapping("/remove")
     public R<Boolean> remove(Long id) {
         boolean res = ${className}Service.removeById(id);
         return R.ok(res);
     }
+
+    /**
+     * 导出${functionName}列表
+     */
+    @PreAuthorize("@ss.hasPermi('${permissionPrefix}:export')")
+    @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ${ClassName} ${className})
+    {
+        List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
+        ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
+        util.exportExcel(response, list, "${functionName}数据");
+    }
 }
diff --git a/target/classes/vm/java/domain.java.vm b/target/classes/vm/java/domain.java.vm
index b1b4f5e..01fe80e 100644
--- a/target/classes/vm/java/domain.java.vm
+++ b/target/classes/vm/java/domain.java.vm
@@ -49,6 +49,7 @@ private static final long serialVersionUID=1L;
         private $column.javaType $column.javaField;
         #else
         @ApiModelProperty("$column.columnComment")
+        @Excel(name = "$column.columnComment")
         @TableField("$column.columnName")
         private $column.javaType $column.javaField;
         #end
@@ -56,6 +57,7 @@ private static final long serialVersionUID=1L;
         #if($column.javaType == 'Date')
     /** $column.columnComment */
         @ApiModelProperty(value = "$column.columnComment",hidden = true)
+        @Excel(name = "$column.columnComment")
         @TableField("$column.columnName")
         @JsonSerialize(using = ToStringSerializer.class)
         private String $column.javaField;
diff --git a/target/classes/vm/vue/index.vue.vm b/target/classes/vm/vue/index.vue.vm
index 5ff768a..e5fdf74 100644
--- a/target/classes/vm/vue/index.vue.vm
+++ b/target/classes/vm/vue/index.vue.vm
@@ -1,586 +1,713 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-input
-          v-model="queryParams.${column.javaField}"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option
-            v-for="dict in dict.type.${dictType}"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-date-picker clearable
-          v-model="queryParams.${column.javaField}"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择${comment}">
-        </el-date-picker>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      <el-form-item label="${comment}">
-        <el-date-picker
-          v-model="daterange${AttrName}"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-#end
-#end
-#end
-      <el-form-item>
-        <el-button type="primary" 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>
+    <div class="app-container">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="68px">
+            #foreach($column in $columns)
+                #if($column.query)
+                    #set($dictType=$column.dictType)
+                    #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                    #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                    #if($parentheseIndex != -1)
+                        #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                    #else
+                        #set($comment=$column.columnComment)
+                    #end
+                    #if($column.htmlType == "input")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-input
+                                    v-model="queryParams.${column.javaField}"
+                                    placeholder="请输入${comment}"
+                                    clearable
+                                    @keyup.enter.native="handleQuery"
+                            />
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                                <el-option
+                                        v-for="dict in dict.type.${dictType}"
+                                        :key="dict.value"
+                                        :label="dict.label"
+                                        :value="dict.value"
+                                />
+                            </el-select>
+                        </el-form-item>
+                    #elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+                                <el-option label="请选择字典生成" value=""/>
+                            </el-select>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
+                        <el-form-item label="${comment}" prop="${column.javaField}">
+                            <el-date-picker clearable
+                                            v-model="queryParams.${column.javaField}"
+                                            type="date"
+                                            value-format="yyyy-MM-dd"
+                                            placeholder="请选择${comment}">
+                            </el-date-picker>
+                        </el-form-item>
+                    #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        <el-form-item label="${comment}">
+                            <el-date-picker
+                                    v-model="daterange${AttrName}"
+                                    style="width: 240px"
+                                    value-format="yyyy-MM-dd"
+                                    type="daterange"
+                                    range-separator="-"
+                                    start-placeholder="开始日期"
+                                    end-placeholder="结束日期"
+                            ></el-date-picker>
+                        </el-form-item>
+                    #end
+                #end
+            #end
+            <el-form-item>
+                <el-button type="primary" 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"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['${moduleName}:${businessName}:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['${moduleName}:${businessName}:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['${moduleName}:${businessName}:remove']"
-        >删除</el-button>
-      </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
-        <template slot-scope="scope">
-#if($column.htmlType == "checkbox")
-          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
-          <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
-#end
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $javaField)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['${moduleName}:${businessName}:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-        </el-form-item>
-#elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <image-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <file-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "editor")
-        <el-form-item label="${comment}">
-          <editor v-model="form.${field}" :min-height="192"/>
-        </el-form-item>
-#elseif($column.htmlType == "select" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-            <el-option
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-              :value="parseInt(dict.value)"
-#else
-              :value="dict.value"
-#end
-            ></el-option>
-          </el-select>
-        </el-form-item>
-#elseif($column.htmlType == "select" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <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}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-              :label="dict.value">
-              {{dict.label}}
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox>请选择字典生成</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio
-              v-for="dict in dict.type.${dictType}"
-              :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-              :label="parseInt(dict.value)"
-#else
-              :label="dict.value"
-#end
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "datetime")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-date-picker clearable
-            v-model="form.${field}"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
-#elseif($column.htmlType == "textarea")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-#end
-#end
-#end
-#end
-#if($table.sub)
-        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
-          </el-col>
+            <el-col :span="1.5">
+                <el-button
+                        type="primary"
+                        plain
+                        icon="el-icon-plus"
+                        size="mini"
+                        @click="handleAdd"
+                        v-hasPermi="['${moduleName}:${businessName}:add']"
+                >新增
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                        type="success"
+                        plain
+                        icon="el-icon-edit"
+                        size="mini"
+                        :disabled="single"
+                        @click="handleUpdate"
+                        v-hasPermi="['${moduleName}:${businessName}:edit']"
+                >修改
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                        type="danger"
+                        plain
+                        icon="el-icon-delete"
+                        size="mini"
+                        :disabled="multiple"
+                        @click="handleDelete"
+                        v-hasPermi="['${moduleName}:${businessName}:remove']"
+                >删除
+                </el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button
+                        type="warning"
+                        plain
+                        icon="Download"
+                        @click="handleExport"
+                        v-hasPermi="['${moduleName}:${businessName}:export']"
+                >导出
+                </el-button>
+            </el-col>
+            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
-        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" align="center" prop="index" width="50"/>
-#foreach($column in $subTable.columns)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
-          <el-table-column label="$comment" prop="${javaField}" width="240">
-            <template slot-scope="scope">
-              <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd" placeholder="请选择$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option
-                  v-for="dict in dict.type.$column.dictType"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </template>
-          </el-table-column>
-#end
-#end
+
+        <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center"/>
+            #foreach($column in $columns)
+                #set($javaField=$column.javaField)
+                #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                #if($parentheseIndex != -1)
+                    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                #else
+                    #set($comment=$column.columnComment)
+                #end
+                #if($column.pk)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}"/>
+                #elseif($column.list && $column.htmlType == "datetime")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
+                        <template slot-scope="scope">
+                            <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && $column.htmlType == "imageUpload")
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+                        <template slot-scope="scope">
+                            <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $column.dictType)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}">
+                        <template slot-scope="scope">
+                            #if($column.htmlType == "checkbox")
+                                <dict-tag :options="dict.type.${column.dictType}"
+                                          :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+                            #else
+                                <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+                            #end
+                        </template>
+                    </el-table-column>
+                #elseif($column.list && "" != $javaField)
+                    <el-table-column label="${comment}" align="center" prop="${javaField}"/>
+                #end
+            #end
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+                <template slot-scope="scope">
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-edit"
+                            @click="handleUpdate(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:edit']"
+                    >修改
+                    </el-button>
+                    <el-button
+                            size="mini"
+                            type="text"
+                            icon="el-icon-delete"
+                            @click="handleDelete(scope.row)"
+                            v-hasPermi="['${moduleName}:${businessName}:remove']"
+                    >删除
+                    </el-button>
+                </template>
+            </el-table-column>
         </el-table>
-#end
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
+
+        <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"
+        />
+
+        <!-- 添加或修改${functionName}对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                #foreach($column in $columns)
+                    #set($field=$column.javaField)
+                    #if($column.insert && !$column.pk)
+                        #if(($column.usableColumn) || (!$column.superColumn))
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #set($dictType=$column.dictType)
+                            #if($column.htmlType == "input")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" placeholder="请输入${comment}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "imageUpload")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <image-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "fileUpload")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <file-upload v-model="form.${field}"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "editor")
+                                <el-form-item label="${comment}">
+                                    <editor v-model="form.${field}" :min-height="192"/>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && "" != $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-select v-model="form.${field}" placeholder="请选择${comment}">
+                                        <el-option
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.label"
+                                            #if($column.javaType == "Integer" || $column.javaType == "Long")
+                                                :value="parseInt(dict.value)"
+                                            #else
+                                                :value="dict.value"
+                                            #end
+                                        ></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            #elseif($column.htmlType == "select" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <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}" prop="${field}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                                :label="dict.value">
+                                            {{dict.label}}
+                                        </el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "checkbox" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-checkbox-group v-model="form.${field}">
+                                        <el-checkbox>请选择字典生成</el-checkbox>
+                                    </el-checkbox-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && "" != $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio
+                                                v-for="dict in dict.type.${dictType}"
+                                                :key="dict.value"
+                                            #if($column.javaType == "Integer" || $column.javaType == "Long")
+                                                :label="parseInt(dict.value)"
+                                            #else
+                                                :label="dict.value"
+                                            #end
+                                        >{{dict.label}}
+                                        </el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "radio" && $dictType)
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-radio-group v-model="form.${field}">
+                                        <el-radio label="1">请选择字典生成</el-radio>
+                                    </el-radio-group>
+                                </el-form-item>
+                            #elseif($column.htmlType == "datetime")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-date-picker clearable
+                                                    v-model="form.${field}"
+                                                    type="date"
+                                                    value-format="yyyy-MM-dd"
+                                                    placeholder="请选择${comment}">
+                                    </el-date-picker>
+                                </el-form-item>
+                            #elseif($column.htmlType == "textarea")
+                                <el-form-item label="${comment}" prop="${field}">
+                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容"/>
+                                </el-form-item>
+                            #end
+                        #end
+                    #end
+                #end
+                #if($table.sub)
+                    <el-divider content-position="center">${subTable.functionName}信息</el-divider>
+                    <el-row :gutter="10" class="mb8">
+                        <el-col :span="1.5">
+                            <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">
+                                添加
+                            </el-button>
+                        </el-col>
+                        <el-col :span="1.5">
+                            <el-button type="danger" icon="el-icon-delete" size="mini"
+                                       @click="handleDelete${subClassName}">删除
+                            </el-button>
+                        </el-col>
+                    </el-row>
+                    <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index"
+                              @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+                        <el-table-column type="selection" width="50" align="center"/>
+                        <el-table-column label="序号" align="center" prop="index" width="50"/>
+                        #foreach($column in $subTable.columns)
+                            #set($javaField=$column.javaField)
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                            #if($column.pk || $javaField == ${subTableFkclassName})
+                            #elseif($column.list && $column.htmlType == "input")
+                                <el-table-column label="$comment" prop="${javaField}" width="150">
+                                    <template slot-scope="scope">
+                                        <el-input v-model="scope.row.$javaField" placeholder="请输入$comment"/>
+                                    </template>
+                                </el-table-column>
+                            #elseif($column.list && $column.htmlType == "datetime")
+                                <el-table-column label="$comment" prop="${javaField}" width="240">
+                                    <template slot-scope="scope">
+                                        <el-date-picker clearable v-model="scope.row.$javaField" type="date"
+                                                        value-format="yyyy-MM-dd" placeholder="请选择$comment"/>
+                                    </template>
+                                </el-table-column>
+                            #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") &&
+                                "" != $column.dictType)
+                                <el-table-column label="$comment" prop="${javaField}" width="150">
+                                    <template slot-scope="scope">
+                                        <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
+                                            <el-option
+                                                    v-for="dict in dict.type.$column.dictType"
+                                                    :key="dict.value"
+                                                    :label="dict.label"
+                                                    :value="dict.value"
+                                            ></el-option>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                            #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") &&
+                                "" == $column.dictType)
+                                <el-table-column label="$comment" prop="${javaField}" width="150">
+                                    <template slot-scope="scope">
+                                        <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
+                                            <el-option label="请选择字典生成" value=""/>
+                                        </el-select>
+                                    </template>
+                                </el-table-column>
+                            #end
+                        #end
+                    </el-table>
+                #end
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
-import { listPage${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
+    import {
+        listPage${BusinessName},
+        get${BusinessName},
+        del${BusinessName},
+        add${BusinessName},
+        update${BusinessName}
+    } from "@/api/${moduleName}/${businessName}";
 
-export default {
-  name: "${BusinessName}",
-#if(${dicts} != '')
-  dicts: [${dicts}],
-#end
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-#if($table.sub)
-      // 子表选中数据
-      checked${subClassName}: [],
-#end
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // ${functionName}表格数据
-      ${businessName}List: [],
-#if($table.sub)
-      // ${subTable.functionName}表格数据
-      ${subclassName}List: [],
-#end
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      // $comment时间范围
-      daterange${AttrName}: [],
-#end
-#end
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-#foreach ($column in $columns)
-#if($column.query)
-        $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-#foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-        $column.javaField: [
-          { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-        ]#if($foreach.count != $columns.size()),#end
-#end
-#end
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    /** 查询${functionName}列表 */
-    getList() {
-      this.loading = true;
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      this.queryParams.params = {};
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
-        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
-        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
-      }
-#end
-#end
-      listPage${BusinessName}(this.queryParams).then(response => {
-        this.${businessName}List = response.data;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-        $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
-        $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
-      };
-#if($table.sub)
-      this.${subclassName}List = [];
-#end
-      this.resetForm("form");
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      this.daterange${AttrName} = [];
-#end
-#end
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.${pkColumn.javaField})
-      this.single = selection.length!==1
-      this.multiple = !selection.length
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加${functionName}";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
-      get${BusinessName}(${pkColumn.javaField}).then(response => {
-        this.form = response.data;
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-        this.form.$column.javaField = this.form.${column.javaField}.split(",");
-#end
-#end
-#if($table.sub)
-        this.${subclassName}List = response.data.${subclassName}List;
-#end
-        this.open = true;
-        this.title = "修改${functionName}";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.#[[$]]#refs["form"].validate(valid => {
-        if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-          this.form.$column.javaField = this.form.${column.javaField}.join(",");
-#end
-#end
-#if($table.sub)
-          this.form.${subclassName}List = this.${subclassName}List;
-#end
-          if (this.form.${pkColumn.javaField} != null) {
-            update${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            add${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
-      this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
-        return del${BusinessName}(${pkColumn.javaField}s);
-      }).then(() => {
-        this.getList();
-        this.#[[$modal]]#.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-#if($table.sub)
-	/** ${subTable.functionName}序号 */
-    row${subClassName}Index({ row, rowIndex }) {
-      row.index = rowIndex + 1;
-    },
+    export default {
+        name: "${BusinessName}",
+        #if(${dicts} != '')
+            dicts: [${dicts}],
+        #end
+        data() {
+            return {
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                #if($table.sub)
+                    // 子表选中数据
+                    checked${subClassName}: [],
+                #end
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // ${functionName}表格数据
+                    ${businessName}List: [],
+                #if($table.sub)
+                    // ${subTable.functionName}表格数据
+                        ${subclassName}List: [],
+                #end
+                // 弹出层标题
+                title: "",
+                // 是否显示弹出层
+                open: false,
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        // $comment时间范围
+                        daterange${AttrName}: [],
+                    #end
+                #end
+                // 查询参数
+                queryParams: {
+                    pageNum: 1,
+                    pageSize: 10,
+                    #foreach ($column in $columns)
+                        #if($column.query)
+                                $column.javaField: null#if($foreach.count != $columns.size()),#end
+                        #end
+                    #end
+                },
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                    #foreach ($column in $columns)
+                        #if($column.required)
+                            #set($parentheseIndex=$column.columnComment.indexOf("（"))
+                            #if($parentheseIndex != -1)
+                                #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+                            #else
+                                #set($comment=$column.columnComment)
+                            #end
+                                $column.javaField: [
+                                {
+                                    required: true, message: "$comment不能为空", trigger: #if($column.htmlType ==
+                                    "select" || $column.htmlType == "radio")"change"#else"blur"#end }
+                            ]#if($foreach.count != $columns.size()),#end
+                        #end
+                    #end
+                }
+            };
+        },
+        created() {
+            this.getList();
+        },
+        methods: {
+            /** 查询${functionName}列表 */
+            getList() {
+                this.loading = true;
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        this.queryParams.params = {};
+                        #break
+                    #end
+                #end
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
+                            this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
+                            this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+                        }
+                    #end
+                #end
+                listPage${BusinessName}(this.queryParams).then(response => {
+                    this.${businessName}List = response.data;
+                    this.total = response.total;
+                    this.loading = false;
+                });
+            },
+            // 取消按钮
+            cancel() {
+                this.open = false;
+                this.reset();
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                    #foreach ($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                                $column.javaField: []#if($foreach.count != $columns.size()),#end
+                        #else
+                                $column.javaField: null#if($foreach.count != $columns.size()),#end
+                        #end
+                    #end
+                };
+                #if($table.sub)
+                    this.${subclassName}List = [];
+                #end
+                this.resetForm("form");
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1;
+                this.getList();
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                #foreach ($column in $columns)
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+                        #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+                        this.daterange${AttrName} = [];
+                    #end
+                #end
+                this.resetForm("queryForm");
+                this.handleQuery();
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.ids = selection.map(item => item.${pkColumn.javaField})
+                this.single = selection.length !== 1
+                this.multiple = !selection.length
+            },
+            /** 新增按钮操作 */
+            handleAdd() {
+                this.reset();
+                this.open = true;
+                this.title = "添加${functionName}";
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                this.reset();
+                const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
+                get${BusinessName}(${pkColumn.javaField}).then(response => {
+                    this.form = response.data;
+                    #foreach ($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                            this.form.$column.javaField = this.form.${column.javaField}.split(",");
+                        #end
+                    #end
+                    #if($table.sub)
+                        this.${subclassName}List = response.data.${subclassName}List;
+                    #end
+                    this.open = true;
+                    this.title = "修改${functionName}";
+                });
+            },
+            /** 提交按钮 */
+            submitForm() {
+                this.#[[$]]
+                #refs["form"].validate(valid => {
+                    if (valid) {
+                        #foreach($column in $columns)
+                        #if($column.htmlType == "checkbox")
+                        this.form.$column.javaField = this.form.$
+                        {
+                            column.javaField
+                        }
+                    .
+                        join(",");
+                        #end
+                        #end
+                        #if($table.sub)
+                        this.form.$
+                        {
+                            subclassName
+                        }
+                        List = this.$
+                        {
+                            subclassName
+                        }
+                        List;
+                        #end
+                        if (this.form.${
+                            pkColumn.javaField
+                        }
+                    !=
+                        null
+                    )
+                        {
+                            update$
+                            {
+                                BusinessName
+                            }
+                            (this.form).then(response => {
+                                this.#[[$modal]]
+                                #.msgSuccess("修改成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        }
+                    else
+                        {
+                            add$
+                            {
+                                BusinessName
+                            }
+                            (this.form).then(response => {
+                                this.#[[$modal]]
+                                #.msgSuccess("新增成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        }
+                    }
+                });
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                const ${pkColumn.javaField}s = row.$
+                {
+                    pkColumn.javaField
+                }
+            ||
+                this.ids;
+                this.#[[$modal]]
+                #.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function () {
+                    return del$
+                    {
+                        BusinessName
+                    }
+                    (${pkColumn.javaField}s);
+                }).then(() => {
+                    this.getList();
+                    this.#[[$modal]]
+                    #.msgSuccess("删除成功");
+                }).catch(() => {
+                });
+            },
+    #if($table.sub)
+    /** ${subTable.functionName}序号 */
+    row$
+    {
+        subClassName
+    }
+    Index({row, rowIndex})
+    {
+        row.index = rowIndex + 1;
+    }
+    ,
     /** ${subTable.functionName}添加按钮操作 */
-    handleAdd${subClassName}() {
-      let obj = {};
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
-      obj.$column.javaField = "";
-#end
-#end
-      this.${subclassName}List.push(obj);
-    },
+    handleAdd$
+    {
+        subClassName
+    }
+    ()
+    {
+        let obj = {};
+        #foreach($column in $subTable.columns)
+        #if($column.pk || $column.javaField == ${subTableFkclassName})
+        #elseif($column.list && "" != $javaField)
+        obj.$column.javaField = "";
+        #end
+        #end
+        this.$
+        {
+            subclassName
+        }
+        List.push(obj);
+    }
+    ,
     /** ${subTable.functionName}删除按钮操作 */
-    handleDelete${subClassName}() {
-      if (this.checked${subClassName}.length == 0) {
-        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
-      } else {
-        const ${subclassName}List = this.${subclassName}List;
-        const checked${subClassName} = this.checked${subClassName};
-        this.${subclassName}List = ${subclassName}List.filter(function(item) {
-          return checked${subClassName}.indexOf(item.index) == -1
-        });
-      }
-    },
+    handleDelete$
+    {
+        subClassName
+    }
+    ()
+    {
+        if (this.checked${
+            subClassName
+        }
+    .
+        length == 0
+    )
+        {
+            this.#[[$modal]]
+            #.msgError("请先选择要删除的                        数据");
+        }
+    else
+        {
+            const List = this.List;
+            const checked = this.checked;
+            this.List = List.filter(function (item) {
+                return checked.indexOf(item.index) == -1
+            });
+        }
+    }
+    ,
     /** 复选框选中数据 */
-    handle${subClassName}SelectionChange(selection) {
-      this.checked${subClassName} = selection.map(item => item.index)
-    },
-#end
-  }
-};
+    handle$
+    {
+        subClassName
+    }
+    SelectionChange(selection)
+    {
+        this.checked$
+        {
+            subClassName
+        }
+        = selection.map(item => item.index)
+    }
+    ,
+    #end
+    /** 导出按钮操作 */
+    handleExport()
+    {
+        this.download('${moduleName}/${businessName}/export', {
+            ...this.queryParams
+        }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+    }
+    }
+    }
+    ;
 </script>
diff --git a/target/classes/vm/vue/v3/index.vue.vm b/target/classes/vm/vue/v3/index.vue.vm
index 748d8d1..56b7d38 100644
--- a/target/classes/vm/vue/v3/index.vue.vm
+++ b/target/classes/vm/vue/v3/index.vue.vm
@@ -96,6 +96,16 @@
           v-hasPermi="['${moduleName}:${businessName}:remove']"
         >删除</el-button>
       </el-col>
+      <el-col :span="1.5">
+            <el-button
+                    type="warning"
+                    plain
+                    icon="Download"
+                    @click="handleExport"
+                    v-hasPermi="['${moduleName}:${businessName}:export']"
+            >导出
+            </el-button>
+        </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -570,5 +580,11 @@ function handle${subClassName}SelectionChange(selection) {
 }
 
 #end
+/** 导出按钮操作 */
+function handleExport() {
+    proxy.download('${moduleName}/${businessName}/export', {
+        ...queryParams.value
+    }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
+}
 getList();
 </script>