diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index b5e45f5c5..4833a670e 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -95,10 +95,10 @@ v-hasPermi="['${moduleName}:${businessName}:export']" >导出 - + - + #foreach($column in $columns) #set($javaField=$column.javaField) @@ -109,17 +109,17 @@ #set($comment=$column.columnComment) #end #if($column.pk) - + #elseif($column.list && $column.htmlType == "datetime") - + #elseif($column.list && "" != $column.dictType) - + #elseif($column.list && "" != $javaField) - + #end #end @@ -288,12 +288,23 @@ export default { pageNum: 1, pageSize: 10, #foreach ($column in $columns) +#if($velocityCount == 1) +#set($javaField=$column.javaField) + orderByColumn: '${javaField}', + isAsc: 'asc', +#end #if($column.query) $column.javaField: null#if($velocityCount != $columns.size()),#end #end #end }, +#foreach ($column in $columns) +#set($javaField=$column.javaField) + // 默认排序 + defaultSort: { prop: '${javaField}', order: 'descending' }, +#break +#end // 表单参数 form: {}, // 表单校验 @@ -306,8 +317,9 @@ export default { #else #set($comment=$column.columnComment) #end +#set($comment=$column.columnComment) $column.javaField: [ - { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end } + { required: true, message: "$comment不能为空", trigger: "#if($column.htmlType == "select")"change"#else"blur"#end" } ]#if($velocityCount != $columns.size()),#end #end @@ -326,6 +338,21 @@ export default { #end }, methods: { + /** 自定义排序 */ + sortChange(column, prop, order) { + var sortingType = column.order; + if (sortingType == 'ascending') { + this.queryParams.orderByColumn = column.prop; + this.queryParams.isAsc = 'asc'; + } else if (sortingType == 'descending') { + this.queryParams.orderByColumn = column.prop; + this.queryParams.isAsc = 'desc'; + } else { + this.queryParams.orderByColumn = this.defaultSort.prop; + this.queryParams.isAsc = this.defaultSort.order == 'descending'?'desc':'asc'; + } + this.getList(); + }, /** 查询${functionName}列表 */ getList() { this.loading = true; @@ -467,4 +494,4 @@ export default { } } }; - + \ No newline at end of file