@@ -1,7 +1,7 @@  | 
            ||
| 1 | 1 | 
                # -*- coding: utf-8 -*-  | 
            
| 2 | 2 | 
                 | 
            
| 3 | 
                -from django.contrib import admin  | 
            |
| 4 | 3 | 
                from daterange_filter.filter import DateRangeFilter  | 
            
| 4 | 
                +from django.contrib import admin  | 
            |
| 5 | 5 | 
                from django_admin import AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin  | 
            
| 6 | 6 | 
                 | 
            
| 7 | 7 | 
                from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo  | 
            
                @@ -15,8 +15,8 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd  | 
            ||
| 15 | 15 | 
                 | 
            
| 16 | 16 | 
                 | 
            
| 17 | 17 | 
                class SaleclerkSubmitLogInfoAdmin(AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin, admin.ModelAdmin):  | 
            
| 18 | 
                -    list_display = ('model_name', 'distributor_name', 'clerk_name', 'code', 'remark', 'dupload', 'is_wxwork', 'has_scan', 'ymd', 'trackingNo', 'created_at')
               | 
            |
| 19 | 
                -    list_filter = ('brand_pk', 'dupload', 'test_user', 'test_sn', 'has_scan', 'is_wxwork', ('created_at', DateRangeFilter))
               | 
            |
| 18 | 
                +    list_display = ('model_name', 'distributor_name', 'clerk_name', 'code', 'has_scan', 'remark', 'dupload', 'ymd', 'trackingNo', 'is_wxwork', 'is_staff_delete', 'status', 'created_at', 'updated_at')
               | 
            |
| 19 | 
                +    list_filter = ('brand_pk', 'dupload', 'test_user', 'test_sn', 'has_scan', 'is_wxwork', 'is_staff_delete', 'status', ('created_at', DateRangeFilter))
               | 
            |
| 20 | 20 | 
                     search_fields = ('code', 'remark', 'trackingNo', 'distributor_name', 'clerk_name', 'model_name')
               | 
            
| 21 | 21 | 
                 | 
            
| 22 | 22 | 
                 | 
            
                @@ -2,6 +2,7 @@ Django==1.11.26  | 
            ||
| 2 | 2 | 
                django-admin==2.0.0  | 
            
| 3 | 3 | 
                django-cors-headers==3.0.2  | 
            
| 4 | 4 | 
                django-curtail-uuid==1.0.4  | 
            
| 5 | 
                +django-daterange-filter==1.3.0  | 
            |
| 5 | 6 | 
                django-detect==1.0.17  | 
            
| 6 | 7 | 
                django-file-md5==1.0.3  | 
            
| 7 | 8 | 
                django-file-upload==1.1.1  | 
            
                @@ -22,4 +23,3 @@ django-six==1.0.4  | 
            ||
| 22 | 23 | 
                django-uniapi==1.0.7  | 
            
| 23 | 24 | 
                django-we==1.5.3  | 
            
| 24 | 25 | 
                djangorestframework==3.7.7  | 
            
| 25 | 
                -django-daterange-filter==1.3.0  |