change - 代码生成优化

os-generator/src/main/resources/vm/java/controller.java.vm

@@ -16,7 +16,6 @@ import com.os.common.annotation.Log;
 import com.os.common.core.controller.BaseController;
 import com.os.common.core.domain.AjaxResult;
 import com.os.common.enums.BusinessType;
-import com.os.common.utils.DateUtils;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.service.I${ClassName}Service;
 import com.os.common.utils.poi.ExcelUtil;
@@ -89,8 +88,7 @@ public class ${ClassName}Controller extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody ${ClassName} ${className})
     {
-        ${className}.setCreatedBy(getUsername());
+        ${className}.setCreateBy(getUsername());
-        ${className}.setCreatedTime(DateUtils.getNowDate());
         return toAjax(${className}Service.insert${ClassName}(${className}));
     }
 
@@ -102,8 +100,7 @@ public class ${ClassName}Controller extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody ${ClassName} ${className})
     {
-        ${className}.setUpdatedBy(getUsername());
+        ${className}.setUpdateBy(getUsername());
-        ${className}.setUpdatedTime(DateUtils.getNowDate());
         return toAjax(${className}Service.update${ClassName}(${className}));
     }
 

os-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -1,7 +1,6 @@
 <template>
     <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-                 label-width="100px">
             #foreach($column in $columns)
                 #if($column.query)
                     #set($dictType=$column.dictType)
@@ -35,7 +34,7 @@
                     #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-option label="请选择字典生成" value="" />
                             </el-select>
                         </el-form-item>
                     #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
@@ -77,8 +76,7 @@
                         size="mini"
                         @click="handleAdd"
                         v-hasPermi="['${moduleName}:${businessName}:add']"
-                >新增
+                >新增</el-button>
-                </el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button
@@ -87,8 +85,7 @@
                         icon="el-icon-sort"
                         size="mini"
                         @click="toggleExpandAll"
-                >展开/折叠
+                >展开/折叠</el-button>
-                </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
@@ -111,26 +108,22 @@
                 #end
                 #if($column.pk)
                 #elseif($column.list && $column.htmlType == "datetime")
-                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180" v-if="columns[${foreach.index}].visible">
-                                     v-if="columns[${foreach.index}].visible">
                         <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"
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="100" v-if="columns[${foreach.index}].visible">
-                                     v-if="columns[${foreach.index}].visible">
                         <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}"
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="columns[${foreach.index}].visible">
-                                     v-if="columns[${foreach.index}].visible">
                         <template slot-scope="scope">
                             #if($column.htmlType == "checkbox")
-                                <dict-tag :options="dict.type.${column.dictType}"
+                                <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-                                          :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
                             #else
                                 <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
                             #end
@@ -138,11 +131,9 @@
                     </el-table-column>
                 #elseif($column.list && "" != $javaField)
                     #if(${foreach.index} == 1)
-                        <el-table-column label="${comment}" prop="${javaField}"
+                        <el-table-column label="${comment}" prop="${javaField}" v-if="columns[${foreach.index}].visible" />
-                                         v-if="columns[${foreach.index}].visible"/>
                     #else
-                        <el-table-column label="${comment}" align="center" prop="${javaField}"
+                        <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="columns[${foreach.index}].visible" />
-                                         v-if="columns[${foreach.index}].visible"/>
                     #end
                 #end
             #end
@@ -154,24 +145,21 @@
                             icon="el-icon-edit"
                             @click="handleUpdate(scope.row)"
                             v-hasPermi="['${moduleName}:${businessName}:edit']"
-                    >修改
+                    >修改</el-button>
-                    </el-button>
                     <el-button
                             size="mini"
                             type="text"
                             icon="el-icon-plus"
                             @click="handleAdd(scope.row)"
                             v-hasPermi="['${moduleName}:${businessName}:add']"
-                    >新增
+                    >新增</el-button>
-                    </el-button>
                     <el-button
                             size="mini"
                             type="text"
                             icon="el-icon-delete"
                             @click="handleDelete(scope.row)"
                             v-hasPermi="['${moduleName}:${businessName}:remove']"
