|
|
@@ -157,10 +157,24 @@ class OrderViewSet(CustomModelViewSet):
|
|
|
# 小程序草稿箱、已上报修改，调用明细
|
|
|
instance = self.get_object()
|
|
|
serializer = self.get_serializer(instance)
|
|
|
+ # 草稿的数据
|
|
|
if instance.category == order.ZERO:
|
|
|
- return response_ok(serializer.data)
|
|
|
+ edit_file2 = []
|
|
|
+ images = OrderImages.objects.filter(order=instance)
|
|
|
+ for image in images:
|
|
|
+ item2 = {
|
|
|
+ 'upload_id': image.image.id,
|
|
|
+ 'url': image.image.get_path(),
|
|
|
+ 'type': image.type,
|
|
|
+ }
|
|
|
+ edit_file2.append(item2)
|
|
|
+ result = {
|
|
|
+ 'data': serializer.data,
|
|
|
+ 'edit_file2': edit_file2,
|
|
|
+ }
|
|
|
+ return response_ok(result)
|
|
|
else:
|
|
|
- # y已上报修改，返回需要修改的字段列表
|
|
|
+ # 已上报修改，返回需要修改的字段列表
|
|
|
edit_data = []
|
|
|
edit_file = []
|
|
|
edit_file2 = []
|
|
|
@@ -175,14 +189,15 @@ class OrderViewSet(CustomModelViewSet):
|
|
|
else:
|
|
|
edit_file.append(item)
|
|
|
# 待审核，加载图片使用
|
|
|
- images = OrderImages.objects.filter(order=instance)
|
|
|
- for image in images:
|
|
|
- item2 = {
|
|
|
- 'upload_id': image.image.id,
|
|
|
- 'url': image.image.get_path(),
|
|
|
- 'type': image.type,
|
|
|
- }
|
|
|
- edit_file2.append(item2)
|
|
|
+ if instance.status == order.ZERO:
|
|
|
+ images = OrderImages.objects.filter(order=instance)
|
|
|
+ for image in images:
|
|
|
+ item2 = {
|
|
|
+ 'upload_id': image.image.id,
|
|
|
+ 'url': image.image.get_path(),
|
|
|
+ 'type': image.type,
|
|
|
+ }
|
|
|
+ edit_file2.append(item2)
|
|
|
result = {
|
|
|
'data': serializer.data,
|
|
|
'edit_values': edit_data,
|
wushaodong