进度明细

apps/customer/models.py

@@ -79,6 +79,7 @@ class NewCustomer(models.Model):
     status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, verbose_name=u"状态", default=NORMAL)
     store = models.ForeignKey(Store, verbose_name=u'门店', related_name='customer_store',
                               editable=False, on_delete=models.PROTECT)
+    notes = models.CharField(max_length=500, verbose_name=u"备注", null=True)
 
     class Meta:
         db_table = 'new_customer'

apps/customer/views.py

@@ -262,15 +262,11 @@ class NewCustomerViewSet(CustomModelViewSet):
                         ser.project.add(project.id)
                 # TODO 创建订单流程,保存图片
                 user = self.request.user
-                print(2222222222,user)
                 operation = u'更新进度为：{}'.format(order.stage_progress.name)
                 progress_details = ProgressDetails.objects.create(order=order, user=user, operation=operation, notes=notes)
 
                 for i in range(6):
-                    print(33333333, i)
                     file = request.data.get('file{}'.format(i))
-                    print(22222222222, file)
-                    print(4444444,user.store)
                     if file:
                         upload = Upload.objects._addnew(user.store, progress_details, user, file)
                         if not upload:

apps/order/models.py

@@ -25,6 +25,7 @@ class Order(models.Model):
                                      on_delete=models.PROTECT)
     create_time = models.DateTimeField(verbose_name=u'下单时间', auto_now_add=True, editable=False)
     status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, verbose_name=u"订单状态", default=NORMAL)
+    notes = models.CharField(max_length=500, verbose_name=u"备注", null=True)
 
     class Meta:
         db_table = "order"
@@ -64,14 +65,6 @@ class ProgressDetails(models.Model):
             'user': self.user.name,
             'notes': self.notes,
             'operation_time': strftime(self.operation_time),
-            'images': [],
         }
-        from apps.upload.models import Upload
-        images = Upload.objects.filter(progress_details=self)
-        for img in images:
-            dict['images'].append(
-                {
-                    'url': img.picture,
-                }
-            )
+
         return dict

apps/order/urls.py

@@ -7,6 +7,7 @@ from .views import *
 urlpatterns = [
     url(r'^get_process/$', GetProcessView.as_view()),
     url(r'^get_details/$', GetDetailsView.as_view()),
+    url(r'^get_files/$', GetFilesView.as_view()),
 
 ]
 

apps/order/views.py

@@ -11,6 +11,7 @@ from utils.permission import isLogin, check_permission
 from apps.customer.models import NewCustomer
 from apps.order.models import Order,ProgressDetails
 from apps.option.models import Option
+from apps.upload.models import Upload
 
 class GetProcessView(APIView):
     permission_classes = [isLogin]
@@ -73,4 +74,22 @@ class GetDetailsView(APIView):
         for detail in details:
             dict = detail.get_details()
             data.append(dict)
-        return response_ok(data)
+        return response_ok(data)
+
+class GetFilesView(APIView):
+    permission_classes = [isLogin]
+
+    def get(self, request):
+        progress_details_id = request.GET.get('progress_details_id')
+        images = Upload.objects.filter(progress_details_id=progress_details_id)
+        img_data = []
+        for img in images:
+            img_data.append(
+                {
+                    'url': img.picture,
+                    'create_time': img.create_time,
+                    'file_size': img.file_size,
+                    'user': img.user.name,
+                }
+            )
+        return response_ok(img_data)