add DateRangeFilter
4 mainītis faili ar 12 papildinājumiem un 9 dzēšanām
+ 2
- 1
integral/admin.py
@@ -1,6 +1,7 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 | 3 |
from django.contrib import admin |
| 4 |
+from daterange_filter.filter import DateRangeFilter |
|
| 4 | 5 |
from django_admin import AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin |
| 5 | 6 |
|
| 6 | 7 |
from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo |
@@ -15,7 +16,7 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd |
||
| 15 | 16 |
|
| 16 | 17 |
class SaleclerkSubmitLogInfoAdmin(AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin, admin.ModelAdmin): |
| 17 | 18 |
list_display = ('model_name', 'distributor_name', 'clerk_name', 'code', 'remark', 'dupload', 'is_wxwork', 'has_scan', 'ymd', 'trackingNo', 'created_at')
|
| 18 |
- list_filter = ('brand_pk', 'dupload', 'test_user', 'test_sn', 'has_scan', 'is_wxwork')
|
|
| 19 |
+ list_filter = ('brand_pk', 'dupload', 'test_user', 'test_sn', 'has_scan', 'is_wxwork', ('created_at', DateRangeFilter))
|
|
| 19 | 20 |
search_fields = ('code', 'remark', 'trackingNo', 'distributor_name', 'clerk_name', 'model_name')
|
| 20 | 21 |
|
| 21 | 22 |
|
+ 2
- 2
integral/models.py
@@ -115,8 +115,8 @@ class SaleclerkSubmitLogInfo(BaseModelMixin): |
||
| 115 | 115 |
is_wxwork = models.BooleanField(_(u'is_wxwork'), default=False, help_text=_(u'是否为企业微信端'), db_index=True) |
| 116 | 116 |
|
| 117 | 117 |
class Meta: |
| 118 |
- verbose_name = _(u'saleclerksubmitloginfo') |
|
| 119 |
- verbose_name_plural = _(u'saleclerksubmitloginfo') |
|
| 118 |
+ verbose_name = _(u'销售员扫码出库记录') |
|
| 119 |
+ verbose_name_plural = _(u'销售员扫码出库记录') |
|
| 120 | 120 |
|
| 121 | 121 |
def __unicode__(self): |
| 122 | 122 |
return unicode(self.pk) |
+ 7
- 6
kodo/settings.py
@@ -73,6 +73,7 @@ INSTALLED_APPS = ( |
||
| 73 | 73 |
'server', |
| 74 | 74 |
'statistic', |
| 75 | 75 |
'website', |
| 76 |
+ 'daterange_filter', |
|
| 76 | 77 |
) |
| 77 | 78 |
|
| 78 | 79 |
INSTALLED_APPS += ('multidomain', )
|
@@ -342,12 +343,12 @@ MAKE_PASSWORD_HASHER = '' |
||
| 342 | 343 |
|
| 343 | 344 |
# CORS |
| 344 | 345 |
# CORS_ORIGIN_ALLOW_ALL = True |
| 345 |
-CORS_ORIGIN_WHITELIST = ( |
|
| 346 |
- 'localhost:8000', |
|
| 347 |
- '127.0.0.1:8000', |
|
| 348 |
- 'localhost:8080', |
|
| 349 |
- '127.0.0.1:8080', |
|
| 350 |
-) |
|
| 346 |
+# CORS_ORIGIN_WHITELIST = ( |
|
| 347 |
+# 'localhost:8000', |
|
| 348 |
+# '127.0.0.1:8000', |
|
| 349 |
+# 'localhost:8080', |
|
| 350 |
+# '127.0.0.1:8080', |
|
| 351 |
+# ) |
|
| 351 | 352 |
CORS_ALLOW_CREDENTIALS = True |
| 352 | 353 |
|
| 353 | 354 |
# 富文本编辑器 |
+ 1
- 0
requirements_dj.txt
@@ -22,3 +22,4 @@ django-six==1.0.4 |
||
| 22 | 22 |
django-uniapi==1.0.7 |
| 23 | 23 |
django-we==1.5.3 |
| 24 | 24 |
djangorestframework==3.7.7 |
| 25 |
+django-daterange-filter==1.3.0 |