Răsfoiți Sursa

申请发票,发票查询

wushaodong 4 ani în urmă
părinte
comite
3a00e166c2
3 a modificat fișierele cu 14 adăugiri și 10 ștergeri
  1. 2 1
      apps/tenant/models.py
  2. 1 0
      apps/tenant/serializers.py
  3. 11 9
      apps/tenant/views.py

+ 2 - 1
apps/tenant/models.py

@@ -236,7 +236,8 @@ class Invoice(models.Model):
     bank_account = models.CharField(max_length=50, verbose_name=u'银行帐户', blank=True, null=True)
     invoice_sum = models.FloatField(verbose_name=u'发票金额')
 
-    user = models.CharField(max_length=20, verbose_name=u"申请人")
+    user = models.ForeignKey(settings.AUTH_USER_MODEL,verbose_name=u"申请人", related_name='invoice_user',
+                             on_delete=models.PROTECT,blank=True)
     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)

+ 1 - 0
apps/tenant/serializers.py

@@ -78,6 +78,7 @@ class InvoiceSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
     def create(self, validated_data):
+        validated_data['user'] = self.context['request'].user
         validated_data['tenant'] = self.context['request'].user.employee.tenant
         instance = super(InvoiceSerializer, self).create(validated_data)
         return instance

+ 11 - 9
apps/tenant/views.py

@@ -195,19 +195,21 @@ class InvoiceDataView(APIView):
         try:
             if not pay['amount']:
                 return CustomError('未开具发票!')
+            print(111111,)
             invoice = Invoice.objects.filter(tenant=tenant).order_by('-id').first()
+
             if invoice:
                 data = {
-                    'invoice_name': invoice['invoice_name'],
-                    'tax_no': invoice['tax_no'],
-                    'company_address': invoice['company_address'],
-                    'phone_no': invoice['phone_no'],
-                    'deposit_bank': invoice['deposit_bank'],
-                    'bank_account': invoice['bank_account'],
+                    'invoice_name': invoice.invoice_name,
+                    'tax_no': invoice.tax_no,
+                    'company_address': invoice.company_address,
+                    'phone_no': invoice.phone_no,
+                    'deposit_bank': invoice.deposit_bank,
+                    'bank_account': invoice.bank_account,
                     'invoice_sum': pay['amount'],
-                    'consignee': invoice['consignee'],
-                    'consignee_tel': invoice['consignee_tel'],
-                    'consignee_address': invoice['company_address'],
+                    'consignee': invoice.consignee,
+                    'consignee_tel': invoice.consignee_tel,
+                    'consignee_address': invoice.company_address,
                 }
             else:
                 data['invoice_sum']=pay['amount']