gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(filters): 修复daterange过滤问题

dev
Angelo 2023-09-12 13:20:06 +08:00
parent 39f38edd1b
commit 3a007fe8ab
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/dvadmin/utils/filters.py
View File

@ -358,7 +358,6 @@ class CustomDjangoFilterBackend(DjangoFilterBackend):
query = Q(**{orm_lookup: filterset.data[search_term_key]}) query = Q(**{orm_lookup: filterset.data[search_term_key]})
queries.append(query) queries.append(query)
elif filterset_data_len == 2: elif filterset_data_len == 2:
orm_lookup += '__range'
query = Q(**{orm_lookup: filterset.data.getlist(search_term_key)}) query = Q(**{orm_lookup: filterset.data.getlist(search_term_key)})
queries.append(query) queries.append(query)
if len(queries) > 0: if len(queries) > 0:

2
web/src/install.js
View File

@ -364,7 +364,7 @@ Vue.prototype.commonEndColumns = function (param = {}) {
width: 160, width: 160,
search: { search: {
disabled: !showData.create_datetime.showForm, disabled: !showData.create_datetime.showForm,
width: 240, width: 380,
component: { // 查询框组件配置，默认根据form配置生成 component: { // 查询框组件配置，默认根据form配置生成
name: 'el-date-picker', name: 'el-date-picker',
props: { props: {