saleclerkinfo 标识是否是网销。
saleclerksubmitloginfo 添加字段，上传快递单号。
4 измененных файлов с 7 добавлено и 3 удалено
+ 1
- 1
integral/admin.py
@@ -14,7 +14,7 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd |
||
| 14 | 14 |
|
| 15 | 15 |
|
| 16 | 16 |
class SaleclerkSubmitLogInfoAdmin(AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin, admin.ModelAdmin): |
| 17 |
- 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')
|
|
| 17 |
+ 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')
|
|
| 18 | 18 |
list_filter = ('brand_pk', 'dupload', 'test_user', 'test_sn','has_scan', 'status')
|
| 19 | 19 |
search_fields = ('code', 'remark')
|
| 20 | 20 |
|
+ 2
- 0
integral/models.py
@@ -110,6 +110,8 @@ class SaleclerkSubmitLogInfo(BaseModelMixin): |
||
| 110 | 110 |
ym = models.IntegerField(_(u'ym'), default=0, help_text=u'年月', db_index=True) # 例：201712, tc.local_string(format='%Y%m') |
| 111 | 111 |
ymd = models.IntegerField(_(u'ymd'), default=0, help_text=u'年月日', db_index=True) # 例：20171208, tc.local_string(format='%Y%m%d') |
| 112 | 112 |
|
| 113 |
+ trackingNo = models.CharField(_(u'trackingNo'), max_length=32, blank=True, null=True, help_text=u'快递单号') |
|
| 114 |
+ |
|
| 113 | 115 |
class Meta: |
| 114 | 116 |
verbose_name = _(u'saleclerksubmitloginfo') |
| 115 | 117 |
verbose_name_plural = _(u'saleclerksubmitloginfo') |
+ 2
- 2
mch/admin.py
@@ -114,8 +114,8 @@ class DistributorInfoAdmin(admin.ModelAdmin): |
||
| 114 | 114 |
|
| 115 | 115 |
|
| 116 | 116 |
class SaleclerkInfoAdmin(AdvancedExportExcelModelAdmin, AdvancedActionsModelAdmin, admin.ModelAdmin): |
| 117 |
- 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')
|
|
| 118 |
- list_filter = ('test_user', 'user_status', 'status')
|
|
| 117 |
+ 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')
|
|
| 118 |
+ list_filter = ('test_user', 'user_status', 'is_online_sales', 'status')
|
|
| 119 | 119 |
search_fields = ('brand_id', 'brand_name', 'distributor_id', 'distributor_name', 'clerk_id', 'clerk_name', 'clerk_phone', 'unionid', 'openid')
|
| 120 | 120 |
actions_exclude = ('delete_selected', )
|
| 121 | 121 |
|
+ 2
- 0
mch/models.py
@@ -345,6 +345,8 @@ class SaleclerkInfo(BaseModelMixin, SexModelMixin): |
||
| 345 | 345 |
|
| 346 | 346 |
test_user = models.BooleanField(_(u'test_user'), default=False, help_text=_(u'是否为测试用户'), db_index=True) |
| 347 | 347 |
|
| 348 |
+ is_online_sales = models.BooleanField(_(u'is_online_sales'), default=False, help_text=_(u'是否为网销'), db_index=True) |
|
| 349 |
+ |
|
| 348 | 350 |
class Meta: |
| 349 | 351 |
verbose_name = _(u'经销商销售员信息') |
| 350 | 352 |
verbose_name_plural = _(u'经销商销售员信息') |