Merge branch 'master' of http://git.zzliaoyuan.com:4000/wushaodong/decorate

apps/account/views.py

@@ -192,7 +192,7 @@ class StoreTreeView(APIView):
                 'field':'agent',
                 'children': [],
             }
-            stores = Store.objects.filter(agent=agent, enable=True).values('id','name')
+            stores = Store.objects.filter(agent_id=agent['id'], enable=True).values('id','name')
             for store in stores:
                 manage_store = ManageStoreUser.objects.filter(manage_user_id=id, store=store).first()
                 checked = True and manage_store or False

apps/agent/models.py

@@ -13,7 +13,7 @@ class Agent(models.Model):
     area = models.CharField(verbose_name=u'区域', max_length=50)
     address = models.CharField(verbose_name=u'地址', max_length=200)
     create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u'添加人',related_name='agent_create_user',
-                                    editable=False, on_delete=models.PROTECT)
+                                    editable=False,on_delete=models.PROTECT)
     create_time = models.DateTimeField(verbose_name=u'添加时间', auto_now_add=True, editable=False)
 
     class Meta:

apps/customer/models.py

@@ -23,14 +23,17 @@ class ReportCustomer(models.Model):
                                               default=settings.MALE)
     village = models.CharField(max_length=100, verbose_name=u'小区')
     address = models.CharField(max_length=100, verbose_name=u'地址')
-    source = models.ForeignKey(Option, verbose_name=u'来源', related_name='customer_source',
-                               on_delete=models.PROTECT)
-    project = models.ManyToManyField(Option, verbose_name=u'项目', related_name='customer_category', editable=False, null=True,blank=True,)
+    source = models.ForeignKey(Option, verbose_name=u'来源', related_name='customer_source', on_delete=models.PROTECT)
+    project = models.ManyToManyField(Option, verbose_name=u'项目', related_name='customer_category', editable=False, null=True,blank=True)
     notes = models.CharField(max_length=500, verbose_name=u"备注", null=True)
     report_status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, verbose_name=u'报备状态', default=NOT_CHECKED)
     check_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u'审核人', related_name='customer_check_user',
                                    on_delete=models.PROTECT, null=True)
     check_time = models.DateTimeField(verbose_name=u'审核时间', null=True)
+    create_user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u'添加人', related_name='customer_create_user',
+                                    editable=False, on_delete=models.PROTECT)
+    create_time = models.DateTimeField(verbose_name=u'添加时间', auto_now_add=True, editable=False)
+
 
     class Meta:
         db_table = 'report_customer'

apps/customer/serializers.py

@@ -10,16 +10,20 @@ class ReportCustomerSerializer(serializers.ModelSerializer):
     gender_text = serializers.CharField(source='get_gender_display', read_only=True)
     report_status_text = serializers.CharField(source='get_report_status_display', read_only=True)
     check_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
+    source_text = serializers.CharField(source='source.name', read_only=True)
+    create_time = serializers.DateTimeField(format='%Y-%m-%d %H:%M', read_only=True)
     project_text = serializers.SerializerMethodField()
 
     def get_project_text(self, obj):
-        return OptionSerializer(obj.project, many=True).data
+        project = obj.project.all()
+        return ','.join(project.values_list('name', flat=True))
 
     class Meta:
         model = ReportCustomer
         fields = '__all__'
 
     def create(self, validated_data):
+        validated_data['create_user'] = self.context['request'].user
         instance = super(ReportCustomerSerializer, self).create(validated_data)
         projects = self.initial_data['project']
         if projects:

apps/customer/urls.py

@@ -11,5 +11,5 @@ urlpatterns = [
 ]
 
 router = SimpleRouter()
-router.register(r'reportcustomer', ReportCustomerViewSet)
+router.register(r'report_customer', ReportCustomerViewSet)
 urlpatterns += router.urls

uis/views/customer/index.html

@@ -128,7 +128,7 @@
                 , {field: 'tel', title: '电话', width: 150}
                 , {field: 'village', title: '小区', width: 200}
                 , {field: 'address', title: '地址', width: 200}
-                , {field: 'source', title: '来源', width: 100}
+                , {field: 'source_text', title: '来源', width: 100}
                 , {field: 'project_text', title: '项目', width: 200}
                 , {field: 'notes', title: '备注', width: 200}
                 , {field: 'report_status_text', title: '报备状态', width: 200}