Huis Verkennen Help
Registreer Inloggen
Kodo
/
kodo
Volgen 2
Ster 0
Vork 0

Bladeren bron
Update

Brightcells 7 jaren geleden
bovenliggende
cbc12e6b47
commit
2988703c52
4 gewijzigde bestanden met toevoegingen van 84 en 18 verwijderingen
Toon Diff Stats
  1. 19 0
      mch/migrations/0020_auto_20180517_1819.py
  2. 2 2
      requirements.txt
  3. 47 0
      statistic/migrations/0007_auto_20180517_1819.py
  4. 16 16
      statistic/models.py

+ 19 - 0
mch/migrations/0020_auto_20180517_1819.py
Bestand weergeven 

@@ -0,0 +1,19 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.11 on 2018-05-17 10:19
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', '0019_saleclerkinfo'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AlterModelOptions(
16 
+            name='saleclerkinfo',
17 
+            options={'verbose_name': '\u7ecf\u9500\u5546\u9500\u552e\u5458\u4fe1\u606f', 'verbose_name_plural': '\u7ecf\u9500\u5546\u9500\u552e\u5458\u4fe1\u606f'},
18 
+        ),
19 
+    ]

+ 2 - 2
requirements.txt
Bestand weergeven 

@@ -25,7 +25,7 @@ django-rlog==1.0.7
25 25 
 django-shortuuidfield==0.1.3
26 26 
 django-six==1.0.4
27 27 
 django-uniapi==1.0.1
28 
-django-we==1.3.8
28 
+django-we==1.3.9
29 29 
 djangorestframework==3.7.7
30 30 
 furl==1.0.1
31 31 
 hiredis==0.2.0
 
@@ -43,7 +43,7 @@ pywe-pay-notify==1.0.4
43 43 
 pywe-response==1.0.1
44 44 
 pywe-sign==1.0.8
45 45 
 pywe-xml==1.0.6
46 
-qiniu==7.2.0
46 
+qiniu==7.2.2
47 47 
 redis==2.10.6
48 48 
 redis-extensions==1.2.1
49 49 
 requests==2.18.4

+ 47 - 0
statistic/migrations/0007_auto_20180517_1819.py
Bestand weergeven 

@@ -0,0 +1,47 @@
1 
+# -*- coding: utf-8 -*-
2 
+# Generated by Django 1.11.11 on 2018-05-17 10:19
3 
+from __future__ import unicode_literals
4 
+
5 
+from django.db import migrations
6 
+
7 
+
8 
+class Migration(migrations.Migration):
9 
+
10 
+    dependencies = [
11 
+        ('statistic', '0006_auto_20180508_1830'),
12 
+    ]
13 
+
14 
+    operations = [
15 
+        migrations.AlterModelOptions(
16 
+            name='consumedistributorsalestatisticinfo',
17 
+            options={'verbose_name': '[\u6d88\u8d39\u8005\u7ef4\u5ea6]\u7ecf\u9500\u5546\u9500\u91cf\u7edf\u8ba1', 'verbose_name_plural': '[\u6d88\u8d39\u8005\u7ef4\u5ea6]\u7ecf\u9500\u5546\u9500\u91cf\u7edf\u8ba1'},
18 
+        ),
19 
+        migrations.AlterModelOptions(
20 
+            name='consumemodelsalestatisticinfo',
21 
+            options={'verbose_name': '[\u6d88\u8d39\u8005\u7ef4\u5ea6]\u578b\u53f7\u9500\u91cf\u7edf\u8ba1', 'verbose_name_plural': '[\u6d88\u8d39\u8005\u7ef4\u5ea6]\u578b\u53f7\u9500\u91cf\u7edf\u8ba1'},
22 
+        ),
23 
+        migrations.AlterModelOptions(
24 
+            name='consumeprovincesalestatisticinfo',
25 
+            options={'verbose_name': '[\u6d88\u8d39\u8005\u7ef4\u5ea6]\u7701\u4efd\u9500\u91cf\u7edf\u8ba1', 'verbose_name_plural': '[\u6d88\u8d39\u8005\u7ef4\u5ea6]\u7701\u4efd\u9500\u91cf\u7edf\u8ba1'},
26 
+        ),
27 
+        migrations.AlterModelOptions(
28 
+            name='consumesalestatisticinfo',
29 
+            options={'verbose_name': '[\u6d88\u8d39\u8005\u7ef4\u5ea6]\u9500\u91cf\u7edf\u8ba1', 'verbose_name_plural': '[\u6d88\u8d39\u8005\u7ef4\u5ea6]\u9500\u91cf\u7edf\u8ba1'},
30 
+        ),
31 
+        migrations.AlterModelOptions(
32 
+            name='distributorsalestatisticinfo',
33 
+            options={'verbose_name': '[\u7ecf\u9500\u5546\u7ef4\u5ea6]\u7ecf\u9500\u5546\u9500\u91cf\u7edf\u8ba1', 'verbose_name_plural': '[\u7ecf\u9500\u5546\u7ef4\u5ea6]\u7ecf\u9500\u5546\u9500\u91cf\u7edf\u8ba1'},
34 
+        ),
35 
+        migrations.AlterModelOptions(
36 
+            name='modelsalestatisticinfo',
37 
+            options={'verbose_name': '[\u7ecf\u9500\u5546\u7ef4\u5ea6]\u578b\u53f7\u9500\u91cf\u7edf\u8ba1', 'verbose_name_plural': '[\u7ecf\u9500\u5546\u7ef4\u5ea6]\u578b\u53f7\u9500\u91cf\u7edf\u8ba1'},
38 
+        ),
39 
+        migrations.AlterModelOptions(
40 
+            name='provincesalestatisticinfo',
41 
+            options={'verbose_name': '[\u7ecf\u9500\u5546\u7ef4\u5ea6]\u7701\u4efd\u9500\u91cf\u7edf\u8ba1', 'verbose_name_plural': '[\u7ecf\u9500\u5546\u7ef4\u5ea6]\u7701\u4efd\u9500\u91cf\u7edf\u8ba1'},
42 
+        ),
43 
+        migrations.AlterModelOptions(
44 
+            name='salestatisticinfo',
45 
+            options={'verbose_name': '[\u7ecf\u9500\u5546\u7ef4\u5ea6]\u9500\u91cf\u7edf\u8ba1', 'verbose_name_plural': '[\u7ecf\u9500\u5546\u7ef4\u5ea6]\u9500\u91cf\u7edf\u8ba1'},
46 
+        ),
47 
+    ]

