diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py index ad1bc32..6f37be2 100644 --- a/backend/dvadmin/system/views/user.py +++ b/backend/dvadmin/system/views/user.py @@ -249,16 +249,17 @@ class UserViewSet(CustomModelViewSet): serializer_class = UserSerializer create_serializer_class = UserCreateSerializer update_serializer_class = UserUpdateSerializer - filter_fields = ["^name", "~username", "^mobile", "is_active", "dept", "user_type", "$dept__name"] - # filter_fields = { - # "name": ["icontains"], - # "mobile": ["iregex"], - # "username": ["icontains"], - # "is_active": ["icontains"], - # "dept": ["exact"], - # "user_type": ["exact"], - # "dept__name": ["icontains"], - # } + # filter_fields = ["^name", "~username", "^mobile", "is_active", "dept", "user_type", "$dept__name"] + filter_fields = { + "name": ["icontains"], + "mobile": ["iregex"], + "username": ["icontains"], + "is_active": ["icontains"], + "dept": ["exact"], + "user_type": ["exact"], + "dept__name": ["icontains"], + "create_datetime": ["range"], + } search_fields = ["username", "name", "gender", "dept__name", "role__name"] # 导出 export_field_label = { diff --git a/web/src/views/system/user/crud.js b/web/src/views/system/user/crud.js index 28fe9a6..1d07520 100644 --- a/web/src/views/system/user/crud.js +++ b/web/src/views/system/user/crud.js @@ -404,7 +404,7 @@ export const crudOptions = (vm) => { } } ].concat(vm.commonEndColumns({ - create_datetime: { showTable: false }, + create_datetime: { showTable: false, showForm: true }, update_datetime: { showTable: false } })) }