integral/admin.py

@@ -1,7 +1,7 @@

                 # -*- coding: utf-8 -*-
              

                 
              

                 from django.contrib import admin
              

                -from django_admin import ReadOnlyModelAdmin
              

                +from django_admin import ReadOnlyModelAdmin, AdvancedExportExcelModelAdmin
              

                 
              

                 from integral.models import SaleclerkIntegralIncomeExpensesInfo, SaleclerkSubmitLogInfo
              

                 
              
@@ -13,9 +13,9 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd

                     search_fields = ('clerk_id', 'code', 'remark')
              

                 
              

                 
              

                -class SaleclerkSubmitLogInfoAdmin(ReadOnlyModelAdmin, admin.ModelAdmin):
              

                -    list_display = ('clerk_id', 'code', 'remark', 'dupload', 'test_user', 'test_sn', 'status', 'created_at', 'updated_at')
              

                -    list_filter = ('dupload', 'test_user', 'test_sn', 'status')
              

                +class SaleclerkSubmitLogInfoAdmin(AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin, admin.ModelAdmin):
              

                +    list_display = ('brand_pk', 'brand_name', 'model_pk', 'model_name', 'distributor_pk', 'distributor_name', 'clerk_id', 'clerk_name', 'code', 'remark', 'dupload', 'test_user', 'test_sn', 'status', 'created_at', 'updated_at')
              

                +    list_filter = ('brand_pk', 'dupload', 'test_user', 'test_sn', 'status')
              

                     search_fields = ('code', 'remark')
              

                 
              

                 
              

integral/models.py

@@ -85,11 +85,17 @@ class SaleclerkIntegralIncomeExpensesInfo(BaseModelMixin):

                 
              

                 
              

                 class SaleclerkSubmitLogInfo(BaseModelMixin):
              

                -    clerk_id = models.CharField(_(u'clerk_id'), max_length=32, blank=True, null=True, help_text=u'店员唯一标识', db_index=True)
              

                -
              

                     brand_pk = models.IntegerField(_(u'brand_pk'), default=0, help_text=u'品牌PK', db_index=True)
              

                +    brand_name = models.CharField(_(u'brand_name'), max_length=255, blank=True, null=True, help_text=u'品牌名称')
              

                +
              

                     model_pk = models.IntegerField(_(u'model_pk'), default=0, help_text=u'型号PK', db_index=True)
              

                +    model_name = models.CharField(_(u'model_name'), max_length=255, blank=True, null=True, help_text=u'型号名称')
              

                +
              

                     distributor_pk = models.IntegerField(_(u'distributor_pk'), default=0, help_text=u'经销商PK', db_index=True)
              

                +    distributor_name = models.CharField(_(u'distributor_name'), max_length=32, blank=True, null=True, help_text=u'经销商名称')
              

                +
              

                +    clerk_id = models.CharField(_(u'clerk_id'), max_length=32, blank=True, null=True, help_text=u'店员唯一标识', db_index=True)
              

                +    clerk_name = models.CharField(_(u'clerk_name'), max_length=32, blank=True, null=True, help_text=u'店员名称')
              

                 
              

                     code = models.CharField(_(u'code'), max_length=32, blank=True, null=True, help_text=u'机身码', db_index=True)
              

                 
              

page/sale_views.py

@@ -170,10 +170,14 @@ def clerk_sale_decrypt_api(request):

                 
              

                     # 店员提交记录
              

                     ssli = SaleclerkSubmitLogInfo.objects.create(
              

                -        clerk_id=clerk.clerk_id,
              

                         brand_pk=brand.pk,
              

                +        brand_name=brand.brand_name,
              

                         model_pk=modelID,
              

                +        model_name=model.model_name,
              

                         distributor_pk=distributorID,
              

                +        distributor_name=distributor.distributor_name,
              

                +        clerk_id=clerk.clerk_id,
              

                +        clerk_name=clerk.clerk_name,
              

                         code=serialNo,
              

                         consumer_name=consumer_name,
              

                         consumer_phone=consumer_phone,