integral/admin.py

@@ -14,7 +14,7 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd

                 
              

                 
              

                 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', 'ym', 'ymd', 'status', 'has_scan', 'created_at', 'updated_at')
              

                +    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', 'ym', 'ymd', 'status', 'has_scan', 'trackingNo', 'created_at', 'updated_at')
              

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

                     search_fields = ('code', 'remark')
              

                 
              

integral/models.py

@@ -110,6 +110,8 @@ class SaleclerkSubmitLogInfo(BaseModelMixin):

                     ym = models.IntegerField(_(u'ym'), default=0, help_text=u'年月', db_index=True)  # 例：201712, tc.local_string(format='%Y%m')
              

                     ymd = models.IntegerField(_(u'ymd'), default=0, help_text=u'年月日', db_index=True)  # 例：20171208, tc.local_string(format='%Y%m%d')
              

                 
              

                +    trackingNo = models.CharField(_(u'trackingNo'), max_length=32, blank=True, null=True, help_text=u'快递单号')
              

                +
              

                     class Meta:
              

                         verbose_name = _(u'saleclerksubmitloginfo')
              

                         verbose_name_plural = _(u'saleclerksubmitloginfo')
              

mch/admin.py

@@ -114,8 +114,8 @@ class DistributorInfoAdmin(admin.ModelAdmin):

                 
              

                 
              

                 class SaleclerkInfoAdmin(AdvancedExportExcelModelAdmin, AdvancedActionsModelAdmin, admin.ModelAdmin):
              

                -    list_display = ('brand_id', 'brand_name', 'distributor_id', 'distributor_name', 'clerk_id', 'clerk_name', 'clerk_sex', 'clerk_phone', 'unionid', 'openid', 'num', 'integral', 'total_integral', 'user_status', 'test_user', 'status', 'created_at', 'updated_at')
              

                -    list_filter = ('test_user', 'user_status', 'status')
              

                +    list_display = ('brand_id', 'brand_name', 'distributor_id', 'distributor_name', 'clerk_id', 'clerk_name', 'clerk_sex', 'clerk_phone', 'unionid', 'openid', 'num', 'integral', 'total_integral', 'user_status', 'test_user', 'is_online_sales' 'status', 'created_at', 'updated_at')
              

                +    list_filter = ('test_user', 'user_status', 'is_online_sales', 'status')
              

                     search_fields = ('brand_id', 'brand_name', 'distributor_id', 'distributor_name', 'clerk_id', 'clerk_name', 'clerk_phone', 'unionid', 'openid')
              

                     actions_exclude = ('delete_selected', )
              

                 
              

mch/models.py

@@ -345,6 +345,8 @@ class SaleclerkInfo(BaseModelMixin, SexModelMixin):

                 
              

                     test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True)
              

                 
              

                +    is_online_sales = models.BooleanField(_(u'is_online_sales'), default=False, help_text=_(u'是否为网销'), db_index=True)
              

                +
              

                     class Meta:
              

                         verbose_name = _(u'经销商销售员信息')
              

                         verbose_name_plural = _(u'经销商销售员信息')