+ 16 - 16
statistic/models.py
Bestand weergeven 

@@ -37,8 +37,8 @@ class SaleStatisticInfo(BaseModelMixin):
37 37 
     num = models.IntegerField(_(u'num'), default=0, help_text=u'数量')
38 38
39 39 
     class Meta:
40 
-        verbose_name = _(u'销量统计')
41 
-        verbose_name_plural = _(u'销量统计')
40 
+        verbose_name = _(u'[经销商维度]销量统计')
41 
+        verbose_name_plural = _(u'[经销商维度]销量统计')
42 42
43 43 
     def __unicode__(self):
44 44 
         return unicode(self.pk)
 
@@ -59,8 +59,8 @@ class ModelSaleStatisticInfo(BaseModelMixin):
59 59 
     num = models.IntegerField(_(u'num'), default=0, help_text=u'数量')
60 60
61 61 
     class Meta:
62 
-        verbose_name = _(u'型号销量统计')
63 
-        verbose_name_plural = _(u'型号销量统计')
62 
+        verbose_name = _(u'[经销商维度]型号销量统计')
63 
+        verbose_name_plural = _(u'[经销商维度]型号销量统计')
64 64
65 65 
     def __unicode__(self):
66 66 
         return unicode(self.pk)
 
@@ -92,8 +92,8 @@ class DistributorSaleStatisticInfo(BaseModelMixin):
92 92 
     num = models.IntegerField(_(u'num'), default=0, help_text=u'数量')
93 93
94 94 
     class Meta:
95 
-        verbose_name = _(u'经销商销量统计')
96 
-        verbose_name_plural = _(u'经销商销量统计')
95 
+        verbose_name = _(u'[经销商维度]经销商销量统计')
96 
+        verbose_name_plural = _(u'[经销商维度]经销商销量统计')
97 97
98 98 
     def __unicode__(self):
99 99 
         return unicode(self.pk)
 
@@ -118,8 +118,8 @@ class ProvinceSaleStatisticInfo(BaseModelMixin):
118 118 
     position = models.IntegerField(_(u'position'), default=1, help_text=u'排序')
119 119
120 120 
     class Meta:
121 
-        verbose_name = _(u'省份销量统计')
122 
-        verbose_name_plural = _(u'省份销量统计')
121 
+        verbose_name = _(u'[经销商维度]省份销量统计')
122 
+        verbose_name_plural = _(u'[经销商维度]省份销量统计')
123 123
124 124 
     def __unicode__(self):
125 125 
         return unicode(self.pk)
 
@@ -143,8 +143,8 @@ class ConsumeSaleStatisticInfo(BaseModelMixin):
143 143 
     num = models.IntegerField(_(u'num'), default=0, help_text=u'数量')
144 144
145 145 
     class Meta:
146 
-        verbose_name = _(u'销量统计')
147 
-        verbose_name_plural = _(u'销量统计')
146 
+        verbose_name = _(u'[消费者维度]销量统计')
147 
+        verbose_name_plural = _(u'[消费者维度]销量统计')
148 148
149 149 
     def __unicode__(self):
150 150 
         return unicode(self.pk)
 
@@ -165,8 +165,8 @@ class ConsumeModelSaleStatisticInfo(BaseModelMixin):
165 165 
     num = models.IntegerField(_(u'num'), default=0, help_text=u'数量')
166 166
167 167 
     class Meta:
168 
-        verbose_name = _(u'型号销量统计')
169 
-        verbose_name_plural = _(u'型号销量统计')
168 
+        verbose_name = _(u'[消费者维度]型号销量统计')
169 
+        verbose_name_plural = _(u'[消费者维度]型号销量统计')
170 170
171 171 
     def __unicode__(self):
172 172 
         return unicode(self.pk)
 
@@ -189,8 +189,8 @@ class ConsumeDistributorSaleStatisticInfo(BaseModelMixin):
189 189 
     num = models.IntegerField(_(u'num'), default=0, help_text=u'数量')
190 190
191 191 
     class Meta:
192 
-        verbose_name = _(u'经销商销量统计')
193 
-        verbose_name_plural = _(u'经销商销量统计')
192 
+        verbose_name = _(u'[消费者维度]经销商销量统计')
193 
+        verbose_name_plural = _(u'[消费者维度]经销商销量统计')
194 194
195 195 
     def __unicode__(self):
196 196 
         return unicode(self.pk)
 
@@ -215,8 +215,8 @@ class ConsumeProvinceSaleStatisticInfo(BaseModelMixin):
215 215 
     position = models.IntegerField(_(u'position'), default=1, help_text=u'排序')
216 216
217 217 
     class Meta:
218 
-        verbose_name = _(u'省份销量统计')
219 
-        verbose_name_plural = _(u'省份销量统计')
218 
+        verbose_name = _(u'[消费者维度]省份销量统计')
219 
+        verbose_name_plural = _(u'[消费者维度]省份销量统计')
220 220
221 221 
     def __unicode__(self):
222 222 
         return unicode(self.pk)