订单审批

apps/order/views.py

@@ -162,6 +162,7 @@ class OrderViewSet(CustomModelViewSet):
             # y已上报修改，返回需要修改的字段列表
             edit_data = []
             edit_file = []
+            edit_file2 = []
             edit_values = OrderDetailEdit.objects.filter(order=instance).values('value', 'reason', 'type')
             for r in edit_values:
                 item = {
@@ -172,10 +173,21 @@ class OrderViewSet(CustomModelViewSet):
                     edit_data.append(item)
                 else:
                     edit_file.append(item)
+            # 待审核，加载图片使用
+            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,
                 'edit_file': edit_file,
+                'edit_file2': edit_file2,
             }
             return response_ok(result)
 
@@ -244,9 +256,9 @@ class OrderViewSet(CustomModelViewSet):
                     # 返回修改
                     if not len(data):
                         raise CustomError('请填写返回修改原因')
+                    # 删除已修改过的历史修改信息
+                    OrderDetailEdit.objects.filter(order=instance, edit_time__isnull=False).delete()
                     for item in json.loads(data):
-                        # 根据修改类别，删除对应的历史修改信息
-                        OrderDetailEdit.objects.filter(order=instance, type=item['type']).delete()
                         OrderDetailEdit.objects.create(order=instance, value=item['name'], reason=item['reason'],
                                                        type=item['type'])
                         if item['type'] == OrderDetailEdit.ONE:
@@ -297,15 +309,16 @@ class OrderViewSet(CustomModelViewSet):
 
     @action(methods=['post'], detail=True)
     def deleteImage(self, request, pk):
-        upload_id = self.request.POST.get('upload_id')
+        upload_id = request.POST.get('id')
+
         try:
             order = self.get_object()
             with transaction.atomic():
                 if upload_id:
                     upload = Upload.objects.filter(id=upload_id).first()
                     if upload:
-                        upload.del_images()
                         OrderImages.objects.filter(order=order, image_id=upload_id).delete()
+                        upload.del_images()
                         return response_ok()
                 return response_error('图片参数错误，删除失败')
         except CustomError as e: