:art: back_express_name / back_tracking_number

huangqimin001 3 年之前
父節點
當前提交
414cc1ada2
共有 4 個文件被更改,包括 56 次插入2 次删除
  1. 1 1
      maintenance/admin.py
  2. 30 0
      maintenance/migrations/0003_auto_20210915_1653.py
  3. 6 1
      maintenance/models.py
  4. 19 0
      mch/migrations/0063_auto_20210915_1653.py

+ 1 - 1
maintenance/admin.py

@@ -14,7 +14,7 @@ class ExpressCompanyInfoAdmin(admin.ModelAdmin):
14 14
 
15 15
 
16 16
 class MaintenaceInfoAdmin(admin.ModelAdmin):
17
-    list_display = ('user_id', 'name', 'phone', 'address', 'sn', 'desc', 'point_id', 'point_name', 'express_name', 'tracking_number', 'maintenace_status', 'status', 'created_at', 'updated_at')
17
+    list_display = ('user_id', 'name', 'phone', 'address', 'sn', 'desc', 'point_id', 'point_name', 'express_name', 'tracking_number', 'back_express_name', 'back_tracking_number', 'maintenace_status', 'status', 'created_at', 'updated_at')
18 18
 
19 19
 
20 20
 admin.site.register(MaintenacePointInfo, MaintenacePointInfoAdmin)

+ 30 - 0
maintenance/migrations/0003_auto_20210915_1653.py

@@ -0,0 +1,30 @@
1
+# -*- coding: utf-8 -*-
2
+# Generated by Django 1.11.29 on 2021-09-15 08:53
3
+from __future__ import unicode_literals
4
+
5
+from django.db import migrations, models
6
+
7
+
8
+class Migration(migrations.Migration):
9
+
10
+    dependencies = [
11
+        ('maintenance', '0002_maintenaceinfo_user_id'),
12
+    ]
13
+
14
+    operations = [
15
+        migrations.AddField(
16
+            model_name='maintenaceinfo',
17
+            name='back_express_name',
18
+            field=models.CharField(blank=True, help_text='\u5bc4\u56de\u5feb\u9012\u516c\u53f8', max_length=255, null=True, verbose_name='back_express_name'),
19
+        ),
20
+        migrations.AddField(
21
+            model_name='maintenaceinfo',
22
+            name='back_tracking_number',
23
+            field=models.CharField(blank=True, help_text='\u5bc4\u56de\u5feb\u9012\u5355\u53f7', max_length=255, null=True, verbose_name='back_tracking_number'),
24
+        ),
25
+        migrations.AlterField(
26
+            model_name='maintenaceinfo',
27
+            name='express_name',
28
+            field=models.CharField(blank=True, help_text='\u5feb\u9012\u516c\u53f8', max_length=255, null=True, verbose_name='express_name'),
29
+        ),
30
+    ]

+ 6 - 1
maintenance/models.py

@@ -61,9 +61,12 @@ class MaintenaceInfo(BaseModelMixin):
61 61
     point_id = models.CharField(_(u'point_id'), max_length=32, blank=True, null=True, help_text=u'维修点唯一标识', db_index=True)
62 62
     point_name = models.CharField(_(u'point_name'), max_length=255, blank=True, null=True, help_text=u'维修点名称')
63 63
 
64
-    express_name = models.CharField(_(u'express_name'), max_length=255, blank=True, null=True, help_text=u'快递公司名称')
64
+    express_name = models.CharField(_(u'express_name'), max_length=255, blank=True, null=True, help_text=u'快递公司')
65 65
     tracking_number = models.CharField(_(u'tracking_number'), max_length=255, blank=True, null=True, help_text=u'快递单号')
66 66
 
67
+    back_express_name = models.CharField(_(u'back_express_name'), max_length=255, blank=True, null=True, help_text=u'寄回快递公司')
68
+    back_tracking_number = models.CharField(_(u'back_tracking_number'), max_length=255, blank=True, null=True, help_text=u'寄回快递单号')
69
+
67 70
     maintenace_status = models.CharField(_(u'maintenace_status'), max_length=8, blank=True, null=True, help_text=u'维修状态')
68 71
 
69 72
     class Meta:
@@ -87,6 +90,8 @@ class MaintenaceInfo(BaseModelMixin):
87 90
             'point_name': self.point_name,
88 91
             'express_name': self.express_name,
89 92
             'tracking_number': self.tracking_number,
93
+            'back_express_name': self.back_express_name,
94
+            'back_tracking_number': self.back_tracking_number,
90 95
             'maintenace_status': self.maintenace_status,
91 96
             'created_at': tc.local_string(utc_dt=self.created_at),
92 97
             'updated_at': tc.local_string(utc_dt=self.updated_at),

+ 19 - 0
mch/migrations/0063_auto_20210915_1653.py

@@ -0,0 +1,19 @@
1
+# -*- coding: utf-8 -*-
2
+# Generated by Django 1.11.29 on 2021-09-15 08:53
3
+from __future__ import unicode_literals
4
+
5
+from django.db import migrations
6
+
7
+
8
+class Migration(migrations.Migration):
9
+
10
+    dependencies = [
11
+        ('mch', '0062_distributorinfo_office'),
12
+    ]
13
+
14
+    operations = [
15
+        migrations.AlterModelOptions(
16
+            name='maintenancemaninfo',
17
+            options={'verbose_name': '\u7ef4\u4fee\u5458\u4fe1\u606f', 'verbose_name_plural': '\u7ef4\u4fee\u5458\u4fe1\u606f'},
18
+        ),
19
+    ]