-                    >删除
+                    >删除</el-button>
-                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -192,12 +180,11 @@
                             #set($dictType=$column.dictType)
                             #if("" != $treeParentCode && $column.javaField == $treeParentCode)
                                 <el-form-item label="${comment}" prop="${treeParentCode}">
-                                    <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options"
+                                    <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
-                                                :normalizer="normalizer" placeholder="请选择${comment}"/>
                                 </el-form-item>
                             #elseif($column.htmlType == "input")
                                 <el-form-item label="${comment}" prop="${field}">
-                                    <el-input v-model="form.${field}" placeholder="请输入${comment}"/>
+                                    <el-input v-model="form.${field}" placeholder="请输入${comment}" />
                                 </el-form-item>
                             #elseif($column.htmlType == "imageUpload")
                                 <el-form-item label="${comment}" prop="${field}">
@@ -229,7 +216,7 @@
                             #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-option label="请选择字典生成" value="" />
                                     </el-select>
                                 </el-form-item>
                             #elseif($column.htmlType == "checkbox" && "" != $dictType)
@@ -260,8 +247,7 @@
                                             #else
                                                 :label="dict.value"
                                             #end
-                                        >{{dict.label}}
+                                        >{{dict.label}}</el-radio>
-                                        </el-radio>
                                     </el-radio-group>
                                 </el-form-item>
                             #elseif($column.htmlType == "radio" && $dictType)
@@ -281,7 +267,7 @@
                                 </el-form-item>
                             #elseif($column.htmlType == "textarea")
                                 <el-form-item label="${comment}" prop="${field}">
-                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容"/>
+                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
                                 </el-form-item>
                             #end
                         #end
@@ -297,13 +283,7 @@
 </template>
 
 <script>
