SaleclerkSubmitLogInfo add model_uni_name
променени са 3 файла, в които са добавени 5 реда и са изтрити 3 реда
+ 3
- 3
integral/admin.py
@@ -15,9 +15,9 @@ class SaleclerkIntegralIncomeExpensesInfoAdmin(ReadOnlyModelAdmin, admin.ModelAd |
||
| 15 | 15 |
|
| 16 | 16 |
|
| 17 | 17 |
class SaleclerkSubmitLogInfoAdmin(AdvancedExportExcelModelAdmin, ReadOnlyModelAdmin, admin.ModelAdmin): |
| 18 |
- list_display = ('clerk_id', 'clerk_name', 'model_name', 'distributor_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')
|
|
| 20 |
- search_fields = ('code', 'remark', 'trackingNo', 'distributor_name', 'clerk_name', 'model_name')
|
|
| 18 |
+ list_display = ('clerk_id', 'clerk_name', 'model_name', 'model_uni_name', 'distributor_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', 'remark')
|
|
| 20 |
+ search_fields = ('code', 'trackingNo', 'distributor_name', 'clerk_name', 'model_name', 'model_uni_name')
|
|
| 21 | 21 |
|
| 22 | 22 |
|
| 23 | 23 |
|
+ 1
- 0
integral/models.py
@@ -81,6 +81,7 @@ class SaleclerkSubmitLogInfo(BaseModelMixin): |
||
| 81 | 81 |
|
| 82 | 82 |
model_pk = models.IntegerField(_(u'model_pk'), default=0, help_text=u'型号PK', db_index=True) |
| 83 | 83 |
model_name = models.CharField(_(u'model_name'), max_length=255, blank=True, null=True, help_text=u'型号名称') |
| 84 |
+ model_uni_name = models.CharField(_(u'model_uni_name'), max_length=255, blank=True, null=True, help_text=u'型号统称') |
|
| 84 | 85 |
|
| 85 | 86 |
distributor_pk = models.IntegerField(_(u'distributor_pk'), default=0, help_text=u'经销商PK', db_index=True) |
| 86 | 87 |
distributor_name = models.CharField(_(u'distributor_name'), max_length=32, blank=True, null=True, help_text=u'经销商名称') |
+ 1
- 0
page/sale_views.py
@@ -113,6 +113,7 @@ def clerk_sale_submit_api(request): |
||
| 113 | 113 |
brand_name=brand.brand_name, |
| 114 | 114 |
model_pk=modelID, |
| 115 | 115 |
model_name=model.model_name, |
| 116 |
+ model_uni_name=model.model_uni_name, |
|
| 116 | 117 |
distributor_pk=distributorID, |
| 117 | 118 |
distributor_name=distributor.distributor_name, |
| 118 | 119 |
clerk_id=clerk.clerk_id, |