申请发票,发票查询

apps/tenant/inspection_order/filters.py

@@ -14,5 +14,4 @@ class InspectionOrderFilter(django_filters.FilterSet):
 
     def query_status(self, queryset, *args):
         queryset = queryset.filter(status__in=args[1].split(','))
-        print(queryset)
         return queryset

apps/tenant/models.py

@@ -234,9 +234,9 @@ class Invoice(models.Model):
     phone_no = models.CharField(max_length=20, verbose_name=u'电话号码', blank=True, null=True)
     deposit_bank = models.CharField(max_length=50, verbose_name=u'开户银行', blank=True, null=True)
     bank_account = models.CharField(max_length=50, verbose_name=u'银行帐户', blank=True, null=True)
-    invoice_sum = models.FloatField(max_length=20, verbose_name=u'发票金额')
+    invoice_sum = models.FloatField(verbose_name=u'发票金额')
 
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=u"申请人", on_delete=models.PROTECT)
+    user = models.CharField(max_length=20, verbose_name=u"申请人")
     create_time = models.DateTimeField(verbose_name=u'申请时间', auto_now_add=True, editable=False)
     status = models.PositiveSmallIntegerField(choices=APPLY_STATE_CHOICES, verbose_name=u'状态',
                                               default=NOT_CHECKED)

apps/tenant/serializers.py

@@ -76,3 +76,8 @@ class InvoiceSerializer(serializers.ModelSerializer):
     class Meta:
         model = Invoice
         fields = '__all__'
+
+    def create(self, validated_data):
+        validated_data['tenant'] = self.context['request'].user.employee.tenant
+        instance = super(InvoiceSerializer, self).create(validated_data)
+        return instance

apps/tenant/views.py

@@ -172,17 +172,6 @@ class CompanyViewSet(CustomModelViewSet):
         data = PaySerializer(payment, many=True).data
         return response_ok(data)
 
-class InvoiceViewSet(CustomModelViewSet):
-    permission_classes = [IsTenantUser, ]
-    queryset = Invoice.objects.filter()
-    serializer_class = InvoiceSerializer
-
-    def filter_queryset(self, queryset):
-        queryset = queryset.filter(id=self.request.user.employee.tenant.id)
-        f = InvoiceFilter(self.request.GET, queryset=queryset)
-        print(f)
-        return f.qs
-
 class InvoiceDataView(APIView):
     permission_classes = [IsTenantUser, ]
 
@@ -224,4 +213,14 @@ class InvoiceDataView(APIView):
                 data['invoice_sum']=pay['amount']
         except Exception as e:
             return response_error(str(e))
-        return response_ok(data)
+        return response_ok(data)
+
+class InvoiceViewSet(CustomModelViewSet):
+    permission_classes = [IsTenantUser, ]
+    queryset = Invoice.objects.filter()
+    serializer_class = InvoiceSerializer
+
+    def filter_queryset(self, queryset):
+        queryset = queryset.filter(tenant=self.request.user.employee.tenant)
+        f = InvoiceFilter(self.request.GET, queryset=queryset)
+        return f.qs