优化

apps/account/views.py

@@ -353,9 +353,11 @@ class EmployeeTreeView(APIView):
             if not store:
                 continue
             store_item = {
+                'name': store[0]['name'],
                 'title': store[0]['name'],
                 'id': store_id,
                 'field': 'store',
+                'spread': True,
                 'children': [],
             }
             office_user_id = OfficeStoreUser.objects.filter(store_id=store_id).values('office_user_id')
@@ -363,8 +365,10 @@ class EmployeeTreeView(APIView):
             for employee in employees:
                 user_item = {
                     'title': employee['name'],
+                    'name': employee['name'],
                     'id': '{0}_{1}'.format(store_id, employee['id']),# 门店_人员
                     'field': 'user',
+                    'spread': True,
                 }
                 store_item['children'].append(user_item)
 
@@ -381,8 +385,10 @@ class EmployeeTreeView(APIView):
         for agent in agents:
             agent_item = {
                 'title': agent['name'],
+                'name': agent['name'],
                 'id': agent['id'],
                 'field': 'agent',
+                'spread': True,
                 'children': agent_dict[agent['id']] ,
             }
 
@@ -399,8 +405,10 @@ class EmployeeTreeView(APIView):
                 if agent_user.has_perm('customer.inner_review'):
                     agent_user_item = {
                         'title': agent_user.name,
+                        'name': agent_user.name,
                         'id': agent_user.id,
                         'field': 'user',
+                        'spread': True,
                     }
                     agent_item['children'].insert(0,agent_user_item)
 
@@ -416,8 +424,10 @@ class EmployeeTreeView(APIView):
         for general_agent in general_agents:
             general_agent_item = {
                 'title': general_agent['name'],
+                'name': general_agent['name'],
                 'id': general_agent['id'],
                 'field': 'general_agent',
+                'spread': True,
                 'children': general_agent_dict[general_agent['id']],
             }
             # 当前用户没有代理商，则是总代理账号。此时加载和总代理平行的账号
@@ -427,7 +437,9 @@ class EmployeeTreeView(APIView):
                     if general_agent_user.has_perm('customer.inner_review'):
                         general_agent_user_item = {
                             'title': general_agent_user.name,
+                            'name': general_agent_user.name,
                             'id': general_agent_user.id,
+                            'spread': True,
                             'field': 'user',
                         }
                         general_agent_item['children'].insert(0, general_agent_user_item)

apps/order/serializers.py

@@ -29,7 +29,14 @@ class ProgressDetailsSerializer(serializers.ModelSerializer):
     user_text = serializers.CharField(source='user.name', read_only=True)
     operation_time_f = serializers.DateTimeField(source='operation_time', format=settings.SHORT_DATETIME_FORMAT,
                                                  read_only=True)
+    has_img = serializers.SerializerMethodField()
+
+    def get_has_img(self, obj):
+        if '更新进度为' in obj.operation:
+            return True
+        else:
+            return False
 
     class Meta:
         model = ProgressDetails
-        fields = '__all__'
+        fields = '__all__'

apps/upload/serializers.py

@@ -12,4 +12,4 @@ class UploadSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Upload
-        fields = ('picture', 'create_time_f', 'file_size', 'user_text')
+        fields = ('picture', 'create_time_f', 'file_size', 'user_text', 'width', 'height')