-    import {
+    import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
-        list${BusinessName},
-        get${BusinessName},
-        del${BusinessName},
-        add${BusinessName},
-        update${BusinessName}
-    } from "@/api/${moduleName}/${businessName}";
     import Treeselect from "@riophae/vue-treeselect";
     import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -361,9 +341,7 @@
                                 #set($comment=$column.columnComment)
                             #end
                                 $column.javaField: [
-                                {
+                                { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-                                    required: true, message: "$comment不能为空", trigger: #if($column.htmlType ==
-                                    "select" || $column.htmlType == "radio")"change"#else"blur"#end }
                             ]#if($foreach.count != $columns.size()),#end
                         #end
                     #end
@@ -423,7 +401,7 @@
             getTreeselect() {
                 list${BusinessName}().then(response => {
                     this.${businessName}Options = [];
-                    const data = {${treeCode}: 0, ${treeName}: '顶级节点', children: []};
+                    const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
                     data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
                     this.${businessName}Options.push(data);
                 });
@@ -501,54 +479,22 @@
             },
             /** 提交按钮 */
             submitForm() {
-                this.
+                this.#[[$]]#refs["form"].validate(valid => {
-            #
-                [[$]]
-                #refs["form"].validate(valid => {
                     if (valid) {
-                        #foreach($column in $columns)
+                        #foreach ($column in $columns)
                         #if($column.htmlType == "checkbox")
-                        this.form.$column.javaField = this.form.$
+                        this.form.$column.javaField = this.form.${column.javaField}.join(",");
-                        {
-                            column.javaField
-                        }
-                    .
-                        join(",");
                         #end
                         #end
-                        if (this.form.${
+                        if (this.form.${pkColumn.javaField} != null) {
-                            pkColumn.javaField
+                            update${BusinessName}(this.form).then(response => {
-                        }
+                                this.#[[$modal]]#.msgSuccess("修改成功");
-                    !=
-                        null
-                    )
-                        {
-                            update$
-                            {
-                                BusinessName
-                            }
-                            (this.form).then(response => {
-                                this.
-                            #
-                                [[$modal]]
-                            #.
-                                msgSuccess("修改成功");
                                 this.open = false;
                                 this.getList();
                             });
-                        }
+                        } else {
-                    else
+                            add${BusinessName}(this.form).then(response => {
-                        {
+                                this.#[[$modal]]#.msgSuccess("新增成功");
-                            add$
-                            {
-                                BusinessName
-                            }
-                            (this.form).then(response => {
-                                this.
-                            #
-                                [[$modal]]
-                            #.
-                                msgSuccess("新增成功");
                                 this.open = false;
                                 this.getList();
                             });
@@ -558,37 +504,13 @@
             },
             /** 删除按钮操作 */
             handleDelete(row) {
-                this.
+                this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
-            #
+                    return del${BusinessName}(row.${pkColumn.javaField});
-                [[$modal]]
-            #.
-                confirm('是否确认删除${functionName}编号为"' + row.$
-                {
-                    pkColumn.javaField
-                }
-                +'"的数据项？'
-            ).
-                then(function () {
-                    return del$
-                    {
-                        BusinessName
-                    }
-                    (row.$
-                    {
-                        pkColumn.javaField
-                    }
-                )
-                    ;
                 }).then(() => {
                     this.getList();
-                    this.
+                    this.#[[$modal]]#.msgSuccess("删除成功");
-                #
+                }).catch(() => {});
-                    [[$modal]]
-                #.
-                    msgSuccess("删除成功");
-                }).catch(() => {
-                });
             }
         }
     };
-</script>
+</script>

os-generator/src/main/resources/vm/vue/index.vue.vm

@@ -1,7 +1,6 @@
 <template>
     <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
-                 label-width="100px">
             #foreach($column in $columns)
                 #if($column.query)
                     #set($dictType=$column.dictType)
@@ -35,7 +34,7 @@
                     #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-option label="请选择字典生成" value="" />
                             </el-select>
                         </el-form-item>
                     #elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
@@ -51,12 +50,12 @@
                         <el-form-item label="${comment}">
                             <el-date-picker
                                     v-model="daterange${AttrName}"
-                                    style="width: 240px"
+                                    style="width: 340px"
-                                    value-format="yyyy-MM-dd"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
-                                    type="daterange"
+                                    type="datetimerange"
                                     range-separator="-"
-                                    start-placeholder="开始日期"
+                                    start-placeholder="开始时间"
-                                    end-placeholder="结束日期"
+                                    end-placeholder="结束时间"
                             ></el-date-picker>
                         </el-form-item>
                     #end
@@ -77,8 +76,7 @@
                         size="mini"
                         @click="handleAdd"
                         v-hasPermi="['${moduleName}:${businessName}:add']"
-                >新增
+                >新增</el-button>
-                </el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button
@@ -89,8 +87,7 @@
                         :disabled="single"
                         @click="handleUpdate"
                         v-hasPermi="['${moduleName}:${businessName}:edit']"
-                >修改
+                >修改</el-button>
-                </el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button
@@ -101,8 +98,7 @@
                         :disabled="multiple"
                         @click="handleDelete"
                         v-hasPermi="['${moduleName}:${businessName}:remove']"
-                >删除
+                >删除</el-button>
-                </el-button>
             </el-col>
             <el-col :span="1.5">
                 <el-button
@@ -112,14 +108,13 @@
                         size="mini"
                         @click="handleExport"
                         v-hasPermi="['${moduleName}:${businessName}:export']"
-                >导出
+                >导出</el-button>
-                </el-button>
             </el-col>
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
         <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" width="55" align="center"/>
+            <el-table-column type="selection" width="55" align="center" />
             #foreach($column in $columns)
                 #set($javaField=$column.javaField)
                 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -129,37 +124,31 @@
                     #set($comment=$column.columnComment)
                 #end
                 #if($column.pk)
-                    <el-table-column label="${comment}" align="center" prop="${javaField}"
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="columns[${foreach.index}].visible"/>
-                                     v-if="columns[${foreach.index}].visible"/>
                 #elseif($column.list && $column.htmlType == "datetime")
-                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180"
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="180" v-if="columns[${foreach.index}].visible">
-                                     v-if="columns[${foreach.index}].visible">
                         <template slot-scope="scope">
                             <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
                         </template>
                     </el-table-column>
                 #elseif($column.list && $column.htmlType == "imageUpload")
-                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="100"
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" width="100" v-if="columns[${foreach.index}].visible">
-                                     v-if="columns[${foreach.index}].visible">
                         <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}"
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="columns[${foreach.index}].visible">
-                                     v-if="columns[${foreach.index}].visible">
                         <template slot-scope="scope">
                             #if($column.htmlType == "checkbox")
-                                <dict-tag :options="dict.type.${column.dictType}"
+                                <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-                                          :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}"
+                    <el-table-column label="${comment}" align="center" prop="${javaField}" v-if="columns[${foreach.index}].visible"/>
-                                     v-if="columns[${foreach.index}].visible"/>
                 #end
             #end
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -170,16 +159,14 @@
                             icon="el-icon-edit"
                             @click="handleUpdate(scope.row)"
                             v-hasPermi="['${moduleName}:${businessName}:edit']"
-                    >修改
+                    >修改</el-button>
-                    </el-button>
                     <el-button
                             size="mini"
                             type="text"
                             icon="el-icon-delete"
                             @click="handleDelete(scope.row)"
                             v-hasPermi="['${moduleName}:${businessName}:remove']"
-                    >删除
+                    >删除</el-button>
-                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -208,7 +195,7 @@
                             #set($dictType=$column.dictType)
                             #if($column.htmlType == "input")
                                 <el-form-item label="${comment}" prop="${field}">
-                                    <el-input v-model="form.${field}" placeholder="请输入${comment}"/>
+                                    <el-input v-model="form.${field}" placeholder="请输入${comment}" />
                                 </el-form-item>
                             #elseif($column.htmlType == "imageUpload")
                                 <el-form-item label="${comment}" prop="${field}">
@@ -240,7 +227,7 @@
                             #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-option label="请选择字典生成" value="" />
                                     </el-select>
                                 </el-form-item>
                             #elseif($column.htmlType == "checkbox" && "" != $dictType)
@@ -271,8 +258,7 @@
                                             #else
                                                 :label="dict.value"
                                             #end
-                                        >{{dict.label}}
+                                        >{{dict.label}}</el-radio>
-                                        </el-radio>
                                     </el-radio-group>
                                 </el-form-item>
                             #elseif($column.htmlType == "radio" && $dictType)
@@ -292,7 +278,7 @@
                                 </el-form-item>
                             #elseif($column.htmlType == "textarea")
                                 <el-form-item label="${comment}" prop="${field}">
-                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容"/>
+                                    <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
                                 </el-form-item>
                             #end
                         #end
@@ -302,19 +288,14 @@
                     <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 type="primary" icon="el-icon-plus" size="mini" @click="handleAdd${subClassName}">添加</el-button>
-                                添加
-                            </el-button>
                         </el-col>
                         <el-col :span="1.5">
-                            <el-button type="danger" icon="el-icon-delete" size="mini"
+                            <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete${subClassName}">删除</el-button>
-                                       @click="handleDelete${subClassName}">删除
-                            </el-button>
                         </el-col>
                     </el-row>
-                    <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index"
+                    <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
-                              @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+                        <el-table-column type="selection" width="50" align="center" />
-                        <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)
@@ -328,18 +309,16 @@
                             #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"/>
+                                        <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"
+                                        <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择$comment" />
-                                                        value-format="yyyy-MM-dd" placeholder="请选择$comment"/>
                                     </template>
                                 </el-table-column>
-                            #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") &&
+                            #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
-                                "" != $column.dictType)
                                 <el-table-column label="$comment" prop="${javaField}" width="150">
                                     <template slot-scope="scope">
                                         <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
