KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug 代码生成器时间范围查询的组件优化

Browse Source
This commit is contained in:
zhaoxiao
2023-03-15 17:22:49 +08:00
parent 1262fecd2d
commit 0d111ae337
1 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+34 -5
View File
@@ -69,9 +69,11 @@
<#if query_field_no gt 1> </#if><a-col :xl="10" :lg="11" :md="12" :sm="24">
<#if query_field_no gt 1> </#if><a-form-item label="${po.filedComment}">
<#if po.classType=='date'>
<#if query_field_no gt 1> <a-range-picker format="YYYY-MM-DD" :placeholder="['请选择开始日期', '请选择结束日期']" v-model="queryParam.${po.fieldName}Range" @ok="${po.fieldName}OnOk"/>
<#assign date_flag=true>
<#if query_field_no gt 1> </#if><a-range-picker format="YYYY-MM-DD" :placeholder="['请选择开始日期', '请选择结束日期']" v-model="queryParam.${po.fieldName}Range" @change="${po.fieldName}Change"/>
<#elseif po.classType=='datetime'>
<#if query_field_no gt 1> <a-range-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" :placeholder="['请选择开始时间', '请选择结束时间']" v-model="queryParam.${po.fieldName}Range" @ok="${po.fieldName}OnOk"/>
<#assign date_flag=true>
<#if query_field_no gt 1> </#if><a-range-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" :placeholder="['请选择开始时间', '请选择结束时间']" v-model="queryParam.${po.fieldName}Range" @change="${po.fieldName}Change"/>
<#else>
<#if query_field_no gt 1> </#if><a-input placeholder="请输入最小值" class="query-group-cust" v-model="queryParam.${po.fieldName}_begin"></a-input>
<#if query_field_no gt 1> </#if><span class="query-group-split-cust"></span>
@@ -227,6 +229,9 @@ import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
<#if list_need_pca>
import Area from '@/components/_util/Area'
</#if>
<#if date_flag>
import { filterObj } from '@/utils/util'
</#if>
export default {
name: '${entityName}List',
@@ -404,12 +409,36 @@ export default {
},
<#list columns as po>
<#if po.classType=='datetime' || po.classType=='date'>
${po.fieldName}OnOk () {
this.queryParam.${po.fieldName}_begin = this.queryParam.${po.fieldName}Range[0]
this.queryParam.${po.fieldName}_end = this.queryParam.${po.fieldName}Range[1]
// 范围查询需要处理查询参数
${po.fieldName}Change (value, valueString) {
if (valueString && valueString.length > 0) {
this.queryParam.${po.fieldName}_begin = valueString[0]
this.queryParam.${po.fieldName}_end = valueString[1]
}
},
</#if>
</#list>
<#if date_flag>
getQueryParams () {
// 获取查询条件
const sqp = {}
if (this.superQueryParams) {
sqp.superQueryParams = encodeURI(this.superQueryParams)
sqp.superQueryMatchType = this.superQueryMatchType
}
const param = JSON.parse(JSON.stringify(Object.assign(sqp, this.queryParam, this.isorter, this.filters)))
param.field = this.getQueryField()
param.pageNo = this.ipagination.current
param.pageSize = this.ipagination.pageSize
<#list columns as po>
<#if po.classType=='datetime' || po.classType=='date'>
// 范围查询需要吧range的属性去掉
delete param.${po.fieldName}Range
</#if>
</#list>
return filterObj(param)
},
</#if>
getSuperFieldList () {
<#include "/common/utils.ftl">
const fieldList = []