修改Jeecg日期组件
This commit is contained in:
parent
8b6f4abe72
commit
a1d2aa7003
|
@ -16,12 +16,12 @@
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="4" :sm="8">
|
<a-col :md="4" :sm="8">
|
||||||
<a-form-item label="开始日期">
|
<a-form-item label="开始日期">
|
||||||
<a-date-picker v-model="queryParam.startTime" />
|
<a-date-picker v-model="queryParam.startTime":format="dateFormat" :show-time="{ format: 'HH:mm:ss' }" show-time @change="searchQuery"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="4" :sm="8">
|
<a-col :md="4" :sm="8">
|
||||||
<a-form-item label="结束日期">
|
<a-form-item label="结束日期">
|
||||||
<a-date-picker v-model="queryParam.endTime" />
|
<a-date-picker v-model="queryParam.endTime":format="dateFormat" :show-time="{ format: 'HH:mm:ss' }" show-time @change="searchQuery"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
||||||
|
@ -168,11 +168,15 @@ export default {
|
||||||
this.queryParam.endTime = end.format(this.dateFormat);
|
this.queryParam.endTime = end.format(this.dateFormat);
|
||||||
param.startTime = start.format(this.dateFormat);
|
param.startTime = start.format(this.dateFormat);
|
||||||
param.endTime = end.format(this.dateFormat);
|
param.endTime = end.format(this.dateFormat);
|
||||||
|
}else{
|
||||||
|
param.startTime = moment(this.queryParam.startTime).format(this.dateFormat);
|
||||||
|
param.endTime = moment(this.queryParam.endTime).format(this.dateFormat);
|
||||||
}
|
}
|
||||||
if (this.superQueryParams) {
|
if (this.superQueryParams) {
|
||||||
param['superQueryParams'] = encodeURI(this.superQueryParams)
|
param['superQueryParams'] = encodeURI(this.superQueryParams)
|
||||||
param['superQueryMatchType'] = this.superQueryMatchType
|
param['superQueryMatchType'] = this.superQueryMatchType
|
||||||
}
|
}
|
||||||
|
console.log(param)
|
||||||
return filterObj(param);
|
return filterObj(param);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
@ -11,12 +11,12 @@
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="4" :sm="8">
|
<a-col :md="4" :sm="8">
|
||||||
<a-form-item label="开始日期">
|
<a-form-item label="开始日期">
|
||||||
<a-date-picker v-model="queryParam.startTime" />
|
<a-date-picker v-model="queryParam.startTime" @change="searchQuery" />
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
<a-col :md="4" :sm="8">
|
<a-col :md="4" :sm="8">
|
||||||
<a-form-item label="结束日期">
|
<a-form-item label="结束日期">
|
||||||
<a-date-picker v-model="queryParam.endTime" />
|
<a-date-picker v-model="queryParam.endTime" @change="searchQuery"/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</a-col>
|
</a-col>
|
||||||
|
|
||||||
|
@ -172,11 +172,15 @@ export default {
|
||||||
this.queryParam.endTime = end.format(this.dateFormat);
|
this.queryParam.endTime = end.format(this.dateFormat);
|
||||||
param.startTime = start.format(this.dateFormat);
|
param.startTime = start.format(this.dateFormat);
|
||||||
param.endTime = end.format(this.dateFormat);
|
param.endTime = end.format(this.dateFormat);
|
||||||
|
}else{
|
||||||
|
param.startTime = moment(this.queryParam.startTime).format(this.dateFormat);
|
||||||
|
param.endTime = moment(this.queryParam.endTime).format(this.dateFormat);
|
||||||
}
|
}
|
||||||
if (this.superQueryParams) {
|
if (this.superQueryParams) {
|
||||||
param['superQueryParams'] = encodeURI(this.superQueryParams)
|
param['superQueryParams'] = encodeURI(this.superQueryParams)
|
||||||
param['superQueryMatchType'] = this.superQueryMatchType
|
param['superQueryMatchType'] = this.superQueryMatchType
|
||||||
}
|
}
|
||||||
|
console.log(param)
|
||||||
return filterObj(param);
|
return filterObj(param);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user