@@ -352,12 +331,11 @@
                                         </el-select>
                                     </template>
                                 </el-table-column>
-                            #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") &&
+                            #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
-                                "" == $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-option label="请选择字典生成" value="" />
                                         </el-select>
                                     </template>
                                 </el-table-column>
@@ -375,13 +353,7 @@
 </template>
 
 <script>
-    import {
+    import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
-        list${BusinessName},
-        get${BusinessName},
-        del${BusinessName},
-        add${BusinessName},
-        update${BusinessName}
-    } from "@/api/${moduleName}/${businessName}";
 
     export default {
         name: "${BusinessName}",
@@ -446,9 +418,7 @@
                                 #set($comment=$column.columnComment)
                             #end
                                 $column.javaField: [
-                                {
+                                { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-                                    required: true, message: "$comment不能为空", trigger: #if($column.htmlType ==
-                                    "select" || $column.htmlType == "radio")"change"#else"blur"#end }
                             ]#if($foreach.count != $columns.size()),#end
                         #end
                     #end
@@ -461,7 +431,7 @@
                         #else
                             #set($comment=$column.columnComment)
                         #end
-                        {key: ${foreach.index}, label: `${comment}`, visible: true},
+                        { key: ${foreach.index}, label: `${comment}`, visible: true },
                     #end
                 ]
             };
@@ -469,301 +439,175 @@
         created() {
             this.getList();
         },
-    methods: {
+        methods: {
-        /** 查询${functionName}列表 */
+            /** 查询${functionName}列表 */
-        getList() {
+            getList() {
-            this.loading = true;
+                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
-            list${BusinessName}(this.queryParams).then(response => {
-                this.${businessName}List = response.rows;
-                this.total = response.total;
-                this.loading = false;
-            });
-        },
-        // 取消按钮
-        cancel() {
-            this.open = false;
-            this.reset();
-        },
-        // 表单重置
-        reset() {
-            this.form = {
                 #foreach ($column in $columns)
-                    #if($column.htmlType == "checkbox")
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-                            $column.javaField: []#if($foreach.count != $columns.size()),#end
+                        this.queryParams.params = {};
-                    #else
+                        #break
-                            $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")
+                    #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-                        this.form.$column.javaField = this.form.${column.javaField}.split(",");
+                        #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
-                #if($table.sub)
+                list${BusinessName}(this.queryParams).then(response => {
-                    this.${subclassName}List = response.data.${subclassName}List;
+                    this.${businessName}List = response.rows;
-                #end
+                    this.total = response.total;
-                this.open = true;
+                    this.loading = false;
-                this.title = "修改${functionName}";
+                });
-            });
+            },
-        },
+            // 取消按钮
-        /** 提交按钮 */
+            cancel() {
-        submitForm() {
+                this.open = false;
-            this.
+                this.reset();
-        #
+            },
-            [[$]]
+            // 表单重置
-            #refs["form"].validate(valid => {
+            reset() {
-                if (valid) {
+                this.form = {
-                    #foreach($column in $columns)
+                    #foreach ($column in $columns)
                         #if($column.htmlType == "checkbox")
-                            this.form.$column.javaField = this.form.$
+                                $column.javaField: []#if($foreach.count != $columns.size()),#end
-                            {
+                        #else
-                                column.javaField
+                                $column.javaField: null#if($foreach.count != $columns.size()),#end
-                            }
+                        #end
-                        .
+                    #end
-                            join(",");
+                };
+                #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.form.$
+                        this.${subclassName}List = response.data.${subclassName}List;
-                        {
-                            subclassName
-                        }
-                        List = this.$
-                        {
-                            subclassName
-                        }
-                        List;
                     #end
-                    if (this.form.${
+                    this.open = true;
-                        pkColumn.javaField
+                    this.title = "修改${functionName}";
-                    }
-                !=
-                    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);
-        }
-        ,
-        /** ${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
                 });
-            }
+            },
-        }
+            /** 提交按钮 */
-        ,
+            submitForm() {
-        /** 复选框选中数据 */
+                this.#[[$]]#refs["form"].validate(valid => {
-        handle$
+                    if (valid) {
-        {
+                        #foreach ($column in $columns)
-            subClassName
+                        #if($column.htmlType == "checkbox")
-        }
+                        this.form.$column.javaField = this.form.${column.javaField}.join(",");
-        SelectionChange(selection)
+                        #end
-        {
+                        #end
-            this.checked$
+                        #if($table.sub)
-            {
+                        this.form.${subclassName}List = this.${subclassName}List;
-                subClassName
+                        #end
-            }
+                        if (this.form.${pkColumn.javaField} != null) {
-            = selection.map(item => item.index)
+                            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);
+    },
+    /** ${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
+            });
+        }
+    },
+    /** 复选框选中数据 */
+    handle${subClassName}SelectionChange(selection) {
+        this.checked${subClassName} = selection.map(item => item.index)
+    },
+    #end
     /** 导出按钮操作 */
-    handleExport()
+    handleExport() {
-    {
         this.download('${moduleName}/${businessName}/export', {
             ...this.queryParams
         }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
     }
     }
-    }
+    };
-    ;
+</script>
-</script>